From ce8b59cd75de41e0dbc392e238d7e3eb6a0de559 Mon Sep 17 00:00:00 2001
From: Martin Zikmund <martin@zikmund.dev>
Date: Tue, 19 Nov 2024 15:19:29 +0100
Subject: [PATCH 1/3] fix: Downgrade BuildTools

---
 src/Uno.Sdk/packages.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Uno.Sdk/packages.json b/src/Uno.Sdk/packages.json
index 0009e9e7..fb42d3de 100644
--- a/src/Uno.Sdk/packages.json
+++ b/src/Uno.Sdk/packages.json
@@ -121,7 +121,7 @@
   },
   {
     "group": "WinAppSdkBuildTools",
-    "version": "10.0.26100.1742",
+    "version": "10.0.22621.3233", // Keep this version until https://github.com/microsoft/WindowsAppSDK/issues/4480 is resolved
     "packages": [
       "Microsoft.Windows.SDK.BuildTools"
     ]
@@ -316,4 +316,4 @@
       "Uno.Cupertino.WinUI"
     ]
   }
-]
\ No newline at end of file
+]

From d0e8bff4a7a6ee2fdb87e8d2367325c9e3108f7c Mon Sep 17 00:00:00 2001
From: Martin Zikmund <martin@zikmund.dev>
Date: Tue, 19 Nov 2024 15:30:28 +0100
Subject: [PATCH 2/3] fix: Skip WinAppSdkBuildTools for updates

---
 src/Uno.Sdk/packages.json        | 2 +-
 tools/Uno.Sdk.Updater/Program.cs | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Uno.Sdk/packages.json b/src/Uno.Sdk/packages.json
