Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Parse "Mono Unity IL2CPP" correctly in platform runtime name #1742

Merged
merged 12 commits into from
Sep 1, 2022
Merged

Parse "Mono Unity IL2CPP" correctly in platform runtime name #1742

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
dc70f0c
modified runtimeparseregex
bitsandfoxes Jun 23, 2022
9e5a980
tweaked regex for more than just unity
bitsandfoxes Jun 23, 2022
76fd9f2
tweaked regex for '-preview'
bitsandfoxes Jun 23, 2022
3957f96
special casing IL2CPP
bitsandfoxes Jun 23, 2022
7c46a6f
Update test/Sentry.Tests/PlatformAbstractions/RuntimeInfoTests.cs
bitsandfoxes Jun 27, 2022
a18bbe6
updated the regex to handle 'IL2CPP'
bitsandfoxes Jun 27, 2022
8d9a037
Merge branch 'fix/runtimeinfo-il2cpp' of https://github.com/getsentry…
bitsandfoxes Jun 27, 2022
ed80a8b
fixed expected test result
bitsandfoxes Jun 27, 2022
ac82a3e
Merge branch 'main' into fix/runtimeinfo-il2cpp
mattjohnsonpint Aug 31, 2022
708385e
Fix regex
mattjohnsonpint Sep 1, 2022
949def2
Update two bad tests
mattjohnsonpint Sep 1, 2022
b3e3f67
Update CHANGELOG.md
mattjohnsonpint Sep 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Sentry/PlatformAbstractions/RuntimeInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ namespace Sentry.PlatformAbstractions
// https://github.com/dotnet/corefx/issues/17452
internal static class RuntimeInfo
{
private static readonly Regex RuntimeParseRegex = new("^(?<name>[^\\d]*)(?<version>(\\d+\\.)+[^\\s]+)",
private static readonly Regex RuntimeParseRegex = new(
@"^(?<name>(?:[A-Za-z.]\S*\s?)*)(?:\s|^|$)(?<version>\d\S*)?",
RegexOptions.Compiled | RegexOptions.CultureInvariant);

/// <summary>
Expand Down
19 changes: 17 additions & 2 deletions test/Sentry.Tests/PlatformAbstractions/RuntimeInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@ public static IEnumerable<object[]> ParseTestCases()
}};
yield return new object[] { new ParseTestCase
{
Raw = ".NET Framework For Windows Mobile 10"
Raw = ".NET Framework For Windows Mobile 10",
ExpectedName = ".NET Framework For Windows Mobile",
ExpectedVersion = "10"
}};
yield return new object[] { new ParseTestCase
{
Expand All @@ -126,7 +128,8 @@ public static IEnumerable<object[]> ParseTestCases()
}};
yield return new object[] { new ParseTestCase
{
Raw = "web"
Raw = "web",
ExpectedName = "web"
}};
yield return new object[] { new ParseTestCase
{
Expand All @@ -139,6 +142,18 @@ public static IEnumerable<object[]> ParseTestCases()
ExpectedName = null,
ExpectedVersion = null
}};
yield return new object[] { new ParseTestCase
{
Raw = "Mono 6.13.0 (explicit/88268f9e785)",
ExpectedName = "Mono",
ExpectedVersion = "6.13.0"
}};
yield return new object[] { new ParseTestCase
{
Raw = "Mono Unity IL2CPP (Jun 22 2022 18:13:02)",
ExpectedName = "Mono Unity IL2CPP",
ExpectedVersion = null
}};
}

public class ParseTestCase
Expand Down