Merge branch 'main' into CP_UpdateToSplat16

ChrisPulman · web-flow · commit e1e5084dae75 · 2025-08-23T00:36:42.000+01:00
diff --git a/src/ReactiveUI.AOTTests/ReactiveUI.AOT.Tests.csproj b/src/ReactiveUI.AOTTests/ReactiveUI.AOT.Tests.csproj
@@ -9,6 +9,7 @@
     <PublishAot>true</PublishAot>
     <InvariantGlobalization>true</InvariantGlobalization>
     <TrimMode>full</TrimMode>
+    <NoWarn>$(NoWarn);IL2026;IL3050;</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ReactiveUI.AOTTests/StringBasedObservationTests.cs b/src/ReactiveUI.AOTTests/StringBasedObservationTests.cs
@@ -3,6 +3,7 @@
 // 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 System.Diagnostics.CodeAnalysis;
 using System.Reactive.Concurrency;
 using System.Reactive.Linq;
 
diff --git a/src/ReactiveUI.AndroidX/Registrations.cs b/src/ReactiveUI.AndroidX/Registrations.cs
@@ -17,6 +17,8 @@ public class Registrations : IWantsToRegisterStuff
 #if NET6_0_OR_GREATER
     [RequiresDynamicCode("Register uses methods that require dynamic code generation")]
     [RequiresUnreferencedCode("Register uses methods that may require unreferenced code")]
