Merge pull request #173 from reactivemarbles/CP_UpdateReactiveUI

ChrisPulman · web-flow · commit 25316746acc2 · 2025-03-16T14:18:55.000Z
Update ReactiveUI add AOT markup
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -30,7 +30,7 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
     <AvaloniaVersion>11.2.5</AvaloniaVersion>
-    <ReactiveUIVersion>20.1.63</ReactiveUIVersion>
+    <ReactiveUIVersion>20.2.45</ReactiveUIVersion>
     <XamarinReactiveUIVersion>19.6.12</XamarinReactiveUIVersion>
     <WebViewVersion>1.0.3124.44</WebViewVersion>
     <CrissCrossCoreTargetFrameworks>netstandard2.0;net8.0;net9.0</CrissCrossCoreTargetFrameworks>
diff --git a/Version.json b/Version.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "2.2.7",
+    "version": "2.2.8",
     "publicReleaseRefSpec": [
         "^refs/heads/master$",
         "^refs/heads/main$"
diff --git a/src/CrissCross.MAUI.Test/CrissCross.MAUI.Test.csproj b/src/CrissCross.MAUI.Test/CrissCross.MAUI.Test.csproj
@@ -54,8 +54,8 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.3" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.3" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.3" />
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.40" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.40" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.50" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.50" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/CrissCross.MAUI/CrissCross.MAUI.csproj b/src/CrissCross.MAUI/CrissCross.MAUI.csproj
@@ -15,6 +15,9 @@
     <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="$(TargetFramework.StartsWith('net8.0')) or $(TargetFramework.StartsWith('net9.0'))">
+    <IsAotCompatible>true</IsAotCompatible>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="CompiledBindings.MAUI" Version="1.0.18" />
     <PackageReference Include="ReactiveUI.Maui" Version="$(ReactiveUIVersion)" />
@@ -26,8 +29,8 @@
     <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.100" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith('net9'))">
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.40" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.40" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.50" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.50" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CrissCross\CrissCross.csproj" />
diff --git a/src/CrissCross.MAUI/NavigationShell.cs b/src/CrissCross.MAUI/NavigationShell.cs
@@ -4,6 +4,7 @@
 
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using System.Reflection;
@@ -21,6 +22,10 @@ namespace CrissCross.MAUI;
 /// <seealso cref="ISetNavigation" />
 /// <seealso cref="IViewModelRoutedViewHost" />
 /// <seealso cref="IUseNavigation" />
+#if NET8_0_OR_GREATER
+[RequiresDynamicCode("The method uses reflection and will not work in AOT environments.")]
+[RequiresUnreferencedCode("The method uses reflection and will not work in AOT environments.")]
+#endif
 public class NavigationShell : Shell, ISetNavigation, IViewModelRoutedViewHost, IUseNavigation, IDisposable
 {
     /// <summary>
diff --git a/src/CrissCross.WPF.Plot/CrissCross.WPF.Plot.csproj b/src/CrissCross.WPF.Plot/CrissCross.WPF.Plot.csproj
@@ -15,7 +15,7 @@
     <PackageReference Include="AppBarButton.WPF" Version="1.0.2" />
     <PackageReference Include="ReactiveList" Version="2.2.0" />
     <PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1" PrivateAssets="all" />
-    <PackageReference Include="ReactiveUI.SourceGenerators" Version="2.1.8" PrivateAssets="all" />
+    <PackageReference Include="ReactiveUI.SourceGenerators" Version="2.1.27" PrivateAssets="all" />
     <PackageReference Include="ScottPlot.WPF" Version="5.0.54" />
   </ItemGroup>
 
diff --git a/src/CrissCross.WPF.Plot/Live/AxisLinesUI.cs b/src/CrissCross.WPF.Plot/Live/AxisLinesUI.cs
@@ -2,7 +2,6 @@
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using System.Drawing;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using ReactiveUI;
@@ -133,6 +132,11 @@ public AxisLinesUI(
     /// <param name="position">The position.</param>
     public void CreateVerticalLine(double position = 0.0)
     {
+        if (string.IsNullOrWhiteSpace(ChartSettings.Color))
+        {
+            return;
+        }
+
         var color = ScottPlot.Color.FromColor(System.Drawing.Color.FromName(ChartSettings.Color));
         AxisLine = Plot.Plot.Add.VerticalLine(x: position, width: (float)ChartSettings.LineWidth, color: color);
         ////AxisLine.Text = LabelText;
@@ -147,6 +151,11 @@ public void CreateVerticalLine(double position = 0.0)
     /// <param name="position">The position.</param>
     public void CreateHorizontalLine(double position = 0.0)
     {
+        if (string.IsNullOrWhiteSpace(ChartSettings.Color))
+        {
+            return;
+        }
+
         var color = ScottPlot.Color.FromColor(System.Drawing.Color.FromName(ChartSettings.Color));
         AxisLine = Plot.Plot.Add.HorizontalLine(y: position, width: (float)ChartSettings.LineWidth, color: color);
         ////AxisLine.Text = LabelText;
@@ -211,9 +220,8 @@ private void AppearanceSubsriptions()
             AxisLine.IsVisible = x.Item3 != "Invisible";
             Plot.Refresh();
         }).DisposeWith(Disposables);
-        this.WhenAnyValue(x => x.ChartSettings.IsChecked).Subscribe(x =>
-        {
-            ChartSettings.Visibility = x == true ? "Invisible" : "Visible";
-        }).DisposeWith(Disposables);
+        this.WhenAnyValue(x => x.ChartSettings.IsChecked)
+            .Subscribe(x => ChartSettings.Visibility = x == true ? "Invisible" : "Visible")
+            .DisposeWith(Disposables);
     }
 }
diff --git a/src/CrissCross.WPF.Plot/Live/DataLoggerUI.cs b/src/CrissCross.WPF.Plot/Live/DataLoggerUI.cs
@@ -255,9 +255,8 @@ private void AppearanceSubsriptions()
             DataLogger.IsVisible = x.Item3 == "Invisible";
             Plot.Refresh();
         }).DisposeWith(Disposables);
