From 283e312e81191075738f735730e35558b1fa8ebb Mon Sep 17 00:00:00 2001
From: David <github.site@torick.net>
Date: Tue, 10 Oct 2023 12:01:12 -0400
Subject: [PATCH] chore: Update uno and upgrade sample app to net7.0

---
 src/Directory.Build.props                     |  1 +
 src/TestApp/Directory.Build.props             |  8 ++++
 .../Uno.UI.RuntimeTests.Engine.Mobile.csproj  | 32 ++++++++--------
 .../Program.cs                                |  1 +
 ...Uno.UI.RuntimeTests.Engine.Skia.Gtk.csproj | 14 ++++---
 ...Tests.Engine.Skia.Linux.FrameBuffer.csproj |  7 ++--
 .../App.xaml                                  | 12 +++---
 .../App.xaml.cs                               | 17 ++++-----
 .../MainWindow.xaml                           | 10 -----
 .../MainWindow.xaml.cs                        | 30 ---------------
 ...Uno.UI.RuntimeTests.Engine.Skia.WPF.csproj | 20 +++++++---
 .../Uno.UI.RuntimeTests.Engine.Wasm.csproj    |  2 +-
 .../Uno.UI.RuntimeTests.Engine.Mobile.csproj  | 30 +++++++--------
 .../Program.cs                                | 31 ++++++++--------
 ...Uno.UI.RuntimeTests.Engine.Skia.Gtk.csproj | 12 +++---
 .../test/PullDevServer.csproj                 |  9 +++++
 ...Tests.Engine.Skia.Linux.FrameBuffer.csproj |  5 ++-
 .../App.xaml                                  |  3 +-
 .../App.xaml.cs                               | 37 +++++++++++++------
 .../MainWindow.xaml                           | 10 -----
 .../MainWindow.xaml.cs                        | 30 ---------------
 ...Uno.UI.RuntimeTests.Engine.Skia.Wpf.csproj | 12 +++---
 .../Uno.UI.RuntimeTests.Engine.Wasm.csproj    |  2 +-
 .../Uno.UI.RuntimeTests.Engine.Package.csproj |  2 +-
 24 files changed, 149 insertions(+), 188 deletions(-)
 create mode 100644 src/TestApp/Directory.Build.props
 delete mode 100644 src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/MainWindow.xaml
 delete mode 100644 src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/MainWindow.xaml.cs
 create mode 100644 src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Gtk/test/PullDevServer.csproj
 delete mode 100644 src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/MainWindow.xaml
 delete mode 100644 src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/MainWindow.xaml.cs

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 4abf556..6cc682a 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -15,6 +15,7 @@
 	<PropertyGroup>
 		<Nullable>enable</Nullable>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+		<NoWarn>$(NoWarn);CS1998</NoWarn>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(TF_BUILD)' == 'true' or '$(GITHUB_ACTIONS)'=='true'">
diff --git a/src/TestApp/Directory.Build.props b/src/TestApp/Directory.Build.props
new file mode 100644
index 0000000..d6d3a01
--- /dev/null
+++ b/src/TestApp/Directory.Build.props
@@ -0,0 +1,8 @@
+<Project ToolsVersion="15.0">
+	<Import Project="..\Directory.Build.props" />
+
+	<PropertyGroup>
+		<DefineConstants>$(DefineConstants);IS_UNO_RUNTIMETEST_PROJECT</DefineConstants>
+	</PropertyGroup>
+
+</Project>
\ No newline at end of file
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
index 06a60fc..da0a191 100644
--- 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
@@ -1,25 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
 		<!-- Disabled because of https://github.com/xamarin/xamarin-macios/issues/16401-->
-		<!-- <TargetFrameworks>$(TargetFrameworks);net6.0-macos</TargetFrameworks> -->
+		<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-macos</TargetFrameworks> -->
 		<SingleProject>true</SingleProject>
 		<OutputType>Exe</OutputType>
 		<!-- Debugger workaround https://github.com/dotnet/maui-samples/blob/8aa6b8780b12e97b157514c3bdc54bb4a13001cd/HelloMacCatalyst/HelloMacCatalyst.csproj#L7 -->
-		<!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
+		<!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
 		<!-- Required for C# Hot Reload, except for macOS which uses CoreCLR (not Mono) -->
