diff --git a/samples/Directory.Packages.props b/samples/Directory.Packages.props index fe1691e..b506a18 100644 --- a/samples/Directory.Packages.props +++ b/samples/Directory.Packages.props @@ -14,17 +14,13 @@ - + - - - - - \ No newline at end of file + diff --git a/samples/Sample.Avalonia.Android/Application.cs b/samples/Sample.Avalonia.Android/Application.cs index 56d9a0e..71152ce 100644 --- a/samples/Sample.Avalonia.Android/Application.cs +++ b/samples/Sample.Avalonia.Android/Application.cs @@ -2,7 +2,6 @@ using Android.Runtime; using Avalonia; using Avalonia.Android; -using ReactiveUI.Avalonia; namespace Sample.Avalonia.Android; @@ -14,6 +13,6 @@ protected Application(nint javaReference, JniHandleOwnership transfer) : base(ja } protected override AppBuilder CustomizeAppBuilder(AppBuilder builder) { - return base.CustomizeAppBuilder(builder).UseReactiveUI(_ => { }); + return base.CustomizeAppBuilder(builder); } } diff --git a/samples/Sample.Avalonia.Browser/Program.cs b/samples/Sample.Avalonia.Browser/Program.cs index 56395c6..7e4e9c1 100644 --- a/samples/Sample.Avalonia.Browser/Program.cs +++ b/samples/Sample.Avalonia.Browser/Program.cs @@ -1,6 +1,5 @@ using Avalonia; using Avalonia.Browser; -using ReactiveUI.Avalonia; using Sample.Avalonia; using System.Runtime.Versioning; using System.Threading.Tasks; @@ -11,9 +10,8 @@ internal sealed partial class Program { private static Task Main(string[] args) => BuildAvaloniaApp() .WithInterFont() - .UseReactiveUI(_ => { }) .StartBrowserAppAsync("out"); public static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure(); -} \ No newline at end of file +} diff --git a/samples/Sample.Avalonia.Desktop/Program.cs b/samples/Sample.Avalonia.Desktop/Program.cs index 6f8a615..e4131d0 100644 --- a/samples/Sample.Avalonia.Desktop/Program.cs +++ b/samples/Sample.Avalonia.Desktop/Program.cs @@ -1,5 +1,4 @@ using Avalonia; -using ReactiveUI.Avalonia; using System; using System.Runtime.InteropServices; @@ -21,9 +20,8 @@ public static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure() .UsePlatformDetect() .WithInterFont() - .UseReactiveUI(_ => { }) .LogToTrace(); [DllImport("kernel32", SetLastError = true, CharSet = CharSet.Unicode)] private static extern bool SetDllDirectory(string lpPathName); -} \ No newline at end of file +} diff --git a/samples/Sample.Avalonia.iOS/AppDelegate.cs b/samples/Sample.Avalonia.iOS/AppDelegate.cs index 0983b55..ba4781b 100644 --- a/samples/Sample.Avalonia.iOS/AppDelegate.cs +++ b/samples/Sample.Avalonia.iOS/AppDelegate.cs @@ -1,7 +1,6 @@ using Avalonia; using Avalonia.iOS; using Foundation; -using ReactiveUI.Avalonia; namespace Sample.Avalonia.iOS; @@ -16,7 +15,6 @@ public partial class AppDelegate : AvaloniaAppDelegate protected override AppBuilder CustomizeAppBuilder(AppBuilder builder) { return base.CustomizeAppBuilder(builder) - .WithInterFont() - .UseReactiveUI(_ => { }); + .WithInterFont(); } } diff --git a/samples/Sample.Avalonia/Sample.Avalonia.csproj b/samples/Sample.Avalonia/Sample.Avalonia.csproj index aa50f3c..91ca3b0 100644 --- a/samples/Sample.Avalonia/Sample.Avalonia.csproj +++ b/samples/Sample.Avalonia/Sample.Avalonia.csproj @@ -26,7 +26,6 @@ All - diff --git a/samples/Sample.Common/ChildContentRegionViewModel.cs b/samples/Sample.Common/ChildContentRegionViewModel.cs index 71bbc3c..12fcd99 100644 --- a/samples/Sample.Common/ChildContentRegionViewModel.cs +++ b/samples/Sample.Common/ChildContentRegionViewModel.cs @@ -1,5 +1,5 @@ using AsyncNavigation.Abstractions; -using ReactiveUI.SourceGenerators; +using CommunityToolkit.Mvvm.Input; namespace Sample.Common; @@ -11,13 +11,13 @@ public ChildContentRegionViewModel(IRegionManager regionManager) _regionManager = regionManager; } - [ReactiveCommand] + [RelayCommand] private async Task AsyncNavigate(string param) { var (viewName, parameters) = SampleHelper.ParseNavigationParam(param); await _regionManager.RequestNavigateAsync("ChildContentRegion", viewName, parameters); } - [ReactiveCommand] + [RelayCommand] private Task UnloadView(string param) { return RequestUnloadAsync(CancellationToken.None); diff --git a/samples/Sample.Common/FrontDialogViewModel.cs b/samples/Sample.Common/FrontDialogViewModel.cs index 9eade91..36e8831 100644 --- a/samples/Sample.Common/FrontDialogViewModel.cs +++ b/samples/Sample.Common/FrontDialogViewModel.cs @@ -1,17 +1,18 @@ using AsyncNavigation.Abstractions; using AsyncNavigation.Core; -using ReactiveUI.SourceGenerators; +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; namespace Sample.Common; public partial class FrontDialogViewModel : InstanceCounterViewModel, IDialogAware { - [Reactive] + [ObservableProperty] private int _ratio; private CancellationTokenSource? _cts; public event AsyncEventHandler? RequestCloseAsync; public string Title => $"{nameof(LightViewModel)}:{InstanceNumber}"; - [ReactiveCommand] + [RelayCommand] private Task CloseDialog(string param) { if (RequestCloseAsync != null) diff --git a/samples/Sample.Common/HeavyViewModel.cs b/samples/Sample.Common/HeavyViewModel.cs index b871808..8c1aa27 100644 --- a/samples/Sample.Common/HeavyViewModel.cs +++ b/samples/Sample.Common/HeavyViewModel.cs @@ -1,7 +1,7 @@ using AsyncNavigation; using AsyncNavigation.Abstractions; using AsyncNavigation.Core; -using ReactiveUI.SourceGenerators; +using CommunityToolkit.Mvvm.Input; using System.Collections.ObjectModel; namespace Sample.Common; @@ -19,13 +19,13 @@ public ObservableCollection HeavyItems public event AsyncEventHandler? RequestCloseAsync; - [ReactiveCommand] + [RelayCommand] private Task UnloadView(string param) { return RequestUnloadAsync(CancellationToken.None); } - [ReactiveCommand] + [RelayCommand] private Task CloseDialog(string param) { return RequestCloseAsync!.Invoke(this, diff --git a/samples/Sample.Common/InfinityViewModel.cs b/samples/Sample.Common/InfinityViewModel.cs index cbb4969..49204cc 100644 --- a/samples/Sample.Common/InfinityViewModel.cs +++ b/samples/Sample.Common/InfinityViewModel.cs @@ -1,18 +1,17 @@ using AsyncNavigation; using AsyncNavigation.Abstractions; -using ReactiveUI; -using ReactiveUI.SourceGenerators; -using System.Reactive.Concurrency; +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; namespace Sample.Common; public partial class InfinityViewModel : InstanceCounterViewModel { - [Reactive] + [ObservableProperty] private string _nextRegionName = ""; - [Reactive] + [ObservableProperty] private string _buttonText = "Next"; - [Reactive] + [ObservableProperty] private bool _isActive = true; private readonly IRegionManager _regionManager; @@ -22,7 +21,7 @@ public InfinityViewModel(IRegionManager regionManager) _regionManager = regionManager; } - [ReactiveCommand] + [RelayCommand] private async Task AsyncNavigate(string param) { await _regionManager.RequestNavigateAsync(NextRegionName, param); diff --git a/samples/Sample.Common/ItemsRegionViewModel.cs b/samples/Sample.Common/ItemsRegionViewModel.cs index 88b678a..7e8ebaf 100644 --- a/samples/Sample.Common/ItemsRegionViewModel.cs +++ b/samples/Sample.Common/ItemsRegionViewModel.cs @@ -1,7 +1,6 @@ using AsyncNavigation; using AsyncNavigation.Abstractions; -using ReactiveUI; -using ReactiveUI.SourceGenerators; +using CommunityToolkit.Mvvm.Input; using System.Diagnostics; namespace Sample.Common; @@ -13,14 +12,14 @@ public ItemsRegionViewModel(IRegionManager regionManager) { _regionManager = regionManager; } - [ReactiveCommand] + [RelayCommand] private async Task AsyncNavigate(string param) { var (viewName, parameters) = SampleHelper.ParseNavigationParam(param); var ret = await _regionManager.RequestNavigateAsync("ItemsRegion", viewName, parameters); Debug.WriteLine(ret); } - [ReactiveCommand] + [RelayCommand] private Task AsyncNavigateAndForget(string param) { var (viewName, parameters) = SampleHelper.ParseNavigationParam(param); @@ -31,7 +30,7 @@ private Task AsyncNavigateAndForget(string param) }); return Task.CompletedTask; } - [ReactiveCommand] + [RelayCommand] private Task UnloadView(string param) { return RequestUnloadAsync(CancellationToken.None); diff --git a/samples/Sample.Common/LightViewModel.cs b/samples/Sample.Common/LightViewModel.cs index 3c0959f..7b44b44 100644 --- a/samples/Sample.Common/LightViewModel.cs +++ b/samples/Sample.Common/LightViewModel.cs @@ -1,6 +1,6 @@ using AsyncNavigation.Abstractions; using AsyncNavigation.Core; -using ReactiveUI.SourceGenerators; +using CommunityToolkit.Mvvm.Input; namespace Sample.Common; @@ -20,33 +20,33 @@ public LightViewModel(IRegionManager regionManager) } - [ReactiveCommand] + [RelayCommand] private Task UnloadView(string param) { return RequestUnloadAsync(CancellationToken.None); } - [ReactiveCommand] + [RelayCommand] private Task CloseDialog(string param) { return RequestCloseAsync!.Invoke(this, new DialogCloseEventArgs(new DialogResult(DialogButtonResult.OK), CancellationToken.None)); } - [ReactiveCommand] + [RelayCommand] private Task CloseDialogWithCancelling(string param) { var cts = new CancellationTokenSource(); cts.CancelAfter(TimeSpan.FromSeconds(2)); return RequestCloseAsync!.Invoke(this, new DialogCloseEventArgs(new DialogResult(DialogButtonResult.OK), cts.Token)); } - [ReactiveCommand] + [RelayCommand] private async Task AsyncPageNavigate(string param) { var (viewName, parameters) = SampleHelper.ParseNavigationParam(param); var ret = await _regionManager.RequestNavigateAsync("NavigationPageRegion", viewName); } - [ReactiveCommand] + [RelayCommand] private async Task AsyncTabbedPageNavigate(string param) { var (viewName, parameters) = SampleHelper.ParseNavigationParam(param); diff --git a/samples/Sample.Common/ListBoxRegionViewModel.cs b/samples/Sample.Common/ListBoxRegionViewModel.cs index 4d59376..f29d307 100644 --- a/samples/Sample.Common/ListBoxRegionViewModel.cs +++ b/samples/Sample.Common/ListBoxRegionViewModel.cs @@ -1,5 +1,5 @@ using AsyncNavigation.Abstractions; -using ReactiveUI.SourceGenerators; +using CommunityToolkit.Mvvm.Input; namespace Sample.Common; @@ -10,20 +10,20 @@ public ListBoxRegionViewModel(IRegionManager regionManager) { _regionManager = regionManager; } - [ReactiveCommand] + [RelayCommand] private async Task AsyncNavigate(string param) { var (viewName, parameters) = SampleHelper.ParseNavigationParam(param); await _regionManager.RequestNavigateAsync("CustomListBoxRegion", viewName, parameters); } - [ReactiveCommand] + [RelayCommand] private async Task GoForward() { await _regionManager.GoForwardAsync("CustomListBoxRegion"); } - [ReactiveCommand] + [RelayCommand] private async Task GoBack() { await _regionManager.GoBackAsync("CustomListBoxRegion"); diff --git a/samples/Sample.Common/MainWindowViewModel.cs b/samples/Sample.Common/MainWindowViewModel.cs index f5761c8..05f2582 100644 --- a/samples/Sample.Common/MainWindowViewModel.cs +++ b/samples/Sample.Common/MainWindowViewModel.cs @@ -1,11 +1,10 @@ using AsyncNavigation; using AsyncNavigation.Abstractions; using AsyncNavigation.Core; -using ReactiveUI; -using ReactiveUI.SourceGenerators; +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; using System.Collections.ObjectModel; using System.Diagnostics; -using System.Reactive.Linq; using System.Runtime.InteropServices; namespace Sample.Common; @@ -54,33 +53,31 @@ public MainWindowViewModel(IRegionManager regionManager, Views.Add("/Tab/Tab_A"); } - this.WhenAnyValue(vm => vm.SelectedView) - .WhereNotNull() - .Subscribe(target => - { - /// If the target starts with "/", we consider it a path navigation. - /// This logic can be customized based on your routing conventions. - if (target.StartsWith("/",StringComparison.OrdinalIgnoreCase)) - { - AsyncPathNavigateAndForget(target); - } - else - { - AsyncNavigateAndForget(target); - } - }); } public string FooterText => $"Powered by .NET {Environment.Version} • {RuntimeInformation.OSDescription}"; - [Reactive] + [ObservableProperty] private bool _isSplitViewPaneOpen = true; - public IObservable SupportDialog { get; } = Observable.Return(!OperatingSystem.IsBrowser()); public ObservableCollection Views { get; } - [Reactive] + [ObservableProperty] private string? _selectedView; + partial void OnSelectedViewChanged(string? value) + { + if (string.IsNullOrWhiteSpace(value)) + return; + + // Paths use router navigation; all other values are registered view names. + if (value.StartsWith("/", StringComparison.OrdinalIgnoreCase)) + AsyncPathNavigateAndForget(value); + else + AsyncNavigateAndForget(value); + } + + private bool CanUseDialogs() => !OperatingSystem.IsBrowser(); + public static bool FilterPredicate(string? search, object? item) { if (item is not null && !string.IsNullOrEmpty(search)) @@ -91,7 +88,7 @@ public static bool FilterPredicate(string? search, object? item) } - [ReactiveCommand] + [RelayCommand] private async Task AsyncNavigate(string param) { var (viewName, parameters) = SampleHelper.ParseNavigationParam(param); @@ -99,7 +96,7 @@ private async Task AsyncNavigate(string param) Debug.WriteLine(result.Duration.TotalMilliseconds); } - [ReactiveCommand] + [RelayCommand] private void AsyncNavigateAndForget(string param) { var (viewName, parameters) = SampleHelper.ParseNavigationParam(param); @@ -117,7 +114,7 @@ private void AsyncPathNavigateAndForget(string path) Debug.WriteLine($"RequestPathNavigateAsync:{result.Duration.TotalMilliseconds}"); }); } - [ReactiveCommand(CanExecute = nameof(SupportDialog))] + [RelayCommand(CanExecute = nameof(CanUseDialogs))] private void Show(string param) { _dialogService.ShowView(param, callBack: result => @@ -126,12 +123,12 @@ private void Show(string param) }); } - [ReactiveCommand(CanExecute = nameof(SupportDialog))] + [RelayCommand(CanExecute = nameof(CanUseDialogs))] private async Task AsyncShowDialog(string param) { var result = await _dialogService.ShowViewDialogAsync(param); } - [ReactiveCommand(CanExecute = nameof(SupportDialog))] + [RelayCommand(CanExecute = nameof(CanUseDialogs))] private async Task AsyncShowDialogWithCancelling(string param) { var cts = new CancellationTokenSource(); @@ -144,36 +141,36 @@ private async Task AsyncShowDialogWithCancelling(string param) Debug.WriteLine("Dialog was cancelled"); } } - [ReactiveCommand(CanExecute = nameof(SupportDialog))] + [RelayCommand(CanExecute = nameof(CanUseDialogs))] private void ShowDialog(string param) { var result = _dialogService.ShowViewDialog(param); } - [ReactiveCommand(CanExecute = nameof(SupportDialog))] + [RelayCommand(CanExecute = nameof(CanUseDialogs))] private void ShowWindow(string param) { var result = _dialogService.ShowWindowDialog(param); } - [ReactiveCommand(CanExecute = nameof(SupportDialog))] + [RelayCommand(CanExecute = nameof(CanUseDialogs))] private async Task AsyncShowWindow(string param) { await _dialogService.ShowWindowDialogAsync(param); } - [ReactiveCommand] + [RelayCommand] private async Task GoForward() { await _regionManager.GoForwardAsync("MainRegion"); } - [ReactiveCommand] + [RelayCommand] private async Task GoBack() { await _regionManager.GoBackAsync("MainRegion"); } - [ReactiveCommand] + [RelayCommand] private void Collect() { var beforeCollect = GC.GetTotalMemory(false); diff --git a/samples/Sample.Common/Sample.Common.csproj b/samples/Sample.Common/Sample.Common.csproj index 625e956..4e8db0a 100644 --- a/samples/Sample.Common/Sample.Common.csproj +++ b/samples/Sample.Common/Sample.Common.csproj @@ -7,11 +7,7 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/samples/Sample.Common/TabRegionViewModel.cs b/samples/Sample.Common/TabRegionViewModel.cs index d1c1029..4db905d 100644 --- a/samples/Sample.Common/TabRegionViewModel.cs +++ b/samples/Sample.Common/TabRegionViewModel.cs @@ -1,6 +1,6 @@ using AsyncNavigation; using AsyncNavigation.Abstractions; -using ReactiveUI.SourceGenerators; +using CommunityToolkit.Mvvm.Input; namespace Sample.Common; public partial class TabRegionViewModel : InstanceCounterViewModel @@ -11,31 +11,31 @@ public TabRegionViewModel(IRegionManager regionManager) _regionManager = regionManager; } - [ReactiveCommand] + [RelayCommand] private async Task AsyncNavigate(string param) { var (viewName, parameters) = SampleHelper.ParseNavigationParam(param); await _regionManager.RequestNavigateAsync("TabRegion", viewName, parameters); } - [ReactiveCommand] + [RelayCommand] private void AsyncNavigateAndForget(string param) { var (viewName, parameters) = SampleHelper.ParseNavigationParam(param); _ = _regionManager.RequestNavigateAsync("TabRegion", viewName, parameters); } - [ReactiveCommand] + [RelayCommand] private async Task GoForward() { await _regionManager.GoForwardAsync("TabRegion"); } - [ReactiveCommand] + [RelayCommand] private async Task GoBack() { await _regionManager.GoBackAsync("TabRegion"); } - [ReactiveCommand] + [RelayCommand] private async Task RequestUnloadView(NavigationContext navigationContext) { if (navigationContext.TryResolveNavigationAware(out var aware)) diff --git a/samples/Sample.Common/ViewModelBase.cs b/samples/Sample.Common/ViewModelBase.cs index ad445cf..da23213 100644 --- a/samples/Sample.Common/ViewModelBase.cs +++ b/samples/Sample.Common/ViewModelBase.cs @@ -1,17 +1,16 @@ using AsyncNavigation; using AsyncNavigation.Abstractions; using AsyncNavigation.Core; -using ReactiveUI; -using ReactiveUI.SourceGenerators; +using CommunityToolkit.Mvvm.ComponentModel; using System.Diagnostics.CodeAnalysis; namespace Sample.Common; -public abstract partial class ViewModelBase : ReactiveObject, INavigationAware +public abstract partial class ViewModelBase : ObservableObject, INavigationAware { - [Reactive] + [ObservableProperty] private string _name; - [Reactive] + [ObservableProperty] private bool _isDialog = false; public ViewModelBase() { diff --git a/samples/Sample.FrontDialog/Program.cs b/samples/Sample.FrontDialog/Program.cs index 5b8ee27..d3d77cc 100644 --- a/samples/Sample.FrontDialog/Program.cs +++ b/samples/Sample.FrontDialog/Program.cs @@ -1,5 +1,4 @@ using Avalonia; -using ReactiveUI.Avalonia; using System; namespace Sample.FrontDialog; @@ -18,6 +17,5 @@ public static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure() .UsePlatformDetect() .WithInterFont() - .LogToTrace() - .UseReactiveUI(_ => { }); + .LogToTrace(); } diff --git a/samples/Sample.FrontDialog/Sample.FrontDialog.csproj b/samples/Sample.FrontDialog/Sample.FrontDialog.csproj index 6f3c5f0..200c298 100644 --- a/samples/Sample.FrontDialog/Sample.FrontDialog.csproj +++ b/samples/Sample.FrontDialog/Sample.FrontDialog.csproj @@ -22,7 +22,6 @@ All - diff --git a/samples/Sample.InfinityNavigation/Program.cs b/samples/Sample.InfinityNavigation/Program.cs index 65b0a51..235c99b 100644 --- a/samples/Sample.InfinityNavigation/Program.cs +++ b/samples/Sample.InfinityNavigation/Program.cs @@ -1,5 +1,4 @@ using Avalonia; -using ReactiveUI.Avalonia; using System; namespace Sample.InfinityNavigation; @@ -18,6 +17,5 @@ public static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure() .UsePlatformDetect() .WithInterFont() - .LogToTrace() - .UseReactiveUI(_ => { }); + .LogToTrace(); } diff --git a/samples/Sample.InfinityNavigation/Sample.InfinityNavigation.csproj b/samples/Sample.InfinityNavigation/Sample.InfinityNavigation.csproj index 6f57aff..08bf116 100644 --- a/samples/Sample.InfinityNavigation/Sample.InfinityNavigation.csproj +++ b/samples/Sample.InfinityNavigation/Sample.InfinityNavigation.csproj @@ -26,7 +26,6 @@ - diff --git a/samples/Sample.WinUI/App.xaml.cs b/samples/Sample.WinUI/App.xaml.cs index 50c9f98..0d835b5 100644 --- a/samples/Sample.WinUI/App.xaml.cs +++ b/samples/Sample.WinUI/App.xaml.cs @@ -3,7 +3,6 @@ using AsyncNavigation.WinUI; using Microsoft.Extensions.DependencyInjection; using Microsoft.UI.Xaml; -using ReactiveUI.Builder; using Sample.Common; using Sample.WinUI.Views; using Sample.WinUI.Regions; @@ -21,9 +20,6 @@ public App() protected override void OnLaunched(LaunchActivatedEventArgs args) { - RxAppBuilder.CreateReactiveUIBuilder() - .WithWinUI() - .BuildApp(); var services = new ServiceCollection(); services.AddNavigationSupport() .AddSingleton() diff --git a/samples/Sample.WinUI/Sample.WinUI.csproj b/samples/Sample.WinUI/Sample.WinUI.csproj index 557a537..b11c8db 100644 --- a/samples/Sample.WinUI/Sample.WinUI.csproj +++ b/samples/Sample.WinUI/Sample.WinUI.csproj @@ -15,7 +15,6 @@ - diff --git a/samples/Sample.Wpf.InfinityNavigation/App.xaml.cs b/samples/Sample.Wpf.InfinityNavigation/App.xaml.cs index 50f7f6d..e90f73c 100644 --- a/samples/Sample.Wpf.InfinityNavigation/App.xaml.cs +++ b/samples/Sample.Wpf.InfinityNavigation/App.xaml.cs @@ -1,6 +1,5 @@ using AsyncNavigation.Abstractions; using Microsoft.Extensions.DependencyInjection; -using ReactiveUI.Builder; using Sample.Common; using Sample.Wpf.InfinityNavigation.Views; using System.Windows; @@ -15,9 +14,6 @@ public partial class App : Application protected override void OnStartup(StartupEventArgs e) { - RxAppBuilder.CreateReactiveUIBuilder() - .WithWpf() - .BuildApp(); Current.ShutdownMode = ShutdownMode.OnMainWindowClose; base.OnStartup(e); diff --git a/samples/Sample.Wpf.InfinityNavigation/Sample.Wpf.InfinityNavigation.csproj b/samples/Sample.Wpf.InfinityNavigation/Sample.Wpf.InfinityNavigation.csproj index 1911a95..73384de 100644 --- a/samples/Sample.Wpf.InfinityNavigation/Sample.Wpf.InfinityNavigation.csproj +++ b/samples/Sample.Wpf.InfinityNavigation/Sample.Wpf.InfinityNavigation.csproj @@ -11,7 +11,6 @@ - diff --git a/samples/Sample.Wpf/App.xaml.cs b/samples/Sample.Wpf/App.xaml.cs index 45babc7..e997c49 100644 --- a/samples/Sample.Wpf/App.xaml.cs +++ b/samples/Sample.Wpf/App.xaml.cs @@ -1,7 +1,6 @@ using AsyncNavigation.Core; using AsyncNavigation.Wpf; using Microsoft.Extensions.DependencyInjection; -using ReactiveUI.Builder; using Sample.Avalonia; using Sample.Common; using Sample.Wpf.Regions; @@ -17,10 +16,6 @@ public partial class App : Application { protected override void OnStartup(StartupEventArgs e) { - RxAppBuilder.CreateReactiveUIBuilder() - .WithWpf() - .BuildApp(); - Current.ShutdownMode = ShutdownMode.OnMainWindowClose; @@ -70,4 +65,4 @@ protected override void OnStartup(StartupEventArgs e) Current.MainWindow = mainWindow; mainWindow.Show(); } -} \ No newline at end of file +} diff --git a/samples/Sample.Wpf/Sample.Wpf.csproj b/samples/Sample.Wpf/Sample.Wpf.csproj index 3aee71b..bd261a5 100644 --- a/samples/Sample.Wpf/Sample.Wpf.csproj +++ b/samples/Sample.Wpf/Sample.Wpf.csproj @@ -15,7 +15,6 @@ -