unoplatform · dr1rrb · Feb 13, 2024 · Feb 13, 2024
diff --git a/src/TestApp/shared/MainPage.xaml.cs b/src/TestApp/shared/MainPage.xaml.cs
@@ -1,5 +1,4 @@
-
-#if HAS_UNO_WINUI || WINDOWS_WINUI
+#if HAS_UNO_WINUI || WINDOWS_WINUI
 using Microsoft.UI.Xaml.Controls;
 #else
 using Windows.UI.Xaml.Controls;

diff --git a/...Uno.UI.RuntimeTests.Engine.Library/Engine/ExternalRunner/RuntimeTestDevServerAttribute.cs b/...Uno.UI.RuntimeTests.Engine.Library/Engine/ExternalRunner/RuntimeTestDevServerAttribute.cs
@@ -1,10 +1,10 @@
-#if !UNO_RUNTIMETESTS_DISABLE_EMBEDDEDRUNNER
-#nullable enable
-
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
 
+#if !UNO_RUNTIMETESTS_DISABLE_EMBEDDEDRUNNER
+#nullable enable
+
 using System;
 using System.Linq;
 

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/ExternalRunner/RuntimeTestEmbeddedRunner.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/ExternalRunner/RuntimeTestEmbeddedRunner.cs
@@ -1,14 +1,14 @@
-#if WINDOWS_UWP
+#if !IS_UNO_RUNTIMETEST_PROJECT
+#pragma warning disable
+#endif
+
+#if WINDOWS_UWP
 #define UNO_RUNTIMETESTS_DISABLE_EMBEDDEDRUNNER
 #endif
 
 #if !UNO_RUNTIMETESTS_DISABLE_EMBEDDEDRUNNER
 #nullable enable
 
-#if !IS_UNO_RUNTIMETEST_PROJECT
-#pragma warning disable
-#endif
-
 using System;
 using System.Diagnostics;
 using System.IO;

diff --git a/...I.RuntimeTests.Engine.Library/Engine/ExternalRunner/RuntimeTestsSourceProjectAttribute.cs b/...I.RuntimeTests.Engine.Library/Engine/ExternalRunner/RuntimeTestsSourceProjectAttribute.cs
@@ -1,10 +1,10 @@
-#if !UNO_RUNTIMETESTS_DISABLE_EMBEDDEDRUNNER
-#nullable enable
-
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
 
+#if !UNO_RUNTIMETESTS_DISABLE_EMBEDDEDRUNNER
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 using System.Text;

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
@@ -1,15 +1,15 @@
-using System;
-using System.ComponentModel;
-using System.IO;
-
-#if !UNO_RUNTIMETESTS_DISABLE_UI && HAS_UNO_WINUI // HAS_UNO_WINUI: exclude non net7 platforms
-#nullable enable
-
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
 #pragma warning disable CA1848 // Log perf
 #pragma warning disable CS1998 // No await
+#nullable enable
+
+#if !UNO_RUNTIMETESTS_DISABLE_UI && HAS_UNO_WINUI // HAS_UNO_WINUI: exclude non net7 platforms
+using System;
+using System.ComponentModel;
+using System.IO;
+
 namespace Uno.UI.RuntimeTests.Internal.Helpers;
 
 /// <summary>

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
@@ -1,9 +1,8 @@
-#if !UNO_RUNTIMETESTS_DISABLE_UI
-
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
 
+#if !UNO_RUNTIMETESTS_DISABLE_UI
 using System;
 using System.Linq;
 using Microsoft.Extensions.Logging;
@@ -23,7 +22,7 @@ public static LogScope Scope<T>(this ILogger log, string scopeName)
 #if false
 		=> new(log, log.BeginScope(scopeName));
 #else
