From 503e9badd94f4c3e256707f605421114f1d91806 Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome@platform.uno>
Date: Tue, 5 Nov 2024 21:42:00 -0500
Subject: [PATCH] chore: Adjust skiasharp defaults

---
 .../5.1/uno51blank/Directory.Packages.props   | 22 +++++++++----------
 .../uno51recommended/Directory.Packages.props | 22 +++++++++----------
 src/Uno.Sdk/packages.json                     |  4 ++--
 ...no.Implicit.Packages.ProjectSystem.targets |  5 ++++-
 4 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/SolutionTemplate/5.1/uno51blank/Directory.Packages.props b/src/SolutionTemplate/5.1/uno51blank/Directory.Packages.props
index 296df9d6fe5a..ef290f97a282 100644
--- a/src/SolutionTemplate/5.1/uno51blank/Directory.Packages.props
+++ b/src/SolutionTemplate/5.1/uno51blank/Directory.Packages.props
@@ -10,17 +10,17 @@
     <PackageVersion Include="Microsoft.Windows.Compatibility" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Android" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.iOS" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.MacCatalyst" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.macOS" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Win32" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.Views" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.Views.Gtk2" Version="2.88.7" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Android" Version="2.88.9-preview.2.2" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.iOS" Version="2.88.9-preview.2.2" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9-preview.2.2" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.MacCatalyst" Version="2.88.9-preview.2.2" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.macOS" Version="2.88.9-preview.2.2" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.9-preview.2.2" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Win32" Version="2.88.9-preview.2.2" />
+    <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.9-preview.2.2" />
+    <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.9-preview.2.2" />
+    <PackageVersion Include="SkiaSharp.Views" Version="2.88.9-preview.2.2" />
+    <PackageVersion Include="SkiaSharp.Views.Gtk2" Version="2.88.9-preview.2.2" />
     <PackageVersion Include="OpenTK" Version="3.1.0" />
     <PackageVersion Include="OpenTK.GLControl" Version="3.1.0" />
     <PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
diff --git a/src/SolutionTemplate/5.1/uno51recommended/Directory.Packages.props b/src/SolutionTemplate/5.1/uno51recommended/Directory.Packages.props
index 1cb2d22cd667..36196be285aa 100644
--- a/src/SolutionTemplate/5.1/uno51recommended/Directory.Packages.props
+++ b/src/SolutionTemplate/5.1/uno51recommended/Directory.Packages.props
@@ -17,17 +17,17 @@
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
     <PackageVersion Include="Serilog.AspNetCore" Version="8.0.1" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Android" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.iOS" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.MacCatalyst" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.macOS" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Win32" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.Views" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.Views.Gtk2" Version="2.88.7" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Android" Version="2.88.9-preview.2.2" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.iOS" Version="2.88.9-preview.2.2" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9-preview.2.2" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.MacCatalyst" Version="2.88.9-preview.2.2" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.macOS" Version="2.88.9-preview.2.2" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.9-preview.2.2" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Win32" Version="2.88.9-preview.2.2" />
+    <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.9-preview.2.2" />
+    <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.9-preview.2.2" />
+    <PackageVersion Include="SkiaSharp.Views" Version="2.88.9-preview.2.2" />
+    <PackageVersion Include="SkiaSharp.Views.Gtk2" Version="2.88.9-preview.2.2" />
     <PackageVersion Include="OpenTK" Version="3.1.0" />
     <PackageVersion Include="OpenTK.GLControl" Version="3.1.0" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
diff --git a/src/Uno.Sdk/packages.json b/src/Uno.Sdk/packages.json
index 56348beaf653..270943c51d98 100644
--- a/src/Uno.Sdk/packages.json
+++ b/src/Uno.Sdk/packages.json
@@ -87,14 +87,14 @@
 	},
 	{
 		"group": "hotdesign",
-		"version": "1.0.0-dev.3",
+		"version": "1.0.0-dev.17",
 		"packages": [
 			"Uno.UI.HotDesign"
 		]
 	},
 	{
 	  "group": "SkiaSharp",
-	  "version": "2.88.8",
+	  "version": "2.88.9-preview.2.2",
 	  "packages": [
 		"SkiaSharp.Skottie",
 		"SkiaSharp.Views.Uno.WinUI",
diff --git a/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.targets b/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.targets
index ce5194b7d6b3..45113990cdc4 100644
--- a/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.targets
+++ b/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.targets
@@ -9,7 +9,10 @@
 		<_UnoProjectSystemPackageReference Include="Uno.Resizetizer" ProjectSystem="true" PrivateAssets="all" />
 		<_UnoProjectSystemPackageReference Include="Uno.Sdk.Extras" ProjectSystem="true" PrivateAssets="all" />
 		<_UnoProjectSystemPackageReference Include="Uno.Settings.DevServer" ProjectSystem="true" PrivateAssets="all" />
-		<_UnoProjectSystemPackageReference Include="Uno.UI.HotDesign" ProjectSystem="true" PrivateAssets="all" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" $(_IsExecutable) == 'true' ">
+		<_UnoProjectSystemPackageReference Include="Uno.UI.HotDesign" ProjectSystem="true" PrivateAssets="all" Condition=" '$(Optimize)' != 'true' " />
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(_ImplicitRestoreOutputType)' == 'WinExe' OR '$(_ImplicitRestoreOutputType)' == 'Exe' ">