Replace RxApp schedulers with RxSchedulers throughout codebase

ChrisPulman · ChrisPulman · commit 01d47c97f59c · 2025-11-30T03:16:38.000Z
Refactors all usages of RxApp.MainThreadScheduler and RxApp.TaskpoolScheduler to use RxSchedulers.MainThreadScheduler and RxSchedulers.TaskpoolScheduler, respectively. Updates documentation comments, registration logic, and all relevant method calls to reference the new RxSchedulers static class. Also removes obsolete dispatcher extension methods from DispatcherObservable.cs and ensures scheduler usage is consistent across all platforms and components.
diff --git a/src/ReactiveUI.Blazor/Registrations.cs b/src/ReactiveUI.Blazor/Registrations.cs
@@ -53,7 +53,7 @@ public void Register(Action<Func<object>, Type> registerFunction)
             PlatformEnlightenmentProvider.Current.EnableWasm();
         }
 
-        RxApp.TaskpoolScheduler = TaskPoolScheduler.Default;
-        RxApp.MainThreadScheduler = CurrentThreadScheduler.Instance;
+        RxSchedulers.TaskpoolScheduler = TaskPoolScheduler.Default;
+        RxSchedulers.MainThreadScheduler = CurrentThreadScheduler.Instance;
     }
 }
