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 b951a15..1074288 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
@@ -25,7 +25,7 @@
-
+
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 b7a6d9d..b3644ff 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
@@ -15,7 +15,7 @@
-
+
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 710b5ae..427d66b 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
@@ -15,7 +15,7 @@
-
+
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 7b4baf0..c13063d 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
@@ -19,7 +19,7 @@
-
+
diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.UWP/Uno.UI.RuntimeTests.Engine.Uwp.csproj b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.UWP/Uno.UI.RuntimeTests.Engine.Uwp.csproj
index 4548515..38feeb5 100644
--- a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.UWP/Uno.UI.RuntimeTests.Engine.Uwp.csproj
+++ b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.UWP/Uno.UI.RuntimeTests.Engine.Uwp.csproj
@@ -10,11 +10,11 @@
-->
6.2.11
-
+
-
+
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 13d3d2e..e9a6215 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
@@ -42,7 +42,7 @@
-
+
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 e4f2dcd..f4dfb8a 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
@@ -21,7 +21,7 @@
-
+
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 2cf194e..9ed77c4 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
@@ -15,7 +15,7 @@
-
+
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 834561a..be860f7 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
@@ -15,7 +15,7 @@
-
+
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 c34066b..32561d7 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
@@ -19,7 +19,7 @@
-
+
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 3b87420..8920bf6 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
@@ -42,7 +42,7 @@
-
+
diff --git a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Windows/Uno.UI.RuntimeTests.Engine.Windows.csproj b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Windows/Uno.UI.RuntimeTests.Engine.Windows.csproj
index f190fab..2045a83 100644
--- a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Windows/Uno.UI.RuntimeTests.Engine.Windows.csproj
+++ b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Windows/Uno.UI.RuntimeTests.Engine.Windows.csproj
@@ -26,7 +26,7 @@
-
+
diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/ExternalRunner/_Private/DevServer.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/ExternalRunner/_Private/DevServer.cs
index fed5d2b..3625203 100644
--- a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/ExternalRunner/_Private/DevServer.cs
+++ b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/ExternalRunner/_Private/DevServer.cs
@@ -45,7 +45,7 @@ internal sealed partial class DevServer : IAsyncDisposable
public static async Task Start(CancellationToken ct)
{
#if !HAS_UNO_DEVSERVER
- throw new NotSupportedException("Dev server is not supported on this platform.");
+ throw new NotSupportedException("Dev server has not been referenced.");
#else
var path = await GetDevServer(ct);
var port = GetTcpPort();
diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/ExternalRunner/_Private/LogScope.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/ExternalRunner/_Private/LogScope.cs
index 54fd811..d172499 100644
--- a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/ExternalRunner/_Private/LogScope.cs
+++ b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/ExternalRunner/_Private/LogScope.cs
@@ -1,4 +1,9 @@
#if !UNO_RUNTIMETESTS_DISABLE_UI
+
+#if !IS_UNO_RUNTIMETEST_PROJECT
+#pragma warning disable
+#endif
+
using System;
using System.Linq;
using Microsoft.Extensions.Logging;
@@ -42,7 +47,8 @@ public bool IsEnabled(LogLevel logLevel)
=> _logger.IsEnabled(logLevel);
///
- public IDisposable BeginScope(TState state)
+ public IDisposable? BeginScope(TState state)
+ where TState : notnull
=> _logger.BeginScope(state);
///