breaking: Remove netstandard2.0, reorganise tests with more coverage

codecov.yml

@@ -0,0 +1,6 @@
+ignore:
+  - src/tests
+  - integrationtests
+  - benchmarks
+  - "**/Tests/"
+  - "**/*.Tests/"

src/Benchmarks/AutoPersistBenchmark.cs

@@ -48,12 +48,7 @@ public void Setup()
         public void AutoPersistCollection()
         {
             var disposable = _collection?.AutoPersistCollection(
-                _ => Observable.Create<Unit>(
-                    _ =>
-                    {
-                        Console.WriteLine("Done stuff");
-                        return Disposable.Empty;
-                    }).Select(_ => Unit.Default),
+                _ => Observable.Return(Unit.Default),
                 TimeSpan.FromMilliseconds(200));
 
             for (int i = 0; i < 5; ++i)

src/Benchmarks/RoutableViewModelMixinsBenchmarks.cs

@@ -60,7 +60,7 @@ public void IterationSetup()
         [Benchmark]
         public void WhenNavigatedToObservable()
         {
-            using (_mockViewModel!().WhenNavigatedToObservable().Subscribe(x => Console.WriteLine("Observed")))
+            using (_mockViewModel!().WhenNavigatedToObservable().Subscribe(_ => { }))
             using (_router!.Navigate.Execute(_mockViewModel()).Subscribe())
             {
             }

src/Directory.Build.props

@@ -2,7 +2,6 @@
   <PropertyGroup>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Platform>AnyCPU</Platform>
-    <IsTestProject>$(MSBuildProjectName.Contains('Tests'))</IsTestProject>
     <DebugType>embedded</DebugType>
     <Authors>.NET Foundation and Contributors</Authors>
     <Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
@@ -18,6 +17,7 @@
     <RepositoryUrl>https://github.com/reactiveui/reactiveui</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <NoWarn>$(NoWarn);IDE0060;IDE1006;IDE0130;VSSpell001;CA1510</NoWarn>
+
     <!-- Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
 
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -30,21 +30,28 @@
     <LangVersion>preview</LangVersion>
     <EnableNETAnalyzers>True</EnableNETAnalyzers>
     <AnalysisLevel>latest</AnalysisLevel>
-    <WarningsAsErrors>nullable</WarningsAsErrors>
+    <WarningsAsErrors>nullable;CS4014</WarningsAsErrors>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
 
     <!-- Enable building Windows-specific targets on non-Windows platforms -->
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
+    <IsTestProject>$(MSBuildProjectName.Contains('.Test'))</IsTestProject>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(IsTestProject)' == 'true'">
+    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
+    <TUnitImplicitUsings>false</TUnitImplicitUsings>
+    <TUnitAssertionsImplicitUsings>false</TUnitAssertionsImplicitUsings>
   </PropertyGroup>
 
   <PropertyGroup>
     <!-- Granular Target Framework definitions for cross-platform builds -->
     <ReactiveUICoreTargets>net8.0;net9.0;net10.0</ReactiveUICoreTargets>
 
     <!-- Platform-specific targets - always defined but only used on supported platforms -->
-    <ReactiveUIFrameworkTargets Condition="$([MSBuild]::IsOsPlatform('Windows'))">net462;net472</ReactiveUIFrameworkTargets>
+    <ReactiveUIFrameworkTargets Condition="$([MSBuild]::IsOsPlatform('Windows'))">net462;net472;net481</ReactiveUIFrameworkTargets>
     <ReactiveUIMauiWindowsTargets>net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0</ReactiveUIMauiWindowsTargets>
     <ReactiveUIWindowsTargets>net8.0-windows10.0.19041.0;net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0</ReactiveUIWindowsTargets>
     <ReactiveUIWinUITargets>net8.0-windows10.0.19041.0;net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0</ReactiveUIWinUITargets>
@@ -58,7 +65,7 @@
     <ReactiveUITestTargets>net8.0;net9.0;net10.0</ReactiveUITestTargets>
     <ReactiveUITestTargets Condition="$([MSBuild]::IsOsPlatform('Windows'))">net8.0-windows10.0.19041.0;net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0</ReactiveUITestTargets>
 
-    <ReactiveUIMauiTestTargets Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(ReactiveUIMauiWindowsTargets)</ReactiveUIMauiTestTargets>
+<!--    <ReactiveUIMauiTestTargets Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(ReactiveUIMauiWindowsTargets)</ReactiveUIMauiTestTargets>-->
     <ReactiveUIMauiTestTargets>$(ReactiveUIMauiTestTargets);net9.0;net10.0</ReactiveUIMauiTestTargets>
 
     <ReactiveMauiTargets Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(ReactiveUIMauiWindowsTargets)</ReactiveMauiTargets>
@@ -68,11 +75,15 @@
     <!-- Modern targets for tests and benchmarks (no netstandard) -->
     <ReactiveUIModernTargets>net8.0;net9.0;net10.0</ReactiveUIModernTargets>
 
-    <ReactiveUITestingTargets>netstandard2.0;$(ReactiveUIModernTargets)</ReactiveUITestingTargets>
-    <ReactiveUITestingTargets Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(ReactiveUITestingTargets);net462;net472</ReactiveUITestingTargets>
+    <!-- Testing target frameworks for non-platform tests (core .NET + .NET Framework) -->
+    <ReactiveUITestingTargets>net8.0;net9.0;net10.0</ReactiveUITestingTargets>
+
+    <!-- Testing target frameworks for UI platform tests (.NET Framework + Windows-specific TFMs) -->
+    <ReactiveUITestingUITargets>$(ReactiveUITestingTargets)</ReactiveUITestingUITargets>
+    <ReactiveUITestingUITargets Condition="$([MSBuild]::IsOsPlatform('Windows'))">net8.0-windows10.0.19041.0;net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0</ReactiveUITestingUITargets>
 
     <!-- Start with core targets available on all platforms -->
-    <ReactiveUIFinalTargetFrameworks>netstandard2.0;$(ReactiveUICoreTargets)</ReactiveUIFinalTargetFrameworks>
+    <ReactiveUIFinalTargetFrameworks>$(ReactiveUICoreTargets)</ReactiveUIFinalTargetFrameworks>
 
     <!-- Add Android targets (available on all platforms with Android SDK) -->
     <ReactiveUIFinalTargetFrameworks>$(ReactiveUIFinalTargetFrameworks);$(ReactiveUIAndroidTargets)</ReactiveUIFinalTargetFrameworks>
@@ -88,28 +99,39 @@
     <ReactiveUIFinalModernTargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(ReactiveUIFinalModernTargetFrameworks);$(ReactiveUIFrameworkTargets);$(ReactiveUIWindowsTargets)</ReactiveUIFinalModernTargetFrameworks>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <!-- Ensure all test runs use our runsettings to control cross-assembly parallelism -->
-    <RunSettingsFilePath>$(MSBuildThisFileDirectory)tests.runsettings</RunSettingsFilePath>
-  </PropertyGroup>
+  <!-- MTP Native JSON Configuration -->
+  <ItemGroup Condition="'$(IsTestProject)' == 'true'">
+    <!-- Copy testconfig.json to each test project's output directory for MTP auto-discovery -->
+    <None Include="$(MSBuildThisFileDirectory)testconfig.json">
+      <Link>testconfig.json</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 
+  <!-- AOT Compatibility Settings for non-test, non-WPF projects on modern .NET -->
   <PropertyGroup Condition="$(MSBuildProjectName.Contains('WPF')) != 'true' and '$(IsTestProject)' != 'true' and ($(TargetFramework.StartsWith('net8.0')) or $(TargetFramework.StartsWith('net9.0')) or $(TargetFramework.StartsWith('net10.0')))">
+    <!-- Mark this library as AOT-compatible -->
     <IsAotCompatible>true</IsAotCompatible>
+
+    <!-- Enable trim analyzers to verify library is trim-safe -->
+    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+    <EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
+
+    <!-- Treat trimming warnings as errors during build -->
+    <ILLinkTreatWarningsAsErrors>true</ILLinkTreatWarningsAsErrors>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
 
   <ItemGroup Condition="$(IsTestProject)">
-    <PackageReference Include="NUnit"/>
-    <PackageReference Include="NUnit3TestAdapter"/>
-    <PackageReference Include="NUnit.Analyzers"/>
+    <PackageReference Include="TUnit"/>
     <PackageReference Include="Microsoft.NET.Test.Sdk"/>
+    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage"/>
     <PackageReference Include="Microsoft.Reactive.Testing"/>
     <PackageReference Include="PublicApiGenerator"/>
-    <PackageReference Include="coverlet.msbuild" PrivateAssets="All"/>
-    <PackageReference Include="Verify.NUnit"/>
+    <PackageReference Include="Verify.TUnit"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsTestProject)' != 'true'">

src/Directory.Packages.props

@@ -4,28 +4,28 @@
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <PropertyGroup>
-    <SplatVersion>17.1.1</SplatVersion>
+    <SplatVersion>18.1.1</SplatVersion>
     <XamarinAndroidXCoreVersion>1.17.0</XamarinAndroidXCoreVersion>
     <XamarinAndroidXLifecycleLiveDataVersion>2.9.2.1</XamarinAndroidXLifecycleLiveDataVersion>
     <MauiVersion Condition="$(TargetFramework.StartsWith('net10'))">10.0.0</MauiVersion>
     <MauiVersion Condition="$(TargetFramework.StartsWith('net9'))">9.0.110</MauiVersion>
-    <AspNetVersion Condition="$(TargetFramework.StartsWith('net10'))">10.0.0-rc.1.25451.107</AspNetVersion>
-    <AspNetVersion Condition="$(TargetFramework.StartsWith('net9'))">9.0.9</AspNetVersion>
-    <AspNetVersion Condition="$(TargetFramework.StartsWith('net8'))">8.0.20</AspNetVersion>
+    <AspNetVersion Condition="$(TargetFramework.StartsWith('net10'))">10.0.0</AspNetVersion>
+    <AspNetVersion Condition="$(TargetFramework.StartsWith('net9'))">9.0.11</AspNetVersion>
+    <AspNetVersion Condition="$(TargetFramework.StartsWith('net8'))">8.0.22</AspNetVersion>
     <AspNetVersion Condition="$(TargetFramework.StartsWith('netstandard'))">3.1.32</AspNetVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Akavache.Sqlite3" Version="11.5.1" />
     <PackageVersion Include="Akavache.SystemTextJson" Version="11.5.1" />
-    <PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
+    <PackageVersion Include="bunit" Version="2.4.2" />
     <PackageVersion Include="DynamicData" Version="9.4.1" />
     <PackageVersion Include="JetBrains.DotMemoryUnit" Version="3.2.20220510" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
-    <PackageVersion Include="NUnit" Version="4.4.0" />
-    <PackageVersion Include="NUnit3TestAdapter" Version="5.2.0" />
-    <PackageVersion Include="NUnit.Analyzers" Version="4.11.2" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0" />
+    <PackageVersion Include="Microsoft.Testing.Platform.MSBuild" Version="2.0.2" />
     <PackageVersion Include="Microsoft.Reactive.Testing" Version="6.1.0" />
     <PackageVersion Include="System.Reactive" Version="6.1.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
@@ -46,7 +46,8 @@
     <PackageVersion Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
     <PackageVersion Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
     <PackageVersion Include="System.Text.Json" Version="10.0.1" />
-    <PackageVersion Include="Verify.NUnit" Version="31.9.0" />
+    <PackageVersion Include="TUnit" Version="1.6.28" />
+    <PackageVersion Include="Verify.TUnit" Version="31.9.0" />
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.3.0-prerelease.251115.2" />
     <PackageVersion Include="Microsoft.AspNetCore.Components" Version="$(AspNetVersion)" />
     <PackageVersion Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />

src/ReactiveUI.AndroidX/ControlFetcherMixin.cs

@@ -31,7 +31,7 @@ public static class ControlFetcherMixin
 #endif
     public static void WireUpControls(this Fragment fragment, View inflatedView, ResolveStrategy resolveMembers = ResolveStrategy.Implicit)
     {
-        ArgumentNullException.ThrowIfNull(fragment);
+        ArgumentExceptionHelper.ThrowIfNull(fragment);
 
         foreach (var member in fragment.GetWireUpMembers(resolveMembers))
         {

src/ReactiveUI.AndroidX/ReactiveAppCompatActivity.cs

@@ -6,6 +6,7 @@
 using Android.App;
 using Android.Content;
 using Android.Runtime;
+
 using AndroidX.AppCompat.App;
 
 namespace ReactiveUI.AndroidX;

src/ReactiveUI.AndroidX/ReactiveFragmentActivity.cs

@@ -120,7 +120,7 @@ protected override void OnResume()
     /// <inheritdoc/>
     protected override void OnActivityResult(int requestCode, Result resultCode, Intent? data)
     {
-        ArgumentNullException.ThrowIfNull(data);
+        ArgumentExceptionHelper.ThrowIfNull(data);
 
         base.OnActivityResult(requestCode, resultCode, data);
         _activityResult.OnNext((requestCode, resultCode, data));

src/ReactiveUI.AndroidX/ReactivePagerAdapter.cs

@@ -53,7 +53,7 @@ public ReactivePagerAdapter(
     /// <inheritdoc/>
     public override Object InstantiateItem(ViewGroup container, int position)
     {
-        ArgumentNullException.ThrowIfNull(container);
+        ArgumentExceptionHelper.ThrowIfNull(container);
 
         var data = _list.Items[position];
 
@@ -74,9 +74,9 @@ public override Object InstantiateItem(ViewGroup container, int position)
     /// <inheritdoc/>
     public override void DestroyItem(ViewGroup container, int position, Object @object)
     {
-        ArgumentNullException.ThrowIfNull(container);
+        ArgumentExceptionHelper.ThrowIfNull(container);
 
-        ArgumentNullException.ThrowIfNull(@object);
+        ArgumentExceptionHelper.ThrowIfNull(@object);
 
         if (@object is not View view)
         {

src/ReactiveUI.AndroidX/ReactivePreferenceFragment.cs

@@ -4,6 +4,7 @@
 // See the LICENSE file in the project root for full license information.
 
 using Android.Runtime;
+
 using AndroidX.Preference;
 
 namespace ReactiveUI.AndroidX;

src/ReactiveUI.AndroidX/ReactiveRecyclerViewAdapter.cs

@@ -4,6 +4,7 @@
 // See the LICENSE file in the project root for full license information.
 
 using AndroidX.RecyclerView.Widget;
+
 using DynamicData;
 
 namespace ReactiveUI.AndroidX;
@@ -51,7 +52,7 @@ protected ReactiveRecyclerViewAdapter(IObservable<IChangeSet<TViewModel>> backin
     /// <inheritdoc/>
     public override void OnBindViewHolder(RecyclerView.ViewHolder holder, int position)
     {
-        ArgumentNullException.ThrowIfNull(holder);
+        ArgumentExceptionHelper.ThrowIfNull(holder);
 
         if (holder is not IViewFor viewForHolder)
         {

src/ReactiveUI.AndroidX/ReactiveRecyclerViewViewHolder.cs

@@ -6,7 +6,9 @@
 using System.Reflection;
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
+
 using Android.Views;
+
 using AndroidX.RecyclerView.Widget;
 
 namespace ReactiveUI.AndroidX;
@@ -45,7 +47,7 @@ protected ReactiveRecyclerViewViewHolder(View view)
         : base(view)
     {
         SetupRxObj();
-        ArgumentNullException.ThrowIfNull(view);
+        ArgumentExceptionHelper.ThrowIfNull(view);
 
         view.ViewAttachedToWindow += OnViewAttachedToWindow;
         view.ViewDetachedFromWindow += OnViewDetachedFromWindow;

src/ReactiveUI.AndroidX/ReactiveUI.AndroidX.csproj

@@ -6,6 +6,20 @@
     <PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;androidx;android;net;</PackageTags>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">34.0</SupportedOSPlatformVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Using Include="System" />
+    <Using Include="System.Collections.Generic" />
+    <Using Include="System.ComponentModel" />
+    <Using Include="System.Diagnostics.CodeAnalysis" />
+    <Using Include="System.Linq" />
+    <Using Include="System.Reactive" />
+    <Using Include="System.Reactive.Linq" />
+    <Using Include="System.Reactive.Subjects" />
+    <Using Include="System.Reactive.Threading.Tasks" />
+    <Using Include="System.Threading.Tasks" />
+    <Using Include="ReactiveUI.Helpers" />
+    <Using Include="Splat" />
+  </ItemGroup>
   <ItemGroup>
     <!-- Modern .NET 9 Android approach for AndroidX libraries -->
     <!-- Core AndroidX (AppCompat, RecyclerView, Fragment) available implicitly through .NET Android SDK -->