diff --git a/src/ReactiveUI.Blend/FollowObservableStateBehavior.cs b/src/ReactiveUI.Blend/FollowObservableStateBehavior.cs
@@ -114,7 +114,7 @@ protected static void OnStateObservableChanged(DependencyObject? sender, Depende
 #pragma warning disable CA2208 // Instantiate argument exceptions correctly
         var newValue = (IObservable<string>)e.NewValue ?? throw new ArgumentNullException(nameof(e.NewValue));
 #pragma warning restore CA2208 // Instantiate argument exceptions correctly
-        item._watcher = newValue.ObserveOn(RxApp.MainThreadScheduler).Subscribe(
+        item._watcher = newValue.ObserveOn(RxSchedulers.MainThreadScheduler).Subscribe(
             x =>
             {
                 var target = item.TargetObject ?? item.AssociatedObject;
diff --git a/src/ReactiveUI.Blend/Platforms/net4/ObservableTrigger.cs b/src/ReactiveUI.Blend/Platforms/net4/ObservableTrigger.cs
@@ -62,7 +62,7 @@ protected static void OnObservableChanged(DependencyObject sender, DependencyPro
             triggerItem._watcher = null;
         }
 
-        triggerItem._watcher = ((IObservable<object>)e.NewValue).ObserveOn(RxApp.MainThreadScheduler).Subscribe(
+        triggerItem._watcher = ((IObservable<object>)e.NewValue).ObserveOn(RxSchedulers.MainThreadScheduler).Subscribe(
          triggerItem.InvokeActions,
          _ =>
          {
diff --git a/src/ReactiveUI.Blend/Platforms/uap/ObservableTriggerBehavior.cs b/src/ReactiveUI.Blend/Platforms/uap/ObservableTriggerBehavior.cs
@@ -117,7 +117,7 @@ private static void OnObservableChanged(DependencyObject sender, DependencyPrope
     {
         var @this = (ObservableTriggerBehavior)sender;
 
-        @this._watcher.Disposable = ((IObservable<object>)e.NewValue).ObserveOn(RxApp.MainThreadScheduler).Subscribe(
+        @this._watcher.Disposable = ((IObservable<object>)e.NewValue).ObserveOn(RxSchedulers.MainThreadScheduler).Subscribe(
          x => Interaction.ExecuteActions(@this._resolvedSource, @this.Actions, x),
          ex =>
          {
diff --git a/src/ReactiveUI.Builder.WpfApp/App.xaml.cs b/src/ReactiveUI.Builder.WpfApp/App.xaml.cs
@@ -55,7 +55,7 @@ protected override void OnStartup(StartupEventArgs e)
                 // Network service used to broadcast/receive messages across instances
                 r.RegisterLazySingleton(static () => new Services.ChatNetworkService());
             })
-            .Build();
+            .BuildApp();
 
         // Setup Suspension
         RxApp.SuspensionHost.CreateNewAppState = static () => new ChatState();
@@ -74,7 +74,7 @@ protected override void OnStartup(StartupEventArgs e)
         // Load persisted state asynchronously and update UI when ready
         _ = _driver
             .LoadState()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(
                 static stateObj =>
                 {
diff --git a/src/ReactiveUI.Builder.WpfApp/ViewModels/ChatRoomViewModel.cs b/src/ReactiveUI.Builder.WpfApp/ViewModels/ChatRoomViewModel.cs
@@ -40,7 +40,7 @@ public ChatRoomViewModel(IScreen hostScreen, ChatRoom room, string user)
         MessageBus.Current.Listen<ChatNetworkMessage>(contract: room.Name)
             .Where(msg => msg.InstanceId != Services.AppInstance.Id)
             .Throttle(TimeSpan.FromMilliseconds(33))
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(msg =>
             {
                 _room.Messages.Add(new ChatMessage { Sender = msg.Sender, Text = msg.Text, Timestamp = msg.Timestamp });
diff --git a/src/ReactiveUI.Builder.WpfApp/ViewModels/LobbyViewModel.cs b/src/ReactiveUI.Builder.WpfApp/ViewModels/LobbyViewModel.cs
@@ -75,11 +75,11 @@ public LobbyViewModel(IScreen hostScreen)
         this.WhenAnyObservable(x => x.RoomsChanged)
             .StartWith(Unit.Default)
             .Select(_ => (IReadOnlyList<ChatRoom>)[.. GetState().Rooms])
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .ToProperty(this, nameof(Rooms), out _rooms);
 
         // Request a snapshot from peers shortly after activation
-        RxApp.MainThreadScheduler.Schedule(Unit.Default, TimeSpan.FromMilliseconds(500), (s, __) =>
+        RxSchedulers.MainThreadScheduler.Schedule(Unit.Default, TimeSpan.FromMilliseconds(500), (s, __) =>
         {
             var req = new Services.RoomEventMessage(Services.RoomEventKind.SyncRequest, string.Empty) { InstanceId = Services.AppInstance.Id };
             Trace.WriteLine("[Lobby] Broadcasting SyncRequest");
diff --git a/src/ReactiveUI.Maui/Common/ViewModelViewHost.cs b/src/ReactiveUI.Maui/Common/ViewModelViewHost.cs
@@ -86,7 +86,7 @@ public ViewModelViewHost()
         this.WhenActivated(d =>
         {
             d(contractChanged
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(x => _viewContract = x ?? string.Empty));
 
             d(vmAndContract.DistinctUntilChanged().Subscribe(x => ResolveViewForViewModel(x.ViewModel, x.Contract)));
diff --git a/src/ReactiveUI.Maui/Registrations.cs b/src/ReactiveUI.Maui/Registrations.cs
@@ -43,8 +43,8 @@ public void Register(Action<Func<object>, Type> registerFunction)
 
         if (!ModeDetector.InUnitTestRunner())
         {
-            RxApp.MainThreadScheduler = new WaitForDispatcherScheduler(static () => DispatcherQueueScheduler.Current);
-            RxApp.TaskpoolScheduler = TaskPoolScheduler.Default;
+            RxSchedulers.MainThreadScheduler = new WaitForDispatcherScheduler(static () => DispatcherQueueScheduler.Current);
+            RxSchedulers.TaskpoolScheduler = TaskPoolScheduler.Default;
         }
 
         RxApp.SuppressViewCommandBindingMessage = true;
diff --git a/src/ReactiveUI.Maui/RoutedViewHost.cs b/src/ReactiveUI.Maui/RoutedViewHost.cs
@@ -81,7 +81,7 @@ public RoutedViewHost()
             Router?
                 .Navigate
                 .Where(_ => StacksAreDifferent())
-                .ObserveOn(RxApp.MainThreadScheduler)
+                .ObserveOn(RxSchedulers.MainThreadScheduler)
                 .SelectMany(_ => PagesForViewModel(Router.GetCurrentViewModel()))
                 .SelectMany(async page =>
                 {
@@ -245,7 +245,7 @@ protected virtual Page PageForViewModel(IRoutableViewModel vm)
 
         if (SetTitleOnNavigate)
         {
-            RxApp.MainThreadScheduler.Schedule(() => pg.Title = vm.UrlPathSegment);
+            RxSchedulers.MainThreadScheduler.Schedule(() => pg.Title = vm.UrlPathSegment);
         }
 
         return pg;
diff --git a/src/ReactiveUI.Winforms/Registrations.cs b/src/ReactiveUI.Winforms/Registrations.cs
@@ -45,7 +45,7 @@ public void Register(Action<Func<object>, Type> registerFunction)
         if (!ModeDetector.InUnitTestRunner())
         {
             WindowsFormsSynchronizationContext.AutoInstall = true;
-            RxApp.MainThreadScheduler = new WaitForDispatcherScheduler(static () => new SynchronizationContextScheduler(new WindowsFormsSynchronizationContext()));
+            RxSchedulers.MainThreadScheduler = new WaitForDispatcherScheduler(static () => new SynchronizationContextScheduler(new WindowsFormsSynchronizationContext()));
         }
     }
 }
diff --git a/src/ReactiveUI.Wpf/Common/ViewModelViewHost.cs b/src/ReactiveUI.Wpf/Common/ViewModelViewHost.cs
@@ -113,7 +113,7 @@ public ViewModelViewHost()
         this.WhenActivated(d =>
         {
             d(contractChanged
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(x => _viewContract = x ?? string.Empty));
 
             d(vmAndContract.DistinctUntilChanged().Subscribe(x => ResolveViewForViewModel(x.ViewModel, x.Contract)));
diff --git a/src/ReactiveUI.Wpf/Registrations.cs b/src/ReactiveUI.Wpf/Registrations.cs
@@ -43,8 +43,8 @@ public void Register(Action<Func<object>, Type> registerFunction)
         if (!ModeDetector.InUnitTestRunner())
         {
             // NB: On .NET Core, trying to touch DispatcherScheduler blows up :cry:
-            RxApp.MainThreadScheduler = new WaitForDispatcherScheduler(static () => DispatcherScheduler.Current);
-            RxApp.TaskpoolScheduler = TaskPoolScheduler.Default;
+            RxSchedulers.MainThreadScheduler = new WaitForDispatcherScheduler(static () => DispatcherScheduler.Current);
+            RxSchedulers.TaskpoolScheduler = TaskPoolScheduler.Default;
         }
 
         RxApp.SuppressViewCommandBindingMessage = true;
diff --git a/src/ReactiveUI.Wpf/Rx/Linq/DispatcherObservable.cs b/src/ReactiveUI.Wpf/Rx/Linq/DispatcherObservable.cs
@@ -133,43 +133,6 @@ public static IObservable<TSource> ObserveOn<TSource>(this IObservable<TSource>
         return ObserveOn_(source, dispatcherObject.Dispatcher, priority);
     }
 
-
-    /// <summary>
-    /// Wraps the source sequence in order to run its observer callbacks on the dispatcher associated with the current thread.
-    /// </summary>
-    /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
-    /// <param name="source">Source sequence.</param>
-    /// <returns>The source sequence whose observations happen on the current thread's dispatcher.</returns>
-    /// <exception cref="ArgumentNullException"><paramref name="source"/> is null.</exception>
-    [Obsolete("Use ObserveOn(RxApp.MainThreadScheduler)", false)]
-    public static IObservable<TSource> ObserveOnDispatcher<TSource>(this IObservable<TSource> source)
-    {
-        if (source == null)
-        {
-            throw new ArgumentNullException(nameof(source));
-        }
-
-        return ObserveOn_(source, DispatcherScheduler.Current.Dispatcher);
-    }
-
-    /// <summary>
-    /// Wraps the source sequence in order to run its observer callbacks on the dispatcher associated with the current thread.
-    /// </summary>
-    /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
-    /// <param name="source">Source sequence.</param>
-    /// <param name="priority">Priority to schedule work items at.</param>
-    /// <returns>The source sequence whose observations happen on the current thread's dispatcher.</returns>
-    /// <exception cref="ArgumentNullException"><paramref name="source"/> is null.</exception>
-    public static IObservable<TSource> ObserveOnDispatcher<TSource>(this IObservable<TSource> source, DispatcherPriority priority)
-    {
-        if (source == null)
-        {
-            throw new ArgumentNullException(nameof(source));
-        }
-
-        return ObserveOn_(source, DispatcherScheduler.Current.Dispatcher, priority);
-    }
-
     private static IObservable<TSource> ObserveOn_<TSource>(IObservable<TSource> source, Dispatcher dispatcher, DispatcherPriority priority)
     {
         return Synchronization.ObserveOn(source, new DispatcherSynchronizationContext(dispatcher, priority));
@@ -323,49 +286,6 @@ public static IObservable<TSource> SubscribeOn<TSource>(this IObservable<TSource
         return SubscribeOn_(source, dispatcherObject.Dispatcher, priority);
     }
 
-    /// <summary>
-    /// Wraps the source sequence in order to run its subscription and unsubscription logic on the dispatcher associated with the current thread.
-    /// </summary>
-    /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
-    /// <param name="source">Source sequence.</param>
-    /// <returns>The source sequence whose subscriptions and unsubscriptions happen on the current thread's dispatcher.</returns>
-    /// <exception cref="ArgumentNullException"><paramref name="source"/> is null.</exception>
-    /// <remarks>
-    /// Only the side-effects of subscribing to the source sequence and disposing subscriptions to the source sequence are run on the dispatcher associated with the current thread.
-    /// In order to invoke observer callbacks on the dispatcher associated with the current thread, e.g. to render results in a control, use <see cref="DispatcherObservable.ObserveOnDispatcher{TSource}(IObservable{TSource})"/>.
-    /// </remarks>
-    public static IObservable<TSource> SubscribeOnDispatcher<TSource>(this IObservable<TSource> source)
-    {
-        if (source == null)
-        {
-            throw new ArgumentNullException(nameof(source));
-        }
-
-        return SubscribeOn_(source, DispatcherScheduler.Current.Dispatcher);
-    }
-
-    /// <summary>
-    /// Wraps the source sequence in order to run its subscription and unsubscription logic on the dispatcher associated with the current thread.
-    /// </summary>
-    /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
-    /// <param name="source">Source sequence.</param>
-    /// <param name="priority">Priority to schedule work items at.</param>
-    /// <returns>The source sequence whose observations happen on the current thread's dispatcher.</returns>
-    /// <exception cref="ArgumentNullException"><paramref name="source"/> is null.</exception>
-    /// <remarks>
-    /// Only the side-effects of subscribing to the source sequence and disposing subscriptions to the source sequence are run on the dispatcher associated with the current thread.
-    /// In order to invoke observer callbacks on the dispatcher associated with the current thread, e.g. to render results in a control, use <see cref="DispatcherObservable.ObserveOnDispatcher{TSource}(IObservable{TSource}, DispatcherPriority)"/>.
-    /// </remarks>
-    public static IObservable<TSource> SubscribeOnDispatcher<TSource>(this IObservable<TSource> source, DispatcherPriority priority)
-    {
-        if (source == null)
-        {
-            throw new ArgumentNullException(nameof(source));
-        }
-
-        return SubscribeOn_(source, DispatcherScheduler.Current.Dispatcher, priority);
-    }
-
     private static IObservable<TSource> SubscribeOn_<TSource>(IObservable<TSource> source, Dispatcher dispatcher, DispatcherPriority priority)
     {
         return Synchronization.SubscribeOn(source, new DispatcherSynchronizationContext(dispatcher, priority));
diff --git a/src/ReactiveUI.sln b/src/ReactiveUI.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 18
-VisualStudioVersion = 18.0.11018.127 d18.0
+VisualStudioVersion = 18.0.11018.127
 MinimumVisualStudioVersion = 16.0.31613.86
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BD9762CF-E104-481C-96A6-26E624B86283}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/src/ReactiveUI/Builder/ReactiveUIBuilder.cs b/src/ReactiveUI/Builder/ReactiveUIBuilder.cs
@@ -926,12 +926,12 @@ private void ConfigureSchedulers() =>
             {
                 if (MainThreadScheduler != null && _setRxAppMainScheduler)
                 {
-                    RxApp.MainThreadScheduler = MainThreadScheduler;
+                    RxSchedulers.MainThreadScheduler = MainThreadScheduler;
                 }
 
                 if (TaskpoolScheduler != null && _setRxAppTaskPoolScheduler)
                 {
-                    RxApp.TaskpoolScheduler = TaskpoolScheduler;
+                    RxSchedulers.TaskpoolScheduler = TaskpoolScheduler;
                 }
             });
 }
diff --git a/src/ReactiveUI/Mixins/AutoPersistHelper.cs b/src/ReactiveUI/Mixins/AutoPersistHelper.cs
@@ -91,14 +91,14 @@ public static IDisposable AutoPersist<T, TDontCare>(this T @this, Func<T, IObser
         var saveHint = @this.GetChangedObservable().Where(x => x.PropertyName is not null && persistableProperties.ContainsKey(x.PropertyName)).Select(_ => Unit.Default).Merge(manualSaveSignal.Select(_ => Unit.Default));
 
         var autoSaver = saveHint
-                        .Throttle(interval.Value, RxApp.TaskpoolScheduler)
+                        .Throttle(interval.Value, RxSchedulers.TaskpoolScheduler)
                         .SelectMany(_ => doPersist(@this))
                         .Publish();
 
         // NB: This rigamarole is to prevent the initialization of a class
         // from triggering a save
         var ret = new SingleAssignmentDisposable();
-        RxApp.MainThreadScheduler.Schedule(() =>
+        RxSchedulers.MainThreadScheduler.Schedule(() =>
         {
             if (ret.IsDisposed)
             {
diff --git a/src/ReactiveUI/ObservableForProperty/POCOObservableForProperty.cs b/src/ReactiveUI/ObservableForProperty/POCOObservableForProperty.cs
@@ -39,7 +39,7 @@ public class POCOObservableForProperty : ICreatesObservableForProperty
             _hasWarned[(type, propertyName)] = true;
         }
 
-        return Observable.Return(new ObservedChange<object, object?>(sender, expression, default), RxApp.MainThreadScheduler ?? CurrentThreadScheduler.Instance)
+        return Observable.Return(new ObservedChange<object, object?>(sender, expression, default), RxSchedulers.MainThreadScheduler ?? CurrentThreadScheduler.Instance)
                          .Concat(Observable<IObservedChange<object, object?>>.Never);
     }
 }
diff --git a/src/ReactiveUI/Platforms/android/PlatformRegistrations.cs b/src/ReactiveUI/Platforms/android/PlatformRegistrations.cs
@@ -27,8 +27,8 @@ public void Register(Action<Func<object>, Type> registerFunction) // TODO: Creat
 
         if (!ModeDetector.InUnitTestRunner())
         {
-            RxApp.TaskpoolScheduler = TaskPoolScheduler.Default;
-            RxApp.MainThreadScheduler = HandlerScheduler.MainThreadScheduler;
+            RxSchedulers.TaskpoolScheduler = TaskPoolScheduler.Default;
+            RxSchedulers.MainThreadScheduler = HandlerScheduler.MainThreadScheduler;
         }
 
         registerFunction(static () => new BundleSuspensionDriver(), typeof(ISuspensionDriver));
diff --git a/src/ReactiveUI/Platforms/apple-common/ReactiveControl.cs b/src/ReactiveUI/Platforms/apple-common/ReactiveControl.cs
@@ -121,7 +121,7 @@ public override void ViewWillMoveToSuperview(NSView? newsuper)
 
     /// <inheritdoc/>
     void ICanForceManualActivation.Activate(bool activate) =>
-        RxApp.MainThreadScheduler.Schedule(() =>
+        RxSchedulers.MainThreadScheduler.Schedule(() =>
             (activate ? _activated : _deactivated).OnNext(Unit.Default));
 
     /// <inheritdoc/>
diff --git a/src/ReactiveUI/Platforms/apple-common/ReactiveImageView.cs b/src/ReactiveUI/Platforms/apple-common/ReactiveImageView.cs
@@ -146,7 +146,7 @@ public override void ViewWillMoveToSuperview(NSView? newsuper)
 
     /// <inheritdoc/>
     void ICanForceManualActivation.Activate(bool activate) =>
-        RxApp.MainThreadScheduler.Schedule(() =>
+        RxSchedulers.MainThreadScheduler.Schedule(() =>
             (activate ? _activated : _deactivated).OnNext(Unit.Default));
 
     /// <inheritdoc/>
diff --git a/src/ReactiveUI/Platforms/apple-common/ReactiveView.cs b/src/ReactiveUI/Platforms/apple-common/ReactiveView.cs
@@ -128,7 +128,7 @@ public override void ViewWillMoveToSuperview(NSView? newsuper)
 
     /// <inheritdoc/>
     void ICanForceManualActivation.Activate(bool activate) =>
-        RxApp.MainThreadScheduler.Schedule(() =>
+        RxSchedulers.MainThreadScheduler.Schedule(() =>
             (activate ? _activated : _deactivated).OnNext(Unit.Default));
 
     /// <inheritdoc/>
diff --git a/src/ReactiveUI/Platforms/apple-common/ViewModelViewHost.cs b/src/ReactiveUI/Platforms/apple-common/ViewModelViewHost.cs
@@ -37,7 +37,7 @@ public ViewModelViewHost()
         _currentView = new SerialDisposable();
         _viewContract = this
             .WhenAnyObservable(static x => x.ViewContractObservable)
-            .ToProperty(this, static x => x.ViewContract, initialValue: null, scheduler: RxApp.MainThreadScheduler);
+            .ToProperty(this, static x => x.ViewContract, initialValue: null, scheduler: RxSchedulers.MainThreadScheduler);
 
         Initialize();
     }
@@ -181,7 +181,7 @@ private void Initialize()
             .Select(x => x.DefaultContent);
 
         viewChange
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(
                 x =>
                 {
@@ -215,7 +215,7 @@ private void Initialize()
                 });
 
         defaultViewChange
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(x => Adopt(this, x));
     }
 }
diff --git a/src/ReactiveUI/Platforms/mac/AutoSuspendHelper.cs b/src/ReactiveUI/Platforms/mac/AutoSuspendHelper.cs
@@ -63,7 +63,7 @@ public AutoSuspendHelper(NSApplicationDelegate appDelegate)
     /// <returns>The termination reply from the application.</returns>
     public NSApplicationTerminateReply ApplicationShouldTerminate(NSApplication sender)
     {
-        RxApp.MainThreadScheduler.Schedule(() =>
+        RxSchedulers.MainThreadScheduler.Schedule(() =>
                                                _shouldPersistState.OnNext(Disposable.Create(() =>
                                                                               sender.ReplyToApplicationShouldTerminate(true))));
 
diff --git a/src/ReactiveUI/Platforms/mac/PlatformRegistrations.cs b/src/ReactiveUI/Platforms/mac/PlatformRegistrations.cs
@@ -31,8 +31,8 @@ public void Register(Action<Func<object>, Type> registerFunction)
 
         if (!ModeDetector.InUnitTestRunner())
         {
-            RxApp.TaskpoolScheduler = TaskPoolScheduler.Default;
-            RxApp.MainThreadScheduler = new WaitForDispatcherScheduler(static () => new NSRunloopScheduler());
+            RxSchedulers.TaskpoolScheduler = TaskPoolScheduler.Default;
+            RxSchedulers.MainThreadScheduler = new WaitForDispatcherScheduler(static () => new NSRunloopScheduler());
         }
 
         registerFunction(static () => new AppSupportJsonSuspensionDriver(), typeof(ISuspensionDriver));
diff --git a/src/ReactiveUI/Platforms/net/PlatformRegistrations.cs b/src/ReactiveUI/Platforms/net/PlatformRegistrations.cs
@@ -27,8 +27,8 @@ public void Register(Action<Func<object>, Type> registerFunction)
 
         if (!ModeDetector.InUnitTestRunner())
         {
-            RxApp.TaskpoolScheduler = TaskPoolScheduler.Default;
-            RxApp.MainThreadScheduler = DefaultScheduler.Instance;
+            RxSchedulers.TaskpoolScheduler = TaskPoolScheduler.Default;
+            RxSchedulers.MainThreadScheduler = DefaultScheduler.Instance;
         }
     }
 }
diff --git a/src/ReactiveUI/Platforms/netstandard2.0/PlatformRegistrations.cs b/src/ReactiveUI/Platforms/netstandard2.0/PlatformRegistrations.cs
diff --git a/src/ReactiveUI/Platforms/tizen/PlatformRegistrations.cs b/src/ReactiveUI/Platforms/tizen/PlatformRegistrations.cs
diff --git a/src/ReactiveUI/Platforms/uikit-common/CommonReactiveSource.cs b/src/ReactiveUI/Platforms/uikit-common/CommonReactiveSource.cs
diff --git a/src/ReactiveUI/Platforms/uikit-common/PlatformRegistrations.cs b/src/ReactiveUI/Platforms/uikit-common/PlatformRegistrations.cs
diff --git a/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionView.cs b/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionView.cs
diff --git a/src/ReactiveUI/Platforms/uikit-common/ReactiveTableView.cs b/src/ReactiveUI/Platforms/uikit-common/ReactiveTableView.cs
diff --git a/src/ReactiveUI/Platforms/uikit-common/UICollectionViewAdapter.cs b/src/ReactiveUI/Platforms/uikit-common/UICollectionViewAdapter.cs
diff --git a/src/ReactiveUI/Platforms/uikit-common/UITableViewAdapter.cs b/src/ReactiveUI/Platforms/uikit-common/UITableViewAdapter.cs
diff --git a/src/ReactiveUI/ReactiveCommand/ReactiveCommand.cs b/src/ReactiveUI/ReactiveCommand/ReactiveCommand.cs
diff --git a/src/ReactiveUI/ReactiveCommand/ReactiveCommandBase.cs b/src/ReactiveUI/ReactiveCommand/ReactiveCommandBase.cs
diff --git a/src/ReactiveUI/Routing/RoutingState.cs b/src/ReactiveUI/Routing/RoutingState.cs
diff --git a/src/ReactiveUI/RxSchedulers.cs b/src/ReactiveUI/RxSchedulers.cs

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public void Register(Action<Func<object>, Type> registerFunction)`
`53`	`53`	`PlatformEnlightenmentProvider.Current.EnableWasm();`
`54`	`54`	`}`
`55`	`55`
`56`		`- RxApp.TaskpoolScheduler = TaskPoolScheduler.Default;`
`57`		`- RxApp.MainThreadScheduler = CurrentThreadScheduler.Instance;`
	`56`	`+ RxSchedulers.TaskpoolScheduler = TaskPoolScheduler.Default;`
	`57`	`+ RxSchedulers.MainThreadScheduler = CurrentThreadScheduler.Instance;`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ protected static void OnStateObservableChanged(DependencyObject? sender, Depende`
`114`	`114`	`#pragma warning disable CA2208 // Instantiate argument exceptions correctly`
`115`	`115`	`var newValue = (IObservable<string>)e.NewValue ?? throw new ArgumentNullException(nameof(e.NewValue));`
`116`	`116`	`#pragma warning restore CA2208 // Instantiate argument exceptions correctly`
`117`		`- item._watcher = newValue.ObserveOn(RxApp.MainThreadScheduler).Subscribe(`
	`117`	`+ item._watcher = newValue.ObserveOn(RxSchedulers.MainThreadScheduler).Subscribe(`
`118`	`118`	`x =>`
`119`	`119`	`{`
`120`	`120`	`var target = item.TargetObject ?? item.AssociatedObject;`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ protected static void OnObservableChanged(DependencyObject sender, DependencyPro`
`62`	`62`	`triggerItem._watcher = null;`
`63`	`63`	`}`
`64`	`64`
`65`		`- triggerItem._watcher = ((IObservable<object>)e.NewValue).ObserveOn(RxApp.MainThreadScheduler).Subscribe(`
	`65`	`+ triggerItem._watcher = ((IObservable<object>)e.NewValue).ObserveOn(RxSchedulers.MainThreadScheduler).Subscribe(`
`66`	`66`	`triggerItem.InvokeActions,`
`67`	`67`	`_ =>`
`68`	`68`	`{`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ private static void OnObservableChanged(DependencyObject sender, DependencyPrope`
`117`	`117`	`{`
`118`	`118`	`var @this = (ObservableTriggerBehavior)sender;`
`119`	`119`
`120`		`- @this._watcher.Disposable = ((IObservable<object>)e.NewValue).ObserveOn(RxApp.MainThreadScheduler).Subscribe(`
	`120`	`+ @this._watcher.Disposable = ((IObservable<object>)e.NewValue).ObserveOn(RxSchedulers.MainThreadScheduler).Subscribe(`
`121`	`121`	`x => Interaction.ExecuteActions(@this._resolvedSource, @this.Actions, x),`
`122`	`122`	`ex =>`
`123`	`123`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public ChatRoomViewModel(IScreen hostScreen, ChatRoom room, string user)`
`40`	`40`	`MessageBus.Current.Listen<ChatNetworkMessage>(contract: room.Name)`
`41`	`41`	`.Where(msg => msg.InstanceId != Services.AppInstance.Id)`
`42`	`42`	`.Throttle(TimeSpan.FromMilliseconds(33))`
`43`		`- .ObserveOn(RxApp.MainThreadScheduler)`
	`43`	`+ .ObserveOn(RxSchedulers.MainThreadScheduler)`
`44`	`44`	`.Subscribe(msg =>`
`45`	`45`	`{`
`46`	`46`	`_room.Messages.Add(new ChatMessage { Sender = msg.Sender, Text = msg.Text, Timestamp = msg.Timestamp });`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public ViewModelViewHost()`
`86`	`86`	`this.WhenActivated(d =>`
`87`	`87`	`{`
`88`	`88`	`d(contractChanged`
`89`		`- .ObserveOn(RxApp.MainThreadScheduler)`
	`89`	`+ .ObserveOn(RxSchedulers.MainThreadScheduler)`
`90`	`90`	`.Subscribe(x => _viewContract = x ?? string.Empty));`
`91`	`91`
`92`	`92`	`d(vmAndContract.DistinctUntilChanged().Subscribe(x => ResolveViewForViewModel(x.ViewModel, x.Contract)));`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ public void Register(Action<Func<object>, Type> registerFunction)`
`43`	`43`
`44`	`44`	`if (!ModeDetector.InUnitTestRunner())`
`45`	`45`	`{`
`46`		`- RxApp.MainThreadScheduler = new WaitForDispatcherScheduler(static () => DispatcherQueueScheduler.Current);`
`47`		`- RxApp.TaskpoolScheduler = TaskPoolScheduler.Default;`
	`46`	`+ RxSchedulers.MainThreadScheduler = new WaitForDispatcherScheduler(static () => DispatcherQueueScheduler.Current);`
	`47`	`+ RxSchedulers.TaskpoolScheduler = TaskPoolScheduler.Default;`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`RxApp.SuppressViewCommandBindingMessage = true;`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public RoutedViewHost()`
`81`	`81`	`Router?`
`82`	`82`	`.Navigate`
`83`	`83`	`.Where(_ => StacksAreDifferent())`
`84`		`- .ObserveOn(RxApp.MainThreadScheduler)`
	`84`	`+ .ObserveOn(RxSchedulers.MainThreadScheduler)`
`85`	`85`	`.SelectMany(_ => PagesForViewModel(Router.GetCurrentViewModel()))`
`86`	`86`	`.SelectMany(async page =>`
`87`	`87`	`{`
`@@ -245,7 +245,7 @@ protected virtual Page PageForViewModel(IRoutableViewModel vm)`
`245`	`245`
`246`	`246`	`if (SetTitleOnNavigate)`
`247`	`247`	`{`
`248`		`- RxApp.MainThreadScheduler.Schedule(() => pg.Title = vm.UrlPathSegment);`
	`248`	`+ RxSchedulers.MainThreadScheduler.Schedule(() => pg.Title = vm.UrlPathSegment);`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`return pg;`