From 5e0a20f5247aa967ac1012af46472af8d01ebf4c Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Fri, 7 Jun 2024 13:03:27 -0600
Subject: [PATCH 1/8] chore: update packages

---
 Directory.Packages.props | 30 +++++++++++++++---------------
 global.json              |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index d5f281e5d..94a16d8d3 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -21,15 +21,15 @@
     See https://aka.platform.uno/upgrade-uno-packages for more information.
   -->
   <ItemGroup Condition=" $(IsUnoProject) == 'true' ">
-    <PackageVersion Include="Uno.Extensions.Markup.Generators" Version="5.1.5" />
-    <PackageVersion Include="Uno.WinUI.Markup" Version="5.1.5" />
+    <PackageVersion Include="Uno.Extensions.Markup.Generators" Version="5.2.14" />
+    <PackageVersion Include="Uno.WinUI.Markup" Version="5.2.14" />
     <PackageVersion Include="Uno.WinUI" Version="$(UnoVersion)" />
     <PackageVersion Include="Uno.WinUI.Lottie" Version="$(UnoVersion)" />
     <PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="$(UnoVersion)" />
     <PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="$(UnoVersion)" />
     <PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="$(UnoVersion)" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.8" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.8" />
+    <PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.15" />
+    <PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.15" />
     <PackageVersion Include="Uno.WinUI.WebAssembly" Version="$(UnoVersion)" />
     <PackageVersion Include="Uno.WinUI.DevServer" Version="$(UnoVersion)" />
     <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="$(UnoVersion)" />
@@ -42,15 +42,15 @@
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
     <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.7" />
     <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.7" />
-    <PackageVersion Include="Uno.Resizetizer" Version="1.3.0" />
+    <PackageVersion Include="Uno.Resizetizer" Version="1.4.10" />
     <PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
-    <PackageVersion Include="Uno.Extensions.Logging.WinUI" Version="4.0.0" />
-    <PackageVersion Include="Uno.Extensions.Logging.Serilog" Version="4.0.0" />
+    <PackageVersion Include="Uno.Extensions.Logging.WinUI" Version="4.1.24" />
+    <PackageVersion Include="Uno.Extensions.Logging.Serilog" Version="4.1.24" />
     <PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
-    <PackageVersion Include="Uno.Material.WinUI" Version="4.1.1" />
-    <PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="5.1.7" />
-    <PackageVersion Include="Uno.Toolkit.WinUI" Version="5.1.7" />
-    <PackageVersion Include="Uno.Extensions.Hosting.WinUI" Version="4.0.0" />
+    <PackageVersion Include="Uno.Material.WinUI" Version="5.0.13" />
+    <PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="6.0.24" />
+    <PackageVersion Include="Uno.Toolkit.WinUI" Version="6.0.24" />
+    <PackageVersion Include="Uno.Extensions.Hosting.WinUI" Version="4.1.24" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageVersion Include="Xamarin.Google.Android.Material" Version="1.10.0.3" />
     <PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
@@ -63,10 +63,10 @@
     <PackageVersion Include="Xamarin.Forms.Mocks" Version="4.7.0.1" />
     <PackageVersion Include="Humanizer.Core" Version="2.14.1" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageVersion Include="Moq" Version="4.20.70" />
-    <PackageVersion Include="xunit" Version="2.6.6" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
+    <PackageVersion Include="xunit" Version="2.8.1" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
     <PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
   </ItemGroup>
   <ItemGroup Condition=" $(UseMaui) != 'true' ">
@@ -84,7 +84,7 @@
   <ItemGroup>
     <!-- Global Packages -->
     <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
-    <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
+    <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.139" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
   </ItemGroup>
 </Project>
diff --git a/global.json b/global.json
index 113d9ce0a..f0d439727 100644
--- a/global.json
+++ b/global.json
@@ -2,6 +2,6 @@
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.7.56",
     "MSBuild.Sdk.Extras": "3.0.44",
-    "Uno.Sdk": "5.1.69"
+    "Uno.Sdk": "5.2.161"
   }
 }

From aefc02af3b9a9744adee341bf2241531b004f67e Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Fri, 7 Jun 2024 14:01:50 -0600
Subject: [PATCH 2/8] ci: bump uno-check

---
 .github/workflows/build_uno.yml | 1 +
 .github/workflows/ci.yml        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/build_uno.yml b/.github/workflows/build_uno.yml
index 772446c63..ebf1c73b0 100644
--- a/.github/workflows/build_uno.yml
+++ b/.github/workflows/build_uno.yml
@@ -28,5 +28,6 @@ jobs:
       windows-sdk-version: 18362
       dotnet-version: 8.0.x
       uno-check: true
+      uno-check-version: 1.23.0
       uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --skip dotnetnewunotemplates'
       run-tests: false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 960aee758..3ef8e4083 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -67,6 +67,7 @@ jobs:
       solution-path: PrismLibrary_Uno.slnf
       windows-sdk-version: 18362
       uno-check: true
+      uno-check-version: 1.23.0
       uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --skip dotnetnewunotemplates'
       run-tests: false
       code-sign: true

From 285b5e35eed152d444fc8c98b63753db623c6513 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Wed, 3 Jul 2024 20:56:56 -0700
Subject: [PATCH 3/8] ci: update Uno.Check

---
 .github/workflows/build_uno.yml | 4 ++--
 .github/workflows/ci.yml        | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_uno.yml b/.github/workflows/build_uno.yml
