Switch to RxSchedulers, adjust ReactiveUI and deps

CyLuGh · CyLuGh · commit e1ee327cbfa0 · 2026-03-03T15:16:32.000+01:00
Migrate ReactiveUI scheduler and state APIs and update related code—replace RxApp.MainThreadScheduler with RxSchedulers.MainThreadScheduler and RxApp.DefaultExceptionHandler with RxState.DefaultExceptionHandler; adapt UseReactiveUI call to the builder overload and add a WPF startup ReactiveUI builder. Also add explicit Convert.ToDouble bindings for scrollbar maximums. Bump multiple package versions (Avalonia, ReactiveUI, ReactiveUI.Avalonia, SkiaSharp, Svg.Skia, System.Text.Json, NLog, Microsoft.NET.Test.Sdk, and others) to newer releases. Changes touch demo apps, WPF/Avalonia views, view models, observable extensions, and several csproj files to align with API updates and dependency upgrades.
diff --git a/src/Demo.AvaloniaApplication.Desktop/Demo.AvaloniaApplication.Desktop.csproj b/src/Demo.AvaloniaApplication.Desktop/Demo.AvaloniaApplication.Desktop.csproj
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.10" />
-    <PackageReference Include="System.Text.Json" Version="10.0.1" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.12" />
+    <PackageReference Include="System.Text.Json" Version="10.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Demo.AvaloniaApplication.Desktop/Program.cs b/src/Demo.AvaloniaApplication.Desktop/Program.cs
@@ -20,5 +20,5 @@ public static AppBuilder BuildAvaloniaApp() =>
             .UsePlatformDetect()
             .WithInterFont()
             .LogToTrace()
-            .UseReactiveUI();
+            .UseReactiveUI(builder => { });
 }
diff --git a/src/Demo.AvaloniaApplication/Demo.AvaloniaApplication.csproj b/src/Demo.AvaloniaApplication/Demo.AvaloniaApplication.csproj
@@ -14,17 +14,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.10" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.10" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.10" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.10" />
+    <PackageReference Include="Avalonia" Version="11.3.12" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.12" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.12" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.12" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.10" />
-    <PackageReference Include="Splat.DependencyInjection.SourceGenerator" Version="1.2.3">
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.12" />
+    <PackageReference Include="Splat.DependencyInjection.SourceGenerator" Version="2.2.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Text.Json" Version="10.0.1" />
+    <PackageReference Include="System.Text.Json" Version="10.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Demo/App.xaml.cs b/src/Demo/App.xaml.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using NLog.Targets;
+using ReactiveUI.Builder;
 using Splat;
 
 namespace Demo
@@ -21,6 +22,13 @@ public App()
             // Locator.CurrentMutable.UseNLogWithWrappingFullLogger();
         }
 