-        this.WhenAnyValue(x => x.ChartSettings.IsChecked).Subscribe(x =>
-        {
-            ChartSettings.Visibility = x == true ? "Invisible" : "Visible";
-        }).DisposeWith(Disposables);
+        this.WhenAnyValue(x => x.ChartSettings.IsChecked)
+            .Subscribe(x => ChartSettings.Visibility = x == true ? "Invisible" : "Visible")
+            .DisposeWith(Disposables);
     }
 }
diff --git a/src/CrissCross.WPF.Plot/Live/IData.cs b/src/CrissCross.WPF.Plot/Live/IData.cs
@@ -7,5 +7,5 @@ namespace CrissCross.WPF.Plot;
 /// <summary>
 /// Interface IData.
 /// </summary>
-/// <seealso cref="CrissCross.RxObject" />
+/// <seealso cref="RxObject" />
 public partial class IData : RxObject;
diff --git a/src/CrissCross.WPF.Plot/Live/RightPropertiesV2ViewModel.cs b/src/CrissCross.WPF.Plot/Live/RightPropertiesV2ViewModel.cs
@@ -24,7 +24,7 @@ public partial class RightPropertiesV2ViewModel : RxObject
     [Reactive]
     private double _lineWidth;
     [Reactive]
-    private string _lineColor;
+    private string? _lineColor;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="RightPropertiesV2ViewModel"/> class.
diff --git a/src/CrissCross.WPF.Plot/Live/ScatterUI.cs b/src/CrissCross.WPF.Plot/Live/ScatterUI.cs
@@ -243,17 +243,17 @@ protected override void Dispose(bool disposing)
 
     private void AppearanceSubsriptions()
     {
-        this.WhenAnyValue(x => x.ChartSettings.LineWidth, x => x.ChartSettings.Color, x => x.ChartSettings.Visibility).Subscribe(x =>
-        {
-            Scatter!.LineStyle.Width = (float)x.Item1;
-            Scatter!.Color = ScottPlot.Color.FromColor(System.Drawing.Color.FromName(x.Item2));
-            ChartSettings.IsChecked = x.Item3 == "Invisible" ? true : false;
-            Scatter.IsVisible = x.Item3 == "Invisible" ? false : true;
-            Plot.Refresh();
-        }).DisposeWith(Disposables);
-        this.WhenAnyValue(x => x.ChartSettings.IsChecked).Subscribe(x =>
-        {
-            ChartSettings.Visibility = x == true ? "Invisible" : "Visible";
-        }).DisposeWith(Disposables);
+        this.WhenAnyValue(x => x.ChartSettings.LineWidth, x => x.ChartSettings.Color, x => x.ChartSettings.Visibility)
+            .Subscribe(x =>
+            {
+                Scatter!.LineStyle.Width = (float)x.Item1;
+                Scatter!.Color = ScottPlot.Color.FromColor(System.Drawing.Color.FromName(x.Item2));
+                ChartSettings.IsChecked = x.Item3 == "Invisible";
+                Scatter.IsVisible = x.Item3 != "Invisible";
+                Plot.Refresh();
+            }).DisposeWith(Disposables);
+        this.WhenAnyValue(x => x.ChartSettings.IsChecked)
+            .Subscribe(x => ChartSettings.Visibility = x ? "Invisible" : "Visible")
+            .DisposeWith(Disposables);
     }
 }
