Skip to content

Commit

Permalink
fix .NET 4.8.1 detection (#2067)
Browse files Browse the repository at this point in the history
  • Loading branch information
adamsitnik committed Aug 2, 2022
1 parent 7fb8723 commit 8e355b5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/BenchmarkDotNet/Helpers/FrameworkVersionHelper.cs
Expand Up @@ -11,6 +11,7 @@ internal static class FrameworkVersionHelper
// should be ordered by release number
private static readonly (int minReleaseNumber, string version)[] FrameworkVersions =
{
(533320, "4.8.1"), // value taken from Windows 11 arm64 insider build
(528040, "4.8"),
(461808, "4.7.2"),
(461308, "4.7.1"),
Expand Down Expand Up @@ -48,7 +49,7 @@ internal static string MapToReleaseVersion(string servicingVersion)
return "4.7.1";
if (string.Compare(servicingVersion, "4.8") < 0)
return "4.7.2";
if (string.Compare(servicingVersion, "4.8.1") < 0)
if (string.Compare(servicingVersion, "4.8.9") < 0)
return "4.8";

return "4.8.1"; // most probably the last major release of Full .NET Framework
Expand Down
3 changes: 3 additions & 0 deletions tests/BenchmarkDotNet.Tests/FrameworkVersionHelperTests.cs
Expand Up @@ -19,6 +19,9 @@ public class FrameworkVersionHelperTests
[InlineData("4.7.3324.0", "4.7.2")]
[InlineData("4.8", "4.8")]
[InlineData("4.8.024", "4.8")]
[InlineData("4.8.4510.0", "4.8")]
[InlineData("4.8.4526.0", "4.8")]
[InlineData("4.8.9032.0", "4.8.1")]
public void ServicingVersionsAreMappedToCorrespondingReleaseVersions(string servicingVersion, string expectedReleaseVersion)
{
Assert.Equal(expectedReleaseVersion, FrameworkVersionHelper.MapToReleaseVersion(servicingVersion));
Expand Down

0 comments on commit 8e355b5

Please sign in to comment.