-		<UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != 'net6.0-maccatalyst' and '$(TargetFramework)' != 'net6.0-macos'">True</UseInterpreter>
+		<UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != 'net7.0-maccatalyst' and '$(TargetFramework)' != 'net7.0-macos'">True</UseInterpreter>
 		<IsUnoHead>true</IsUnoHead>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-ios'">14.2</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-android'">21.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net6.0-macos'">10.14</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-ios'">14.2</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-android'">21.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net7.0-macos'">10.14</SupportedOSPlatformVersion>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(RuntimeIdentifier)'==''">
 		<!-- Default values for command line builds -->
-		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-ios'">iossimulator-x64</RuntimeIdentifier>
-		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
-		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-macos'">osx-x64</RuntimeIdentifier>
+		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-ios'">iossimulator-x64</RuntimeIdentifier>
+		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
+		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-macos'">osx-x64</RuntimeIdentifier>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Uno.UI" Version="4.6.19" />
@@ -31,7 +31,7 @@
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	</ItemGroup>
 	<Choose>
-		<When Condition="'$(TargetFramework)'=='net6.0-android'">
+		<When Condition="'$(TargetFramework)'=='net7.0-android'">
 			<ItemGroup>
 				<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.4" />
 				<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" />
@@ -40,8 +40,8 @@
 				<AndroidEnvironment Include="Android/environment.conf" />
 			</ItemGroup>
 		</When>
-		<When Condition="'$(TargetFramework)'=='net6.0-ios'">
-			<PropertyGroup Condition="'$(TargetFramework)'=='net6.0-ios'">
+		<When Condition="'$(TargetFramework)'=='net7.0-ios'">
+			<PropertyGroup Condition="'$(TargetFramework)'=='net7.0-ios'">
 				<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
 				<!-- See https://github.com/unoplatform/uno/issues/9430 for more details. -->
 				<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
@@ -52,7 +52,7 @@
 				<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
 			</ItemGroup>
 		</When>
-		<When Condition="'$(TargetFramework)'=='net6.0-maccatalyst'">
+		<When Condition="'$(TargetFramework)'=='net7.0-maccatalyst'">
 			<PropertyGroup>
 				<!-- Configure the GC -->
 				<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
@@ -67,7 +67,7 @@
 				<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
 			</ItemGroup>
 		</When>
-		<When Condition="'$(TargetFramework)'=='net6.0-macos'">
+		<When Condition="'$(TargetFramework)'=='net7.0-macos'">
 			<PropertyGroup>
 				<TrimMode Condition="'$(Configuration)'=='Release'">link</TrimMode>
 			</PropertyGroup>
diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Program.cs b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Program.cs
index 48726c7..95a7f7a 100644
--- a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Program.cs
+++ b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Program.cs
@@ -1,6 +1,7 @@
 using System;
 using GLib;
 using Uno.UI.Runtime.Skia;
