fix: Updating uno and fixing build

unoplatform · Oct 25, 2022 · efa4506 · efa4506
1 parent b29babf
commit efa4506
Show file tree

Hide file tree

Showing 20 changed files with 97 additions and 67 deletions.
diff --git a/samples/Playground/Directory.Build.targets b/samples/Playground/Directory.Build.targets
@@ -34,4 +34,9 @@
   </Choose>
 
 	<Import Project="..\..\src\xamarinmac-workaround.targets" Condition="exists('..\..\src\xamarinmac-workaround.targets') and $(TargetFramework.ToLower().StartsWith('xamarin')) and $(TargetFramework.ToLower().Contains('mac'))" />
+
+	<!-- Uno.WinUI.MSAL references Uno.WinUI for windows10 tfm. This target
+		overrides the protection in uno.winui.targets that raises an error 
+		that breaks build -->
+	<Target Name="_WinAppSDKNotSupported" BeforeTargets="BeforeBuild" />
 </Project>
diff --git a/samples/Playground/Directory.Packages.props b/samples/Playground/Directory.Packages.props
@@ -25,20 +25,20 @@
 		<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.3.0" />
 		<PackageVersion Include="Uno.Material" Version="2.3.0" />
 		<PackageVersion Include="Uno.Material.WinUI" Version="2.3.0" />
-		<PackageVersion Include="Uno.Toolkit.UI" Version="2.4.0-dev.75" />
-		<PackageVersion Include="Uno.Toolkit.UI.Material" Version="2.4.0-dev.75" />
-		<PackageVersion Include="Uno.Toolkit.WinUI" Version="2.4.0-dev.75" />
-		<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="2.4.0-dev.75" />
-		<PackageVersion Include="Uno.UI" Version="4.6.0-dev.692" />
-		<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.0-dev.692" />
-		<PackageVersion Include="Uno.UI.RemoteControl" Version="4.6.0-dev.692" />
-		<PackageVersion Include="Uno.UI.Skia.Gtk" Version="4.6.0-dev.692" />
-		<PackageVersion Include="Uno.UI.Skia.Tizen" Version="4.6.0-dev.692" />
-		<PackageVersion Include="Uno.UI.Skia.Wpf" Version="4.6.0-dev.692" />
-		<PackageVersion Include="Uno.UI.WebAssembly" Version="4.6.0-dev.692" />
+		<PackageVersion Include="Uno.Toolkit.UI" Version="2.4.0-dev.85" />
+		<PackageVersion Include="Uno.Toolkit.UI.Material" Version="2.4.0-dev.85" />
+		<PackageVersion Include="Uno.Toolkit.WinUI" Version="2.4.0-dev.85" />
+		<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="2.4.0-dev.85" />
+		<PackageVersion Include="Uno.UI" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.UI.RemoteControl" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.UI.Skia.Gtk" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.UI.Skia.Tizen" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.UI.Skia.Wpf" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.UI.WebAssembly" Version="4.6.0-dev.947" />
 		<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.33" />
 		<PackageVersion Include="Uno.Wasm.Bootstrap" Version="3.3.1" />
 		<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="3.3.1" />
-		<PackageVersion Include="Uno.WinUI" Version="4.6.0-dev.692" />
+		<PackageVersion Include="Uno.WinUI" Version="4.6.0-dev.947" />
 	</ItemGroup>
 </Project>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -43,15 +43,15 @@
 		<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.3.0" />
 		<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.3.0" />
 		<PackageVersion Include="Uno.Roslyn" Version="1.3.0-dev.12" />