+        protected override void OnStartup(StartupEventArgs e)
+        {
+            base.OnStartup(e);
+
+            var _ = RxAppBuilder.CreateReactiveUIBuilder().WithWpf().BuildApp();
+        }
+
         private void ConfigureLogs()
         {
             var config = new NLog.Config.LoggingConfiguration();
diff --git a/src/Demo/CanvasWindow.xaml.cs b/src/Demo/CanvasWindow.xaml.cs
@@ -31,14 +31,14 @@ public CanvasWindow()
             TestGrid.ViewModel.SelectionMode = SelectionMode.Single;
 
             HierarchyGrid
-                .ViewModel.SelectionChanged.ObserveOn(RxApp.MainThreadScheduler)
+                .ViewModel.SelectionChanged.ObserveOn(RxSchedulers.MainThreadScheduler)
                 .Subscribe(selections =>
                 {
                     TextBlockSelection.Text = $"Selection count: {selections.Length}";
                 });
 
             HierarchyGrid
-                .ViewModel.EditedCellChanged.ObserveOn(RxApp.MainThreadScheduler)
+                .ViewModel.EditedCellChanged.ObserveOn(RxSchedulers.MainThreadScheduler)
                 .Subscribe(oec =>
                 {
                     TextBlockEdition.Text = oec.Match(
diff --git a/src/Demo/Demo.csproj b/src/Demo/Demo.csproj
@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="Bogus" Version="35.6.5" />
-    <PackageReference Include="NLog" Version="6.0.7" />
+    <PackageReference Include="NLog" Version="6.1.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/HierarchyGrid.Avalonia/Grid.axaml.cs b/src/HierarchyGrid.Avalonia/Grid.axaml.cs
@@ -50,7 +50,7 @@ public Grid()
             this.WhenAnyValue(x => x.ViewModel)
                 .WhereNotNull()
                 .Throttle(TimeSpan.FromMilliseconds(50))
-                .ObserveOn(RxApp.MainThreadScheduler)
+                .ObserveOn(RxSchedulers.MainThreadScheduler)
                 .Do(vm => PopulateFromViewModel(this, vm, disposables))
                 .Subscribe()
                 .DisposeWith(disposables);
@@ -100,7 +100,7 @@ CompositeDisposable disposables
                 handler => view.SkiaElement.PaintSurface += handler,
                 handler => view.SkiaElement.PaintSurface -= handler
             )
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe()
             .DisposeWith(disposables);
 
@@ -110,7 +110,7 @@ CompositeDisposable disposables
                 handler => view.SkiaElement.PointerMoved += handler,
                 handler => view.SkiaElement.PointerMoved -= handler
             )
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe()
             .DisposeWith(disposables);
 
@@ -129,7 +129,7 @@ CompositeDisposable disposables
                 handler => view.SkiaElement.PointerPressed += handler,
                 handler => view.SkiaElement.PointerPressed -= handler
             )
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe()
             .DisposeWith(disposables);
 
@@ -139,7 +139,7 @@ CompositeDisposable disposables
                 handler => view.SkiaElement.PointerWheelChanged += handler,
                 handler => view.SkiaElement.PointerWheelChanged -= handler
             )
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe()
             .DisposeWith(disposables);
 
@@ -185,10 +185,20 @@ CompositeDisposable disposables
             )
             .DisposeWith(disposables);
 
-        view.OneWayBind(viewModel, vm => vm.MaxHorizontalOffset, v => v.HorizontalScrollBar.Maximum)
+        view.OneWayBind(
+                viewModel,
+                vm => vm.MaxHorizontalOffset,
+                v => v.HorizontalScrollBar.Maximum,
+                Convert.ToDouble
+            )
             .DisposeWith(disposables);
 
-        view.OneWayBind(viewModel, vm => vm.MaxVerticalOffset, v => v.VerticalScrollBar.Maximum)
+        view.OneWayBind(
+                viewModel,
+                vm => vm.MaxVerticalOffset,
+                v => v.VerticalScrollBar.Maximum,
+                Convert.ToDouble
+            )
             .DisposeWith(disposables);
 
         view.SkiaElement.Invalidate();
diff --git a/src/HierarchyGrid.Avalonia/HierarchyGrid.Avalonia.csproj b/src/HierarchyGrid.Avalonia/HierarchyGrid.Avalonia.csproj
@@ -19,13 +19,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.Skia" Version="11.3.10" />
+    <PackageReference Include="Avalonia.Skia" Version="11.3.12" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.10" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.12" />
     <PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1" PrivateAssets="all" />
-    <PackageReference Include="ReactiveUI.Avalonia" Version="11.3.8" />
-    <PackageReference Include="SkiaSharp.Views" Version="3.119.1" />
-    <PackageReference Include="System.Text.Json" Version="10.0.1" />
+    <PackageReference Include="ReactiveUI.Avalonia" Version="11.4.7" />
+    <PackageReference Include="SkiaSharp.Views" Version="3.119.2" />
+    <PackageReference Include="System.Text.Json" Version="10.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/HierarchyGrid.Definitions.Tests/HierarchyGrid.Definitions.Tests.csproj b/src/HierarchyGrid.Definitions.Tests/HierarchyGrid.Definitions.Tests.csproj
@@ -7,8 +7,8 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="8.8.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
-    <PackageReference Include="System.Text.Json" Version="10.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+    <PackageReference Include="System.Text.Json" Version="10.0.3" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/HierarchyGrid.Definitions/HierarchyGrid.Definitions.csproj b/src/HierarchyGrid.Definitions/HierarchyGrid.Definitions.csproj
@@ -32,11 +32,11 @@
   <ItemGroup>
     <PackageReference Include="LanguageExt.Core" Version="4.4.9" />
     <PackageReference Include="morelinq" Version="4.4.0" />