+using Uno.UI.Runtime.Skia.Gtk;
 
 namespace Uno.UI.RuntimeTests.Engine.Skia.Gtk
 {
diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Uno.UI.RuntimeTests.Engine.Skia.Gtk.csproj b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Uno.UI.RuntimeTests.Engine.Skia.Gtk.csproj
index 21801e9..a83d392 100644
--- a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Uno.UI.RuntimeTests.Engine.Skia.Gtk.csproj
+++ b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Uno.UI.RuntimeTests.Engine.Skia.Gtk.csproj
@@ -1,8 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
 		<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
+		<WarningsNotAsErrors>$(WarningsNotAsErrors);Uno0001</WarningsNotAsErrors>
+		<DefineConstants>$(DefineConstants);__SKIA__</DefineConstants>
 	</PropertyGroup>
 	<ItemGroup Condition="exists('..\Uno.UI.RuntimeTests.Engine.UWP')">
 		<EmbeddedResource Include="..\Uno.UI.RuntimeTests.Engine.UWP\Package.appxmanifest" LogicalName="Package.appxmanifest" />
@@ -14,12 +16,12 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-		<PackageReference Include="Uno.UI.Skia.Gtk" 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.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="MSTest.TestFramework" Version="2.2.10" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>
 
 	<Import Project="..\..\shared\uno.ui.runtimetests.engine.Shared.projitems" Label="Shared" />
diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer.csproj b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer.csproj
index dd53b5f..f105242 100644
--- a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer.csproj
+++ b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer.csproj
@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
 		<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
-		<TargetFramework>net6.0</TargetFramework>
-		<NoWarn>$(NoWarn);Uno0001</NoWarn>
+		<TargetFramework>net7.0</TargetFramework>
+		<WarningsNotAsErrors>$(WarningsNotAsErrors);Uno0001</WarningsNotAsErrors>
+		<DefineConstants>$(DefineConstants);__SKIA__;IS_UNO_RUNTIMETEST_PROJECT</DefineConstants>
 	</PropertyGroup>
 	<ItemGroup Condition="exists('..\Uno.UI.RuntimeTests.Engine.UWP')">
 		<EmbeddedResource Include="..\Uno.UI.RuntimeTests.Engine.UWP\Package.appxmanifest" LogicalName="Package.appxmanifest" />
diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/App.xaml b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/App.xaml
index 0ef813e..0606217 100644
--- a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/App.xaml
+++ b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/App.xaml
@@ -1,9 +1,7 @@
 <Application x:Class="Uno.UI.RuntimeTests.Engine.WPF.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:Uno.UI.RuntimeTests.Engine.WPF"
-             StartupUri="MainWindow.xaml">
-    <Application.Resources>
-         
-    </Application.Resources>
+			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+			 xmlns:local="clr-namespace:Uno.UI.RuntimeTests.Engine.WPF">
+	<Application.Resources>
+	</Application.Resources>
 </Application>
diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/App.xaml.cs b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/App.xaml.cs
index 596521a..cdfad1e 100644
--- a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/App.xaml.cs
+++ b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/App.xaml.cs
@@ -1,17 +1,14 @@
 using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
 using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
+using Uno.UI.Runtime.Skia.Wpf;
 
-namespace Uno.UI.RuntimeTests.Engine.WPF
+namespace Uno.UI.RuntimeTests.Engine.WPF;
+
+public partial class App : Application
 {
-	/// <summary>
-	/// Interaction logic for App.xaml
-	/// </summary>
-	public partial class App : Application
+	public App()
 	{
+		new WpfHost(Dispatcher, () => new Uno.UI.RuntimeTests.Engine.App()).Run();
 	}
-}
+}
\ No newline at end of file
diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/MainWindow.xaml b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/MainWindow.xaml
deleted file mode 100644
index 14553fb..0000000
--- a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/MainWindow.xaml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Window x:Class="Uno.UI.RuntimeTests.Engine.WPF.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Uno.UI.RuntimeTests.Engine.WPF"
-        mc:Ignorable="d"
-        Title="MainWindow" Height="450" Width="800">
-	<ContentControl x:Name="root"/>
-</Window>
diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/MainWindow.xaml.cs b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/MainWindow.xaml.cs
deleted file mode 100644
index 6a250d1..0000000
--- a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/MainWindow.xaml.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Uno.UI.RuntimeTests.Engine.WPF
-{
-	/// <summary>
-	/// Interaction logic for MainWindow.xaml
-	/// </summary>
-	public partial class MainWindow : Window
-	{
-		public MainWindow()
-		{
-			InitializeComponent();
-	
-			root.Content = new global::Uno.UI.Skia.Platform.WpfHost(Dispatcher, () => new Uno.UI.RuntimeTests.Engine.App());
-		}
-	}
-}
diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/Uno.UI.RuntimeTests.Engine.Skia.WPF.csproj b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/Uno.UI.RuntimeTests.Engine.Skia.WPF.csproj
index 64d7674..52c70d9 100644
--- a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/Uno.UI.RuntimeTests.Engine.Skia.WPF.csproj
+++ b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/Uno.UI.RuntimeTests.Engine.Skia.WPF.csproj
@@ -1,9 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
 		<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
-		<TargetFramework>net6.0-windows</TargetFramework>
+		<TargetFramework>net7.0-windows</TargetFramework>
 		<UseWPF>true</UseWPF>
+		<WarningsNotAsErrors>$(WarningsNotAsErrors);Uno0001</WarningsNotAsErrors>
+		<DefineConstants>$(DefineConstants);__SKIA__;IS_UNO_RUNTIMETEST_PROJECT</DefineConstants>
 	</PropertyGroup>
 	<ItemGroup Label="AssemblyInfo">
 		<AssemblyAttribute Include="System.Runtime.InteropServices.ComVisibleAttribute">
