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] 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;
     }