Merge branch 'vnext'

Author: 13xforever

CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs

@@ -280,7 +280,7 @@ private static async ValueTask BuildNotesSectionAsync(DiscordEmbedBuilder builde
 
         if (items["os_type"] is "Windows"
             && Version.TryParse(items["os_version"], out var winVersion)
-            && (winVersion is { Major: < 10 } or { Build: <19045 or (>20000 and <22621) }))
+            && winVersion is { Major: < 11 } or { Build: <22631 })
             notes.Add("⚠️ Please [upgrade your Windows](https://www.microsoft.com/en-us/software-download/windows11) to currently supported version");
         if (items["os_type"] is "MacOS" && Version.TryParse(items["os_version"], out var macVersion))
         {

CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs

@@ -1018,16 +1018,16 @@ select m
                 19041 => "10 2004",
                 19042 => "10 20H2",
                 19043 => "10 21H1",
-                19044 => "10 21H2", // deprecated
-                19045 => "10 22H2",
+                19044 => "10 21H2",
+                19045 => "10 22H2", // deprecated
 
                 < 21390 => "10 Dev Build " + windowsVersion.Build,
                 21390 => "10 21H2 Insider",
                 < 22000 => "11 Internal Build " + windowsVersion.Build,
-                22000 => "11 21H2", // deprecated
+                22000 => "11 21H2",
                 < 22621 => "11 22H2 Insider Build " + windowsVersion.Build,
-                22621 => "11 22H2",
-                22631 => "11 23H2",
+                22621 => "11 22H2", // deprecated
+                22631 => "11 23H2", // nov 11, 2025
                 < 23000 => "11 Beta Build " + windowsVersion.Build, // 22k series
                 < 24000 => "11 Dev Build " + windowsVersion.Build, // 23k series
                 < 25000 => "11 ??? Build " + windowsVersion.Build,

Tests/MemoryCacheExtensionTests.cs

@@ -17,15 +17,14 @@ public void GetCacheKeysTest()
         const string testVal = "vale13";
         cache.Set(13, testVal);
         cache.Set("bob", 69);
-        Assert.Multiple(() =>
-            {
+        using (Assert.EnterMultipleScope())
+        {
                 Assert.That(cache.TryGetValue(13, out string? expectedVal), Is.True);
                 Assert.That(expectedVal, Is.EqualTo(testVal));
                 Assert.That(cache.TryGetValue("bob", out int? expectedValInt), Is.True);
                 Assert.That(expectedValInt, Is.EqualTo(69));
-            }
-        );
-        Assert.That(cache.GetCacheKeys<int>(), Has.Count.EqualTo(1));
+                Assert.That(cache.GetCacheKeys<int>(), Has.Count.EqualTo(1));
+        }
     }
 
     [Test]
@@ -36,7 +35,10 @@ public void GetCacheEntriesTest()
 
         cache.Set(13, "val13");
         cache.Set("bob", 69);
-        Assert.That(cache.GetCacheEntries<int>(), Has.Count.EqualTo(1));
-        Assert.That(cache.GetCacheEntries<string>(), Has.Count.EqualTo(1));
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(cache.GetCacheEntries<int>(), Has.Count.EqualTo(1));
+            Assert.That(cache.GetCacheEntries<string>(), Has.Count.EqualTo(1));
+        }
     }
 }