diff --git a/src/CrissCross.WPF.Plot/Live/Settings.cs b/src/CrissCross.WPF.Plot/Live/Settings.cs
@@ -2,7 +2,6 @@
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using System.Drawing;
 using System.Reactive;
 using ReactiveUI;
 using ReactiveUI.SourceGenerators;
diff --git a/src/CrissCross.WPF.Plot/Live/StreamerUI.cs b/src/CrissCross.WPF.Plot/Live/StreamerUI.cs
@@ -4,7 +4,6 @@
 
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
-using CrissCross;
 using ReactiveUI;
 using ReactiveUI.SourceGenerators;
 using ScottPlot;
@@ -226,13 +225,12 @@ private void AppearanceSubsriptions()
         {
             Streamer!.LineStyle.Width = (float)x.Item1;
             Streamer!.Color = ScottPlot.Color.FromColor(System.Drawing.Color.FromName(x.Item2));
-            ChartSettings.IsChecked = x.Item3 == "Invisible" ? true : false;
-            Streamer.IsVisible = x.Item3 == "Invisible" ? false : true;
+            ChartSettings.IsChecked = x.Item3 == "Invisible";
+            Streamer.IsVisible = x.Item3 != "Invisible";
             Plot.Refresh();
         }).DisposeWith(Disposables);
-        this.WhenAnyValue(x => x.ChartSettings.IsChecked).Subscribe(x =>
-        {
-            ChartSettings.Visibility = x == true ? "Invisible" : "Visible";
-        }).DisposeWith(Disposables);
+        this.WhenAnyValue(x => x.ChartSettings.IsChecked)
+            .Subscribe(x => ChartSettings.Visibility = x ? "Invisible" : "Visible")
+            .DisposeWith(Disposables);
     }
 }
diff --git a/src/CrissCross.WPF.Plot/Settings/ChartSettingsViewModel.cs b/src/CrissCross.WPF.Plot/Settings/ChartSettingsViewModel.cs
@@ -2,19 +2,6 @@
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-////using System.Reactive;
-////using System.Reactive.Disposables;
-////using System.Reactive.Linq;
-////using System.Windows;
-////using System.Windows.Controls;
-////using CP.Reactive;
-////using ReactiveMarbles.ObservableEvents;
-////using ReactiveUI;
-////using ReactiveUI.Fody.Helpers;
-////using ScottPlot;
-////using ScottPlot.Plottables;
-////using ScottPlot.WPF;
-
 namespace CrissCross.WPF.Plot;
 
 /// <summary>
diff --git a/src/CrissCross.WPF.UI.Gallery/CrissCross.WPF.UI.Gallery.csproj b/src/CrissCross.WPF.UI.Gallery/CrissCross.WPF.UI.Gallery.csproj
@@ -16,7 +16,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="ReactiveUI.SourceGenerators" Version="2.1.8" PrivateAssets="all" />
+    <PackageReference Include="ReactiveUI.SourceGenerators" Version="2.1.27" PrivateAssets="all" />
     <PackageReference Include="CompiledBindings.WPF" Version="1.0.18" />
   </ItemGroup>
 
diff --git a/src/CrissCross.WPF.UI/CrissCross.WPF.UI.csproj b/src/CrissCross.WPF.UI/CrissCross.WPF.UI.csproj
@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CP.Extensions.Hosting.ReactiveUI.Wpf" Version="2.1.8" />
+    <PackageReference Include="CP.Extensions.Hosting.ReactiveUI.Wpf" Version="2.1.10" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.3" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.3" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.3" />
@@ -38,7 +38,7 @@
     <PackageReference Include="CP.Xaml.Converters" Version="1.0.2" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
     <PackageReference Include="CompiledBindings.WPF" Version="1.0.18" />
-    <PackageReference Include="ReactiveUI.SourceGenerators" Version="2.1.8" PrivateAssets="all" />
+    <PackageReference Include="ReactiveUI.SourceGenerators" Version="2.1.27" PrivateAssets="all" />
     <PackageReference Include="PolySharp" Version="1.15.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/CrissCross/CrissCross.csproj b/src/CrissCross/CrissCross.csproj
@@ -5,6 +5,9 @@
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);$(CrissCrossWinTargetFrameworks)</TargetFrameworks>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
   </PropertyGroup>