-		=> new (Uno.Extensions.LogExtensionPoint.AmbientLoggerFactory.CreateLogger(typeof(T).FullName + "#" + scopeName));
+		=> new(Uno.Extensions.LogExtensionPoint.AmbientLoggerFactory.CreateLogger(typeof(T).FullName + "#" + scopeName));
 #endif
 }
 

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/ExternalRunner/_Private/ProcessHelper.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/ExternalRunner/_Private/ProcessHelper.cs
@@ -1,11 +1,10 @@
-#if !UNO_RUNTIMETESTS_DISABLE_UI && HAS_UNO_WINUI // HAS_UNO_WINUI: exclude non net7 platforms
-#nullable enable
-
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
 #pragma warning disable CA1848 // Log perf
+#nullable enable
 
+#if !UNO_RUNTIMETESTS_DISABLE_UI && HAS_UNO_WINUI // HAS_UNO_WINUI: exclude non net7 platforms
 using System;
 using System.Diagnostics;
 using System.Text;

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/ExternalRunner/_Private/SecondaryApp.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/ExternalRunner/_Private/SecondaryApp.cs
@@ -1,12 +1,12 @@
-using System;
+#if !IS_UNO_RUNTIMETEST_PROJECT
+#pragma warning disable
+#endif
+
+using System;
 
 #if !UNO_RUNTIMETESTS_DISABLE_UI
 #nullable enable
 
-#if !IS_UNO_RUNTIMETEST_PROJECT
-#pragma warning disable
-#endif
-
 namespace Uno.UI.RuntimeTests.Internal.Helpers;
 
 /// <summary>
@@ -58,13 +58,13 @@ internal static partial class SecondaryApp
 		try
 		{
 			var results = await global::System.Text.Json.JsonSerializer.DeserializeAsync<TestCaseResult[]>(global::System.IO.File.OpenRead(resultFile), cancellationToken: ct);
-			
+
 			return results ?? global::System.Array.Empty<TestCaseResult>();
 		}
 		catch (global::System.Text.Json.JsonException error)
 		{
 			throw new global::System.InvalidOperationException(
-				$"Failed to deserialize the test results from '{resultFile}', this usually indicates that the secondary app has been closed (or crashed) before the end of the test suit.", 
+				$"Failed to deserialize the test results from '{resultFile}', this usually indicates that the secondary app has been closed (or crashed) before the end of the test suit.",
 				error);
 		}
 	}

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/TestCase.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/TestCase.cs
@@ -1,9 +1,8 @@
-#nullable enable
-
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
 #pragma warning disable CA1852 // Make class final : unnecessary breaking change
+#nullable enable
 
 using System;
 using System.Linq;
@@ -25,7 +24,7 @@ public override string ToString()
 	{
 		var result = $"({string.Join(",", Parameters.Select(p => p?.ToString() ?? "<null>"))})";
 
-		if (Pointer is {} pt)
+		if (Pointer is { } pt)
 		{
 			result += $" [{pt}]";
 		}

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/TestCaseResult.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/TestCaseResult.cs
@@ -1,9 +1,8 @@
-#nullable enable
-
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
 #pragma warning disable CA1852 // Make class final : unnecessary breaking change
+#nullable enable
 
 using System;
 using System.Linq;

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/TestResult.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/TestResult.cs
@@ -1,6 +1,6 @@
 #if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
-# endif
+#endif
 
 using System;
 using System.Linq;

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UI/UnitTestsControl.CustomConsoleOutput.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UI/UnitTestsControl.CustomConsoleOutput.cs
@@ -1,9 +1,8 @@
-#if !UNO_RUNTIMETESTS_DISABLE_UI
-
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
 
+#if !UNO_RUNTIMETESTS_DISABLE_UI
 using System;
 using System.Collections.Generic;
 using System.IO;

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UI/UnitTestsControl.TestRun.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UI/UnitTestsControl.TestRun.cs
@@ -1,12 +1,11 @@
-namespace Uno.UI.RuntimeTests;
-
-#if !UNO_RUNTIMETESTS_DISABLE_UI
-
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
 #pragma warning disable CA1852 // Make class final : unnecessary breaking change
 
+namespace Uno.UI.RuntimeTests;
+
+#if !UNO_RUNTIMETESTS_DISABLE_UI
 public sealed partial class UnitTestsControl
 {
 	private class TestRun

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UI/UnitTestsControl.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UI/UnitTestsControl.cs
@@ -1,13 +1,11 @@
-#if !UNO_RUNTIMETESTS_DISABLE_UI
-
-#nullable enable
-
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
 #pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
 #pragma warning disable CA1848 // Use the LoggerMessage delegates
+#nullable enable
 
+#if !UNO_RUNTIMETESTS_DISABLE_UI
 using System;
 using System.Collections.Generic;
 using System.Security.Cryptography;
@@ -323,7 +321,7 @@
 					Text = $"{testClass.Name} ({testClass.Assembly.GetName().Name})",
 					Foreground = new SolidColorBrush(Colors.White),
 					FontSize = 16d,
 					IsTextSelectionEnabled = true
 				};

 				testResults.Children.Add(testResultBlock);
@@ -378,7 +376,7 @@
 				FontFamily = new FontFamily("Courier New"),
 				Margin = new Thickness(8, 0, 0, 0),
 				Foreground = new SolidColorBrush(Colors.LightGray),
 				IsTextSelectionEnabled = true
 			};

 			var retriesText = _currentRun.CurrentRepeatCount != 0 ? $" (Retried {_currentRun.CurrentRepeatCount} time(s))" : "";
