Support latest Windows and macOS versions in OsBrandStringHelper

Author: AndreyAkinshin

src/BenchmarkDotNet/Environments/OsBrandStringHelper.cs

@@ -96,20 +96,21 @@ public class OsBrandStringHelper
             { "10.0.17763", "10 Redstone 5 [1809, October 2018 Update]" },
             { "10.0.18362", "10 19H1 [1903, May 2019 Update]" },
             { "10.0.18363", "10 19H2 [1909, November 2019 Update]" },
-            { "10.0.19041", "10 20H1 [2004, May 2020 Update]" }
+            { "10.0.19041", "10 20H1 [2004, May 2020 Update]" },
+            { "10.0.19042", "10 20H2 [20H2, October 2020 Update]" }
         };
 
         private class Windows10Version
         {
-            private int Version { get; }
+            private string Version { get; }
             [NotNull] private string CodeName { get; }
             [NotNull] private string MarketingName { get; }
             private int BuildNumber { get; }
 
             [NotNull] private string ShortifiedCodeName => CodeName.Replace(" ", "");
             [NotNull] private string ShortifiedMarketingName => MarketingName.Replace(" ", "");
 
-            private Windows10Version(int version, [NotNull] string codeName, [NotNull] string marketingName, int buildNumber)
+            private Windows10Version(string version, [NotNull] string codeName, [NotNull] string marketingName, int buildNumber)
             {
                 Version = version;
                 CodeName = codeName;
@@ -124,21 +125,24 @@ private string ToFullVersion([CanBeNull] int? ubr = null)
             // When people past in on GitHub, it can be a reason of an ugly horizontal scrollbar.
             // To avoid this, we are trying to minimize this line and use the minimum possible number of characters.
             public string ToPrettifiedString([CanBeNull] int? ubr)
-                => $"{ToFullVersion(ubr)} ({Version}/{ShortifiedMarketingName}/{ShortifiedCodeName})";
+                => Version == ShortifiedCodeName
+                    ? $"{ToFullVersion(ubr)} ({Version}/{ShortifiedMarketingName})"
+                    : $"{ToFullVersion(ubr)} ({Version}/{ShortifiedMarketingName}/{ShortifiedCodeName})";
 
             // See https://en.wikipedia.org/wiki/Windows_10_version_history
             private static readonly List<Windows10Version> WellKnownVersions = new List<Windows10Version>
             {
-                new Windows10Version(1507, "Threshold 1", "RTM", 10240),
-                new Windows10Version(1511, "Threshold 2", "November Update", 10586),
-                new Windows10Version(1607, "Redstone 1", "Anniversary Update", 14393),
-                new Windows10Version(1703, "Redstone 2", "Creators Update", 15063),
-                new Windows10Version(1709, "Redstone 3", "Fall Creators Update", 16299),
-                new Windows10Version(1803, "Redstone 4", "April 2018 Update", 17134),
-                new Windows10Version(1809, "Redstone 5", "October 2018 Update", 17763),
-                new Windows10Version(1903, "19H1", "May 2019 Update", 18362),
-                new Windows10Version(1909, "19H2", "November 2019 Update", 18363),
-                new Windows10Version(2004, "20H1", "May 2020 Update", 19041)
+                new Windows10Version("1507", "Threshold 1", "RTM", 10240),
+                new Windows10Version("1511", "Threshold 2", "November Update", 10586),
+                new Windows10Version("1607", "Redstone 1", "Anniversary Update", 14393),
+                new Windows10Version("1703", "Redstone 2", "Creators Update", 15063),
+                new Windows10Version("1709", "Redstone 3", "Fall Creators Update", 16299),
+                new Windows10Version("1803", "Redstone 4", "April 2018 Update", 17134),
+                new Windows10Version("1809", "Redstone 5", "October 2018 Update", 17763),
+                new Windows10Version("1903", "19H1", "May 2019 Update", 18362),
+                new Windows10Version("1909", "19H2", "November 2019 Update", 18363),
+                new Windows10Version("2004", "20H1", "May 2020 Update", 19041),
+                new Windows10Version("20H2", "20H2", "October 2020 Update", 19042),
             };
 
             [CanBeNull]
@@ -202,7 +206,8 @@ private MacOSXVersion(int darwinVersion, [NotNull] string codeName)
                 new MacOSXVersion(16, "Sierra"),
                 new MacOSXVersion(17, "High Sierra"),
                 new MacOSXVersion(18, "Mojave"),
-                new MacOSXVersion(19, "Catalina")
+                new MacOSXVersion(19, "Catalina"),
+                new MacOSXVersion(20, "Big Sur")
             };
 
             [CanBeNull]

tests/BenchmarkDotNet.Tests/Environments/OsBrandStringTests.cs

@@ -42,13 +42,15 @@ public void WindowsIsPrettified(string originalVersion, string prettifiedName)
         [InlineData("10.0.18362", 693, "Windows 10.0.18362.693 (1903/May2019Update/19H1)")]
         [InlineData("10.0.18363", 657, "Windows 10.0.18363.657 (1909/November2019Update/19H2)")]
         [InlineData("10.0.19041", 1, "Windows 10.0.19041.1 (2004/May2020Update/20H1)")]
+        [InlineData("10.0.19042", 746, "Windows 10.0.19042.746 (20H2/October2020Update)")]
         public void WindowsWithUbrIsPrettified(string originalVersion, int ubr, string prettifiedName)
             => Check(OsBrandStringHelper.Prettify("Windows", originalVersion, ubr), prettifiedName);
 
         [Theory]
         [InlineData("macOS 10.12.6 (16G29)", "Darwin 16.7.0", "macOS Sierra 10.12.6 (16G29) [Darwin 16.7.0]")]
         [InlineData("macOS 10.13.4 (17E199)", "Darwin 17.5.0", "macOS High Sierra 10.13.4 (17E199) [Darwin 17.5.0]")]
         [InlineData("macOS 10.15.4 (19E266)", "Darwin 19.4.0", "macOS Catalina 10.15.4 (19E266) [Darwin 19.4.0]")]
+        [InlineData("macOS 11.1 (20C69)", "Darwin 20.2.0", "macOS Big Sur 11.1 (20C69) [Darwin 20.2.0]")]
         public void MacOSXIsPrettified(string systemVersion, string kernelVersion, string prettifiedName)
             => Check(OsBrandStringHelper.PrettifyMacOSX(systemVersion, kernelVersion), prettifiedName);
     }