fix: Fix support of UWP vs. WinUI

unoplatform · Nov 2, 2023 · cf74f0b · cf74f0b
1 parent 8fd173e
commit cf74f0b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/TestApp/shared/App.xaml.cs b/src/TestApp/shared/App.xaml.cs
@@ -168,7 +168,7 @@ private static void InitializeLogging()
 				builder.AddFilter("Uno.UI.RuntimeTests.HotReload", LogLevel.Debug);
 
 				// Hot reload testing
-				builder.AddFilter("Uno.UI.RemoteControl", LogLevel.Debug);
+				builder.AddFilter("Uno.UI.RemoteControl", LogLevel.Trace);
 				builder.AddFilter("Uno.UI.RuntimeTests.Internal.Helpers", LogLevel.Debug); // DevServer and SecondaryApp
 				builder.AddFilter("Uno.UI.RuntimeTests.HotReloadHelper", LogLevel.Trace); // Helper used by tests in secondary app instances (non debuggable)
 				builder.AddFilter("Uno.UI.RuntimeTests.UnitTestsControl", LogLevel.Information); // Dumps the runner status

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/ExternalRunner/RuntimeTestEmbeddedRunner.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/ExternalRunner/RuntimeTestEmbeddedRunner.cs
@@ -18,8 +18,14 @@
 using System.Threading.Tasks;
 using System.Threading;
 using Windows.UI.Core;
-using Windows.UI.Xaml;
+
+#if HAS_UNO_WINUI || WINDOWS_WINUI
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
 
 namespace Uno.UI.RuntimeTests.Engine;