index ebf1c73b0..26f0fa1f3 100644
--- a/.github/workflows/build_uno.yml
+++ b/.github/workflows/build_uno.yml
@@ -26,8 +26,8 @@ jobs:
       name: Build Prism.Uno
       solution-path: PrismLibrary_Uno.slnf
       windows-sdk-version: 18362
-      dotnet-version: 8.0.x
+      dotnet-version: 8.0.300
       uno-check: true
-      uno-check-version: 1.23.0
+      uno-check-version: 1.24.0
       uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --skip dotnetnewunotemplates'
       run-tests: false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3ef8e4083..9aca14288 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -66,8 +66,9 @@ jobs:
       name: Build Prism.Uno
       solution-path: PrismLibrary_Uno.slnf
       windows-sdk-version: 18362
+      dotnet-version: 8.0.300
       uno-check: true
-      uno-check-version: 1.23.0
+      uno-check-version: 1.24.0
       uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --skip dotnetnewunotemplates'
       run-tests: false
       code-sign: true

From a94900e64528db88155d0dc2559496283a972334 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Wed, 17 Jul 2024 18:41:21 -0600
Subject: [PATCH 4/8] ci: bump uno check

---
 .github/workflows/build_uno.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_uno.yml b/.github/workflows/build_uno.yml
index 26f0fa1f3..493ca6b54 100644
--- a/.github/workflows/build_uno.yml
+++ b/.github/workflows/build_uno.yml
@@ -28,6 +28,6 @@ jobs:
       windows-sdk-version: 18362
       dotnet-version: 8.0.300
       uno-check: true
-      uno-check-version: 1.24.0
+      uno-check-version: 1.25.0
       uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --skip dotnetnewunotemplates'
       run-tests: false

From f04635b7937fc046fb960fe2cd062bd1f851d5b5 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Wed, 17 Jul 2024 18:53:05 -0600
Subject: [PATCH 5/8] ci: disable uno.check

---
 .github/workflows/build_uno.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_uno.yml b/.github/workflows/build_uno.yml
index 493ca6b54..669648992 100644
--- a/.github/workflows/build_uno.yml
+++ b/.github/workflows/build_uno.yml
@@ -27,7 +27,8 @@ jobs:
       solution-path: PrismLibrary_Uno.slnf
       windows-sdk-version: 18362
       dotnet-version: 8.0.300
-      uno-check: true
+      install-workload: ios android macos maccatalyst wasm-tools
+      uno-check: false
       uno-check-version: 1.25.0
       uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --skip dotnetnewunotemplates'
       run-tests: false

From 75462be2015257d6381fdf6bcca25b44c50bcd3e Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Wed, 17 Jul 2024 19:11:52 -0600
Subject: [PATCH 6/8] ci: bump uno.check for Jerome

---
 .github/workflows/build_uno.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_uno.yml b/.github/workflows/build_uno.yml
index 669648992..b63cb313f 100644
--- a/.github/workflows/build_uno.yml
+++ b/.github/workflows/build_uno.yml
@@ -27,8 +27,8 @@ jobs:
       solution-path: PrismLibrary_Uno.slnf
       windows-sdk-version: 18362
       dotnet-version: 8.0.300
-      install-workload: ios android macos maccatalyst wasm-tools
-      uno-check: false
-      uno-check-version: 1.25.0
+      # install-workload: ios android macos maccatalyst wasm-tools
+      uno-check: true
+      uno-check-version: 1.25.1
       uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --skip dotnetnewunotemplates'
       run-tests: false

From dbe230ecd10011a5f975891a89f261396d9fa9dd Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Wed, 17 Jul 2024 19:32:32 -0600
Subject: [PATCH 7/8] ci: try sdk installer update

---
 .github/workflows/build_uno.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_uno.yml b/.github/workflows/build_uno.yml
index b63cb313f..49ad5d71c 100644
--- a/.github/workflows/build_uno.yml
+++ b/.github/workflows/build_uno.yml
@@ -21,7 +21,7 @@ on:
 
 jobs:
   build-prism-uno:
-    uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@master
+    uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@dev/update-netsdkinstaller
     with:
       name: Build Prism.Uno
       solution-path: PrismLibrary_Uno.slnf

From 8263f603256abca9759efc89ef2bf2c523803d7a Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Thu, 18 Jul 2024 18:45:47 -0600
Subject: [PATCH 8/8] ci: build workaround

---
 .github/workflows/build_uno.yml | 4 ++--
 .github/workflows/ci.yml        | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_uno.yml b/.github/workflows/build_uno.yml
index 49ad5d71c..f7d17a49f 100644
--- a/.github/workflows/build_uno.yml
+++ b/.github/workflows/build_uno.yml
@@ -27,8 +27,8 @@ jobs:
       solution-path: PrismLibrary_Uno.slnf
       windows-sdk-version: 18362
       dotnet-version: 8.0.300
-      # install-workload: ios android macos maccatalyst wasm-tools
-      uno-check: true
+      install-workload: ios android macos maccatalyst wasm-tools
+      uno-check: false
       uno-check-version: 1.25.1
       uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --skip dotnetnewunotemplates'
       run-tests: false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9aca14288..f0edf7a1a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -67,7 +67,8 @@ jobs:
       solution-path: PrismLibrary_Uno.slnf
       windows-sdk-version: 18362
       dotnet-version: 8.0.300
-      uno-check: true
+      install-workload: ios android macos maccatalyst wasm-tools
+      uno-check: false
       uno-check-version: 1.24.0
       uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --skip dotnetnewunotemplates'
       run-tests: false