@@ -18,12 +20,12 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-		<PackageReference Include="Uno.UI.Skia.Wpf" 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.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="MSTest.TestFramework" Version="2.2.10" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
 	</ItemGroup>
 	<ItemGroup>
 		<UpToDateCheckInput Include="..\..\shared\**\*.xaml" />
@@ -32,6 +34,12 @@
 		<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>
\ No newline at end of file
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
index c375aeb..5c9cf9e 100644
--- 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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<NoWarn>NU1701;Uno0001</NoWarn>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
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
index 35b871e..37a85c9 100644
--- 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
@@ -1,21 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst;net6.0-macos</TargetFrameworks>
+		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst;net7.0-macos</TargetFrameworks>
 		<SingleProject>true</SingleProject>
 		<OutputType>Exe</OutputType>
-		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-ios'">iossimulator-x64</RuntimeIdentifier>
-		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
-		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-macos'">osx-x64</RuntimeIdentifier>
+		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-ios'">iossimulator-x64</RuntimeIdentifier>
+		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
+		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-macos'">osx-x64</RuntimeIdentifier>
 		<!-- Debugger workaround https://github.com/dotnet/maui-samples/blob/8aa6b8780b12e97b157514c3bdc54bb4a13001cd/HelloMacCatalyst/HelloMacCatalyst.csproj#L7 -->
-		<!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
+		<!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
 		<!-- Required for C# Hot Reload, except for macOS which uses CoreCLR (not Mono) -->
 		<!-- Disabled because of https://github.com/dotnet/runtime/issues/68808 -->
-		<!--<UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != 'net6.0-maccatalyst' and '$(TargetFramework)' != 'net6.0-macos'">True</UseInterpreter>-->
+		<!--<UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != 'net7.0-maccatalyst' and '$(TargetFramework)' != 'net7.0-macos'">True</UseInterpreter>-->
 		<IsUnoHead>true</IsUnoHead>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-ios'">14.2</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-android'">21.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net6.0-macos'">10.14</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-ios'">14.2</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-android'">21.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net7.0-macos'">10.14</SupportedOSPlatformVersion>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Uno.WinUI" Version="4.6.19" />
@@ -27,7 +27,7 @@
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	</ItemGroup>
 	<Choose>
-		<When Condition="'$(TargetFramework)'=='net6.0-android'">
+		<When Condition="'$(TargetFramework)'=='net7.0-android'">
 			<ItemGroup>
 				<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.4" />
 				<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" />
@@ -36,8 +36,8 @@
 				<AndroidEnvironment Include="Android/environment.conf" />
 			</ItemGroup>
 		</When>
-		<When Condition="'$(TargetFramework)'=='net6.0-ios'">
-			<PropertyGroup Condition="'$(TargetFramework)'=='net6.0-ios'">
+		<When Condition="'$(TargetFramework)'=='net7.0-ios'">
+			<PropertyGroup Condition="'$(TargetFramework)'=='net7.0-ios'">
 				<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
 				<!-- See https://github.com/unoplatform/uno/issues/9430 for more details. -->
 				<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
@@ -48,7 +48,7 @@
 				<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
 			</ItemGroup>
 		</When>
-		<When Condition="'$(TargetFramework)'=='net6.0-maccatalyst'">
+		<When Condition="'$(TargetFramework)'=='net7.0-maccatalyst'">
 			<PropertyGroup>
 				<!-- Configure the GC -->
 				<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
@@ -63,7 +63,7 @@
 				<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
 			</ItemGroup>
 		</When>
-		<When Condition="'$(TargetFramework)'=='net6.0-macos'">
+		<When Condition="'$(TargetFramework)'=='net7.0-macos'">
 			<PropertyGroup>
 			</PropertyGroup>
 		</When>
diff --git a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Program.cs b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Program.cs
index 5cd2ed5..ef5f735 100644
--- a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Program.cs
+++ b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Program.cs
@@ -1,22 +1,21 @@
 using GLib;
 using System;
-using Uno.UI.Runtime.Skia;
+using Uno.UI.Runtime.Skia.Gtk;
 
