dep: Update ReactiveUI to 16.1.1

NatTypeTester.Models/NatTypeTester.Models.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\common.props" />
 
   <ItemGroup>
-    <PackageReference Include="ReactiveUI" Version="15.1.1" />
+    <PackageReference Include="ReactiveUI" Version="16.1.1" />
     <PackageReference Include="Volo.Abp.Core" Version="4.4.0" />
   </ItemGroup>
 

NatTypeTester.ViewModels/NatTypeTester.ViewModels.csproj

@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <PackageReference Include="Dns.Net.Abstractions" Version="0.1.0" />
-    <PackageReference Include="ReactiveUI" Version="15.1.1" />
+    <PackageReference Include="ReactiveUI" Version="16.1.1" />
     <PackageReference Include="Volo.Abp.Core" Version="4.4.0" />
   </ItemGroup>
 

NatTypeTester/MainWindow.xaml.cs

@@ -1,11 +1,11 @@
 using Microsoft.Extensions.DependencyInjection;
 using ModernWpf.Controls;
 using NatTypeTester.ViewModels;
+using ReactiveMarbles.ObservableEvents;
 using ReactiveUI;
 using System;
 using System.Linq;
 using System.Reactive.Disposables;
-using System.Reactive.Linq;
 using Volo.Abp.DependencyInjection;
 
 namespace NatTypeTester
@@ -34,16 +34,17 @@ namespace NatTypeTester
 				#endregion
 
 				this.Bind(ViewModel, vm => vm.Router, v => v.RoutedViewHost.Router).DisposeWith(d);
-				Observable.FromEventPattern<NavigationViewSelectionChangedEventArgs>(NavigationView, nameof(NavigationView.SelectionChanged))
-				.Subscribe(args =>
+
+				NavigationView.Events().SelectionChanged
+				.Subscribe(parameter =>
 				{
-					if (args.EventArgs.IsSettingsSelected)
+					if (parameter.args.IsSettingsSelected)
 					{
 						ViewModel.Router.Navigate.Execute(serviceProvider.GetRequiredService<SettingViewModel>());
 						return;
 					}
 
-					if (args.EventArgs.SelectedItem is not NavigationViewItem { Tag: string tag })
+					if (parameter.args.SelectedItem is not NavigationViewItem { Tag: string tag })
 					{
 						return;
 					}

NatTypeTester/NatTypeTester.csproj

@@ -14,8 +14,8 @@
     <PackageReference Include="Dns.Net" Version="0.1.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
     <PackageReference Include="ModernWpfUI" Version="0.9.4" />
-    <PackageReference Include="ReactiveUI.Events.WPF" Version="15.1.1" />
-    <PackageReference Include="ReactiveUI.WPF" Version="15.1.1" />
+    <PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.0.10" PrivateAssets="all" />
+    <PackageReference Include="ReactiveUI.WPF" Version="16.1.1" />
     <PackageReference Include="Splat.Microsoft.Extensions.DependencyInjection" Version="13.1.1" />
     <PackageReference Include="Volo.Abp.Autofac" Version="4.4.0" />
   </ItemGroup>

NatTypeTester/Views/RFC3489View.xaml.cs

@@ -1,11 +1,11 @@
 using JetBrains.Annotations;
 using NatTypeTester.Utils;
 using NatTypeTester.ViewModels;
+using ReactiveMarbles.ObservableEvents;
 using ReactiveUI;
 using System;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
-using System.Windows.Controls;
 using System.Windows.Input;
 using Volo.Abp.DependencyInjection;
 
@@ -30,8 +30,7 @@ namespace NatTypeTester.Views
 
 				this.BindCommand(ViewModel, vm => vm.TestClassicNatType, v => v.TestButton).DisposeWith(d);
 
-				this.Events()
-						.KeyDown
+				this.Events().KeyDown
 						.Where(x => x.Key == Key.Enter && TestButton.Command.CanExecute(default))
 						.Subscribe(_ => TestButton.Command.Execute(default))
 						.DisposeWith(d);

NatTypeTester/Views/RFC5780View.xaml.cs

@@ -1,11 +1,11 @@
 using JetBrains.Annotations;
 using NatTypeTester.Utils;
 using NatTypeTester.ViewModels;
+using ReactiveMarbles.ObservableEvents;
 using ReactiveUI;
 using System;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
-using System.Windows.Controls;
 using System.Windows.Input;
 using Volo.Abp.DependencyInjection;
 
@@ -34,8 +34,7 @@ namespace NatTypeTester.Views
 
 				this.BindCommand(ViewModel, vm => vm.DiscoveryNatType, v => v.DiscoveryButton).DisposeWith(d);
 
-				this.Events()
-						.KeyDown
+				this.Events().KeyDown
 						.Where(x => x.Key == Key.Enter && DiscoveryButton.Command.CanExecute(default))
 						.Subscribe(_ => DiscoveryButton.Command.Execute(default))
 						.DisposeWith(d);