Improve the code a bit more

.editorconfig

@@ -5,7 +5,7 @@ root = true
 indent_style = space
 
 # Xml files
-[*.{xml,csproj}]
+[*.{xml,csproj,targets,props}]
 indent_size = 2
 tab_width = 2
 
@@ -19,7 +19,7 @@ indent_size = 4
 tab_width = 4
 
 # New line preferences
-end_of_line = crlf
+end_of_line = lf
 insert_final_newline = true
 
 #### .NET Coding Conventions ####

Directory.Build.props

@@ -1,5 +1,12 @@
 <Project>
-    <PropertyGroup>
-        <MauiVersion>7.0.92</MauiVersion>
-    </PropertyGroup>
+
+  <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <MauiVersion>7.0.92</MauiVersion>
+  </PropertyGroup>
+
 </Project>

Directory.Build.targets

@@ -1,13 +1,10 @@
 <Project>
-    <PropertyGroup>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
-    </PropertyGroup>
+  <PropertyGroup>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
+    <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
+  </PropertyGroup>
 </Project>

sample/SampleMauiApp/SampleMauiApp.csproj

@@ -1,16 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst;net7.0-tizen</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
     <TargetFrameworks>net7.0-maccatalyst</TargetFrameworks>
-    <!-- <TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks> -->
-    <!-- <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks> -->
-    <!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-    <!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
     <OutputType>Exe</OutputType>
     <RootNamespace>SampleMauiApp</RootNamespace>
     <UseMaui>true</UseMaui>
     <SingleProject>true</SingleProject>
-    <ImplicitUsings>enable</ImplicitUsings>
+    <IsPackable>false</IsPackable>
 
     <!-- Display name -->
     <ApplicationTitle>SampleMauiApp</ApplicationTitle>

sample/SampleMauiApp/Tests/UITests/DynamicUITests.cs

@@ -1,6 +1,7 @@
+using System.Collections;
+
 using Microsoft.Maui.Handlers;
 using Microsoft.Maui.Platform;
-using System.Collections;
 
 namespace SampleMauiApp;
 