-namespace Uno.UI.RuntimeTests.Engine.Skia.Gtk
+namespace Uno.UI.RuntimeTests.Engine.Skia.Gtk;
+
+internal class Program
 {
-    internal class Program
-    {
-        static void Main(string[] args)
-        {
-            ExceptionManager.UnhandledException += delegate (UnhandledExceptionArgs expArgs)
-            {
-                Console.WriteLine("GLIB UNHANDLED EXCEPTION" + expArgs.ExceptionObject.ToString());
-                expArgs.ExitApplication = true;
-            };
+	static void Main(string[] args)
+	{
+		ExceptionManager.UnhandledException += delegate (UnhandledExceptionArgs expArgs)
+		{
+			Console.WriteLine("GLIB UNHANDLED EXCEPTION" + expArgs.ExceptionObject.ToString());
+			expArgs.ExitApplication = true;
+		};
 
-            var host = new GtkHost(() => new App());
+		var host = new GtkHost(() => new App());
 
-            host.Run();
-        }
-    }
-}
+		host.Run();
+	}
+}
\ No newline at end of file
diff --git a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Uno.UI.RuntimeTests.Engine.Skia.Gtk.csproj b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Uno.UI.RuntimeTests.Engine.Skia.Gtk.csproj
index 69273d1..f3da05f 100644
--- a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Uno.UI.RuntimeTests.Engine.Skia.Gtk.csproj
+++ b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Uno.UI.RuntimeTests.Engine.Skia.Gtk.csproj
@@ -2,7 +2,9 @@
 	<PropertyGroup>
 		<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
 		<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
+		<WarningsNotAsErrors>$(WarningsNotAsErrors);Uno0001</WarningsNotAsErrors>
+		<DefineConstants>$(DefineConstants);__SKIA__</DefineConstants>
 	</PropertyGroup>
 	<ItemGroup Condition="exists('..\Uno.UI.RuntimeTests.Engine.Windows')">
 		<EmbeddedResource Include="..\Uno.UI.RuntimeTests.Engine.Windows\Package.appxmanifest" LogicalName="Package.appxmanifest" />
@@ -14,12 +16,12 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-		<PackageReference Include="Uno.WinUI.Skia.Gtk" 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.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="MSTest.TestFramework" Version="2.2.10" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
 	</ItemGroup>
 
 	<Import Project="..\..\shared\uno.ui.runtimetests.engine.Shared.projitems" Label="Shared" />
diff --git a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Gtk/test/PullDevServer.csproj b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Gtk/test/PullDevServer.csproj
new file mode 100644
index 0000000..f7a2947
--- /dev/null
+++ b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Gtk/test/PullDevServer.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net7.0</TargetFramework>
+	</PropertyGroup>
+	<ItemGroup>
+	  <PackageReference Include="Uno.WinUI.DevServer" Version="5.0.0-dev.2770" />
+	</ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer.csproj b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer.csproj
index e2a993d..6208d5d 100644
--- a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer.csproj
+++ b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer.csproj
@@ -2,8 +2,9 @@
 	<PropertyGroup>
 		<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
 		<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
-		<TargetFramework>net6.0</TargetFramework>
-		<NoWarn>$(NoWarn);Uno0001</NoWarn>
+		<TargetFramework>net7.0</TargetFramework>
+		<WarningsNotAsErrors>$(WarningsNotAsErrors);Uno0001</WarningsNotAsErrors>
+		<DefineConstants>$(DefineConstants);__SKIA__</DefineConstants>
 	</PropertyGroup>
 	<ItemGroup Condition="exists('..\Uno.UI.RuntimeTests.Engine.Windows')">
 		<EmbeddedResource Include="..\Uno.UI.RuntimeTests.Engine.Windows\Package.appxmanifest" LogicalName="Package.appxmanifest" />
diff --git a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/App.xaml b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/App.xaml
index 6aeb858..f554ee9 100644
--- a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/App.xaml
+++ b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/App.xaml
@@ -1,8 +1,7 @@
 <Application x:Class="Uno.UI.RuntimeTests.Engine.WPF.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:Uno.UI.RuntimeTests.Engine.WPF"
-             StartupUri="MainWindow.xaml">
+             xmlns:local="clr-namespace:Uno.UI.RuntimeTests.Engine.WPF">
     <Application.Resources>
          
     </Application.Resources>