-		<PackageVersion Include="Uno.Toolkit.UI" Version="2.4.0-dev.83" />
-		<PackageVersion Include="Uno.Toolkit.WinUI" Version="2.4.0-dev.83" />
-		<PackageVersion Include="Uno.UI" Version="4.6.0-dev.701" />
-		<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.0-dev.701"/>
-		<PackageVersion Include="Uno.UI.MSAL"  Version="4.6.0-dev.701" />
-		<PackageVersion Include="Uno.UI.Runtime.WebAssembly" Version="4.6.0-dev.701" />
-		<PackageVersion Include="Uno.WinUI" Version="4.6.0-dev.701" />
-		<PackageVersion Include="Uno.WinUI.MSAL" Version="4.6.0-dev.701" />
-		<PackageVersion Include="Uno.WinUI.Runtime.WebAssembly" Version="4.6.0-dev.701" />
+		<PackageVersion Include="Uno.Toolkit.UI" Version="2.4.0-dev.85" />
+		<PackageVersion Include="Uno.Toolkit.WinUI" Version="2.4.0-dev.85" />
+		<PackageVersion Include="Uno.UI" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.0-dev.947"/>
+		<PackageVersion Include="Uno.UI.MSAL"  Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.UI.Runtime.WebAssembly" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.WinUI" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.WinUI.MSAL" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.WinUI.Runtime.WebAssembly" Version="4.6.0-dev.947" />
 		<PackageVersion Include="coverlet.collector" Version="3.1.2" />
 		<PackageVersion Include="xunit" Version="2.4.1" />
 		<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.1" />

diff --git a/src/Uno.Extensions.Authentication.MSAL/Directory.Build.targets b/src/Uno.Extensions.Authentication.MSAL/Directory.Build.targets
@@ -0,0 +1,8 @@
+<Project ToolsVersion="15.0">
+	<Import Project="..\Directory.Build.targets" />
+
+	<!-- Uno.WinUI.MSAL references Uno.WinUI for windows10 tfm. This target
+		overrides the protection in uno.winui.targets that raises an error 
+		that breaks build -->
+	<Target Name="_WinAppSDKNotSupported" BeforeTargets="BeforeBuild" />
+</Project>
diff --git a/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.WinUI.csproj b/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.WinUI.csproj
@@ -4,7 +4,6 @@
 	<PropertyGroup>
 		<Description>MSAL Authentication Extensions for the Uno Platform (WinUI)</Description>
 		<EnableDefaultPageItems>false</EnableDefaultPageItems>
-
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -48,9 +47,12 @@
 		<TargetPlatformMinVersion>14.2</TargetPlatformMinVersion>
 		<TargetPlatformVersion>15.4</TargetPlatformVersion>
 	</PropertyGroup>
-	
-	<ItemGroup>
+
+	<ItemGroup  Condition="'$(_IsWinUI)'=='false'">
 		<PackageReference Include="Uno.WinUI" />
+	</ItemGroup>
+
+	<ItemGroup>
 		<PackageReference Include="Uno.WinUI.MSAL" />
 	</ItemGroup>
 
@@ -61,4 +63,5 @@
 	<ItemGroup>
 	  <SourceGeneratorInput Remove="buildTransitive\Uno.Extensions.Authentication.MSAL.WinUI.props" />
 	</ItemGroup>
+
 </Project>
diff --git a/src/Uno.Extensions.Authentication.Oidc/Uno.Extensions.Authentication.Oidc.WinUI.csproj b/src/Uno.Extensions.Authentication.Oidc/Uno.Extensions.Authentication.Oidc.WinUI.csproj
@@ -14,9 +14,12 @@
 		<PackageId>Uno.Extensions.Authentication.Oidc.WinUI</PackageId>
 		<DefineConstants>$(DefineConstants);WINUI</DefineConstants>
 	</PropertyGroup>
+
+	<ItemGroup  Condition="'$(_IsWinUI)'=='false'">
+		<PackageReference Include="Uno.WinUI" />
+	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Uno.WinUI" />
 		<ProjectReference Include="..\Uno.Extensions.Authentication.UI\Uno.Extensions.Authentication.WinUI.csproj" />
 	</ItemGroup>
 </Project>
diff --git a/src/Uno.Extensions.Authentication.UI/Uno.Extensions.Authentication.WinUI.csproj b/src/Uno.Extensions.Authentication.UI/Uno.Extensions.Authentication.WinUI.csproj
@@ -13,8 +13,11 @@
 		<DefineConstants>$(DefineConstants);WINUI</DefineConstants>
 	</PropertyGroup>
 
-	<ItemGroup>
+	<ItemGroup Condition="'$(_IsWinUI)'=='false'">
 		<PackageReference Include="Uno.WinUI" />
