From bbaebb8332d8f46fcd5c12c4c1e84d4cc37ad566 Mon Sep 17 00:00:00 2001 From: pomianowski Date: Sat, 13 Aug 2022 15:50:09 +0200 Subject: [PATCH] Replace MS Toolkit with Community Toolkit --- docs/SERVICES.md | 18 ++++++++++++------ src/Packages.props | 2 +- src/Wpf.Ui.Demo/ViewModels/ButtonsViewModel.cs | 4 ++-- src/Wpf.Ui.Demo/ViewModels/ColorsViewModel.cs | 4 ++-- .../ViewModels/ContainerViewModel.cs | 2 +- .../ViewModels/DashboardViewModel.cs | 4 ++-- src/Wpf.Ui.Demo/ViewModels/DataViewModel.cs | 2 +- src/Wpf.Ui.Demo/ViewModels/DebugViewModel.cs | 2 +- .../ViewModels/ExperimentalViewModel.cs | 2 +- src/Wpf.Ui.Demo/ViewModels/IconsViewModel.cs | 4 ++-- src/Wpf.Ui.Demo/ViewModels/InputViewModel.cs | 2 +- .../ViewModels/TaskManagerViewModel.cs | 2 +- src/Wpf.Ui.Demo/Views/Pages/Input.xaml | 2 +- src/Wpf.Ui.Demo/Wpf.Ui.Demo.csproj | 2 +- .../ViewModels/ContainerViewModel.cs | 2 +- .../ViewModels/DashboardViewModel.cs | 4 ++-- .../ViewModels/DataViewModel.cs | 2 +- .../ViewModels/SettingsViewModel.cs | 4 ++-- .../Wpf.Ui.Mvvm.CompactNavigation.csproj | 2 +- .../ViewModels/ContainerViewModel.cs | 2 +- .../ViewModels/DashboardViewModel.cs | 4 ++-- .../ViewModels/DataViewModel.cs | 2 +- .../ViewModels/SettingsViewModel.cs | 4 ++-- .../Wpf.Ui.Mvvm.FluentNavigation.csproj | 2 +- .../ViewModels/ContainerViewModel.cs | 2 +- .../ViewModels/DashboardViewModel.cs | 4 ++-- .../ViewModels/DataViewModel.cs | 2 +- .../ViewModels/SettingsViewModel.cs | 4 ++-- .../Wpf.Ui.Mvvm.StoreNavigation.csproj | 2 +- 29 files changed, 50 insertions(+), 44 deletions(-) diff --git a/docs/SERVICES.md b/docs/SERVICES.md index 509f5a9db..a864c926d 100644 --- a/docs/SERVICES.md +++ b/docs/SERVICES.md @@ -1,8 +1,10 @@ # Services -**WPF UI** tries to support ***Dependency Injection*** (DI) and ***Model-View-ViewModel*** (MVVM) patterns. -If you use [CommunityToolkit](https://github.com/CommunityToolkit/dotnet) or [Microsoft.Toolkit.Mvvm](https://docs.microsoft.com/en-us/windows/communitytoolkit/mvvm/introduction) in your application, the services listed below may be useful for you. + +**WPF UI** tries to support **_Dependency Injection_** (DI) and **_Model-View-ViewModel_** (MVVM) patterns. +If you use [CommunityToolkit](https://github.com/CommunityToolkit/dotnet) or [CommunityToolkit.Mvvm](https://docs.microsoft.com/en-us/windows/communitytoolkit/mvvm/introduction) in your application, the services listed below may be useful for you. ## Getting started + **MVVM** Model–view–viewmodel (MVVM) is a software architectural pattern that facilitates the separation of the development of the graphical user interface (the view) – be it via a markup language or GUI code – from the development of the business logic or back-end logic (the model) so that the view is not dependent on any specific model platform.[^1] @@ -11,34 +13,41 @@ In software engineering, dependency injection is a design pattern in which an ob **Sources in WPF UI** The classes and interfaces created for MVVM and DI are located in the namespace: + ```cpp namespace Wpf.Ui.Mvvm.Services; ``` # DialogService + `DialogService` is responsible for managing the display of the `Dialog` control. ### Contract + ```cpp interface Wpf.Ui.Mvvm.Contracts.IDialogService ``` ### Implementation + ```cpp class Wpf.Ui.Mvvm.Services.DialogService ``` ## Exposes + ```cpp // Sets the IDialogControl IDialogService.SetDialogControl(IDialogControl dialog); ``` + ```cpp // Provides direct access to the IDialogControl IDialogService.GetDialogControl(); ``` ### How to use + ```cpp // Services registration in your service management class private static void ConfigureServices(HostBuilderContext context, IServiceCollection services) @@ -53,8 +62,5 @@ public Container(IDialogService dialogService) } ``` - - [^1]: Model–view–viewmodel https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93viewmodel - -[^2]: Dependency injection https://en.wikipedia.org/wiki/Dependency_injection \ No newline at end of file +[^2]: Dependency injection https://en.wikipedia.org/wiki/Dependency_injection diff --git a/src/Packages.props b/src/Packages.props index f2ca092b9..04defd358 100644 --- a/src/Packages.props +++ b/src/Packages.props @@ -1,7 +1,7 @@ - + diff --git a/src/Wpf.Ui.Demo/ViewModels/ButtonsViewModel.cs b/src/Wpf.Ui.Demo/ViewModels/ButtonsViewModel.cs index 877d7fb81..41b416dbb 100644 --- a/src/Wpf.Ui.Demo/ViewModels/ButtonsViewModel.cs +++ b/src/Wpf.Ui.Demo/ViewModels/ButtonsViewModel.cs @@ -4,8 +4,8 @@ // All Rights Reserved. using System.Windows.Input; -using Microsoft.Toolkit.Mvvm.ComponentModel; -using Microsoft.Toolkit.Mvvm.Input; +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; using Wpf.Ui.Mvvm.Contracts; namespace Wpf.Ui.Demo.ViewModels; diff --git a/src/Wpf.Ui.Demo/ViewModels/ColorsViewModel.cs b/src/Wpf.Ui.Demo/ViewModels/ColorsViewModel.cs index 2f2063717..ff987567a 100644 --- a/src/Wpf.Ui.Demo/ViewModels/ColorsViewModel.cs +++ b/src/Wpf.Ui.Demo/ViewModels/ColorsViewModel.cs @@ -9,8 +9,8 @@ using System.Windows; using System.Windows.Input; using System.Windows.Media; -using Microsoft.Toolkit.Mvvm.ComponentModel; -using Microsoft.Toolkit.Mvvm.Input; +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; using Wpf.Ui.Appearance; using Wpf.Ui.Common.Interfaces; using Wpf.Ui.Demo.Models.Colors; diff --git a/src/Wpf.Ui.Demo/ViewModels/ContainerViewModel.cs b/src/Wpf.Ui.Demo/ViewModels/ContainerViewModel.cs index 238880e57..6011e7f75 100644 --- a/src/Wpf.Ui.Demo/ViewModels/ContainerViewModel.cs +++ b/src/Wpf.Ui.Demo/ViewModels/ContainerViewModel.cs @@ -3,7 +3,7 @@ // Copyright (C) Leszek Pomianowski and WPF UI Contributors. // All Rights Reserved. -using Microsoft.Toolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; namespace Wpf.Ui.Demo.ViewModels; diff --git a/src/Wpf.Ui.Demo/ViewModels/DashboardViewModel.cs b/src/Wpf.Ui.Demo/ViewModels/DashboardViewModel.cs index 038786190..2bffccc18 100644 --- a/src/Wpf.Ui.Demo/ViewModels/DashboardViewModel.cs +++ b/src/Wpf.Ui.Demo/ViewModels/DashboardViewModel.cs @@ -4,8 +4,8 @@ // All Rights Reserved. using System.Windows.Input; -using Microsoft.Toolkit.Mvvm.ComponentModel; -using Microsoft.Toolkit.Mvvm.Input; +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; using Wpf.Ui.Common.Interfaces; using Wpf.Ui.Demo.Services.Contracts; using Wpf.Ui.Mvvm.Contracts; diff --git a/src/Wpf.Ui.Demo/ViewModels/DataViewModel.cs b/src/Wpf.Ui.Demo/ViewModels/DataViewModel.cs index 2cbd7cc13..71683be84 100644 --- a/src/Wpf.Ui.Demo/ViewModels/DataViewModel.cs +++ b/src/Wpf.Ui.Demo/ViewModels/DataViewModel.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.Windows.Media; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; using Wpf.Ui.Common.Interfaces; using Wpf.Ui.Demo.Models.Data; diff --git a/src/Wpf.Ui.Demo/ViewModels/DebugViewModel.cs b/src/Wpf.Ui.Demo/ViewModels/DebugViewModel.cs index efcee24e6..482365f7c 100644 --- a/src/Wpf.Ui.Demo/ViewModels/DebugViewModel.cs +++ b/src/Wpf.Ui.Demo/ViewModels/DebugViewModel.cs @@ -4,7 +4,7 @@ // All Rights Reserved. using System.Collections.Generic; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; using Wpf.Ui.Common.Interfaces; namespace Wpf.Ui.Demo.ViewModels; diff --git a/src/Wpf.Ui.Demo/ViewModels/ExperimentalViewModel.cs b/src/Wpf.Ui.Demo/ViewModels/ExperimentalViewModel.cs index 1ef4fe0a0..998f41a72 100644 --- a/src/Wpf.Ui.Demo/ViewModels/ExperimentalViewModel.cs +++ b/src/Wpf.Ui.Demo/ViewModels/ExperimentalViewModel.cs @@ -4,7 +4,7 @@ // All Rights Reserved. using System; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; using Wpf.Ui.Common.Interfaces; using Wpf.Ui.Mvvm.Contracts; diff --git a/src/Wpf.Ui.Demo/ViewModels/IconsViewModel.cs b/src/Wpf.Ui.Demo/ViewModels/IconsViewModel.cs index 700c6b26b..2af24de74 100644 --- a/src/Wpf.Ui.Demo/ViewModels/IconsViewModel.cs +++ b/src/Wpf.Ui.Demo/ViewModels/IconsViewModel.cs @@ -8,8 +8,8 @@ using System.Linq; using System.Threading.Tasks; using System.Windows.Input; -using Microsoft.Toolkit.Mvvm.ComponentModel; -using Microsoft.Toolkit.Mvvm.Input; +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; using Wpf.Ui.Common.Interfaces; using Wpf.Ui.Demo.Models.Icons; diff --git a/src/Wpf.Ui.Demo/ViewModels/InputViewModel.cs b/src/Wpf.Ui.Demo/ViewModels/InputViewModel.cs index 0a3346ce3..77d2c7659 100644 --- a/src/Wpf.Ui.Demo/ViewModels/InputViewModel.cs +++ b/src/Wpf.Ui.Demo/ViewModels/InputViewModel.cs @@ -4,7 +4,7 @@ // All Rights Reserved. using System.Collections.Generic; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; using Wpf.Ui.Common.Interfaces; namespace Wpf.Ui.Demo.ViewModels; diff --git a/src/Wpf.Ui.Demo/ViewModels/TaskManagerViewModel.cs b/src/Wpf.Ui.Demo/ViewModels/TaskManagerViewModel.cs index 704a58691..6efb0bf5f 100644 --- a/src/Wpf.Ui.Demo/ViewModels/TaskManagerViewModel.cs +++ b/src/Wpf.Ui.Demo/ViewModels/TaskManagerViewModel.cs @@ -4,7 +4,7 @@ // All Rights Reserved. using System.Collections.ObjectModel; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; using Wpf.Ui.Common; using Wpf.Ui.Controls; using Wpf.Ui.Controls.Interfaces; diff --git a/src/Wpf.Ui.Demo/Views/Pages/Input.xaml b/src/Wpf.Ui.Demo/Views/Pages/Input.xaml index b71e953d5..45bf46a69 100644 --- a/src/Wpf.Ui.Demo/Views/Pages/Input.xaml +++ b/src/Wpf.Ui.Demo/Views/Pages/Input.xaml @@ -371,7 +371,7 @@ Grid.Column="2" Margin="0,0,0,8" Content="ThreeState CheckBox" - IsChecked="True" + IsChecked="{x:Null}" IsThreeState="True" /> - + diff --git a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.CompactNavigation/ViewModels/ContainerViewModel.cs b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.CompactNavigation/ViewModels/ContainerViewModel.cs index 919f04d7e..211cdff42 100644 --- a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.CompactNavigation/ViewModels/ContainerViewModel.cs +++ b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.CompactNavigation/ViewModels/ContainerViewModel.cs @@ -1,4 +1,4 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; using System; using System.Collections.ObjectModel; using Wpf.Ui.Common; diff --git a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.CompactNavigation/ViewModels/DashboardViewModel.cs b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.CompactNavigation/ViewModels/DashboardViewModel.cs index 33628dd08..43e862060 100644 --- a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.CompactNavigation/ViewModels/DashboardViewModel.cs +++ b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.CompactNavigation/ViewModels/DashboardViewModel.cs @@ -1,5 +1,5 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; -using Microsoft.Toolkit.Mvvm.Input; +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; using Wpf.Ui.Common.Interfaces; namespace $safeprojectname$.ViewModels diff --git a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.CompactNavigation/ViewModels/DataViewModel.cs b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.CompactNavigation/ViewModels/DataViewModel.cs index 65d4ea580..6ec2854ae 100644 --- a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.CompactNavigation/ViewModels/DataViewModel.cs +++ b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.CompactNavigation/ViewModels/DataViewModel.cs @@ -1,4 +1,4 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; using System; using System.Collections.Generic; using System.Windows.Media; diff --git a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.CompactNavigation/ViewModels/SettingsViewModel.cs b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.CompactNavigation/ViewModels/SettingsViewModel.cs index f2ddbdf32..e765a3359 100644 --- a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.CompactNavigation/ViewModels/SettingsViewModel.cs +++ b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.CompactNavigation/ViewModels/SettingsViewModel.cs @@ -1,5 +1,5 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; -using Microsoft.Toolkit.Mvvm.Input; +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; using System; using System.Windows.Input; using Wpf.Ui.Common.Interfaces; diff --git a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.CompactNavigation/Wpf.Ui.Mvvm.CompactNavigation.csproj b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.CompactNavigation/Wpf.Ui.Mvvm.CompactNavigation.csproj index e2b0354a5..d2e0fc374 100644 --- a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.CompactNavigation/Wpf.Ui.Mvvm.CompactNavigation.csproj +++ b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.CompactNavigation/Wpf.Ui.Mvvm.CompactNavigation.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.FluentNavigation/ViewModels/ContainerViewModel.cs b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.FluentNavigation/ViewModels/ContainerViewModel.cs index 919f04d7e..211cdff42 100644 --- a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.FluentNavigation/ViewModels/ContainerViewModel.cs +++ b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.FluentNavigation/ViewModels/ContainerViewModel.cs @@ -1,4 +1,4 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; using System; using System.Collections.ObjectModel; using Wpf.Ui.Common; diff --git a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.FluentNavigation/ViewModels/DashboardViewModel.cs b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.FluentNavigation/ViewModels/DashboardViewModel.cs index 33628dd08..43e862060 100644 --- a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.FluentNavigation/ViewModels/DashboardViewModel.cs +++ b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.FluentNavigation/ViewModels/DashboardViewModel.cs @@ -1,5 +1,5 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; -using Microsoft.Toolkit.Mvvm.Input; +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; using Wpf.Ui.Common.Interfaces; namespace $safeprojectname$.ViewModels diff --git a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.FluentNavigation/ViewModels/DataViewModel.cs b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.FluentNavigation/ViewModels/DataViewModel.cs index 65d4ea580..6ec2854ae 100644 --- a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.FluentNavigation/ViewModels/DataViewModel.cs +++ b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.FluentNavigation/ViewModels/DataViewModel.cs @@ -1,4 +1,4 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; using System; using System.Collections.Generic; using System.Windows.Media; diff --git a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.FluentNavigation/ViewModels/SettingsViewModel.cs b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.FluentNavigation/ViewModels/SettingsViewModel.cs index f2ddbdf32..e765a3359 100644 --- a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.FluentNavigation/ViewModels/SettingsViewModel.cs +++ b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.FluentNavigation/ViewModels/SettingsViewModel.cs @@ -1,5 +1,5 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; -using Microsoft.Toolkit.Mvvm.Input; +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; using System; using System.Windows.Input; using Wpf.Ui.Common.Interfaces; diff --git a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.FluentNavigation/Wpf.Ui.Mvvm.FluentNavigation.csproj b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.FluentNavigation/Wpf.Ui.Mvvm.FluentNavigation.csproj index e2b0354a5..d2e0fc374 100644 --- a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.FluentNavigation/Wpf.Ui.Mvvm.FluentNavigation.csproj +++ b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.FluentNavigation/Wpf.Ui.Mvvm.FluentNavigation.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.StoreNavigation/ViewModels/ContainerViewModel.cs b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.StoreNavigation/ViewModels/ContainerViewModel.cs index 919f04d7e..211cdff42 100644 --- a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.StoreNavigation/ViewModels/ContainerViewModel.cs +++ b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.StoreNavigation/ViewModels/ContainerViewModel.cs @@ -1,4 +1,4 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; using System; using System.Collections.ObjectModel; using Wpf.Ui.Common; diff --git a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.StoreNavigation/ViewModels/DashboardViewModel.cs b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.StoreNavigation/ViewModels/DashboardViewModel.cs index 33628dd08..43e862060 100644 --- a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.StoreNavigation/ViewModels/DashboardViewModel.cs +++ b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.StoreNavigation/ViewModels/DashboardViewModel.cs @@ -1,5 +1,5 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; -using Microsoft.Toolkit.Mvvm.Input; +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; using Wpf.Ui.Common.Interfaces; namespace $safeprojectname$.ViewModels diff --git a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.StoreNavigation/ViewModels/DataViewModel.cs b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.StoreNavigation/ViewModels/DataViewModel.cs index 65d4ea580..6ec2854ae 100644 --- a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.StoreNavigation/ViewModels/DataViewModel.cs +++ b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.StoreNavigation/ViewModels/DataViewModel.cs @@ -1,4 +1,4 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; using System; using System.Collections.Generic; using System.Windows.Media; diff --git a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.StoreNavigation/ViewModels/SettingsViewModel.cs b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.StoreNavigation/ViewModels/SettingsViewModel.cs index f2ddbdf32..e765a3359 100644 --- a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.StoreNavigation/ViewModels/SettingsViewModel.cs +++ b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.StoreNavigation/ViewModels/SettingsViewModel.cs @@ -1,5 +1,5 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; -using Microsoft.Toolkit.Mvvm.Input; +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; using System; using System.Windows.Input; using Wpf.Ui.Common.Interfaces; diff --git a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.StoreNavigation/Wpf.Ui.Mvvm.StoreNavigation.csproj b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.StoreNavigation/Wpf.Ui.Mvvm.StoreNavigation.csproj index e2b0354a5..d2e0fc374 100644 --- a/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.StoreNavigation/Wpf.Ui.Mvvm.StoreNavigation.csproj +++ b/src/Wpf.Ui.Extension/Templates/Wpf.Ui.Mvvm.StoreNavigation/Wpf.Ui.Mvvm.StoreNavigation.csproj @@ -17,7 +17,7 @@ - +