Support Windows 22H2 in OsBrandStringHelper

Author: AndreyAkinshin

src/BenchmarkDotNet/Environments/OsBrandStringHelper.cs

@@ -102,7 +102,9 @@ public class OsBrandStringHelper
             { "10.0.19042", "10 20H2 [20H2, October 2020 Update]" },
             { "10.0.19043", "10 21H1 [21H1, May 2021 Update]" },
             { "10.0.19044", "10 21H2 [21H2, November 2021 Update]" },
-            { "10.0.22000", "11 21H2 [21H2]" },
+            { "10.0.19045", "10 22H2 [22H2, 2022 Update]" },
+            { "10.0.22000", "11 21H2 [21H2, Sun Valley]" },
+            { "10.0.22621", "11 22H2 [22H2, Sun Valley 2]" },
         };
 
         private class Windows1XVersion
@@ -155,9 +157,10 @@ public string ToPrettifiedString(int? ubr)
                 new Windows1XVersion("20H2", "20H2", "October 2020 Update", 19042),
                 new Windows1XVersion("21H1", "21H1", "May 2021 Update", 19043),
                 new Windows1XVersion("21H2", "21H2", "November 2021 Update", 19044),
-                new Windows1XVersion("21H2", "21H2", "November 2021 Update", 19044),
+                new Windows1XVersion("22H2", "22H2", "2022 Update", 19045),
                 // Windows 11
-                new Windows1XVersion("21H2", "21H2", null, 22000),
+                new Windows1XVersion("21H2", "Sun Valley", null, 22000),
+                new Windows1XVersion("22H2", "Sun Valley 2", "2022 Update", 22621),
             };
 
             public static Windows1XVersion? Resolve(string osVersionString)

tests/BenchmarkDotNet.Tests/Environments/OsBrandStringTests.cs

@@ -47,8 +47,10 @@ public void WindowsIsPrettified(string originalVersion, string prettifiedName)
         [InlineData("10.0.19043", 964, "Windows 10 (10.0.19043.964/21H1/May2021Update)")]
         [InlineData("10.0.19044", 1147, "Windows 10 (10.0.19044.1147/21H2/November2021Update)")]
         [InlineData("10.0.19099", 1729, "Windows 10 (10.0.19099.1729)")]
-        [InlineData("10.0.22000", 348, "Windows 11 (10.0.22000.348/21H2)")]
+        [InlineData("10.0.19045", 0, "Windows 10 (10.0.19045.0/22H2/2022Update)")]
+        [InlineData("10.0.22000", 348, "Windows 11 (10.0.22000.348/21H2/SunValley)")]
         [InlineData("10.0.22518", 1012, "Windows 11 (10.0.22518.1012)")]
+        [InlineData("10.0.22621", 0, "Windows 11 (10.0.22621.0/22H2/2022Update/SunValley2)")]
         public void WindowsWithUbrIsPrettified(string originalVersion, int ubr, string prettifiedName)
             => Check(OsBrandStringHelper.Prettify("Windows", originalVersion, ubr), prettifiedName);