-    <PackageReference Include="ReactiveUI" Version="22.3.1" />
-    <PackageReference Include="ReactiveUI.SourceGenerators" Version="2.5.1">
+    <PackageReference Include="ReactiveUI" Version="23.1.8" />
+    <PackageReference Include="ReactiveUI.SourceGenerators" Version="2.6.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Text.Json" Version="10.0.1" />
+    <PackageReference Include="System.Text.Json" Version="10.0.3" />
   </ItemGroup>
 </Project>
diff --git a/src/HierarchyGrid.Definitions/HierarchyGridViewModel.cs b/src/HierarchyGrid.Definitions/HierarchyGridViewModel.cs
@@ -37,13 +37,13 @@ public partial class HierarchyGridViewModel : ReactiveObject, IActivatableViewMo
             .Select(seq => seq.Length > 0)
             .CombineLatest(this.WhenAnyValue(x => x.Consumers).Select(seq => seq.Length > 0))
             .Select(t => t is { First: true, Second: true })
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Do(b =>
             {
                 if (!b && string.IsNullOrEmpty(StatusMessage))
                     StatusMessage = "No data";
             })
-            .ObserveOn(RxApp.MainThreadScheduler);
+            .ObserveOn(RxSchedulers.MainThreadScheduler);
 
     /// <summary>
     /// Message displayed when the grid has no data
@@ -123,10 +123,10 @@ public Seq<PositionedCell> Selections
                 );
                 return editor.IsSome;
             })
-            .ObserveOn(RxApp.MainThreadScheduler);
+            .ObserveOn(RxSchedulers.MainThreadScheduler);
 
     public Interaction<Seq<PositionedCell>, RxUnit> DrawEditionTextBoxInteraction { get; } =
-        new(RxApp.MainThreadScheduler);
+        new(RxSchedulers.MainThreadScheduler);
 
     /// <summary>
     /// Cells with extra rendering elements
@@ -326,27 +326,27 @@ public HierarchyGridState GridState
 
     public ReactiveCommand<bool, RxUnit> DrawGridCommand { get; }
     public Interaction<RxUnit, RxUnit> DrawGridInteraction { get; } =
-        new(RxApp.MainThreadScheduler);
+        new(RxSchedulers.MainThreadScheduler);
 
     public ReactiveCommand<
         (Option<PositionedCell>, Option<PositionedDefinition>),
         RxUnit
     > HandleTooltipCommand { get; }
     public RxCommand CloseTooltip { get; }
     public Interaction<RxUnit, RxUnit> CloseTooltipInteraction { get; } =
-        new(RxApp.MainThreadScheduler);
+        new(RxSchedulers.MainThreadScheduler);
     public Interaction<PositionedCell, RxUnit> ShowTooltipInteraction { get; } =
-        new(RxApp.MainThreadScheduler);
+        new(RxSchedulers.MainThreadScheduler);
     public Interaction<PositionedDefinition, RxUnit> ShowHeaderTooltipInteraction { get; } =
-        new(RxApp.MainThreadScheduler);
+        new(RxSchedulers.MainThreadScheduler);
 
     public ReactiveCommand<CopyMode, RxUnit> CopyToClipboardCommand { get; }
     public Interaction<string, RxUnit> FillClipboardInteraction { get; } =
-        new(RxApp.MainThreadScheduler);
+        new(RxSchedulers.MainThreadScheduler);
 
     [ObservableAsProperty(PropertyName = "IsCopyingToClipboard")]
     private IObservable<bool> IsCopyingToClipboardObservable =>
