From cf74f0bee3b50686b892f94a00b68daac79bd508 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 2 Nov 2023 09:55:07 -0400 Subject: [PATCH] fix: Fix support of UWP vs. WinUI --- src/TestApp/shared/App.xaml.cs | 2 +- .../Engine/ExternalRunner/RuntimeTestEmbeddedRunner.cs | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/TestApp/shared/App.xaml.cs b/src/TestApp/shared/App.xaml.cs index 0801c20..1385c83 100644 --- 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 index af91bff..7f03b34 100644 --- 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;