@@ -15,7 +16,7 @@ public async Task ButtonIsPositionedCorrectlyInLayouts()
 		{
 			Background = Brush.White,
 			Children =
-			{ 
+			{
 				new Grid
 				{
 					WidthRequest = 50,

sample/TestProject/TestProject.csproj

@@ -2,9 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>

src/Xunit.Extensions.UITest.Maui/Xunit.Extensions.UITest.Maui.csproj

@@ -4,8 +4,7 @@
     <TargetFrameworks>net7.0</TargetFrameworks>
     <UseMaui>true</UseMaui>
     <SingleProject>true</SingleProject>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>

src/Xunit.Runner.Devices.Maui/AppHostBuilderExtensions.cs

@@ -9,6 +9,7 @@ public static MauiAppBuilder ConfigureRunner(this MauiAppBuilder appHostBuilder,
 			// register runner components
 			appHostBuilder.Services.AddSingleton(options);
 			appHostBuilder.Services.AddSingleton<ITestRunner, DeviceRunner>();
+			appHostBuilder.Services.AddSingleton<IDiagnosticsManager, DiagnosticsManager>();
 
 			// only register the "root" view models and the others are created by the ITestRunner
 			appHostBuilder.Services.AddSingleton<HomeViewModel>();

src/Xunit.Runner.Devices.Maui/Converters/RunStatusToColorConverter.cs

@@ -15,7 +15,7 @@ class RunStatusToColorConverter : IValueConverter
 
 		return status switch
 		{
-			RunStatus.Ok => Application.Current.Resources["SuccessfulTestsColor"],
+			RunStatus.Passed => Application.Current.Resources["SuccessfulTestsColor"],
 			RunStatus.Failed => Application.Current.Resources["FailedTestsColor"],
 			RunStatus.NoTests => Application.Current.Resources["NoTestsColor"],
 			RunStatus.NotRun => Application.Current.Resources["NotRunTestsColor"],

src/Xunit.Runner.Devices.Maui/Pages/HomePage.xaml.cs

@@ -13,7 +13,6 @@ public HomePage(HomeViewModel homeViewModel)
 		ViewModel = homeViewModel;
 	}
 
-
 	public HomeViewModel? ViewModel
 	{
 		get => BindingContext as HomeViewModel;

src/Xunit.Runner.Devices.Maui/TestRunnerAppShell.xaml

@@ -27,11 +27,11 @@
     <ShellContent
         Title="Diagnostics"
         ContentTemplate="{DataTemplate pages:DiagnosticsPage}"
-        Route="testrunner/diagnostics" />
+        Route="diagnostics" />
 
     <ShellContent
         Title="Credits"
         ContentTemplate="{DataTemplate pages:CreditsPage}"
-        Route="testrunner/credits" />
+        Route="credits" />
 
 </Shell>

src/Xunit.Runner.Devices.Maui/Xunit.Runner.Devices.Maui.csproj

@@ -4,8 +4,7 @@
     <TargetFrameworks>net7.0</TargetFrameworks>
     <UseMaui>true</UseMaui>
     <SingleProject>true</SingleProject>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>

src/Xunit.Runner.Devices/DeviceRunner.cs

@@ -9,13 +9,16 @@ public class DeviceRunner : ITestListener, ITestRunner
 {
 	readonly SynchronizationContext context = SynchronizationContext.Current;
 	readonly AsyncLock executionLock = new();
+	readonly IDiagnosticsManager _diagnosticsManager;
 	readonly TestRunLogger _logger;
 	volatile bool cancelled;
 
-	public DeviceRunner(RunnerOptions options, ILogger<DeviceRunner> logger)
+	public DeviceRunner(RunnerOptions options, IDiagnosticsManager diagnosticsManager, ILogger<DeviceRunner> logger)
 	{
-		TestAssemblies = options.Assemblies;
 		_logger = new TestRunLogger(logger);
+		_diagnosticsManager = diagnosticsManager;
+
+		TestAssemblies = options.Assemblies;
 	}
 
 	public IReadOnlyCollection<Assembly> TestAssemblies { get; }
@@ -64,8 +67,6 @@ public async Task RunAsync(IReadOnlyList<AssemblyRunInfo> runInfos, string? mess
 		}
 	}
 
-	public event EventHandler<string>? DiagnosticMessageRecieved;
-
 	public Task<IReadOnlyList<TestAssemblyViewModel>> DiscoverAsync()
 	{
 		var tcs = new TaskCompletionSource<IReadOnlyList<TestAssemblyViewModel>>();
@@ -217,7 +218,7 @@ void RunTestsInAssembly(List<IDisposable> toDispose, AssemblyRunInfo runInfo)
 
 		var executionOptions = TestFrameworkOptions.ForExecution(runInfo.Configuration);
 
-		var diagSink = new DiagnosticMessageSink(d => context.Post(_ => DiagnosticMessageRecieved?.Invoke(this, d), null), runInfo.AssemblyFileName, executionOptions.GetDiagnosticMessagesOrDefault());
+		var diagSink = new DiagnosticMessageSink(d => context.Post(_ => _diagnosticsManager.PostDiagnosticMessage(d), null), runInfo.AssemblyFileName, executionOptions.GetDiagnosticMessagesOrDefault());
 
 		var deviceExecSink = new DeviceExecutionSink(xunitTestCases, this, context);
 

src/Xunit.Runner.Devices/DiagnosticsManager.cs

@@ -0,0 +1,11 @@
+namespace Xunit.Runner.Devices;
+
+public class DiagnosticsManager : IDiagnosticsManager
+{
+	public event EventHandler<string>? DiagnosticMessageRecieved;
+
+	public void PostDiagnosticMessage(string message)
+	{
+		DiagnosticMessageRecieved?.Invoke(this, message);
+	}
+}

src/Xunit.Runner.Devices/IDiagnosticsManager.cs

@@ -0,0 +1,8 @@
+namespace Xunit.Runner.Devices;
+
+public interface IDiagnosticsManager
+{
+	void PostDiagnosticMessage(string message);
+
+	event EventHandler<string>? DiagnosticMessageRecieved;
+}

src/Xunit.Runner.Devices/ITestRunner.cs

@@ -9,6 +9,4 @@ public interface ITestRunner
 	Task RunAsync(IEnumerable<TestCaseViewModel> tests, string? message = null);
 
 	Task RunAsync(IReadOnlyList<AssemblyRunInfo> runInfos, string? message = null);
-
-	event EventHandler<string> DiagnosticMessageRecieved;
 }

src/Xunit.Runner.Devices/Utils/FileSystemUtils.cs

@@ -47,16 +47,16 @@ internal class FileSystemUtils
 		root = Path.Combine(root, "Contents", "Resources");
 #endif
 		var file = Path.Combine(root, filename);
-#endif
-
-#if WINDOWS
+#elif WINDOWS
 		// Windows: has 2 modes, packaged uses the Package API
 		if (IsPackagedApp.Value)
 			return Package.Current.InstalledLocation.OpenStreamForReadAsync(filename).Result;
 
 		// unpackaged is next to the executable
 		var root = AppContext.BaseDirectory;
 		var file = Path.Combine(root, filename);
+#else
+		var file = filename;
 #endif
 
 		// if the file exists, then open it

src/Xunit.Runner.Devices/Utils/FilteredCollectionView.cs

@@ -195,7 +195,7 @@ protected virtual void OnItemChanged(T sender, PropertyChangedEventArgs args)
 			itemChanged?.Invoke(sender, args);
 		}
 
-		void DataSource_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+		void DataSource_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
 		{
 			switch (e.Action)
 			{
@@ -230,7 +230,7 @@ void DataSource_CollectionChanged(object sender, NotifyCollectionChangedEventArg
 			}
 		}
 
-		void DataSource_ItemChanged(object sender, PropertyChangedEventArgs e)
+		void DataSource_ItemChanged(object? sender, PropertyChangedEventArgs e)
 		{
 			var item = (T)sender;
 			var index = filteredList.IndexOf(item);

src/Xunit.Runner.Devices/ViewModels/DiagnosticsViewModel.cs

@@ -6,18 +6,18 @@ namespace Xunit.Runner.Devices;
 
 public class DiagnosticsViewModel : AbstractBaseViewModel
 {
-	readonly ITestRunner _runner;
+	readonly IDiagnosticsManager _diagnosticsManager;
 
 	string _messagesString = "";
 
-	public DiagnosticsViewModel(ITestRunner runner)
+	public DiagnosticsViewModel(IDiagnosticsManager diagnosticsManager)
 	{
-		_runner = runner;
-		_runner.DiagnosticMessageRecieved += OnDiagnosticMessageRecieved;
+		_diagnosticsManager = diagnosticsManager;
+		_diagnosticsManager.DiagnosticMessageRecieved += OnDiagnosticMessageRecieved;
 
 		Messages.CollectionChanged += OnDiagnosticMessagesCollectionChanged;
 
-		ClearMessagesCommand = new Command(Clear);
+		ClearMessagesCommand = new Command(ClearExecute);
 	}
 
 	public ICommand ClearMessagesCommand { get; }
@@ -30,19 +30,14 @@ public string MessagesString
 		private set => Set(ref _messagesString, value);
 	}
 
-	public void PostDiagnosticMessage(string message)
-	{
-		Messages.Add(message);
-	}
-
-	public void Clear()
+	void ClearExecute()
 	{
 		Messages.Clear();
 	}
 
 	void OnDiagnosticMessageRecieved(object? sender, string message)
 	{
-		PostDiagnosticMessage(message);
+		Messages.Add(message);
 	}
 
 	void OnDiagnosticMessagesCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)