Update build

mono · Jul 10, 2024 · a8895d3 · a8895d3
1 parent acf4572
commit a8895d3
Show file tree

Hide file tree

Showing 21 changed files with 63 additions and 50 deletions.
diff --git a/binding/HarfBuzzSharp.NativeAssets.macOS/HarfBuzzSharp.NativeAssets.macOS.csproj b/binding/HarfBuzzSharp.NativeAssets.macOS/HarfBuzzSharp.NativeAssets.macOS.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <TargetFrameworks>$(BasicTargetFrameworks)</TargetFrameworks>
     <TargetFrameworks Condition="!$(IsLinux)">$(TargetFrameworks);$(TFMCurrent)-macos</TargetFrameworks>
-    <TargetFrameworks Condition="!$(IsLinux) and '$(TFMPrevious)' != ''">$(TargetFrameworks);$(TFMPrevious)-macos</TargetFrameworks>
     <TargetFrameworks Condition="!$(IsLinux) and '$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-macos</TargetFrameworks>
     <PackagingGroup>HarfBuzzSharp</PackagingGroup>
     <Title>$(PackagingGroup) - Native Assets for macOS</Title>

diff --git a/binding/SkiaSharp.NativeAssets.macOS/SkiaSharp.NativeAssets.macOS.csproj b/binding/SkiaSharp.NativeAssets.macOS/SkiaSharp.NativeAssets.macOS.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <TargetFrameworks>$(BasicTargetFrameworks)</TargetFrameworks>
     <TargetFrameworks Condition="!$(IsLinux)">$(TargetFrameworks);$(TFMCurrent)-macos</TargetFrameworks>
-    <TargetFrameworks Condition="!$(IsLinux) and '$(TFMPrevious)' != ''">$(TargetFrameworks);$(TFMPrevious)-macos</TargetFrameworks>
     <TargetFrameworks Condition="!$(IsLinux) and '$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-macos</TargetFrameworks>
     <PackagingGroup>SkiaSharp</PackagingGroup>
     <Title>$(PackagingGroup) - Native Assets for macOS</Title>

diff --git a/binding/SkiaSharp/SKCanvas.cs b/binding/SkiaSharp/SKCanvas.cs
@@ -450,7 +450,9 @@ public void DrawPoint (float x, float y, SKColor color)
 
 		public void DrawImage (SKImage image, SKPoint p, SKPaint paint = null)
 		{
+#pragma warning disable CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.'
 			DrawImage (image, p.X, p.Y, paint?.FilterQuality.ToSamplingOptions() ?? SKSamplingOptions.Default, paint);
+#pragma warning restore CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.'
 		}
 
 		public void DrawImage (SKImage image, SKPoint p, SKSamplingOptions sampling, SKPaint paint = null)
