Merge pull request #3157 from PrismLibrary/dev/ds/uno-update

Update packages

.github/workflows/build_uno.yml

@@ -21,12 +21,14 @@ 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
       windows-sdk-version: 18362
-      dotnet-version: 8.0.x
-      uno-check: true
+      dotnet-version: 8.0.300
+      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

.github/workflows/ci.yml

@@ -66,7 +66,10 @@ jobs:
       name: Build Prism.Uno
       solution-path: PrismLibrary_Uno.slnf
       windows-sdk-version: 18362
-      uno-check: true
+      dotnet-version: 8.0.300
+      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
       code-sign: true

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>

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"
   }
 }