+    [SuppressMessage("Trimming", "IL2046:'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
+    [SuppressMessage("AOT", "IL3051:'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
 #endif
     public void Register(Action<Func<object>, Type> registerFunction)
     {
diff --git a/src/ReactiveUI.Blazor/ReactiveComponentBase.cs b/src/ReactiveUI.Blazor/ReactiveComponentBase.cs
@@ -92,7 +92,7 @@ protected override void OnAfterRender(bool firstRender)
         {
             // The following subscriptions are here because if they are done in OnInitialized, they conflict with certain JavaScript frameworks.
             var viewModelChanged =
-                this.WhenAnyValue(x => x.ViewModel)
+                this.WhenAnyValue<ReactiveComponentBase<T>, T?>(nameof(ViewModel))
                     .WhereNotNull()
                     .Publish()
                     .RefCount(2);
diff --git a/src/ReactiveUI.Blazor/ReactiveInjectableComponentBase.cs b/src/ReactiveUI.Blazor/ReactiveInjectableComponentBase.cs
@@ -94,7 +94,7 @@ protected override void OnAfterRender(bool firstRender)
         {
             // The following subscriptions are here because if they are done in OnInitialized, they conflict with certain JavaScript frameworks.
             var viewModelChanged =
-                this.WhenAnyValue(x => x.ViewModel)
+                this.WhenAnyValue<ReactiveInjectableComponentBase<T>, T?>(nameof(ViewModel))
                     .WhereNotNull()
                     .Publish()
                     .RefCount(2);
diff --git a/src/ReactiveUI.Blazor/ReactiveLayoutComponentBase.cs b/src/ReactiveUI.Blazor/ReactiveLayoutComponentBase.cs
@@ -91,7 +91,7 @@ protected override void OnAfterRender(bool isFirstRender)
         if (isFirstRender)
         {
             var viewModelChanged =
-                this.WhenAnyValue(x => x.ViewModel)
+                this.WhenAnyValue<ReactiveLayoutComponentBase<T>, T?>(nameof(ViewModel))
                     .WhereNotNull()
                     .Publish()
                     .RefCount(2);
diff --git a/src/ReactiveUI.Blazor/Registrations.cs b/src/ReactiveUI.Blazor/Registrations.cs
@@ -17,6 +17,8 @@ public class Registrations : IWantsToRegisterStuff
 #if NET6_0_OR_GREATER
     [RequiresDynamicCode("Register uses methods that require dynamic code generation")]
     [RequiresUnreferencedCode("Register uses methods that may require unreferenced code")]
+    [SuppressMessage("Trimming", "IL2046:'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
+    [SuppressMessage("AOT", "IL3051:'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
 #endif
     public void Register(Action<Func<object>, Type> registerFunction)
     {
diff --git a/src/ReactiveUI.Builder.WpfApp/ViewModels/ChatRoomViewModel.cs b/src/ReactiveUI.Builder.WpfApp/ViewModels/ChatRoomViewModel.cs
@@ -33,7 +33,7 @@ public ChatRoomViewModel(IScreen hostScreen, ChatRoom room, string user)
         _room = room;
         _user = user;
 
-        var canSend = this.WhenAnyValue(x => x.MessageText, txt => !string.IsNullOrWhiteSpace(txt));
+        var canSend = this.WhenAnyValue<ChatRoomViewModel, bool, string>(nameof(MessageText), txt => !string.IsNullOrWhiteSpace(txt));
         SendMessage = ReactiveCommand.Create(SendMessageImpl, canSend);
 
         // Observe new incoming messages via MessageBus using the room name as the contract across instances
diff --git a/src/ReactiveUI.Builder.WpfApp/ViewModels/LobbyViewModel.cs b/src/ReactiveUI.Builder.WpfApp/ViewModels/LobbyViewModel.cs
@@ -29,7 +29,7 @@ public LobbyViewModel(IScreen hostScreen)
         HostScreen = hostScreen;
         UrlPathSegment = "lobby";
 
-        var canCreate = this.WhenAnyValue(x => x.RoomName, rn => !string.IsNullOrWhiteSpace(rn));
+        var canCreate = this.WhenAnyValue<LobbyViewModel, bool, string>(nameof(RoomName), rn => !string.IsNullOrWhiteSpace(rn));
         CreateRoom = ReactiveCommand.Create(CreateRoomImpl, canCreate);
 
         DeleteRoom = ReactiveCommand.Create<ChatRoom>(DeleteRoomImpl);
diff --git a/src/ReactiveUI.Builder.WpfApp/Views/ChatRoomView.xaml.cs b/src/ReactiveUI.Builder.WpfApp/Views/ChatRoomView.xaml.cs
@@ -5,6 +5,7 @@
 
 using System.Reactive.Disposables;
 using System.Windows;
+using ReactiveUI.Builder.WpfApp.ViewModels;
 
 namespace ReactiveUI.Builder.WpfApp.Views;
 
@@ -28,7 +29,7 @@ public ChatRoomView()
         this.WhenActivated(d =>
         {
             // Map ViewModel to DataContext for XAML bindings like {Binding RoomName}
-            this.WhenAnyValue(v => v.ViewModel).BindTo(this, v => v.DataContext).DisposeWith(d);
+            this.WhenAnyValue<ChatRoomView, ChatRoomViewModel>(nameof(ViewModel)).BindTo(this, v => v.DataContext).DisposeWith(d);
 
             this.Bind(ViewModel, vm => vm.MessageText, v => v.MessageBox.Text).DisposeWith(d);
             this.BindCommand(ViewModel, vm => vm.SendMessage, v => v.SendButton).DisposeWith(d);
diff --git a/src/ReactiveUI.Builder.WpfApp/Views/LobbyView.xaml.cs b/src/ReactiveUI.Builder.WpfApp/Views/LobbyView.xaml.cs
@@ -43,7 +43,7 @@ public LobbyView()
             }).DisposeWith(d);
 
             // Delete selected room via Delete button only
-            var selectedRoomStream = this.WhenAnyValue(x => x.RoomsList.SelectedItem)
+            var selectedRoomStream = this.WhenAnyValue<LobbyView, object>(nameof(RoomsList.SelectedItem))
                 .Select(x => x as ChatRoom)
                 .WhereNotNull();
             this.BindCommand(ViewModel, vm => vm.DeleteRoom, v => v.DeleteRoomButton, selectedRoomStream)
diff --git a/src/ReactiveUI.Drawing/Registrations.cs b/src/ReactiveUI.Drawing/Registrations.cs
@@ -17,6 +17,8 @@ public class Registrations : IWantsToRegisterStuff
 #if NET6_0_OR_GREATER
     [RequiresDynamicCode("Register uses methods that require dynamic code generation")]
     [RequiresUnreferencedCode("Register uses methods that may require unreferenced code")]
+    [SuppressMessage("Trimming", "IL2046:'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
+    [SuppressMessage("AOT", "IL3051:'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
 #endif
     public void Register(Action<Func<object>, Type> registerFunction)
     {
diff --git a/src/ReactiveUI.Maui/ActivationForViewFetcher.cs b/src/ReactiveUI.Maui/ActivationForViewFetcher.cs
@@ -177,7 +177,7 @@ public IObservable<bool> GetActivationForView(IActivatableView view)
 
         return viewLoaded
                .Merge(viewUnloaded)
-               .Select(b => b ? view.WhenAnyValue(x => x.IsHitTestVisible).SkipWhile(x => !x) : Observables.False)
+               .Select(b => b ? view.WhenAnyValue<FrameworkElement, bool>(nameof(view.IsHitTestVisible)).SkipWhile(x => !x) : Observables.False)
                .Switch()
                .DistinctUntilChanged();
     }
diff --git a/src/ReactiveUI.Maui/Common/ViewModelViewHost.cs b/src/ReactiveUI.Maui/Common/ViewModelViewHost.cs
@@ -79,7 +79,7 @@ public ViewModelViewHost()
               .DistinctUntilChanged();
 
         var contractChanged = this.WhenAnyObservable(x => x.ViewContractObservable).Do(x => _viewContract = x).StartWith(ViewContract);
-        var viewModelChanged = this.WhenAnyValue(x => x.ViewModel).StartWith(ViewModel);
+        var viewModelChanged = this.WhenAnyValue<ViewModelViewHost, object?>(nameof(ViewModel)).StartWith(ViewModel);
         var vmAndContract = contractChanged
             .CombineLatest(viewModelChanged, (contract, vm) => (ViewModel: vm, Contract: contract));
 
diff --git a/src/ReactiveUI.Maui/Registrations.cs b/src/ReactiveUI.Maui/Registrations.cs
@@ -25,6 +25,8 @@ public class Registrations : IWantsToRegisterStuff
 #if NET6_0_OR_GREATER
     [RequiresDynamicCode("Register uses methods that require dynamic code generation")]
     [RequiresUnreferencedCode("Register uses methods that may require unreferenced code")]
+    [SuppressMessage("Trimming", "IL2046:'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
+    [SuppressMessage("AOT", "IL3051:'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
 #endif
     public void Register(Action<Func<object>, Type> registerFunction)
     {
diff --git a/src/ReactiveUI.Maui/ViewModelViewHost.cs b/src/ReactiveUI.Maui/ViewModelViewHost.cs
@@ -69,7 +69,7 @@ public ViewModelViewHost()
 
         ViewContractObservable = Observable<string>.Default;
 
-        var vmAndContract = this.WhenAnyValue(x => x.ViewModel).CombineLatest(
+        var vmAndContract = this.WhenAnyValue<ViewModelViewHost, object?>(nameof(ViewModel)).CombineLatest(
                                                                               this.WhenAnyObservable(x => x.ViewContractObservable),
                                                                               (vm, contract) => new { ViewModel = vm, Contract = contract, });
 
diff --git a/src/ReactiveUI.Winforms/Registrations.cs b/src/ReactiveUI.Winforms/Registrations.cs
@@ -15,6 +15,8 @@ public class Registrations : IWantsToRegisterStuff
 #if NET6_0_OR_GREATER
     [RequiresDynamicCode("Register uses methods that require dynamic code generation")]
     [RequiresUnreferencedCode("Register uses methods that may require unreferenced code")]
+    [SuppressMessage("Trimming", "IL2046:'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
+    [SuppressMessage("AOT", "IL3051:'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
 #endif
     public void Register(Action<Func<object>, Type> registerFunction)
     {
diff --git a/src/ReactiveUI.Winforms/ViewModelViewHost.cs b/src/ReactiveUI.Winforms/ViewModelViewHost.cs
@@ -153,7 +153,7 @@ protected override void Dispose(bool disposing)
     private IEnumerable<IDisposable> SetupBindings()
     {
         var viewChanges =
-            this.WhenAnyValue(x => x!.Content)
+            this.WhenAnyValue<ViewModelControlHost, object?>(nameof(Content))
                 .WhereNotNull()
                 .OfType<Control>()
                 .Subscribe(x =>
@@ -175,7 +175,7 @@ private IEnumerable<IDisposable> SetupBindings()
 
         yield return viewChanges!;
 
-        yield return this.WhenAnyValue(x => x.DefaultContent).Subscribe(x =>
+        yield return this.WhenAnyValue<ViewModelControlHost, Control?>(nameof(DefaultContent)).Subscribe(x =>
         {
             if (x is not null)
             {
@@ -186,7 +186,7 @@ private IEnumerable<IDisposable> SetupBindings()
         ViewContractObservable = Observable.Return(string.Empty);
 
         var vmAndContract =
-            this.WhenAnyValue(x => x.ViewModel)
+            this.WhenAnyValue<ViewModelControlHost, object?>(nameof(ViewModel))
                 .CombineLatest(
                                this.WhenAnyObservable(x => x.ViewContractObservable!),
                                (vm, contract) => new { ViewModel = vm, Contract = contract });
diff --git a/src/ReactiveUI.Wpf/Common/ViewModelViewHost.cs b/src/ReactiveUI.Wpf/Common/ViewModelViewHost.cs
@@ -106,7 +106,7 @@ public ViewModelViewHost()
               .DistinctUntilChanged();
 
         var contractChanged = this.WhenAnyObservable(x => x.ViewContractObservable).Do(x => _viewContract = x).StartWith(ViewContract);
-        var viewModelChanged = this.WhenAnyValue(x => x.ViewModel).StartWith(ViewModel);
+        var viewModelChanged = this.WhenAnyValue<ViewModelViewHost, object?>(nameof(ViewModel)).StartWith(ViewModel);
         var vmAndContract = contractChanged
             .CombineLatest(viewModelChanged, (contract, vm) => (ViewModel: vm, Contract: contract));
 
diff --git a/src/ReactiveUI.Wpf/Registrations.cs b/src/ReactiveUI.Wpf/Registrations.cs
@@ -14,6 +14,8 @@ public class Registrations : IWantsToRegisterStuff
 #if NET6_0_OR_GREATER
     [RequiresDynamicCode("Register uses methods that require dynamic code generation")]
     [RequiresUnreferencedCode("Register uses methods that may require unreferenced code")]
+    [SuppressMessage("Trimming", "IL2046:'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
+    [SuppressMessage("AOT", "IL3051:'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
 #endif
     public void Register(Action<Func<object>, Type> registerFunction)
     {
diff --git a/src/ReactiveUI/Platforms/android/PlatformRegistrations.cs b/src/ReactiveUI/Platforms/android/PlatformRegistrations.cs
@@ -15,6 +15,8 @@ public class PlatformRegistrations : IWantsToRegisterStuff
 #if NET6_0_OR_GREATER
     [RequiresDynamicCode("Platform registration uses ComponentModelTypeConverter and RxApp which require dynamic code generation")]
     [RequiresUnreferencedCode("Platform registration uses ComponentModelTypeConverter and RxApp which may require unreferenced code")]
+    [SuppressMessage("Trimming", "IL2046:'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
+    [SuppressMessage("AOT", "IL3051:'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
 #endif
     public void Register(Action<Func<object>, Type> registerFunction) // TODO: Create Test
     {
diff --git a/src/ReactiveUI/Platforms/mac/PlatformRegistrations.cs b/src/ReactiveUI/Platforms/mac/PlatformRegistrations.cs
@@ -15,6 +15,8 @@ public class PlatformRegistrations : IWantsToRegisterStuff
 #if NET6_0_OR_GREATER
     [RequiresDynamicCode("Platform registration uses ComponentModelTypeConverter and RxApp which require dynamic code generation")]
     [RequiresUnreferencedCode("Platform registration uses ComponentModelTypeConverter and RxApp which may require unreferenced code")]
+    [SuppressMessage("Trimming", "IL2046:'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
+    [SuppressMessage("AOT", "IL3051:'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
 #endif
     public void Register(Action<Func<object>, Type> registerFunction)
     {
diff --git a/src/ReactiveUI/Platforms/net/PlatformRegistrations.cs b/src/ReactiveUI/Platforms/net/PlatformRegistrations.cs
@@ -16,6 +16,8 @@ public class PlatformRegistrations : IWantsToRegisterStuff
 #if NET6_0_OR_GREATER
     [RequiresDynamicCode("Platform registration uses ComponentModelTypeConverter and RxApp which require dynamic code generation")]
     [RequiresUnreferencedCode("Platform registration uses ComponentModelTypeConverter and RxApp which may require unreferenced code")]
+    [SuppressMessage("Trimming", "IL2046:'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
+    [SuppressMessage("AOT", "IL3051:'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
 #endif
     public void Register(Action<Func<object>, Type> registerFunction)
     {
diff --git a/src/ReactiveUI/Platforms/uikit-common/PlatformRegistrations.cs b/src/ReactiveUI/Platforms/uikit-common/PlatformRegistrations.cs
@@ -15,6 +15,8 @@ public class PlatformRegistrations : IWantsToRegisterStuff
 #if NET6_0_OR_GREATER
     [RequiresDynamicCode("Platform registration uses ComponentModelTypeConverter and RxApp which require dynamic code generation")]
     [RequiresUnreferencedCode("Platform registration uses ComponentModelTypeConverter and RxApp which may require unreferenced code")]
+    [SuppressMessage("Trimming", "IL2046:'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
+    [SuppressMessage("AOT", "IL3051:'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
 #endif
     public void Register(Action<Func<object>, Type> registerFunction)
     {
diff --git a/src/ReactiveUI/Suspension/SuspensionHostExtensions.cs b/src/ReactiveUI/Suspension/SuspensionHostExtensions.cs
@@ -50,7 +50,7 @@ public static IObservable<T> ObserveAppState<T>(this ISuspensionHost item)
     {
         item.ArgumentNullExceptionThrowIfNull(nameof(item));
 
-        return item.WhenAny(suspensionHost => suspensionHost.AppState, observedChange => observedChange.Value)
+        return item.WhenAny<ISuspensionHost, object?, object?>(nameof(item.AppState), observedChange => observedChange.Value)
                    .WhereNotNull()
                    .Cast<T>();
     }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ public class Registrations : IWantsToRegisterStuff`
`17`	`17`	`#if NET6_0_OR_GREATER`
`18`	`18`	`[RequiresDynamicCode("Register uses methods that require dynamic code generation")]`
`19`	`19`	`[RequiresUnreferencedCode("Register uses methods that may require unreferenced code")]`
	`20`	`+ [SuppressMessage("Trimming", "IL2046:'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]`
	`21`	`+ [SuppressMessage("AOT", "IL3051:'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]`
`20`	`22`	`#endif`
`21`	`23`	`public void Register(Action<Func<object>, Type> registerFunction)`
`22`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ protected override void OnAfterRender(bool firstRender)`
`92`	`92`	`{`
`93`	`93`	`// The following subscriptions are here because if they are done in OnInitialized, they conflict with certain JavaScript frameworks.`
`94`	`94`	`var viewModelChanged =`
`95`		`- this.WhenAnyValue(x => x.ViewModel)`
	`95`	`+ this.WhenAnyValue<ReactiveComponentBase<T>, T?>(nameof(ViewModel))`
`96`	`96`	`.WhereNotNull()`
`97`	`97`	`.Publish()`
`98`	`98`	`.RefCount(2);`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ protected override void OnAfterRender(bool firstRender)`
`94`	`94`	`{`
`95`	`95`	`// The following subscriptions are here because if they are done in OnInitialized, they conflict with certain JavaScript frameworks.`
`96`	`96`	`var viewModelChanged =`
`97`		`- this.WhenAnyValue(x => x.ViewModel)`
	`97`	`+ this.WhenAnyValue<ReactiveInjectableComponentBase<T>, T?>(nameof(ViewModel))`
`98`	`98`	`.WhereNotNull()`
`99`	`99`	`.Publish()`
`100`	`100`	`.RefCount(2);`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ protected override void OnAfterRender(bool isFirstRender)`
`91`	`91`	`if (isFirstRender)`
`92`	`92`	`{`
`93`	`93`	`var viewModelChanged =`
`94`		`- this.WhenAnyValue(x => x.ViewModel)`
	`94`	`+ this.WhenAnyValue<ReactiveLayoutComponentBase<T>, T?>(nameof(ViewModel))`
`95`	`95`	`.WhereNotNull()`
`96`	`96`	`.Publish()`
`97`	`97`	`.RefCount(2);`