+	</ItemGroup>
+
+	<ItemGroup>
 		<ProjectReference Include="..\Uno.Extensions.Navigation.UI\Uno.Extensions.Navigation.WinUI.csproj" />
 	</ItemGroup>
 </Project>
diff --git a/src/Uno.Extensions.Hosting.UI/AppHostingEnvironment.cs b/src/Uno.Extensions.Hosting.UI/AppHostingEnvironment.cs
@@ -1,4 +1,6 @@
-using Uno.Foundation;
+#if __WASM__
+using Uno.Foundation;
+#endif
 
 namespace Uno.Extensions.Hosting;
 

diff --git a/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.Skia.csproj b/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.Skia.csproj
@@ -14,7 +14,7 @@
 	</PropertyGroup>
 
 
-	<ItemGroup>
+	<ItemGroup Condition="'$(_IsWinUI)'=='false'">
 		<PackageReference Include="Uno.WinUI" />
 	</ItemGroup>
 

diff --git a/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.csproj b/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.csproj
@@ -17,7 +17,7 @@
 		<DefineConstants>$(DefineConstants);WINUI</DefineConstants>
 	</PropertyGroup>
 
-	<ItemGroup>
+	<ItemGroup Condition="'$(_IsWinUI)'=='false'">
 		<PackageReference Include="Uno.WinUI" />
 	</ItemGroup>
 

diff --git a/src/Uno.Extensions.Localization.UI/Uno.Extensions.Localization.WinUI.csproj b/src/Uno.Extensions.Localization.UI/Uno.Extensions.Localization.WinUI.csproj
@@ -10,8 +10,8 @@
 	<PropertyGroup>
 		<DefineConstants>$(DefineConstants);WINUI</DefineConstants>
 	</PropertyGroup>
-	
-	<ItemGroup>
+
+	<ItemGroup Condition="'$(_IsWinUI)'=='false'">
 		<PackageReference Include="Uno.WinUI" />
 	</ItemGroup>
 </Project>
diff --git a/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.Skia.csproj b/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.Skia.csproj
@@ -9,7 +9,7 @@
 		<AssemblyName>Uno.Extensions.Logging.WinUI</AssemblyName>
 	</PropertyGroup>
 
-	<ItemGroup>
+	<ItemGroup Condition="'$(_IsWinUI)'=='false'">
 		<PackageReference Include="Uno.WinUI" />
 	</ItemGroup>
 

diff --git a/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.csproj b/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.csproj
@@ -21,7 +21,7 @@
 		<PackageReference Include="Uno.Extensions.Logging.OSLog" />
 	</ItemGroup>
 
-	<ItemGroup>
+	<ItemGroup Condition="'$(_IsWinUI)'=='false'">
 		<PackageReference Include="Uno.WinUI" />
 	</ItemGroup>
 

diff --git a/src/Uno.Extensions.Navigation.Toolkit/Uno.Extensions.Navigation.Toolkit.WinUI.csproj b/src/Uno.Extensions.Navigation.Toolkit/Uno.Extensions.Navigation.Toolkit.WinUI.csproj
@@ -17,8 +17,10 @@
 	  <None Remove="LinkerDefinition.xml" />
 	</ItemGroup>
 
-	<ItemGroup>
+	<ItemGroup Condition="'$(_IsWinUI)'=='false'">
 		<PackageReference Include="Uno.WinUI" />
+	</ItemGroup>
+	<ItemGroup>
 		<PackageReference Include="Uno.Toolkit.WinUI" />
 		<ProjectReference Include="..\Uno.Extensions.Navigation.UI\Uno.Extensions.Navigation.WinUI.csproj" />
 	</ItemGroup>

diff --git a/src/Uno.Extensions.Navigation.UI/Uno.Extensions.Navigation.WinUI.csproj b/src/Uno.Extensions.Navigation.UI/Uno.Extensions.Navigation.WinUI.csproj
@@ -13,7 +13,7 @@
 		<DefineConstants>$(DefineConstants);WINUI</DefineConstants>
 	</PropertyGroup>
 