+  <PropertyGroup Condition="$(TargetFramework.StartsWith('net8.0')) or $(TargetFramework.StartsWith('net9.0'))">
+    <IsAotCompatible>true</IsAotCompatible>
+  </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="ReactiveUI" Version="$(ReactiveUIVersion)" />
diff --git a/src/CrissCross/NavigationEvents/ViewModelNavigatingEventArgs.cs b/src/CrissCross/NavigationEvents/ViewModelNavigatingEventArgs.cs
@@ -10,23 +10,18 @@ namespace CrissCross;
 /// <summary>
 /// View Model Navigating Event Args.
 /// </summary>
+/// <remarks>
+/// Initializes a new instance of the <see cref="ViewModelNavigatingEventArgs" /> class.
+/// </remarks>
+/// <param name="from">From.</param>
+/// <param name="to">To.</param>
+/// <param name="navType">Type of the nav.</param>
+/// <param name="view">The view.</param>
+/// <param name="hostName">The hostName.</param>
+/// <param name="parmeter">The parmeter.</param>
 [DataContract]
-public class ViewModelNavigatingEventArgs : ViewModelNavigationEventArgs, IViewModelNavigatingEventArgs
+public class ViewModelNavigatingEventArgs(IRxObject? from, IRxObject? to, NavigationType navType, IViewFor? view, string? hostName, object? parmeter = null) : ViewModelNavigationEventArgs(from, to, navType, view, hostName, parmeter), IViewModelNavigatingEventArgs
 {
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ViewModelNavigatingEventArgs" /> class.
-    /// </summary>
-    /// <param name="from">From.</param>
-    /// <param name="to">To.</param>
-    /// <param name="navType">Type of the nav.</param>
-    /// <param name="view">The view.</param>
-    /// <param name="hostName">The hostName.</param>
-    /// <param name="parmeter">The parmeter.</param>
-    public ViewModelNavigatingEventArgs(IRxObject? from, IRxObject? to, NavigationType navType, IViewFor? view, string? hostName, object? parmeter = null)
-        : base(from, to, navType, view, hostName, parmeter)
-    {
-    }
-
     /// <summary>
     /// Gets or sets a value indicating whether this <see cref="ViewModelNavigatingEventArgs"/>
     /// is canceled.
diff --git a/src/CrissCross/RxObject.cs b/src/CrissCross/RxObject.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for full license information.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Reactive.Disposables;
 using ReactiveUI;
 
@@ -13,6 +14,10 @@ namespace CrissCross;
 /// </summary>
 /// <seealso cref="ReactiveObject" />
 /// <seealso cref="IRxObject" />
+#if NET8_0_OR_GREATER
+[RequiresDynamicCode("The method uses reflection and will not work in AOT environments.")]
+[RequiresUnreferencedCode("The method uses reflection and will not work in AOT environments.")]
+#endif
 public abstract class RxObject : ReactiveObject, IRxObject
 {
     /// <summary>
diff --git a/src/CrissCross/RxObjectMixins.cs b/src/CrissCross/RxObjectMixins.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reactive;
@@ -19,6 +20,10 @@ namespace CrissCross;
 /// <summary>
 /// RxObjectMixins.
 /// </summary>
+#if NET8_0_OR_GREATER
+[RequiresDynamicCode("The method uses reflection and will not work in AOT environments.")]
+[RequiresUnreferencedCode("The method uses reflection and will not work in AOT environments.")]
+#endif
 public static class RxObjectMixins
 {
     private static readonly ReplaySubject<Unit> _buildCompleteSubject = new(1);
diff --git a/src/CrissCross/ViewModelRoutedViewHostMixins.cs b/src/CrissCross/ViewModelRoutedViewHostMixins.cs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",`
`3`		`- "version": "2.2.7",`
	`3`	`+ "version": "2.2.8",`
`4`	`4`	`"publicReleaseRefSpec": [`
`5`	`5`	`"^refs/heads/master$",`
`6`	`6`	`"^refs/heads/main$"`
Original file line number	Diff line number	Diff line change
`@@ -255,9 +255,8 @@ private void AppearanceSubsriptions()`
`255`	`255`	`DataLogger.IsVisible = x.Item3 == "Invisible";`
`256`	`256`	`Plot.Refresh();`
`257`	`257`	`}).DisposeWith(Disposables);`
`258`		`- this.WhenAnyValue(x => x.ChartSettings.IsChecked).Subscribe(x =>`
`259`		`- {`
`260`		`- ChartSettings.Visibility = x == true ? "Invisible" : "Visible";`
`261`		`- }).DisposeWith(Disposables);`
	`258`	`+ this.WhenAnyValue(x => x.ChartSettings.IsChecked)`
	`259`	`+ .Subscribe(x => ChartSettings.Visibility = x == true ? "Invisible" : "Visible")`
	`260`	`+ .DisposeWith(Disposables);`
`262`	`261`	`}`
`263`	`262`	`}`