chore: enable the expanded StyleSharp analyzer rule set and resolve all violations

README.md

@@ -81,6 +81,17 @@ routing/collection/auto-persist helpers now live in a separate **`ReactiveUI.Rou
 for the System.Reactive flavor), so core no longer depends on DynamicData. Add `ReactiveUI.Routing` if you use those
 extensions.
 
+### Analyzers are opt-in
+
+The ReactiveUI packages reference `ReactiveUI.Primitives` with `ExcludeAssets="analyzers"`, so the analyzers that ship
+inside ReactiveUI.Primitives **do not flow to your project** and will not run against your code just because you
+installed ReactiveUI. We don't impose our analyzers on downstream consumers. If you want them, opt in explicitly by
+adding a direct reference to `ReactiveUI.Primitives` (without excluding the analyzer assets), e.g.:
+
+```xml
+<PackageReference Include="ReactiveUI.Primitives" Version="x.y.z" />
+```
+
 [Core]: https://www.nuget.org/packages/ReactiveUI/
 
 [CoreBadge]: https://img.shields.io/nuget/v/ReactiveUI.svg

src/Directory.Build.props

@@ -70,7 +70,7 @@
 
     <!-- Platform-specific targets - always defined but only used on supported platforms -->
     <ReactiveUIFrameworkTargets>net462;net472;net481</ReactiveUIFrameworkTargets>
-    <ReactiveUIMauiWindowsTargets>net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0;net11.0-windows10.0.19041.0</ReactiveUIMauiWindowsTargets>
+    <ReactiveUIMauiWindowsTargets>net10.0-windows10.0.19041.0;net11.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;net11.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;net11.0-windows10.0.19041.0</ReactiveUIWinUITargets>
     <!-- net9 mobile (iOS/tvOS/macOS/maccatalyst) support ended 12 May 2026; target net10 only. -->

src/Directory.Packages.props

@@ -6,8 +6,8 @@
 
   <PropertyGroup Label="Shared Version Variables">
     <SplatVersion>20.0.0</SplatVersion>
-    <PrimitivesVersion>5.4.0</PrimitivesVersion>
-    <TUnitVersion>1.54.0</TUnitVersion>
+    <PrimitivesVersion>5.6.0</PrimitivesVersion>
+    <TUnitVersion>1.56.25</TUnitVersion>
     <XamarinAndroidXLifecycleLiveDataVersion>2.10.0.2</XamarinAndroidXLifecycleLiveDataVersion>
   </PropertyGroup>
 
@@ -78,7 +78,7 @@
   </ItemGroup>
 
   <ItemGroup Label="Analyzers">
-    <PackageVersion Include="StyleSharp.Analyzers" Version="3.11.2"/>
+    <PackageVersion Include="StyleSharp.Analyzers" Version="3.13.4"/>
     <PackageVersion Include="Roslynator.Analyzers" Version="4.15.0"/>
     <PackageVersion Include="SonarAnalyzer.CSharp" Version="10.27.0.140913"/>
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0"/>

src/ReactiveUI.AndroidX.Reactive/PublicAPI/net10.0-android36.0/PublicAPI.Shipped.txt

@@ -51,15 +51,15 @@ ReactiveUI.Reactive.AndroidX.ReactiveFragment<TViewModel>.ViewModel.get -> TView
 ReactiveUI.Reactive.AndroidX.ReactiveFragment<TViewModel>.ViewModel.set -> void
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.Activated.get -> System.IObservable<System.Reactive.Unit>!
-ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.ActivityResult.get -> System.IObservable<(int requestCode, Android.App.Result result, Android.Content.Intent! intent)>!
+ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.ActivityResult.get -> System.IObservable<(int requestCode, Android.App.Result result, Android.Content.Intent? intent)>!
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.Changed.get -> System.IObservable<ReactiveUI.IReactivePropertyChangedEventArgs<ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity!>!>!
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.Changing.get -> System.IObservable<ReactiveUI.IReactivePropertyChangedEventArgs<ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity!>!>!
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.Deactivated.get -> System.IObservable<System.Reactive.Unit>!
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.PropertyChanged -> System.ComponentModel.PropertyChangedEventHandler?
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.PropertyChanging -> System.ComponentModel.PropertyChangingEventHandler?
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.ReactiveFragmentActivity() -> void
-ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.StartActivityForResultAsync(Android.Content.Intent! intent, int requestCode) -> System.Threading.Tasks.Task<(Android.App.Result result, Android.Content.Intent! intent)>!
-ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.StartActivityForResultAsync(System.Type! type, int requestCode) -> System.Threading.Tasks.Task<(Android.App.Result result, Android.Content.Intent! intent)>!
+ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.StartActivityForResultAsync(Android.Content.Intent! intent, int requestCode) -> System.Threading.Tasks.Task<(Android.App.Result result, Android.Content.Intent? intent)>!
+ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.StartActivityForResultAsync(System.Type! type, int requestCode) -> System.Threading.Tasks.Task<(Android.App.Result result, Android.Content.Intent? intent)>!
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.SuppressChangeNotifications() -> System.IDisposable!
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.ThrownExceptions.get -> System.IObservable<System.Exception!>!
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity<TViewModel>

src/ReactiveUI.AndroidX.Reactive/PublicAPI/net11.0-android37/PublicAPI.Shipped.txt

@@ -51,15 +51,15 @@ ReactiveUI.Reactive.AndroidX.ReactiveFragment<TViewModel>.ViewModel.get -> TView
 ReactiveUI.Reactive.AndroidX.ReactiveFragment<TViewModel>.ViewModel.set -> void
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.Activated.get -> System.IObservable<System.Reactive.Unit>!
-ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.ActivityResult.get -> System.IObservable<(int requestCode, Android.App.Result result, Android.Content.Intent! intent)>!
+ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.ActivityResult.get -> System.IObservable<(int requestCode, Android.App.Result result, Android.Content.Intent? intent)>!
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.Changed.get -> System.IObservable<ReactiveUI.IReactivePropertyChangedEventArgs<ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity!>!>!
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.Changing.get -> System.IObservable<ReactiveUI.IReactivePropertyChangedEventArgs<ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity!>!>!
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.Deactivated.get -> System.IObservable<System.Reactive.Unit>!
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.PropertyChanged -> System.ComponentModel.PropertyChangedEventHandler?
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.PropertyChanging -> System.ComponentModel.PropertyChangingEventHandler?
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.ReactiveFragmentActivity() -> void
-ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.StartActivityForResultAsync(Android.Content.Intent! intent, int requestCode) -> System.Threading.Tasks.Task<(Android.App.Result result, Android.Content.Intent! intent)>!
-ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.StartActivityForResultAsync(System.Type! type, int requestCode) -> System.Threading.Tasks.Task<(Android.App.Result result, Android.Content.Intent! intent)>!
+ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.StartActivityForResultAsync(Android.Content.Intent! intent, int requestCode) -> System.Threading.Tasks.Task<(Android.App.Result result, Android.Content.Intent? intent)>!
+ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.StartActivityForResultAsync(System.Type! type, int requestCode) -> System.Threading.Tasks.Task<(Android.App.Result result, Android.Content.Intent? intent)>!
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.SuppressChangeNotifications() -> System.IDisposable!
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity.ThrownExceptions.get -> System.IObservable<System.Exception!>!
 ReactiveUI.Reactive.AndroidX.ReactiveFragmentActivity<TViewModel>

src/ReactiveUI.AndroidX/ActivityResultAwaiter.cs

@@ -0,0 +1,89 @@
+// Copyright (c) 2009-2026 .NET Foundation and Contributors. All rights reserved.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+using Android.Content;
+
+#if REACTIVE_SHIM
+namespace ReactiveUI.Reactive.AndroidX;
+#else
+namespace ReactiveUI.AndroidX;
+#endif
+
+/// <summary>
+/// Awaits the first activity result that matches a request code, then completes the task and detaches. A fused,
+/// allocation-light replacement for <c>Where(...).Select(...).FirstAsync().ToTask()</c>: it is its own observer,
+/// settles exactly once, and unsubscribes on completion. Shared by the AppCompat and Fragment reactive activities.
+/// </summary>
+internal sealed class ActivityResultAwaiter
+    : IObserver<(int requestCode, Result result, Intent? intent)>, IDisposable
+{
+    /// <summary>The request code this awaiter is waiting for.</summary>
+    private readonly int _requestCode;
+
+    /// <summary>Completion source backing the returned task.</summary>
+    private readonly TaskCompletionSource<(Result result, Intent? intent)> _completion = new();
+
+    /// <summary>Holds the source subscription so it can be torn down once settled.</summary>
+    private readonly OnceDisposable _subscription = new();
+
+    /// <summary>Guards against settling more than once.</summary>
+    private int _settled;
+
+    /// <summary>Initializes a new instance of the <see cref="ActivityResultAwaiter"/> class.</summary>
+    /// <param name="requestCode">The request code to await.</param>
+    private ActivityResultAwaiter(int requestCode) => _requestCode = requestCode;
+
+    /// <summary>Subscribes to the activity-result stream and returns a task for the first matching result.</summary>
+    /// <param name="source">The activity-result stream.</param>
+    /// <param name="requestCode">The request code to await.</param>
+    /// <returns>A task that completes with the result and intent of the first matching activity result.</returns>
+    public static Task<(Result result, Intent? intent)> Await(
+        IObservable<(int requestCode, Result result, Intent? intent)> source,
+        int requestCode)
+    {
+        var awaiter = new ActivityResultAwaiter(requestCode);
+        awaiter._subscription.Disposable = source.Subscribe(awaiter);
+        return awaiter._completion.Task;
+    }
+
+    /// <inheritdoc/>
+    public void OnNext((int requestCode, Result result, Intent? intent) value)
+    {
+        if (value.requestCode != _requestCode || Interlocked.Exchange(ref _settled, 1) != 0)
+        {
+            return;
+        }
+
+        _ = _completion.TrySetResult((value.result, value.intent));
+        Dispose();
+    }
+
+    /// <inheritdoc/>
+    public void OnError(Exception error)
+    {
+        if (Interlocked.Exchange(ref _settled, 1) != 0)
+        {
+            return;
+        }
+
+        _ = _completion.TrySetException(error);
+        Dispose();
+    }
+
+    /// <inheritdoc/>
+    public void OnCompleted()
+    {
+        if (Interlocked.Exchange(ref _settled, 1) != 0)
+        {
+            return;
+        }
+
+        _ = _completion.TrySetCanceled();
+        Dispose();
+    }
+
+    /// <inheritdoc/>
+    public void Dispose() => _subscription.Dispose();
+}

src/ReactiveUI.AndroidX/PublicAPI/net10.0-android36.0/PublicAPI.Shipped.txt

@@ -51,15 +51,15 @@ ReactiveUI.AndroidX.ReactiveFragment<TViewModel>.ViewModel.get -> TViewModel?
 ReactiveUI.AndroidX.ReactiveFragment<TViewModel>.ViewModel.set -> void
 ReactiveUI.AndroidX.ReactiveFragmentActivity
 ReactiveUI.AndroidX.ReactiveFragmentActivity.Activated.get -> System.IObservable<ReactiveUI.Primitives.RxVoid>!
-ReactiveUI.AndroidX.ReactiveFragmentActivity.ActivityResult.get -> System.IObservable<(int requestCode, Android.App.Result result, Android.Content.Intent! intent)>!
+ReactiveUI.AndroidX.ReactiveFragmentActivity.ActivityResult.get -> System.IObservable<(int requestCode, Android.App.Result result, Android.Content.Intent? intent)>!
 ReactiveUI.AndroidX.ReactiveFragmentActivity.Changed.get -> System.IObservable<ReactiveUI.IReactivePropertyChangedEventArgs<ReactiveUI.AndroidX.ReactiveFragmentActivity!>!>!
 ReactiveUI.AndroidX.ReactiveFragmentActivity.Changing.get -> System.IObservable<ReactiveUI.IReactivePropertyChangedEventArgs<ReactiveUI.AndroidX.ReactiveFragmentActivity!>!>!
 ReactiveUI.AndroidX.ReactiveFragmentActivity.Deactivated.get -> System.IObservable<ReactiveUI.Primitives.RxVoid>!
 ReactiveUI.AndroidX.ReactiveFragmentActivity.PropertyChanged -> System.ComponentModel.PropertyChangedEventHandler?
 ReactiveUI.AndroidX.ReactiveFragmentActivity.PropertyChanging -> System.ComponentModel.PropertyChangingEventHandler?
 ReactiveUI.AndroidX.ReactiveFragmentActivity.ReactiveFragmentActivity() -> void
-ReactiveUI.AndroidX.ReactiveFragmentActivity.StartActivityForResultAsync(Android.Content.Intent! intent, int requestCode) -> System.Threading.Tasks.Task<(Android.App.Result result, Android.Content.Intent! intent)>!
-ReactiveUI.AndroidX.ReactiveFragmentActivity.StartActivityForResultAsync(System.Type! type, int requestCode) -> System.Threading.Tasks.Task<(Android.App.Result result, Android.Content.Intent! intent)>!
+ReactiveUI.AndroidX.ReactiveFragmentActivity.StartActivityForResultAsync(Android.Content.Intent! intent, int requestCode) -> System.Threading.Tasks.Task<(Android.App.Result result, Android.Content.Intent? intent)>!
+ReactiveUI.AndroidX.ReactiveFragmentActivity.StartActivityForResultAsync(System.Type! type, int requestCode) -> System.Threading.Tasks.Task<(Android.App.Result result, Android.Content.Intent? intent)>!
 ReactiveUI.AndroidX.ReactiveFragmentActivity.SuppressChangeNotifications() -> System.IDisposable!
 ReactiveUI.AndroidX.ReactiveFragmentActivity.ThrownExceptions.get -> System.IObservable<System.Exception!>!
 ReactiveUI.AndroidX.ReactiveFragmentActivity<TViewModel>

src/ReactiveUI.AndroidX/PublicAPI/net11.0-android37/PublicAPI.Shipped.txt

@@ -51,15 +51,15 @@ ReactiveUI.AndroidX.ReactiveFragment<TViewModel>.ViewModel.get -> TViewModel?
 ReactiveUI.AndroidX.ReactiveFragment<TViewModel>.ViewModel.set -> void
 ReactiveUI.AndroidX.ReactiveFragmentActivity
 ReactiveUI.AndroidX.ReactiveFragmentActivity.Activated.get -> System.IObservable<ReactiveUI.Primitives.RxVoid>!
-ReactiveUI.AndroidX.ReactiveFragmentActivity.ActivityResult.get -> System.IObservable<(int requestCode, Android.App.Result result, Android.Content.Intent! intent)>!
+ReactiveUI.AndroidX.ReactiveFragmentActivity.ActivityResult.get -> System.IObservable<(int requestCode, Android.App.Result result, Android.Content.Intent? intent)>!
 ReactiveUI.AndroidX.ReactiveFragmentActivity.Changed.get -> System.IObservable<ReactiveUI.IReactivePropertyChangedEventArgs<ReactiveUI.AndroidX.ReactiveFragmentActivity!>!>!
 ReactiveUI.AndroidX.ReactiveFragmentActivity.Changing.get -> System.IObservable<ReactiveUI.IReactivePropertyChangedEventArgs<ReactiveUI.AndroidX.ReactiveFragmentActivity!>!>!
 ReactiveUI.AndroidX.ReactiveFragmentActivity.Deactivated.get -> System.IObservable<ReactiveUI.Primitives.RxVoid>!
 ReactiveUI.AndroidX.ReactiveFragmentActivity.PropertyChanged -> System.ComponentModel.PropertyChangedEventHandler?
 ReactiveUI.AndroidX.ReactiveFragmentActivity.PropertyChanging -> System.ComponentModel.PropertyChangingEventHandler?
 ReactiveUI.AndroidX.ReactiveFragmentActivity.ReactiveFragmentActivity() -> void
-ReactiveUI.AndroidX.ReactiveFragmentActivity.StartActivityForResultAsync(Android.Content.Intent! intent, int requestCode) -> System.Threading.Tasks.Task<(Android.App.Result result, Android.Content.Intent! intent)>!
-ReactiveUI.AndroidX.ReactiveFragmentActivity.StartActivityForResultAsync(System.Type! type, int requestCode) -> System.Threading.Tasks.Task<(Android.App.Result result, Android.Content.Intent! intent)>!
+ReactiveUI.AndroidX.ReactiveFragmentActivity.StartActivityForResultAsync(Android.Content.Intent! intent, int requestCode) -> System.Threading.Tasks.Task<(Android.App.Result result, Android.Content.Intent? intent)>!
+ReactiveUI.AndroidX.ReactiveFragmentActivity.StartActivityForResultAsync(System.Type! type, int requestCode) -> System.Threading.Tasks.Task<(Android.App.Result result, Android.Content.Intent? intent)>!
 ReactiveUI.AndroidX.ReactiveFragmentActivity.SuppressChangeNotifications() -> System.IDisposable!
 ReactiveUI.AndroidX.ReactiveFragmentActivity.ThrownExceptions.get -> System.IObservable<System.Exception!>!
 ReactiveUI.AndroidX.ReactiveFragmentActivity<TViewModel>

src/ReactiveUI.AndroidX/ReactiveAppCompatActivity.cs

@@ -145,81 +145,4 @@ protected override void Dispose(bool disposing)
 
         base.Dispose(disposing);
     }
-
-    /// <summary>
-    /// Awaits the first <see cref="ActivityResult"/> that matches a request code, then completes the task and
-    /// detaches. A fused, allocation-light replacement for <c>Where(...).Select(...).FirstAsync().ToTask()</c>:
-    /// it is its own observer, settles exactly once, and unsubscribes on completion.
-    /// </summary>
-    private sealed class ActivityResultAwaiter
-        : IObserver<(int requestCode, Result result, Intent? intent)>, IDisposable
-    {
-        /// <summary>The request code this awaiter is waiting for.</summary>
-        private readonly int _requestCode;
-
-        /// <summary>Completion source backing the returned task.</summary>
-        private readonly TaskCompletionSource<(Result result, Intent? intent)> _completion = new();
-
-        /// <summary>Holds the source subscription so it can be torn down once settled.</summary>
-        private readonly OnceDisposable _subscription = new();
-
-        /// <summary>Guards against settling more than once.</summary>
-        private int _settled;
-
-        /// <summary>Initializes a new instance of the <see cref="ActivityResultAwaiter"/> class.</summary>
-        /// <param name="requestCode">The request code to await.</param>
-        private ActivityResultAwaiter(int requestCode) => _requestCode = requestCode;
-
-        /// <summary>Subscribes to the activity-result stream and returns a task for the first matching result.</summary>
-        /// <param name="source">The activity-result stream.</param>
-        /// <param name="requestCode">The request code to await.</param>
-        /// <returns>A task that completes with the result and intent of the first matching activity result.</returns>
-        public static Task<(Result result, Intent? intent)> Await(
-            IObservable<(int requestCode, Result result, Intent? intent)> source,
-            int requestCode)
-        {
-            var awaiter = new ActivityResultAwaiter(requestCode);
-            awaiter._subscription.Disposable = source.Subscribe(awaiter);
-            return awaiter._completion.Task;
-        }
-
-        /// <inheritdoc/>
-        public void OnNext((int requestCode, Result result, Intent? intent) value)
-        {
-            if (value.requestCode != _requestCode || Interlocked.Exchange(ref _settled, 1) != 0)
-            {
-                return;
-            }
-
-            _completion.TrySetResult((value.result, value.intent));
-            Dispose();
-        }
-
-        /// <inheritdoc/>
-        public void OnError(Exception error)
-        {
-            if (Interlocked.Exchange(ref _settled, 1) != 0)
-            {
-                return;
-            }
-
-            _completion.TrySetException(error);
-            Dispose();
-        }
-
-        /// <inheritdoc/>
-        public void OnCompleted()
-        {
-            if (Interlocked.Exchange(ref _settled, 1) != 0)
-            {
-                return;
-            }
-
-            _completion.TrySetCanceled();
-            Dispose();
-        }
-
-        /// <inheritdoc/>
-        public void Dispose() => _subscription.Dispose();
-    }
 }