Support Windows 10 21H1 recognition

marcinotorowski · May 30, 2021 · 52b4468 · 52b4468
1 parent 99a24a8
commit 52b4468
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/Otor.MsixHero.Appx/Diagnostic/System/Windows10Parser.cs b/src/Otor.MsixHero.Appx/Diagnostic/System/Windows10Parser.cs
@@ -137,7 +137,12 @@ private static AppxTargetOperatingSystem GetWindowsDesktop(string version)
                         break;
                     case "10.0.19042":
                         result.MarketingCodename = "October 2020 Update";
-                        result.Name = "Windows 10 2004";
+                        result.Name = "Windows 10 20H2";
+                        result.IsNativeMsixPlatform = AppxTargetOperatingSystemType.MsixNativeSupported;
+                        break;
+                    case "10.0.19043":
+                        result.MarketingCodename = "May 2021 Update";
+                        result.Name = "Windows 10 21H1";
                         result.IsNativeMsixPlatform = AppxTargetOperatingSystemType.MsixNativeSupported;
                         break;
                     default:

diff --git a/src/Otor.MsixHero.Tests/Appx/Diagnostics/Windows10NameParser.cs b/src/Otor.MsixHero.Tests/Appx/Diagnostics/Windows10NameParser.cs
@@ -41,6 +41,7 @@ public void TestMsixCore()
             var windows101909 = new Tuple<string, string>("Windows.Desktop", "10.0.18363");
             var windows102004 = new Tuple<string, string>("Windows.Desktop", "10.0.19041");
             var windows1020H2 = new Tuple<string, string>("Windows.Desktop", "10.0.19042");
+            var windows1021H1 = new Tuple<string, string>("Windows.Desktop", "10.0.19043");
             var windowsOther = new Tuple<string, string>("Windows.Desktop", "10.0.99999");
 
 
@@ -58,6 +59,7 @@ public void TestMsixCore()
             var parsedWindows101909 = Windows10Parser.GetOperatingSystemFromNameAndVersion(windows101909.Item1, windows101909.Item2);
             var parsedWindows102004 = Windows10Parser.GetOperatingSystemFromNameAndVersion(windows102004.Item1, windows102004.Item2);
             var parsedWindows1020H2 = Windows10Parser.GetOperatingSystemFromNameAndVersion(windows1020H2.Item1, windows1020H2.Item2);
+            var parsedWindows1021H1 = Windows10Parser.GetOperatingSystemFromNameAndVersion(windows1021H1.Item1, windows1021H1.Item2);
             var parsedWindowsOther = Windows10Parser.GetOperatingSystemFromNameAndVersion(windowsOther.Item1, windowsOther.Item2);
 
 
@@ -76,6 +78,7 @@ public void TestMsixCore()
             Assert.AreEqual("10.0.18363", parsedWindows101909.TechnicalVersion);
             Assert.AreEqual("10.0.19041", parsedWindows102004.TechnicalVersion);
             Assert.AreEqual("10.0.19042", parsedWindows1020H2.TechnicalVersion);
+            Assert.AreEqual("10.0.19043", parsedWindows1021H1.TechnicalVersion);
             Assert.AreEqual("10.0.99999", parsedWindowsOther.TechnicalVersion);
 
             // Test if display versions were recognized
@@ -92,7 +95,8 @@ public void TestMsixCore()
             Assert.AreEqual("Windows 10 1903", parsedWindows101903.Name);
             Assert.AreEqual("Windows 10 1909", parsedWindows101909.Name);
             Assert.AreEqual("Windows 10 2004", parsedWindows102004.Name);
-            Assert.AreEqual("Windows 10 2004", parsedWindows1020H2.Name);
+            Assert.AreEqual("Windows 10 20H2", parsedWindows1020H2.Name);
+            Assert.AreEqual("Windows 10 21H1", parsedWindows1021H1.Name);
             Assert.AreEqual("Windows 10.0.99999", parsedWindowsOther.Name);
 
             // Test if type of support for MSIX was recognized
@@ -111,6 +115,7 @@ public void TestMsixCore()
             Assert.True(parsedWindows101909.IsNativeMsixPlatform == AppxTargetOperatingSystemType.MsixNativeSupported);
             Assert.True(parsedWindows102004.IsNativeMsixPlatform == AppxTargetOperatingSystemType.MsixNativeSupported);
             Assert.True(parsedWindows1020H2.IsNativeMsixPlatform == AppxTargetOperatingSystemType.MsixNativeSupported);
+            Assert.True(parsedWindows1021H1.IsNativeMsixPlatform == AppxTargetOperatingSystemType.MsixNativeSupported);
 
             // Test if marketing names were recognized
             Assert.AreEqual("November Update", parsedWindows101511.MarketingCodename);
@@ -123,6 +128,7 @@ public void TestMsixCore()
             Assert.AreEqual("November 2019 Update", parsedWindows101909.MarketingCodename);
             Assert.AreEqual("May 2020 Update", parsedWindows102004.MarketingCodename);
             Assert.AreEqual("October 2020 Update", parsedWindows1020H2.MarketingCodename);
+            Assert.AreEqual("May 2021 Update", parsedWindows1021H1.MarketingCodename);
 
         }
     }