@@ -764,10 +762,10 @@
 				if (results.Length != testCases.Count)
 				{
 					ReportTestResult(
-						instance.GetType().Name, 
-						TimeSpan.Zero, 
-						TestResult.Failed, 
-						new InvalidOperationException($"Unexpected tests results, got {results.Length} test results from the secondary app for class {instance.GetType().Name} while we where expecting {testCases.Count}.\""), 
+						instance.GetType().Name,
+						TimeSpan.Zero,
+						TestResult.Failed,
+						new InvalidOperationException($"Unexpected tests results, got {results.Length} test results from the secondary app for class {instance.GetType().Name} while we where expecting {testCases.Count}.\""),
 						$"Got {results.Length} test results from the secondary app for class {instance.GetType().Name} while we where expecting {testCases.Count}.");
 				}
 			}

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UI/UnitTestsUIContentHelper.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UI/UnitTestsUIContentHelper.cs
@@ -1,8 +1,7 @@
-#nullable enable
-
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
+#nullable enable
 
 using System;
 using System.ComponentModel;

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UI/_Private/UnitTestDispatcherCompat.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UI/_Private/UnitTestDispatcherCompat.cs
@@ -1,9 +1,8 @@
-#if !UNO_RUNTIMETESTS_DISABLE_UI
-
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
 
+#if !UNO_RUNTIMETESTS_DISABLE_UI
 using System;
 using System.Collections.Generic;
 using System.Text;

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UnitTestClassInfo.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UnitTestClassInfo.cs
@@ -1,8 +1,7 @@
-#nullable enable
-
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
+#nullable enable
 
 using System;
 using System.Linq;

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UnitTestEngineConfig.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UnitTestEngineConfig.cs
@@ -1,8 +1,7 @@
-#nullable enable
-
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
+#nullable enable
 
 using System;
 using System.Linq;

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UnitTestFilter.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UnitTestFilter.cs
@@ -1,9 +1,8 @@
-#if !UNO_RUNTIMETESTS_DISABLE_UI || !UNO_RUNTIMETESTS_DISABLE_EMBEDDEDRUNNER
-
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
 
+#if !UNO_RUNTIMETESTS_DISABLE_UI || !UNO_RUNTIMETESTS_DISABLE_EMBEDDEDRUNNER
 using System;
 using System.Linq;
 using System.Reflection;

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UnitTestMethodInfo.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UnitTestMethodInfo.cs
@@ -1,11 +1,10 @@
-#if !UNO_RUNTIMETESTS_DISABLE_UI
-
-#nullable enable
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
 #pragma warning disable CA1852 // Make class final : unnecessary breaking change
+#nullable enable
 