diff --git a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/App.xaml.cs b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/App.xaml.cs
index eb1519c..a43ee5b 100644
--- a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/App.xaml.cs
+++ b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/App.xaml.cs
@@ -1,17 +1,30 @@
 using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
 using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
+using Uno.UI.RemoteControl;
+using Uno.UI.Runtime.Skia.Wpf;
 
-namespace Uno.UI.RuntimeTests.Engine.WPF
+namespace Uno.UI.RuntimeTests.Engine.WPF;
+
+/// <summary>
+/// Interaction logic for App.xaml
+/// </summary>
+public partial class App : Application
 {
-    /// <summary>
-    /// Interaction logic for App.xaml
-    /// </summary>
-    public partial class App : Application
-    {
-    }
-}
+	public App()
+	{
+		var host = new WpfHost(Dispatcher, () => new Uno.UI.RuntimeTests.Engine.App());
+		host.Run();
+
+		if (Environment.CommandLine.Contains("--remoteControlServer"))
+		{
+
+		}
+
+			
+		if (RemoteControlClient.Instance is null)
+		{
+			RemoteControlClient.Initialize(typeof(App), new ServerEndpointAttribute("127.0.0.1", 443));
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/MainWindow.xaml b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/MainWindow.xaml
deleted file mode 100644
index ffbd31e..0000000
--- a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/MainWindow.xaml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Window x:Class="Uno.UI.RuntimeTests.Engine.WPF.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Uno.UI.RuntimeTests.Engine.WPF"
-        mc:Ignorable="d"
-        Title="MainWindow" Height="450" Width="800">
-	<ContentControl x:Name="root"/>
-</Window>
diff --git a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/MainWindow.xaml.cs b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/MainWindow.xaml.cs
deleted file mode 100644
index cd07619..0000000
--- a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/MainWindow.xaml.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Uno.UI.RuntimeTests.Engine.WPF
-{
-    /// <summary>
-    /// Interaction logic for MainWindow.xaml
-    /// </summary>
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-
-            root.Content = new global::Uno.UI.Skia.Platform.WpfHost(Dispatcher, () => new Uno.UI.RuntimeTests.Engine.App());
-        }
-    }
-}
diff --git a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/Uno.UI.RuntimeTests.Engine.Skia.Wpf.csproj b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/Uno.UI.RuntimeTests.Engine.Skia.Wpf.csproj
index 2d3b373..cc53124 100644
--- a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/Uno.UI.RuntimeTests.Engine.Skia.Wpf.csproj
+++ b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Wpf/Uno.UI.RuntimeTests.Engine.Skia.Wpf.csproj
@@ -2,8 +2,10 @@
 	<PropertyGroup>
 		<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
 		<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
-		<TargetFramework>net6.0-windows</TargetFramework>
+		<TargetFramework>net7.0-windows</TargetFramework>
 		<UseWPF>true</UseWPF>
+		<WarningsNotAsErrors>$(WarningsNotAsErrors);Uno0001</WarningsNotAsErrors>
+		<DefineConstants>$(DefineConstants);__SKIA__</DefineConstants>
 	</PropertyGroup>
 	<ItemGroup Label="AssemblyInfo">
 		<AssemblyAttribute Include="System.Runtime.InteropServices.ComVisibleAttribute">
@@ -18,12 +20,12 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-		<PackageReference Include="Uno.WinUI.Skia.Wpf" 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.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="MSTest.TestFramework" Version="2.2.10" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
 	</ItemGroup>
 	<ItemGroup>
 		<UpToDateCheckInput Include="..\..\shared\**\*.xaml" />
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
index 2bf367d..ed09a6c 100644
--- 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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<NoWarn>NU1701;Uno0001</NoWarn>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
diff --git a/src/Uno.UI.RuntimeTests.Engine.Package/Uno.UI.RuntimeTests.Engine.Package.csproj b/src/Uno.UI.RuntimeTests.Engine.Package/Uno.UI.RuntimeTests.Engine.Package.csproj
index 6b97d37..561075d 100644
--- a/src/Uno.UI.RuntimeTests.Engine.Package/Uno.UI.RuntimeTests.Engine.Package.csproj
+++ b/src/Uno.UI.RuntimeTests.Engine.Package/Uno.UI.RuntimeTests.Engine.Package.csproj
@@ -14,7 +14,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
-		<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>
 	
 	<ItemGroup>