index fb42d3de..56b61e14 100644
--- a/src/Uno.Sdk/packages.json
+++ b/src/Uno.Sdk/packages.json
@@ -121,7 +121,7 @@
   },
   {
     "group": "WinAppSdkBuildTools",
-    "version": "10.0.22621.3233", // Keep this version until https://github.com/microsoft/WindowsAppSDK/issues/4480 is resolved
+    "version": "10.0.22621.3233",
     "packages": [
       "Microsoft.Windows.SDK.BuildTools"
     ]
diff --git a/tools/Uno.Sdk.Updater/Program.cs b/tools/Uno.Sdk.Updater/Program.cs
index b2a504d8..e2a31f0f 100644
--- a/tools/Uno.Sdk.Updater/Program.cs
+++ b/tools/Uno.Sdk.Updater/Program.cs
@@ -1,3 +1,4 @@
+using System.Globalization;
 using System.IO.Compression;
 using System.Text;
 using System.Text.Json;
@@ -296,7 +297,13 @@ static async Task<ManifestGroup> UpdateGroup(ManifestGroup group, NuGetVersion u
         // Skip Maui on Release branch to avoid AndroidX package misalignment
         || (!unoVersion.IsPreview && group.Group == "Maui"))
     {
-        Console.WriteLine("Leaving group as is: " + group.Group);
+        Console.WriteLine("Skipping " + group.Group + " to avoid Java misalignment.");
+        return group;
+    }
+    // Skip WinAppSdkBuildTools group due to https://github.com/unoplatform/uno/issues/18840
+    else if (string.Equals(group.Group, "WinAppSdkBuildTools", StringComparison.InvariantCultureIgnoreCase))
+    {
+        Console.WriteLine("Skipping " + group.Group + "to avoid issues caused by https://github.com/unoplatform/uno/issues/18840");
         return group;
     }
 

From 8051ac9666634fa9898cda3a46fd8fc94536c4dd Mon Sep 17 00:00:00 2001
From: Martin Zikmund <martin@zikmund.dev>
Date: Tue, 19 Nov 2024 15:47:52 +0100
Subject: [PATCH 3/3] chore: Downgrade to 10.0.22621

---
 src/Uno.Sdk/ReadMe.md                         |   4 +-
 .../unoapp/.run/MyExtensionsApp.1.run.xml     |   2 +-
 .../unoapp/.template.config/template.json     | 256 +++++++++---------
 .../MyExtensionsApp.1.MauiControls.csproj     |   2 +-
 .../unolib/CrossTargetedLibrary.csproj        |   2 +-
 tools/TemplateTfmSwitchGenerator/Program.cs   |   2 +-
 6 files changed, 134 insertions(+), 134 deletions(-)

diff --git a/src/Uno.Sdk/ReadMe.md b/src/Uno.Sdk/ReadMe.md
index b038fd4d..9809fbc1 100644
--- a/src/Uno.Sdk/ReadMe.md
+++ b/src/Uno.Sdk/ReadMe.md
@@ -18,7 +18,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
 | SkiaSharpVersion | 2.88.9-preview.2.2 |
 | SvgSkiaVersion | 2.0.0.2 |
 | WinAppSdkVersion | 1.6.241114003 |
-| WinAppSdkBuildToolsVersion | 10.0.26100.1742 |
+| WinAppSdkBuildToolsVersion | 10.0.22621.1742 |
 | MicrosoftLoggingVersion** | 8.0.1 |
 | WindowsCompatibilityVersion** | 8.0.11 |
 | MicrosoftIdentityClientVersion | 4.66.2 |
@@ -162,7 +162,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
   },
   {
     "group": "WinAppSdkBuildTools",
-    "version": "10.0.26100.1742",
+    "version": "10.0.22621.1742",
     "packages": [
       "Microsoft.Windows.SDK.BuildTools"
     ]
diff --git a/src/Uno.Templates/content/unoapp/.run/MyExtensionsApp.1.run.xml b/src/Uno.Templates/content/unoapp/.run/MyExtensionsApp.1.run.xml
index f8b42cf7..9331475e 100644
--- a/src/Uno.Templates/content/unoapp/.run/MyExtensionsApp.1.run.xml
+++ b/src/Uno.Templates/content/unoapp/.run/MyExtensionsApp.1.run.xml
@@ -51,7 +51,7 @@
   <!--#if (useWinAppSdk)-->
   <configuration default="false" name="MyExtensionsApp.1 (WinAppSDK Unpackaged)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
     <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/MyExtensionsApp.1/MyExtensionsApp.1.csproj" />
-    <option name="LAUNCH_PROFILE_TFM" value="$baseTargetFramework$-windows10.0.26100.0" />
+    <option name="LAUNCH_PROFILE_TFM" value="$baseTargetFramework$-windows10.0.22621.0" />
     <option name="LAUNCH_PROFILE_NAME" value="MyExtensionsApp.1 (WinAppSDK Unpackaged)" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
diff --git a/src/Uno.Templates/content/unoapp/.template.config/template.json b/src/Uno.Templates/content/unoapp/.template.config/template.json
index f4160b85..3bfd4498 100644
--- a/src/Uno.Templates/content/unoapp/.template.config/template.json
+++ b/src/Uno.Templates/content/unoapp/.template.config/template.json
@@ -1381,35 +1381,35 @@
         "cases": [
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0-desktop;net8.0"
+            "value": "net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0-desktop;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0-desktop"
+            "value": "net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0-desktop"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0"
+            "value": "net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-browserwasm"
+            "value": "net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-browserwasm"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-desktop;net8.0"
+            "value": "net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-desktop;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-desktop"
+            "value": "net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-desktop"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0"
+            "value": "net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.26100"
+            "value": "net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.22621"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms == ios && platforms == maccatalyst && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
@@ -1445,35 +1445,35 @@
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net8.0-android;net8.0-ios;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0-desktop;net8.0"
+            "value": "net8.0-android;net8.0-ios;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0-desktop;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net8.0-android;net8.0-ios;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0-desktop"
+            "value": "net8.0-android;net8.0-ios;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0-desktop"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net8.0-android;net8.0-ios;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0"
+            "value": "net8.0-android;net8.0-ios;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net8.0-android;net8.0-ios;net8.0-windows10.0.26100;net8.0-browserwasm"
+            "value": "net8.0-android;net8.0-ios;net8.0-windows10.0.22621;net8.0-browserwasm"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net8.0-android;net8.0-ios;net8.0-windows10.0.26100;net8.0-desktop;net8.0"
+            "value": "net8.0-android;net8.0-ios;net8.0-windows10.0.22621;net8.0-desktop;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net8.0-android;net8.0-ios;net8.0-windows10.0.26100;net8.0-desktop"
+            "value": "net8.0-android;net8.0-ios;net8.0-windows10.0.22621;net8.0-desktop"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net8.0-android;net8.0-ios;net8.0-windows10.0.26100;net8.0"
+            "value": "net8.0-android;net8.0-ios;net8.0-windows10.0.22621;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net8.0-android;net8.0-ios;net8.0-windows10.0.26100"
+            "value": "net8.0-android;net8.0-ios;net8.0-windows10.0.22621"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms == ios && platforms != maccatalyst && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
@@ -1509,35 +1509,35 @@
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net8.0-android;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0-desktop;net8.0"
+            "value": "net8.0-android;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0-desktop;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net8.0-android;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0-desktop"
+            "value": "net8.0-android;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0-desktop"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net8.0-android;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0"
+            "value": "net8.0-android;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net8.0-android;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-browserwasm"
+            "value": "net8.0-android;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-browserwasm"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net8.0-android;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-desktop;net8.0"
+            "value": "net8.0-android;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-desktop;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net8.0-android;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-desktop"
+            "value": "net8.0-android;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-desktop"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net8.0-android;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0"
+            "value": "net8.0-android;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net8.0-android;net8.0-maccatalyst;net8.0-windows10.0.26100"
+            "value": "net8.0-android;net8.0-maccatalyst;net8.0-windows10.0.22621"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms != ios && platforms == maccatalyst && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
@@ -1573,35 +1573,35 @@
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net8.0-android;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0-desktop;net8.0"
+            "value": "net8.0-android;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0-desktop;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net8.0-android;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0-desktop"
+            "value": "net8.0-android;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0-desktop"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net8.0-android;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0"
+            "value": "net8.0-android;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net8.0-android;net8.0-windows10.0.26100;net8.0-browserwasm"
+            "value": "net8.0-android;net8.0-windows10.0.22621;net8.0-browserwasm"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net8.0-android;net8.0-windows10.0.26100;net8.0-desktop;net8.0"
+            "value": "net8.0-android;net8.0-windows10.0.22621;net8.0-desktop;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net8.0-android;net8.0-windows10.0.26100;net8.0-desktop"
+            "value": "net8.0-android;net8.0-windows10.0.22621;net8.0-desktop"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net8.0-android;net8.0-windows10.0.26100;net8.0"
+            "value": "net8.0-android;net8.0-windows10.0.22621;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net8.0-android;net8.0-windows10.0.26100"
+            "value": "net8.0-android;net8.0-windows10.0.22621"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms == android && platforms != ios && platforms != maccatalyst && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
@@ -1637,35 +1637,35 @@
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0-desktop;net8.0"
+            "value": "net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0-desktop;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0-desktop"
+            "value": "net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0-desktop"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0"
+            "value": "net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-browserwasm"
+            "value": "net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-browserwasm"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-desktop;net8.0"
+            "value": "net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-desktop;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-desktop"
+            "value": "net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-desktop"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0"
+            "value": "net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.26100"
+            "value": "net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.22621"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms == ios && platforms == maccatalyst && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
@@ -1701,35 +1701,35 @@
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net8.0-ios;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0-desktop;net8.0"
+            "value": "net8.0-ios;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0-desktop;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net8.0-ios;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0-desktop"
+            "value": "net8.0-ios;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0-desktop"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net8.0-ios;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0"
+            "value": "net8.0-ios;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net8.0-ios;net8.0-windows10.0.26100;net8.0-browserwasm"
+            "value": "net8.0-ios;net8.0-windows10.0.22621;net8.0-browserwasm"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net8.0-ios;net8.0-windows10.0.26100;net8.0-desktop;net8.0"
+            "value": "net8.0-ios;net8.0-windows10.0.22621;net8.0-desktop;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net8.0-ios;net8.0-windows10.0.26100;net8.0-desktop"
+            "value": "net8.0-ios;net8.0-windows10.0.22621;net8.0-desktop"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net8.0-ios;net8.0-windows10.0.26100;net8.0"
+            "value": "net8.0-ios;net8.0-windows10.0.22621;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net8.0-ios;net8.0-windows10.0.26100"
+            "value": "net8.0-ios;net8.0-windows10.0.22621"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms == ios && platforms != maccatalyst && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
@@ -1765,35 +1765,35 @@
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0-desktop;net8.0"
+            "value": "net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0-desktop;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0-desktop"
+            "value": "net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0-desktop"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0"
+            "value": "net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-browserwasm;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-browserwasm"
+            "value": "net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-browserwasm"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-desktop;net8.0"
+            "value": "net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-desktop;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-desktop"
+            "value": "net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0-desktop"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0"
+            "value": "net8.0-maccatalyst;net8.0-windows10.0.22621;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net8.0-maccatalyst;net8.0-windows10.0.26100"
+            "value": "net8.0-maccatalyst;net8.0-windows10.0.22621"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms != ios && platforms == maccatalyst && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
@@ -1829,35 +1829,35 @@
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net8.0-windows10.0.26100;net8.0-browserwasm;net8.0-desktop;net8.0"
+            "value": "net8.0-windows10.0.22621;net8.0-browserwasm;net8.0-desktop;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net8.0-windows10.0.26100;net8.0-browserwasm;net8.0-desktop"
+            "value": "net8.0-windows10.0.22621;net8.0-browserwasm;net8.0-desktop"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net8.0-windows10.0.26100;net8.0-browserwasm;net8.0"
+            "value": "net8.0-windows10.0.22621;net8.0-browserwasm;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net8.0-windows10.0.26100;net8.0-browserwasm"
+            "value": "net8.0-windows10.0.22621;net8.0-browserwasm"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net8.0-windows10.0.26100;net8.0-desktop;net8.0"
+            "value": "net8.0-windows10.0.22621;net8.0-desktop;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net8.0-windows10.0.26100;net8.0-desktop"
+            "value": "net8.0-windows10.0.22621;net8.0-desktop"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net8.0-windows10.0.26100;net8.0"
+            "value": "net8.0-windows10.0.22621;net8.0"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net8.0-windows10.0.26100"
+            "value": "net8.0-windows10.0.22621"
           },
           {
             "condition": "(tfm == 'net8.0' && platforms != android && platforms != ios && platforms != maccatalyst && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
@@ -1893,35 +1893,35 @@
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop;net9.0"
+            "value": "net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0-desktop;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop"
+            "value": "net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0-desktop"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0"
+            "value": "net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm"
+            "value": "net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-browserwasm"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-desktop;net9.0"
+            "value": "net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-desktop;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-desktop"
+            "value": "net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-desktop"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0"
+            "value": "net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.26100"
+            "value": "net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.22621"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms == ios && platforms == maccatalyst && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
@@ -1957,35 +1957,35 @@
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net9.0-android;net9.0-ios;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop;net9.0"
+            "value": "net9.0-android;net9.0-ios;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0-desktop;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net9.0-android;net9.0-ios;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop"
+            "value": "net9.0-android;net9.0-ios;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0-desktop"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net9.0-android;net9.0-ios;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0"
+            "value": "net9.0-android;net9.0-ios;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net9.0-android;net9.0-ios;net9.0-windows10.0.26100;net9.0-browserwasm"
+            "value": "net9.0-android;net9.0-ios;net9.0-windows10.0.22621;net9.0-browserwasm"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net9.0-android;net9.0-ios;net9.0-windows10.0.26100;net9.0-desktop;net9.0"
+            "value": "net9.0-android;net9.0-ios;net9.0-windows10.0.22621;net9.0-desktop;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net9.0-android;net9.0-ios;net9.0-windows10.0.26100;net9.0-desktop"
+            "value": "net9.0-android;net9.0-ios;net9.0-windows10.0.22621;net9.0-desktop"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net9.0-android;net9.0-ios;net9.0-windows10.0.26100;net9.0"
+            "value": "net9.0-android;net9.0-ios;net9.0-windows10.0.22621;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net9.0-android;net9.0-ios;net9.0-windows10.0.26100"
+            "value": "net9.0-android;net9.0-ios;net9.0-windows10.0.22621"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms == ios && platforms != maccatalyst && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
@@ -2021,35 +2021,35 @@
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net9.0-android;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop;net9.0"
+            "value": "net9.0-android;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0-desktop;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net9.0-android;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop"
+            "value": "net9.0-android;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0-desktop"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net9.0-android;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0"
+            "value": "net9.0-android;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net9.0-android;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm"
+            "value": "net9.0-android;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-browserwasm"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net9.0-android;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-desktop;net9.0"
+            "value": "net9.0-android;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-desktop;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net9.0-android;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-desktop"
+            "value": "net9.0-android;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-desktop"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net9.0-android;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0"
+            "value": "net9.0-android;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net9.0-android;net9.0-maccatalyst;net9.0-windows10.0.26100"
+            "value": "net9.0-android;net9.0-maccatalyst;net9.0-windows10.0.22621"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms != ios && platforms == maccatalyst && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
@@ -2085,35 +2085,35 @@
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net9.0-android;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop;net9.0"
+            "value": "net9.0-android;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0-desktop;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net9.0-android;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop"
+            "value": "net9.0-android;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0-desktop"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net9.0-android;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0"
+            "value": "net9.0-android;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net9.0-android;net9.0-windows10.0.26100;net9.0-browserwasm"
+            "value": "net9.0-android;net9.0-windows10.0.22621;net9.0-browserwasm"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net9.0-android;net9.0-windows10.0.26100;net9.0-desktop;net9.0"
+            "value": "net9.0-android;net9.0-windows10.0.22621;net9.0-desktop;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net9.0-android;net9.0-windows10.0.26100;net9.0-desktop"
+            "value": "net9.0-android;net9.0-windows10.0.22621;net9.0-desktop"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net9.0-android;net9.0-windows10.0.26100;net9.0"
+            "value": "net9.0-android;net9.0-windows10.0.22621;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net9.0-android;net9.0-windows10.0.26100"
+            "value": "net9.0-android;net9.0-windows10.0.22621"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms == android && platforms != ios && platforms != maccatalyst && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
@@ -2149,35 +2149,35 @@
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop;net9.0"
+            "value": "net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0-desktop;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop"
+            "value": "net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0-desktop"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0"
+            "value": "net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm"
+            "value": "net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-browserwasm"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-desktop;net9.0"
+            "value": "net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-desktop;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-desktop"
+            "value": "net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-desktop"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0"
+            "value": "net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms == ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.26100"
+            "value": "net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.22621"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms == ios && platforms == maccatalyst && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
@@ -2213,35 +2213,35 @@
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net9.0-ios;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop;net9.0"
+            "value": "net9.0-ios;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0-desktop;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net9.0-ios;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop"
+            "value": "net9.0-ios;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0-desktop"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net9.0-ios;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0"
+            "value": "net9.0-ios;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net9.0-ios;net9.0-windows10.0.26100;net9.0-browserwasm"
+            "value": "net9.0-ios;net9.0-windows10.0.22621;net9.0-browserwasm"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net9.0-ios;net9.0-windows10.0.26100;net9.0-desktop;net9.0"
+            "value": "net9.0-ios;net9.0-windows10.0.22621;net9.0-desktop;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net9.0-ios;net9.0-windows10.0.26100;net9.0-desktop"
+            "value": "net9.0-ios;net9.0-windows10.0.22621;net9.0-desktop"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net9.0-ios;net9.0-windows10.0.26100;net9.0"
+            "value": "net9.0-ios;net9.0-windows10.0.22621;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms == ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net9.0-ios;net9.0-windows10.0.26100"
+            "value": "net9.0-ios;net9.0-windows10.0.22621"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms == ios && platforms != maccatalyst && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
@@ -2277,35 +2277,35 @@
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop;net9.0"
+            "value": "net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0-desktop;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop"
+            "value": "net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0-desktop"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0"
+            "value": "net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-browserwasm;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm"
+            "value": "net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-browserwasm"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-desktop;net9.0"
+            "value": "net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-desktop;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-desktop"
+            "value": "net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0-desktop"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0"
+            "value": "net9.0-maccatalyst;net9.0-windows10.0.22621;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms != ios && platforms == maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net9.0-maccatalyst;net9.0-windows10.0.26100"
+            "value": "net9.0-maccatalyst;net9.0-windows10.0.22621"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms != ios && platforms == maccatalyst && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
@@ -2341,35 +2341,35 @@
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop;net9.0"
+            "value": "net9.0-windows10.0.22621;net9.0-browserwasm;net9.0-desktop;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop"
+            "value": "net9.0-windows10.0.22621;net9.0-browserwasm;net9.0-desktop"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net9.0-windows10.0.26100;net9.0-browserwasm;net9.0"
+            "value": "net9.0-windows10.0.22621;net9.0-browserwasm;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net9.0-windows10.0.26100;net9.0-browserwasm"
+            "value": "net9.0-windows10.0.22621;net9.0-browserwasm"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)",
-            "value": "net9.0-windows10.0.26100;net9.0-desktop;net9.0"
+            "value": "net9.0-windows10.0.22621;net9.0-desktop;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)",
-            "value": "net9.0-windows10.0.26100;net9.0-desktop"
+            "value": "net9.0-windows10.0.22621;net9.0-desktop"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)",
-            "value": "net9.0-windows10.0.26100;net9.0"
+            "value": "net9.0-windows10.0.22621;net9.0"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms != ios && platforms != maccatalyst && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)",
-            "value": "net9.0-windows10.0.26100"
+            "value": "net9.0-windows10.0.22621"
           },
           {
             "condition": "(tfm == 'net9.0' && platforms != android && platforms != ios && platforms != maccatalyst && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)",
diff --git a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj
index 0782b368..f6e1aef9 100644
--- a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj
+++ b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj
@@ -8,7 +8,7 @@
 
     <!--#endif-->
     <!--#if (useWinAppSdk)-->
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) or '$(EnableWindowsTargeting)' == 'true'">$baseTargetFramework$-windows10.0.26100</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) or '$(EnableWindowsTargeting)' == 'true'">$baseTargetFramework$-windows10.0.22621</TargetFrameworks>
     <!--#endif-->
     <TargetFrameworks>
       $baseTargetFramework$;