+#if !UNO_RUNTIMETESTS_DISABLE_UI
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Library/Helpers/AsyncAssert.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Library/Helpers/AsyncAssert.cs
@@ -1,8 +1,8 @@
-#if !UNO_RUNTIMETESTS_DISABLE_LIBRARY
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
 
+#if !UNO_RUNTIMETESTS_DISABLE_LIBRARY
 namespace Uno.UI.RuntimeTests;
 
 public static partial class AsyncAssert
@@ -87,7 +87,7 @@ public static partial class AsyncAssert
 	/// <param name="timeoutMs">The max duration to wait for in milliseconds.</param>
 	/// <param name="ct">Cancellation token to cancel teh asynchronous operation</param>
 	public static global::System.Threading.Tasks.ValueTask IsTrue(global::System.Func<bool> condition, string message, int timeoutMs, global::System.Threading.CancellationToken ct = default)
-		=> IsTrueCore( condition, message, global::System.TimeSpan.FromMilliseconds(timeoutMs), ct);
+		=> IsTrueCore(condition, message, global::System.TimeSpan.FromMilliseconds(timeoutMs), ct);
 
 	/// <summary>
 	/// Asynchronously tests whether the specified condition is true and throws an exception if the condition is false.

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Library/Helpers/HotReloadHelper.DevServer.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Library/Helpers/HotReloadHelper.DevServer.cs
@@ -1,11 +1,10 @@
-#if !UNO_RUNTIMETESTS_DISABLE_LIBRARY && HAS_UNO_DEVSERVER // Set as soon as the DevServer package is referenced, cf. Uno.UI.RuntimeTests.Engine.targets
-#nullable enable
-
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
 #pragma warning disable CA1848 // Log perf
+#nullable enable
 
+#if !UNO_RUNTIMETESTS_DISABLE_LIBRARY && HAS_UNO_DEVSERVER // Set as soon as the DevServer package is referenced, cf. Uno.UI.RuntimeTests.Engine.targets
 using System;
 using System.Collections;
 using System.IO;

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Library/Helpers/HotReloadHelper.Local.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Library/Helpers/HotReloadHelper.Local.cs
@@ -1,9 +1,8 @@
-#if !UNO_RUNTIMETESTS_DISABLE_LIBRARY
-
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
 
+#if !UNO_RUNTIMETESTS_DISABLE_LIBRARY
 namespace Uno.UI.RuntimeTests;
 
 partial class HotReloadHelper

diff --git a/...o.UI.RuntimeTests.Engine.Library/Library/Helpers/HotReloadHelper.MetadataUpdateHandler.cs b/...o.UI.RuntimeTests.Engine.Library/Library/Helpers/HotReloadHelper.MetadataUpdateHandler.cs
@@ -1,10 +1,10 @@
-#if !UNO_RUNTIMETESTS_DISABLE_LIBRARY
-
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
 
-[assembly:System.Reflection.Metadata.MetadataUpdateHandlerAttribute(typeof(global::Uno.UI.RuntimeTests.HotReloadHelper.MetadataUpdateHandler))]
+#if !UNO_RUNTIMETESTS_DISABLE_LIBRARY
+
+[assembly: System.Reflection.Metadata.MetadataUpdateHandlerAttribute(typeof(global::Uno.UI.RuntimeTests.HotReloadHelper.MetadataUpdateHandler))]
 
 namespace Uno.UI.RuntimeTests;
 

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Library/Helpers/HotReloadHelper.NotSupported.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Library/Helpers/HotReloadHelper.NotSupported.cs
@@ -1,9 +1,8 @@
-#if !UNO_RUNTIMETESTS_DISABLE_LIBRARY
-
-#if !IS_UNO_RUNTIMETEST_PROJECT
+#if !IS_UNO_RUNTIMETEST_PROJECT
 #pragma warning disable
 #endif
 
+#if !UNO_RUNTIMETESTS_DISABLE_LIBRARY
 namespace Uno.UI.RuntimeTests;
 
 public static partial class HotReloadHelper