chore: Update Uno

unoplatform · Oct 16, 2023 · ac2d026 · ac2d026
1 parent c1026fc
commit ac2d026
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 36 deletions.
diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Mobile/Uno.UI.RuntimeTests.Engine.Mobile.csproj b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Mobile/Uno.UI.RuntimeTests.Engine.Mobile.csproj
@@ -22,9 +22,9 @@
 		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-macos'">osx-x64</RuntimeIdentifier>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Uno.UI" Version="4.6.19" />
-		<PackageReference Include="Uno.UI.RemoteControl" Version="4.6.19" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.19" />
+		<PackageReference Include="Uno.UI" Version="5.0.0-dev.3500" />
+		<PackageReference Include="Uno.UI.DevServer" Version="5.0.0-dev.3500" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.3500" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
 
 		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />

diff --git a/...estApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Uno.UI.RuntimeTests.Engine.Skia.Gtk.csproj b/...estApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Uno.UI.RuntimeTests.Engine.Skia.Gtk.csproj
@@ -16,9 +16,9 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-		<PackageReference Include="Uno.UI.Skia.Gtk" Version="5.0.0-dev.2691" />
-		<PackageReference Include="Uno.UI.RemoteControl" Version="5.0.0-dev.2691" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.2691" />
+		<PackageReference Include="Uno.UI.Skia.Gtk" Version="5.0.0-dev.3500" />
+		<PackageReference Include="Uno.UI.DevServer" Version="5.0.0-dev.3500" /><!--Note: Keep the DevServer package also in release for hot reload tests (cf. HotReloadHelper).-->
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.3500" />
 
 		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

diff --git a/...ts.Engine.Skia.Linux.FrameBuffer/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer.csproj b/...ts.Engine.Skia.Linux.FrameBuffer/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer.csproj
@@ -16,9 +16,9 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-		<PackageReference Include="Uno.UI.Skia.Linux.FrameBuffer" Version="4.6.19" />
-		<PackageReference Include="Uno.UI.RemoteControl" Version="4.6.19" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.19" />
+		<PackageReference Include="Uno.UI.Skia.Linux.FrameBuffer" Version="5.0.0-dev.3500" />
+		<PackageReference Include="Uno.UI.DevServer" Version="5.0.0-dev.3500" /><!--Note: Keep the DevServer package also in release for hot reload tests (cf. HotReloadHelper).-->
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.3500" />
 
 		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />

diff --git a/...estApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/Uno.UI.RuntimeTests.Engine.Skia.WPF.csproj b/...estApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/Uno.UI.RuntimeTests.Engine.Skia.WPF.csproj
@@ -20,9 +20,9 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-		<PackageReference Include="Uno.UI.Skia.Wpf" Version="5.0.0-dev.2691" />
-		<PackageReference Include="Uno.UI.DevServer" Version="5.0.0-dev.2691"/>  <!--Note: Keep the DevServer package also in release for hot reload tests (cf. HotReloadHelper).-->
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.2691" />
+		<PackageReference Include="Uno.UI.Skia.Wpf" Version="5.0.0-dev.3500" />
+		<PackageReference Include="Uno.UI.DevServer" Version="5.0.0-dev.3500"/><!--Note: Keep the DevServer package also in release for hot reload tests (cf. HotReloadHelper).-->
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.3500" />
 
 		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
@@ -34,12 +34,6 @@
 		<Content Include="Assets\Fonts\uno-fluentui-assets.ttf" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<AssemblyAttribute Include="Uno.UI.RuntimeTests.Engine.RuntimeTestsSourceProjectAttribute">
-			<_Parameter1>$(MSBuildProjectFullPath)</_Parameter1>
-		</AssemblyAttribute>
-	</ItemGroup>
-
 	<Import Project="..\..\shared\uno.ui.runtimetests.engine.Shared.projitems" Label="Shared" />
 	<Import Project="..\..\..\Uno.UI.RuntimeTests.Engine.Library\Uno.UI.RuntimeTests.Engine.Library.projitems" Label="Shared" />
 </Project>
diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Wasm/Uno.UI.RuntimeTests.Engine.Wasm.csproj b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Wasm/Uno.UI.RuntimeTests.Engine.Wasm.csproj
@@ -44,9 +44,9 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
 		<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0" />
-		<PackageReference Include="Uno.UI.WebAssembly" Version="4.6.19" />
-		<PackageReference Include="Uno.UI.RemoteControl" Version="4.6.19" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.19" />
+		<PackageReference Include="Uno.UI.WebAssembly" Version="5.0.0-dev.3500" />
+		<PackageReference Include="Uno.UI.DevServer" Version="5.0.0-dev.3500" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.3500" />
 		<PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.5" />
 		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.5" />
 

diff --git a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Mobile/Uno.UI.RuntimeTests.Engine.Mobile.csproj b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Mobile/Uno.UI.RuntimeTests.Engine.Mobile.csproj
@@ -18,9 +18,9 @@
 		<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net7.0-macos'">10.14</SupportedOSPlatformVersion>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Uno.WinUI" Version="4.6.19" />
-		<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.6.19" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.19" />
+		<PackageReference Include="Uno.WinUI" Version="5.0.0-dev.3500" />
+		<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.0-dev.3500" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.3500" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
 
 		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />

diff --git a/...tApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Uno.UI.RuntimeTests.Engine.Skia.Gtk.csproj b/...tApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Uno.UI.RuntimeTests.Engine.Skia.Gtk.csproj
@@ -16,9 +16,9 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-		<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="5.0.0-dev.2691" />
-		<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.0-dev.2691" /><!-- Also in release to be able to run hot-reload tests-->
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.2691" />
+		<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="5.0.0-dev.3500" />
+		<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.0-dev.3500" /><!--Note: Keep the DevServer package also in release for hot reload tests (cf. HotReloadHelper).-->
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.3500" />
 
 		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />

diff --git a/...ts.Engine.Skia.Linux.FrameBuffer/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer.csproj b/...ts.Engine.Skia.Linux.FrameBuffer/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer.csproj
@@ -16,9 +16,9 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-		<PackageReference Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.6.19" />
-		<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.6.19" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.19" />
+		<PackageReference Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="5.0.0-dev.3500" />
+		<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.0-dev.3500" /><!--Note: Keep the DevServer package also in release for hot reload tests (cf. HotReloadHelper).-->
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.3500" />
 
 		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />

diff --git a/...tApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/Uno.UI.RuntimeTests.Engine.Skia.Wpf.csproj b/...tApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/Uno.UI.RuntimeTests.Engine.Skia.Wpf.csproj
@@ -20,9 +20,9 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-		<PackageReference Include="Uno.WinUI.Skia.Wpf" Version="5.0.0-dev.2691" />
-		<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.0-dev.2691" /><!-- Also in release to be able to run hot-reload tests-->
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.2691" />
+		<PackageReference Include="Uno.WinUI.Skia.Wpf" Version="5.0.0-dev.3500" />
+		<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.0-dev.3500" /><!--Note: Keep the DevServer package also in release for hot reload tests (cf. HotReloadHelper).-->
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.3500" />
 
 		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />

diff --git a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Wasm/Uno.UI.RuntimeTests.Engine.Wasm.csproj b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Wasm/Uno.UI.RuntimeTests.Engine.Wasm.csproj
@@ -44,9 +44,9 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
 		<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0" />
-		<PackageReference Include="Uno.WinUI.WebAssembly" Version="4.6.19" />
-		<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.6.19" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.19" />
+		<PackageReference Include="Uno.WinUI.WebAssembly" Version="5.0.0-dev.3500" />
+		<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.0-dev.3500" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.3500" />
 		<PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.5" />
 		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.5" />