diff --git a/src/Uno.Templates/content/unolib/CrossTargetedLibrary.csproj b/src/Uno.Templates/content/unolib/CrossTargetedLibrary.csproj
index 15a1564a..69c46476 100644
--- a/src/Uno.Templates/content/unolib/CrossTargetedLibrary.csproj
+++ b/src/Uno.Templates/content/unolib/CrossTargetedLibrary.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Uno.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$baseTargetFramework$;$baseTargetFramework$-ios;$baseTargetFramework$-maccatalyst;$baseTargetFramework$-android;$baseTargetFramework$-windows10.0.26100;$baseTargetFramework$-browserwasm;$baseTargetFramework$-desktop</TargetFrameworks>
+    <TargetFrameworks>$baseTargetFramework$;$baseTargetFramework$-ios;$baseTargetFramework$-maccatalyst;$baseTargetFramework$-android;$baseTargetFramework$-windows10.0.22621;$baseTargetFramework$-browserwasm;$baseTargetFramework$-desktop</TargetFrameworks>
     <UnoSingleProject>true</UnoSingleProject>
     <OutputType>Library</OutputType>
     <!-- Ensures the .xr.xml files are generated in a proper layout folder -->
diff --git a/tools/TemplateTfmSwitchGenerator/Program.cs b/tools/TemplateTfmSwitchGenerator/Program.cs
index 996af3cd..0a6d6bd6 100644
--- a/tools/TemplateTfmSwitchGenerator/Program.cs
+++ b/tools/TemplateTfmSwitchGenerator/Program.cs
@@ -9,7 +9,7 @@
     new Platform("platforms == android", "platforms != android", "android"),
     new Platform("platforms == ios", "platforms != ios", "ios"),
     new Platform("platforms == maccatalyst", "platforms != maccatalyst", "maccatalyst"),
-    new Platform("platforms == windows", "platforms != windows", "windows10.0.26100"),
+    new Platform("platforms == windows", "platforms != windows", "windows10.0.22621"),
     new Platform("platforms == wasm", "platforms != wasm", "browserwasm"),
     new Platform("platforms == desktop", "platforms != desktop", "desktop"),
     new Platform("useUnitTests == true", "useUnitTests == false", null)