Merge pull request #18397 from unoplatform/dev/youssef/packages-cleanup

chore: Use Uno.WinUI.Runtime.* packages in Uno.Sdk
unoplatform · Oct 6, 2024 · 969e990 · 969e990
2 parents 6f7a516 + 4b1d1b5
commit 969e990
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/src/Uno.Sdk/packages.json b/src/Uno.Sdk/packages.json
@@ -11,13 +11,12 @@
 		"Uno.WinUI.Svg",
 		"Uno.WinUI.Lottie",
 		"Uno.WinUI.DevServer",
-		"Uno.WinUI.Skia.Gtk",
-		"Uno.WinUI.Skia.Linux.FrameBuffer",
-		"Uno.WinUI.Skia.MacOS",
-		"Uno.WinUI.Skia.Wpf",
-		"Uno.WinUI.Skia.X11",
+		"Uno.WinUI.Runtime.Skia.Gtk",
+		"Uno.WinUI.Runtime.Skia.Linux.FrameBuffer",
+		"Uno.WinUI.Runtime.Skia.MacOS",
+		"Uno.WinUI.Runtime.Skia.Wpf",
+		"Uno.WinUI.Runtime.Skia.X11",
 		"Uno.WinUI.Svg",
-		"Uno.WinUI.WebAssembly",
 		"Uno.WinUI.Runtime.WebAssembly",
 		"Uno.WinUI.MediaPlayer.WebAssembly",
 		"Uno.WinUI.Graphics3DGL",

diff --git a/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.Desktop.targets b/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.Desktop.targets
@@ -15,10 +15,10 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="$(_IsExecutable) == 'true'">
-		<_UnoProjectSystemPackageReference Include="Uno.WinUI.Skia.Linux.FrameBuffer" ProjectSystem="true" />
-		<_UnoProjectSystemPackageReference Include="Uno.WinUI.Skia.MacOS" ProjectSystem="true" />
-		<_UnoProjectSystemPackageReference Include="Uno.WinUI.Skia.Wpf" ProjectSystem="true" />
-		<_UnoProjectSystemPackageReference Include="Uno.WinUI.Skia.X11" ProjectSystem="true" />
+		<_UnoProjectSystemPackageReference Include="Uno.WinUI.Runtime.Skia.Linux.FrameBuffer" ProjectSystem="true" />
+		<_UnoProjectSystemPackageReference Include="Uno.WinUI.Runtime.Skia.MacOS" ProjectSystem="true" />
+		<_UnoProjectSystemPackageReference Include="Uno.WinUI.Runtime.Skia.Wpf" ProjectSystem="true" />
+		<_UnoProjectSystemPackageReference Include="Uno.WinUI.Runtime.Skia.X11" ProjectSystem="true" />
 
 		<!-- Enable WPF Hardware acceleration over RDP, only if not specified by the project -->
     	<RuntimeHostConfigurationOption 

diff --git a/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.Legacy.targets b/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.Legacy.targets
@@ -1,14 +1,14 @@
 <Project>
 	<ItemGroup Condition="$(MSBuildProjectName.EndsWith('Skia.WPF'))">
-		<_UnoProjectSystemPackageReference Include="Uno.WinUI.Skia.Wpf" ProjectSystem="true" />
+		<_UnoProjectSystemPackageReference Include="Uno.WinUI.Runtime.Skia.Wpf" ProjectSystem="true" />
 		<_UnoProjectSystemPackageReference Include="SkiaSharp.NativeAssets.Win32" ProjectSystem="true" />
 	</ItemGroup>
 	<ItemGroup Condition="$(MSBuildProjectName.EndsWith('Skia.Linux.FrameBuffer'))">
-		<_UnoProjectSystemPackageReference Include="Uno.WinUI.Skia.Linux.FrameBuffer" ProjectSystem="true" />
+		<_UnoProjectSystemPackageReference Include="Uno.WinUI.Runtime.Skia.Linux.FrameBuffer" ProjectSystem="true" />
 		<_UnoProjectSystemPackageReference Include="SkiaSharp.NativeAssets.Linux" ProjectSystem="true" />
 	</ItemGroup>
 	<ItemGroup Condition="$(MSBuildProjectName.EndsWith('Skia.Gtk'))">
-		<_UnoProjectSystemPackageReference Include="Uno.WinUI.Skia.Gtk" ProjectSystem="true" />
+		<_UnoProjectSystemPackageReference Include="Uno.WinUI.Runtime.Skia.Gtk" ProjectSystem="true" />
 		<_UnoProjectSystemPackageReference Include="SkiaSharp.NativeAssets.Linux" ProjectSystem="true" />
 		<_UnoProjectSystemPackageReference Include="SkiaSharp.NativeAssets.macOS" ProjectSystem="true" />
 	</ItemGroup>

diff --git a/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.Wasm.targets b/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.Wasm.targets
@@ -7,15 +7,14 @@
 	<Import Project="$(MSBuildThisFileDirectory)Uno.Implicit.Packages.ProjectSystem.Uno.targets" />
 
 	<ItemGroup Condition=" $(_IsExecutable) == 'true' ">
-		<_UnoProjectSystemPackageReference Include="Uno.WinUI.WebAssembly" ProjectSystem="true" />
 		<_UnoProjectSystemPackageReference Include="Uno.WinUI.MediaPlayer.WebAssembly" ProjectSystem="true" Condition="$(UnoFeatures.Contains(';mediaelement;'))"/>
 		<_UnoProjectSystemPackageReference Include="Microsoft.Windows.Compatibility" ProjectSystem="true" />
 		<_UnoProjectSystemPackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" ProjectSystem="true" />
 		<_UnoProjectSystemPackageReference Include="Uno.Wasm.Bootstrap" ProjectSystem="true" />
 		<_UnoProjectSystemPackageReference Include="Uno.Wasm.Bootstrap.DevServer" ProjectSystem="true" />
 	</ItemGroup>
 
-	<ItemGroup Condition=" $(_IsExecutable) == 'false' ">
+	<ItemGroup>
 		<_UnoProjectSystemPackageReference Include="Uno.WinUI.Runtime.WebAssembly" ProjectSystem="true" />
 	</ItemGroup>