@@ -460,7 +462,9 @@ public void DrawImage (SKImage image, SKPoint p, SKSamplingOptions sampling, SKP
 
 		public void DrawImage (SKImage image, float x, float y, SKPaint paint = null)
 		{
+#pragma warning disable CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.'
 			DrawImage (image, x, y, paint?.FilterQuality.ToSamplingOptions() ?? SKSamplingOptions.Default, paint);
+#pragma warning restore CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.'
 		}
 
 		public void DrawImage (SKImage image, float x, float y, SKSamplingOptions sampling, SKPaint paint = null)
@@ -472,7 +476,9 @@ public void DrawImage (SKImage image, float x, float y, SKSamplingOptions sampli
 
 		public void DrawImage (SKImage image, SKRect dest, SKPaint paint = null)
 		{
+#pragma warning disable CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.'
 			DrawImage (image, null, &dest, paint?.FilterQuality.ToSamplingOptions() ?? SKSamplingOptions.Default, paint);
+#pragma warning restore CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.'
 		}
 
 		public void DrawImage (SKImage image, SKRect dest, SKSamplingOptions sampling, SKPaint paint = null)
@@ -482,7 +488,9 @@ public void DrawImage (SKImage image, SKRect dest, SKSamplingOptions sampling, S
 
 		public void DrawImage (SKImage image, SKRect source, SKRect dest, SKPaint paint = null)
 		{
+#pragma warning disable CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.'
 			DrawImage (image, &source, &dest, paint?.FilterQuality.ToSamplingOptions() ?? SKSamplingOptions.Default, paint);
+#pragma warning restore CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.'
 		}
 
 		public void DrawImage (SKImage image, SKRect source, SKRect dest, SKSamplingOptions sampling, SKPaint paint = null)
@@ -942,19 +950,25 @@ public void DrawRoundRectDifference (SKRoundRect outer, SKRoundRect inner, SKPai
 		// DrawAtlas
 
 		public void DrawAtlas (SKImage atlas, SKRect[] sprites, SKRotationScaleMatrix[] transforms, SKPaint paint = null) =>
+#pragma warning disable CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.'
 			DrawAtlas (atlas, sprites, transforms, null, SKBlendMode.Dst, paint?.FilterQuality.ToSamplingOptions() ?? SKSamplingOptions.Default, null, paint);
+#pragma warning restore CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.'
 
 		public void DrawAtlas (SKImage atlas, SKRect[] sprites, SKRotationScaleMatrix[] transforms, SKSamplingOptions sampling, SKPaint paint = null) =>
 			DrawAtlas (atlas, sprites, transforms, null, SKBlendMode.Dst, sampling, null, paint);
 
 		public void DrawAtlas (SKImage atlas, SKRect[] sprites, SKRotationScaleMatrix[] transforms, SKColor[] colors, SKBlendMode mode, SKPaint paint = null) =>
+#pragma warning disable CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.'
 			DrawAtlas (atlas, sprites, transforms, colors, mode, paint?.FilterQuality.ToSamplingOptions() ?? SKSamplingOptions.Default, null, paint);
+#pragma warning restore CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.'
 
 		public void DrawAtlas (SKImage atlas, SKRect[] sprites, SKRotationScaleMatrix[] transforms, SKColor[] colors, SKBlendMode mode, SKSamplingOptions sampling, SKPaint paint = null) =>
 			DrawAtlas (atlas, sprites, transforms, colors, mode, sampling, null, paint);
 
 		public void DrawAtlas (SKImage atlas, SKRect[] sprites, SKRotationScaleMatrix[] transforms, SKColor[] colors, SKBlendMode mode, SKRect cullRect, SKPaint paint = null) =>
+#pragma warning disable CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.'
 			DrawAtlas (atlas, sprites, transforms, colors, mode, paint?.FilterQuality.ToSamplingOptions() ?? SKSamplingOptions.Default, &cullRect, paint);
+#pragma warning restore CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.'
 
 		public void DrawAtlas (SKImage atlas, SKRect[] sprites, SKRotationScaleMatrix[] transforms, SKColor[] colors, SKBlendMode mode, SKSamplingOptions sampling, SKRect cullRect, SKPaint paint = null) =>
 			DrawAtlas (atlas, sprites, transforms, colors, mode, sampling, &cullRect, paint);

diff --git a/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj
@@ -31,6 +31,11 @@
     <MauiSplashScreen Include="Resources\skiasharplogo.png" BaseSize="256" Color="#F8F8F8" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Maui.Core" Version="$(MauiVersion)" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
     <ProjectReference Include="..\..\..\..\source\SkiaSharp.Views.Maui\SkiaSharp.Views.Maui.Controls\SkiaSharp.Views.Maui.Controls.csproj" />

diff --git a/samples/Basic/UnoPlatform/SkiaSharpSample.Mobile/SkiaSharpSample.Mobile.csproj b/samples/Basic/UnoPlatform/SkiaSharpSample.Mobile/SkiaSharpSample.Mobile.csproj
@@ -22,9 +22,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Uno.WinUI" Version="4.9.26" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.26" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.26" />
+    <PackageReference Include="Uno.WinUI" Version="5.2.175" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="5.2.175" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.2.175" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
@@ -37,10 +37,10 @@
 
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0-android'">
     <PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.1" />
-    <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" />
+    <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.37" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0-ios' or '$(TargetFramework)'=='net8.0-maccatalyst'">
-    <PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
+    <PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
   </ItemGroup>
 
   <Import Project="..\SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems" Label="Shared" />

diff --git a/samples/Basic/UnoPlatform/SkiaSharpSample.Skia.Gtk/SkiaSharpSample.Skia.Gtk.csproj b/samples/Basic/UnoPlatform/SkiaSharpSample.Skia.Gtk/SkiaSharpSample.Skia.Gtk.csproj
@@ -10,10 +10,10 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-    <PackageReference Include="Uno.WinUI" Version="4.9.26" />
-    <PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.9.26" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.26" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.26" />
+    <PackageReference Include="Uno.WinUI" Version="5.2.175" />
+    <PackageReference Include="Uno.WinUI.Skia.Gtk" Version="5.2.175" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="5.2.175" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.2.175" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Basic/UnoPlatform/SkiaSharpSample.Skia.WPF.Host/SkiaSharpSample.Skia.Wpf.Host.csproj b/samples/Basic/UnoPlatform/SkiaSharpSample.Skia.WPF.Host/SkiaSharpSample.Skia.Wpf.Host.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Uno.WinUI" Version="4.9.26" />
-    <PackageReference Include="Uno.WinUI.Skia.Wpf" Version="4.9.26" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.26" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.26" />
+    <PackageReference Include="Uno.WinUI" Version="5.2.175" />
+    <PackageReference Include="Uno.WinUI.Skia.Wpf" Version="5.2.175" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="5.2.175" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.2.175" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Basic/UnoPlatform/SkiaSharpSample.Skia.WPF/SkiaSharpSample.Skia.WPF.csproj b/samples/Basic/UnoPlatform/SkiaSharpSample.Skia.WPF/SkiaSharpSample.Skia.WPF.csproj
@@ -8,10 +8,10 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-    <PackageReference Include="Uno.WinUI" Version="4.9.26" />
-    <PackageReference Include="Uno.WinUI.Skia.Wpf" Version="4.9.26" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.26" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.26" />
+    <PackageReference Include="Uno.WinUI" Version="5.2.175" />
+    <PackageReference Include="Uno.WinUI.Skia.Wpf" Version="5.2.175" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="5.2.175" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.2.175" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Basic/UnoPlatform/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj b/samples/Basic/UnoPlatform/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj
@@ -21,12 +21,12 @@
     <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.4" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0" />
-    <PackageReference Include="Uno.WinUI.WebAssembly" Version="4.9.26" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.26" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.26" />
-    <PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.27" />
-    <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.27" />
+    <PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
+    <PackageReference Include="Uno.WinUI.WebAssembly" Version="5.2.175" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="5.2.175" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.2.175" />
+    <PackageReference Include="Uno.Wasm.Bootstrap" Version="8.0.17" />
+    <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.17" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
@@ -1,11 +1,3 @@
 <Project>
 
-  <PropertyGroup>
-    <!-- 
-    Force use Uno's Roslyn hosted generators instead of Uno.SourceGeneration tasks, even when LangVersion below 9.0.
-    The original issue is caused by https://github.com/unoplatform/uno/issues/9297
-    -->
-    <UnoUIUseRoslynSourceGenerators>true</UnoUIUseRoslynSourceGenerators>
-  </PropertyGroup>
-
 </Project>
diff --git a/scripts/VERSIONS.txt b/scripts/VERSIONS.txt
@@ -12,7 +12,7 @@ GLibSharp                                       release     3.24.24.95
 AtkSharp                                        release     3.24.24.95
 System.Memory                                   release     4.5.5
 SharpVk                                         release     0.4.2
-Uno.WinUI                                       release     4.9.26
+Uno.WinUI                                       release     5.2.175
 Microsoft.WindowsAppSDK                         release     1.3.230602002
 Microsoft.Maui.Graphics                         release     7.0.92
 Microsoft.Windows.SDK.NET.Ref                   release     10.0.19041.27

diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml
@@ -15,9 +15,10 @@ variables:
   XCODE_VERSION: '14.3.1'
   XCODE_VERSION_NATIVE: '14.3.1'
   VISUAL_STUDIO_VERSION: ''
+  DOTNET_VERSION: '8.0.x'
   DOTNET_VERSION_PREVIEW: ''
   DOTNET_WORKLOAD_SOURCE: ''
-  DOTNET_WORKLOAD_TIZEN: '8.0.130'
+  DOTNET_WORKLOAD_TIZEN: '8.0.149'
   CONFIGURATION: 'Release'
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   NUGET_DIFF_PRERELEASE: false

diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml
@@ -195,9 +195,9 @@ jobs:
             condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''))
             inputs:
               packageType: 'sdk'
-              version: 7.0.x
+              version: $(DOTNET_VERSION)
             retryCountOnTaskFailure: 3
-            displayName: Install .NET 7.0.x
+            displayName: Install .NET $(DOTNET_VERSION)
           - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet"
             displayName: Install the preview version of .NET
             retryCountOnTaskFailure: 3

diff --git a/source/SkiaSharp.Build.props b/source/SkiaSharp.Build.props
@@ -41,7 +41,7 @@
     <DotNetSdkManifestVersionRegex>\d+\.\d+\.\d+(-[a-z]+\.\d+)?</DotNetSdkManifestVersionRegex>
     <DotNetSdkManifestVersion Condition="'$(MSBuildRuntimeType)' == 'Core'">$([System.Text.RegularExpressions.Regex]::Match('$(MSBuildExtensionsPath)', '$(DotNetSdkManifestVersionRegex)'))</DotNetSdkManifestVersion>
     <DotNetSdkManifestVersion Condition="'$(MSBuildRuntimeType)' != 'Core'"></DotNetSdkManifestVersion>
-    <!-- The previous/lowest version of .NET we want to support (just the base TFM and then Windows/macOS native binaries) -->
+    <!-- The previous/lowest version of .NET we want to support (just the base TFM/no platforms) -->
     <TFMPrevious>net6.0</TFMPrevious>
     <!-- The current version of .NET that we are shipping for (all the TFMs) -->
     <TFMCurrent>net8.0</TFMCurrent>
@@ -95,11 +95,6 @@
     <IsNetMacOSSupported Condition="'$(DotNetMacOSWorkloadIsInstalled)' != 'true'">false</IsNetMacOSSupported>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <!-- Force the use of Uno Roslyn generators to reduce memory usage on CI -->
-    <UnoUIUseRoslynSourceGenerators>True</UnoUIUseRoslynSourceGenerators>
-  </PropertyGroup>
-
   <!-- .NET Standard, .NET Framework and .NET -->
   <PropertyGroup>
     <BasicTargetFrameworksCurrent>netstandard2.0;netstandard2.1;net462;$(TFMCurrent)</BasicTargetFrameworksCurrent>
@@ -111,7 +106,6 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(TFMPrevious)' != ''">
     <BasicTargetFrameworksPrevious>$(TFMPrevious)</BasicTargetFrameworksPrevious>
-    <PlatformTargetFrameworksPrevious Condition="!$(IsLinux) and $(IsNetMacOSSupported)">$(TFMNext)-macos</PlatformTargetFrameworksPrevious>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TFMNext)' != ''">
     <BasicTargetFrameworksNext>$(TFMNext)</BasicTargetFrameworksNext>

diff --git a/...e/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.csproj b/...e/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.csproj
@@ -14,6 +14,10 @@
     <WindowsPackageType>None</WindowsPackageType>
     <WindowsAppSdkBootstrapInitialize>false</WindowsAppSdkBootstrapInitialize>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Maui.Core" Version="$(MauiVersion)" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
     <ProjectReference Include="..\SkiaSharp.Views.Maui.Core\SkiaSharp.Views.Maui.Core.csproj" />

diff --git a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/SkiaSharp.Views.Maui.Core.csproj b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/SkiaSharp.Views.Maui.Core.csproj
@@ -15,6 +15,9 @@
     <WindowsPackageType>None</WindowsPackageType>
     <WindowsAppSdkBootstrapInitialize>false</WindowsAppSdkBootstrapInitialize>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Maui.Core" Version="$(MauiVersion)" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
     <ProjectReference Include="..\..\SkiaSharp.Views\SkiaSharp.Views\SkiaSharp.Views.csproj" Condition="$(TargetFramework.Contains('-'))" />

diff --git a/.../SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Skia/SkiaSharp.Views.Uno.WinUI.Skia.csproj b/.../SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Skia/SkiaSharp.Views.Uno.WinUI.Skia.csproj
@@ -12,7 +12,7 @@
     <DefineConstants>$(DefineConstants);HAS_UNO_SKIA;WINUI</DefineConstants>  
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Uno.WinUI" Version="4.9.26" />
+    <PackageReference Include="Uno.WinUI" Version="5.2.175" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />

diff --git a/.../SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Wasm/SkiaSharp.Views.Uno.WinUI.Wasm.csproj b/.../SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Wasm/SkiaSharp.Views.Uno.WinUI.Wasm.csproj
@@ -13,8 +13,8 @@
     <DefineConstants>$(DefineConstants);__WASM__;WINUI</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Uno.WinUI" Version="4.9.26" />
-    <PackageReference Include="Uno.WinUI.Runtime.WebAssembly" Version="4.9.26" />
+    <PackageReference Include="Uno.WinUI" Version="5.2.175" />
+    <PackageReference Include="Uno.WinUI.Runtime.WebAssembly" Version="5.2.175" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />

diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Uno.WinUI.csproj b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Uno.WinUI.csproj
@@ -24,7 +24,7 @@
     <ProjectReference Include="..\..\..\binding\SkiaSharp.NativeAssets.WebAssembly\SkiaSharp.NativeAssets.WebAssembly.csproj" Condition="!$(TargetFramework.Contains('-'))" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Uno.WinUI" Version="4.9.26" Condition="!$(TargetFramework.Contains('-windows'))" />
+    <PackageReference Include="Uno.WinUI" Version="5.2.175" Condition="!$(TargetFramework.Contains('-windows'))" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.1" PrivateAssets="all" Condition="$(TargetFramework.Contains('-windows'))" />
   </ItemGroup>
   <PropertyGroup>

diff --git a/tests/SkiaSharp.Tests.Devices/SkiaSharp.Tests.Devices.csproj b/tests/SkiaSharp.Tests.Devices/SkiaSharp.Tests.Devices.csproj
@@ -41,6 +41,8 @@
     <PackageReference Include="DeviceRunners.UITesting.Xunit" Version="0.1.0-preview.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Maui.Core" Version="$(MauiVersion)" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/SkiaSharp.Tests.Wasm/SkiaSharp.Tests.Wasm.csproj b/tests/SkiaSharp.Tests.Wasm/SkiaSharp.Tests.Wasm.csproj
@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.27" />
-    <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.27" />
+    <PackageReference Include="Uno.Wasm.Bootstrap" Version="8.0.17" />
+    <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.17" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.extensibility.core" Version="2.4.2" />
     <PackageReference Include="xunit.runner.utility" Version="2.4.2" />