-        CopyToClipboardCommand.IsExecuting.ObserveOn(RxApp.MainThreadScheduler);
+        CopyToClipboardCommand.IsExecuting.ObserveOn(RxSchedulers.MainThreadScheduler);
 
     public ReactiveCommand<bool, RxUnit> ToggleStatesCommand { get; }
 
@@ -433,7 +433,7 @@ private void ManageOffsets(CompositeDisposable disposables)
             )
             .Throttle(TimeSpan.FromMilliseconds(5))
             .Where(x => x)
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .SubscribeSafe(_ => HorizontalOffset = MaxHorizontalOffset)
             .DisposeWith(disposables);
 
@@ -442,7 +442,7 @@ private void ManageOffsets(CompositeDisposable disposables)
             .CombineLatest(this.WhenAnyValue(x => x.MaxVerticalOffset), (vo, m) => vo > m && m > 0)
             .Throttle(TimeSpan.FromMilliseconds(5))
             .Where(x => x)
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .SubscribeSafe(_ => VerticalOffset = MaxVerticalOffset)
             .DisposeWith(disposables);
 
diff --git a/src/HierarchyGrid.Definitions/IObservableExtensions.cs b/src/HierarchyGrid.Definitions/IObservableExtensions.cs
@@ -75,7 +75,7 @@ public static IDisposable SubscribeSafe<T>(
                 );
 
                 // Delete this line if you're not using ReactiveUI.
-                RxApp.DefaultExceptionHandler.OnNext(ex);
+                RxState.DefaultExceptionHandler.OnNext(ex);
             }
         );
     }
@@ -111,7 +111,7 @@ public static IDisposable SubscribeSafe<T>(
                 );
 
                 // Delete this line if you're not using ReactiveUI.
-                RxApp.DefaultExceptionHandler.OnNext(ex);
+                RxState.DefaultExceptionHandler.OnNext(ex);
             }
         );
     }
diff --git a/src/HierarchyGrid.Skia/HierarchyGrid.Skia.csproj b/src/HierarchyGrid.Skia/HierarchyGrid.Skia.csproj
@@ -16,13 +16,13 @@
 	</PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="3.119.1" />
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="3.119.1" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.119.1" />
-    <PackageReference Include="SkiaSharp.NativeAssets.macOS" Version="3.119.1" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="3.119.1" />
-    <PackageReference Include="Svg.Skia" Version="3.3.0" />
-    <PackageReference Include="System.Text.Json" Version="10.0.1" />
+    <PackageReference Include="SkiaSharp" Version="3.119.2" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="3.119.2" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.119.2" />
+    <PackageReference Include="SkiaSharp.NativeAssets.macOS" Version="3.119.2" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="3.119.2" />
+    <PackageReference Include="Svg.Skia" Version="3.4.1" />
+    <PackageReference Include="System.Text.Json" Version="10.0.3" />
     <PackageReference Include="Topten.RichTextKit" Version="0.4.167" />
   </ItemGroup>
 
diff --git a/src/HierarchyGrid/HierarchyGrid.csproj b/src/HierarchyGrid/HierarchyGrid.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<TargetFramework>net8.0-windows10.0.19041</TargetFramework>
@@ -23,9 +23,9 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="ReactiveUI.WPF" Version="22.3.1" />
-		<PackageReference Include="SkiaSharp.HarfBuzz" Version="3.119.1" />
-		<PackageReference Include="SkiaSharp.Views.WPF" Version="3.119.1" />
+		<PackageReference Include="ReactiveUI.WPF" Version="23.1.8" />
+		<PackageReference Include="SkiaSharp.HarfBuzz" Version="3.119.2" />
+		<PackageReference Include="SkiaSharp.Views.WPF" Version="3.119.2" />
 		<PackageReference Include="TextCopy" Version="6.2.1" />
 	</ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@ public static AppBuilder BuildAvaloniaApp() =>`
`20`	`20`	`.UsePlatformDetect()`
`21`	`21`	`.WithInterFont()`
`22`	`22`	`.LogToTrace()`
`23`		`- .UseReactiveUI();`
	`23`	`+ .UseReactiveUI(builder => { });`
`24`	`24`	`}`