-	<ItemGroup>
+	<ItemGroup Condition="'$(_IsWinUI)'=='false'">
 		<PackageReference Include="Uno.WinUI" />
 	</ItemGroup>
 </Project>
diff --git a/src/Uno.Extensions.Reactive.UI/Uno.Extensions.Reactive.UI.WinUI.csproj b/src/Uno.Extensions.Reactive.UI/Uno.Extensions.Reactive.UI.WinUI.csproj
@@ -14,8 +14,11 @@
 
 	<Import Project="common.props" />
 
-	<ItemGroup>
+	<ItemGroup Condition="'$(_IsWinUI)'=='false'">
 		<PackageReference Include="Uno.WinUI" />
+	</ItemGroup>
+
+	<ItemGroup>
 		<PackageReference Include="Uno.Toolkit.WinUI" />
 	</ItemGroup>
 </Project>
diff --git a/src/Uno.Extensions.Storage.UI/GlobalUsings.cs b/src/Uno.Extensions.Storage.UI/GlobalUsings.cs
@@ -14,6 +14,7 @@
 global using Uno.Extensions.Storage;
 global using Uno.Extensions.Storage.KeyValueStorage;
 global using Uno.Extensions.Threading;
+global using Windows.Security.Credentials;
 global using Windows.Storage;
 
 #if WINUI
@@ -27,7 +28,7 @@
 	global using Microsoft.UI.Xaml.Data;
 	global using Microsoft.UI.Xaml.Media;
 #else
-	global using Windows.System;
+global using Windows.System;
 	global using Windows.UI.Xaml;
 	global using Windows.UI.Xaml.Controls;
 	global using Windows.UI.Xaml.Controls.Primitives;

diff --git a/src/Uno.Extensions.Storage.UI/Uno.Extensions.Storage.WinUI.csproj b/src/Uno.Extensions.Storage.UI/Uno.Extensions.Storage.WinUI.csproj
@@ -13,7 +13,7 @@
 		<DefineConstants>$(DefineConstants);WINUI</DefineConstants>
 	</PropertyGroup>
 
-	<ItemGroup>
+	<ItemGroup Condition="'$(_IsWinUI)'=='false'">
 		<PackageReference Include="Uno.WinUI" />
 	</ItemGroup>
 </Project>
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/Directory.Packages.props b/src/Uno.Extensions.Templates/content/unoapp-extensions/Directory.Packages.props
@@ -10,18 +10,18 @@
     <PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
     <PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0" />
     <PackageVersion Include="Uno.Material.WinUI" Version="2.3.0" />
-    <PackageVersion Include="Uno.Toolkit.WinUI.Material" Version=" 2.4.0-dev.75" />
-    <PackageVersion Include="Uno.Toolkit.WinUI" Version="2.4.0-dev.75" />
-    <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.0-dev.573" />
+    <PackageVersion Include="Uno.Toolkit.WinUI.Material" Version=" 2.4.0-dev.85" />
+    <PackageVersion Include="Uno.Toolkit.WinUI" Version="2.4.0-dev.85" />
+    <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.0-dev.947" />
     <PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
     <PackageVersion Include="Uno.Wasm.Bootstrap" Version="3.3.1" />
     <PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="3.3.1" />
-    <PackageVersion Include="Uno.WinUI" Version="4.6.0-dev.573" />
-    <PackageVersion Include="Uno.WinUI.WebAssembly" Version="4.6.0-dev.573" />
-    <PackageVersion Include="Uno.WinUI.RemoteControl" Version="4.6.0-dev.573" />
-    <PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.6.0-dev.573" />
-    <PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="4.6.0-dev.573" />
-    <PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="4.6.0-dev.573" />
+    <PackageVersion Include="Uno.WinUI" Version="4.6.0-dev.947" />
+    <PackageVersion Include="Uno.WinUI.WebAssembly" Version="4.6.0-dev.947" />
+    <PackageVersion Include="Uno.WinUI.RemoteControl" Version="4.6.0-dev.947" />
+    <PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.6.0-dev.947" />
+    <PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="4.6.0-dev.947" />
+    <PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="4.6.0-dev.947" />
     <PackageVersion Include="Xamarin.Google.Android.Material" Version="1.4.0.4" />
     <PackageVersion Include="Uno.Extensions.Authentication.WinUI" Version="255.255.255.255" />
     <PackageVersion Include="Uno.Extensions.Hosting.WinUI" Version="255.255.255.255" />

diff --git a/testing/TestHarness/Directory.Packages.props b/testing/TestHarness/Directory.Packages.props
@@ -35,33 +35,33 @@
 		<PackageVersion Include="Uno.Material" Version="2.3.0" />
 		<PackageVersion Include="Uno.Material.WinUI" Version="2.3.0" />
 		<PackageVersion Include="Uno.Microsoft.Toolkit.Uwp.UI" Version="7.1.11" />
-		<PackageVersion Include="Uno.Toolkit.UI" Version="2.4.0-dev.83" />
-		<PackageVersion Include="Uno.Toolkit.UI.Material" Version="2.4.0-dev.83" />
-		<PackageVersion Include="Uno.Toolkit.WinUI" Version="2.4.0-dev.83" />
-		<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="2.4.0-dev.83" />
-		<PackageVersion Include="Uno.UI" Version="4.6.0-dev.701" />
-		<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.0-dev.701" />
-		<PackageVersion Include="Uno.UI.MSAL" Version="4.6.0-dev.701" />
-		<PackageVersion Include="Uno.UI.RemoteControl" Version="4.6.0-dev.701" />
-		<PackageVersion Include="Uno.UI.Skia.Gtk" Version="4.6.0-dev.701" />
-		<PackageVersion Include="Uno.UI.Skia.Linux.FrameBuffer" Version="4.6.0-dev.701" />
-		<PackageVersion Include="Uno.UI.Skia.Tizen" Version="4.6.0-dev.701" />
-		<PackageVersion Include="Uno.UI.Skia.Wpf" Version="4.6.0-dev.701" />
-		<PackageVersion Include="Uno.UI.WebAssembly" Version="4.6.0-dev.701" />
+		<PackageVersion Include="Uno.Toolkit.UI" Version="2.4.0-dev.85" />
+		<PackageVersion Include="Uno.Toolkit.UI.Material" Version="2.4.0-dev.85" />
+		<PackageVersion Include="Uno.Toolkit.WinUI" Version="2.4.0-dev.85" />
+		<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="2.4.0-dev.85" />
+		<PackageVersion Include="Uno.UI" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.UI.MSAL" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.UI.RemoteControl" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.UI.Skia.Gtk" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.UI.Skia.Linux.FrameBuffer" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.UI.Skia.Tizen" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.UI.Skia.Wpf" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.UI.WebAssembly" Version="4.6.0-dev.947" />
 		<PackageVersion Include="Uno.UITest" Version="1.1.0-dev.32" />
 		<PackageVersion Include="Uno.UITest.Selenium" Version="1.1.0-dev.32" />
 		<PackageVersion Include="Uno.UITest.Xamarin" Version="1.1.0-dev.32" />
 		<PackageVersion Include="Uno.UITest.Helpers" Version="1.1.0-dev.32" />
 		<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
 		<PackageVersion Include="Uno.Wasm.Bootstrap" Version="3.3.1" />
 		<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="3.3.1" />
-		<PackageVersion Include="Uno.WinUI" Version="4.6.0-dev.701" />
-		<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="4.6.0-dev.701" />
-		<PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.6.0-dev.701" />
-		<PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="4.6.0-dev.701" />
-		<PackageVersion Include="Uno.WinUI.MSAL" Version="4.6.0-dev.701" />
-		<PackageVersion Include="Uno.WinUI.RemoteControl" Version="4.6.0-dev.701" />
-		<PackageVersion Include="Uno.WinUI.WebAssembly" Version="4.6.0-dev.701" />
+		<PackageVersion Include="Uno.WinUI" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.WinUI.MSAL" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.WinUI.RemoteControl" Version="4.6.0-dev.947" />
+		<PackageVersion Include="Uno.WinUI.WebAssembly" Version="4.6.0-dev.947" />
 		<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
 		<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
 		<PackageVersion Include="NUnit" Version="3.13.3" />