Migrated demo project from deprecated MvvmLight library to CommunityToolkit.Mvvm.

sskodje · sskodje · commit 03cbc11e240e · 2023-06-18T12:22:20.000+02:00
diff --git a/Demo/Demo.csproj b/Demo/Demo.csproj
@@ -16,7 +16,8 @@
 
   <ItemGroup>
     <PackageReference Include="CommonServiceLocator" Version="2.0.5" />
-    <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Demo/SampleData/SampleViewModelPinnedTabExampleWindow.cs b/Demo/SampleData/SampleViewModelPinnedTabExampleWindow.cs
@@ -1,8 +1,8 @@
 ﻿using System;
 using System.Collections.ObjectModel;
 using System.Linq;
+using CommunityToolkit.Mvvm.Input;
 using Demo.ViewModel;
-using GalaSoft.MvvmLight.Command;
 
 namespace Demo.SampleData
 {
diff --git a/Demo/ViewModel/IViewModelPinnedTabExampleWindow.cs b/Demo/ViewModel/IViewModelPinnedTabExampleWindow.cs
@@ -1,4 +1,4 @@
-﻿using GalaSoft.MvvmLight.Command;
+﻿using CommunityToolkit.Mvvm.Input;
 
 namespace Demo.ViewModel
 {
diff --git a/Demo/ViewModel/TabBase.cs b/Demo/ViewModel/TabBase.cs
@@ -1,9 +1,9 @@
-﻿using System.Windows.Media;
-using GalaSoft.MvvmLight;
+﻿using CommunityToolkit.Mvvm.ComponentModel;
+using System.Windows.Media;
 
 namespace Demo.ViewModel
 {
-    public abstract class TabBase : ViewModelBase
+    public abstract class TabBase : ObservableRecipient
     {
         private int _tabNumber;
         public int TabNumber
@@ -13,7 +13,7 @@ public int TabNumber
             {
                 if (_tabNumber != value)
                 {
-                    Set(() => TabNumber, ref _tabNumber, value);
+                    SetProperty(ref _tabNumber, value);
                 }
             }
         }
@@ -26,7 +26,7 @@ public string TabName
             {
                 if (_tabName != value)
                 {
-                    Set(() => TabName, ref _tabName, value);
+                    SetProperty(ref _tabName, value);
                 }
             }
         }
@@ -40,7 +40,7 @@ public bool IsPinned
             {
                 if (_isPinned != value)
                 {
-                    Set(() => IsPinned, ref _isPinned, value);
+                    SetProperty(ref _isPinned, value);
                 }
             }
         }
@@ -54,7 +54,7 @@ public ImageSource TabIcon
             {
                 if (!Equals(_tabIcon, value))
                 {
-                    Set(() => TabIcon, ref _tabIcon, value);
+                    SetProperty(ref _tabIcon, value);
                 }
             }
         }
diff --git a/Demo/ViewModel/TabClass4.cs b/Demo/ViewModel/TabClass4.cs
@@ -11,7 +11,7 @@ public bool IsBlinking
             {
                 if (_isBlinking != value)
                 {
-                    Set(() => IsBlinking, ref _isBlinking, value);
+                    SetProperty(ref _isBlinking, value);
                 }
             }
         }
diff --git a/Demo/ViewModel/ViewModelExampleBase.cs b/Demo/ViewModel/ViewModelExampleBase.cs
@@ -6,13 +6,13 @@
 using System.Windows.Data;
 using System.Windows.Media.Imaging;
 using ChromeTabs;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using Demo.Properties;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
 
 namespace Demo.ViewModel
 {
-    public class ViewModelExampleBase : ViewModelBase
+    public class ViewModelExampleBase : ObservableRecipient
     {
         //since we don't know what kind of objects are bound, so the sorting happens outside with the ReorderTabsCommand.
         public RelayCommand<TabReorder> ReorderTabsCommand { get; set; }
@@ -29,7 +29,7 @@ public TabBase SelectedTab
             {
                 if (_selectedTab != value)
                 {
-                    Set(() => SelectedTab, ref _selectedTab, value);
+                    SetProperty(ref _selectedTab, value);
                 }
             }
         }
@@ -41,8 +41,8 @@ public bool CanAddTabs
             set
             {
                 if (_canAddTabs == value) return;
-                Set(() => CanAddTabs, ref _canAddTabs, value);
-                AddTabCommand.RaiseCanExecuteChanged();
+                SetProperty(ref _canAddTabs, value);
+                AddTabCommand.NotifyCanExecuteChanged();
             }
         }
 
diff --git a/Demo/ViewModel/ViewModelLocator.cs b/Demo/ViewModel/ViewModelLocator.cs
@@ -13,8 +13,11 @@
 */
 
 using CommonServiceLocator;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Ioc;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
+using System.ComponentModel;
+using System.Windows.Navigation;
+
 
 namespace Demo.ViewModel
 {
@@ -29,51 +32,54 @@ public class ViewModelLocator
         /// </summary>
         public ViewModelLocator()
         {
-            ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
-
-            if (ViewModelBase.IsInDesignModeStatic)
+            if (DesignerProperties.GetIsInDesignMode(new System.Windows.DependencyObject()))
             {
                 // Create design time view services and models
-                SimpleIoc.Default.Register<IViewModelMainWindow, SampleData.SampleViewModelMainWindow>();
-                SimpleIoc.Default.Register<IViewModelPinnedTabExampleWindow, SampleData.SampleViewModelPinnedTabExampleWindow>();
-                SimpleIoc.Default.Register<IViewModelCustomStyleExampleWindow, SampleData.SampleViewModelCustomStyleExampleWindow>();
+                Ioc.Default.ConfigureServices(
+                        new ServiceCollection()
+                          .AddSingleton<IViewModelMainWindow, SampleData.SampleViewModelMainWindow>()
+                          .AddSingleton<IViewModelPinnedTabExampleWindow, SampleData.SampleViewModelPinnedTabExampleWindow>()
+                          .AddSingleton<IViewModelCustomStyleExampleWindow, SampleData.SampleViewModelCustomStyleExampleWindow>()
+                          .BuildServiceProvider());
             }
             else
             {
                 // Create run time view services and models
-                SimpleIoc.Default.Register<IViewModelMainWindow, ViewModelMainWindow>();
-                SimpleIoc.Default.Register<IViewModelPinnedTabExampleWindow, ViewModelPinnedTabExampleWindow>();
-                SimpleIoc.Default.Register<IViewModelCustomStyleExampleWindow, ViewModelCustomStyleExampleWindow>();
+                Ioc.Default.ConfigureServices(
+                        new ServiceCollection()
+                          .AddSingleton<IViewModelMainWindow, ViewModelMainWindow>()
+                          .AddSingleton<IViewModelPinnedTabExampleWindow, ViewModelPinnedTabExampleWindow>()
+                          .AddSingleton<IViewModelCustomStyleExampleWindow, ViewModelCustomStyleExampleWindow>()
+                          .BuildServiceProvider());
             }
-
         }
 
         public IViewModelCustomStyleExampleWindow VieWModelCustomStyleExampleWindow
         {
-             get
+            get
             {
-                return ServiceLocator.Current.GetInstance<IViewModelCustomStyleExampleWindow>();
+                return Ioc.Default.GetService<IViewModelCustomStyleExampleWindow>();
             }
         }
 
         public IViewModelMainWindow ViewModelMainWindow
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<IViewModelMainWindow>();
+                return Ioc.Default.GetService<IViewModelMainWindow>();
             }
         }
 
         public IViewModelPinnedTabExampleWindow ViewModelPinnedTabExampleWindow
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<IViewModelPinnedTabExampleWindow>();
+                return Ioc.Default.GetService<IViewModelPinnedTabExampleWindow>();
             }
 
         }
 
-        
+
         public static void Cleanup()
         {
             // TODO Clear the ViewModels
diff --git a/Demo/ViewModel/ViewModelMainWindow.cs b/Demo/ViewModel/ViewModelMainWindow.cs
@@ -15,7 +15,7 @@ public bool CanMoveTabs
             {
                 if (_canMoveTabs != value)
                 {
-                    Set(() => CanMoveTabs, ref _canMoveTabs, value);
+                    SetProperty(ref _canMoveTabs, value);
                 }
             }
         }
@@ -28,7 +28,7 @@ public bool ShowAddButton
             {
                 if (_showAddButton != value)
                 {
-                    Set(() => ShowAddButton, ref _showAddButton, value);
+                    SetProperty(ref _showAddButton, value);
                 }
             }
         }
diff --git a/Demo/ViewModel/ViewModelPinnedTabExampleWindow.cs b/Demo/ViewModel/ViewModelPinnedTabExampleWindow.cs
@@ -1,7 +1,7 @@
-﻿using System.ComponentModel;
+﻿using CommunityToolkit.Mvvm.Input;
+using System.ComponentModel;
 using System.Linq;
 using System.Windows.Data;
-using GalaSoft.MvvmLight.Command;
 
 namespace Demo.ViewModel
 {

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.ObjectModel;`
`3`	`3`	`using System.Linq;`
	`4`	`+using CommunityToolkit.Mvvm.Input;`
`4`	`5`	`using Demo.ViewModel;`
`5`		`-using GalaSoft.MvvmLight.Command;`
`6`	`6`
`7`	`7`	`namespace Demo.SampleData`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using GalaSoft.MvvmLight.Command;`
	`1`	`+using CommunityToolkit.Mvvm.Input;`
`2`	`2`
`3`	`3`	`namespace Demo.ViewModel`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`		`-using System.Windows.Media;`
`2`		`-using GalaSoft.MvvmLight;`
	`1`	`+using CommunityToolkit.Mvvm.ComponentModel;`
	`2`	`+using System.Windows.Media;`
`3`	`3`
`4`	`4`	`namespace Demo.ViewModel`
`5`	`5`	`{`
`6`		`- public abstract class TabBase : ViewModelBase`
	`6`	`+ public abstract class TabBase : ObservableRecipient`
`7`	`7`	`{`
`8`	`8`	`private int _tabNumber;`
`9`	`9`	`public int TabNumber`
`@@ -13,7 +13,7 @@ public int TabNumber`
`13`	`13`	`{`
`14`	`14`	`if (_tabNumber != value)`
`15`	`15`	`{`
`16`		`- Set(() => TabNumber, ref _tabNumber, value);`
	`16`	`+ SetProperty(ref _tabNumber, value);`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	`}`
`@@ -26,7 +26,7 @@ public string TabName`
`26`	`26`	`{`
`27`	`27`	`if (_tabName != value)`
`28`	`28`	`{`
`29`		`- Set(() => TabName, ref _tabName, value);`
	`29`	`+ SetProperty(ref _tabName, value);`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`}`
`@@ -40,7 +40,7 @@ public bool IsPinned`
`40`	`40`	`{`
`41`	`41`	`if (_isPinned != value)`
`42`	`42`	`{`
`43`		`- Set(() => IsPinned, ref _isPinned, value);`
	`43`	`+ SetProperty(ref _isPinned, value);`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`}`
`@@ -54,7 +54,7 @@ public ImageSource TabIcon`
`54`	`54`	`{`
`55`	`55`	`if (!Equals(_tabIcon, value))`
`56`	`56`	`{`
`57`		`- Set(() => TabIcon, ref _tabIcon, value);`
	`57`	`+ SetProperty(ref _tabIcon, value);`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public bool IsBlinking`
`11`	`11`	`{`
`12`	`12`	`if (_isBlinking != value)`
`13`	`13`	`{`
`14`		`- Set(() => IsBlinking, ref _isBlinking, value);`
	`14`	`+ SetProperty(ref _isBlinking, value);`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,13 @@`
`6`	`6`	`using System.Windows.Data;`
`7`	`7`	`using System.Windows.Media.Imaging;`
`8`	`8`	`using ChromeTabs;`
	`9`	`+using CommunityToolkit.Mvvm.ComponentModel;`
	`10`	`+using CommunityToolkit.Mvvm.Input;`
`9`	`11`	`using Demo.Properties;`
`10`		`-using GalaSoft.MvvmLight;`
`11`		`-using GalaSoft.MvvmLight.Command;`
`12`	`12`
`13`	`13`	`namespace Demo.ViewModel`
`14`	`14`	`{`
`15`		`- public class ViewModelExampleBase : ViewModelBase`
	`15`	`+ public class ViewModelExampleBase : ObservableRecipient`
`16`	`16`	`{`
`17`	`17`	`//since we don't know what kind of objects are bound, so the sorting happens outside with the ReorderTabsCommand.`
`18`	`18`	`public RelayCommand<TabReorder> ReorderTabsCommand { get; set; }`
`@@ -29,7 +29,7 @@ public TabBase SelectedTab`
`29`	`29`	`{`
`30`	`30`	`if (_selectedTab != value)`
`31`	`31`	`{`
`32`		`- Set(() => SelectedTab, ref _selectedTab, value);`
	`32`	`+ SetProperty(ref _selectedTab, value);`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`}`
`@@ -41,8 +41,8 @@ public bool CanAddTabs`
`41`	`41`	`set`
`42`	`42`	`{`
`43`	`43`	`if (_canAddTabs == value) return;`
`44`		`- Set(() => CanAddTabs, ref _canAddTabs, value);`
`45`		`- AddTabCommand.RaiseCanExecuteChanged();`
	`44`	`+ SetProperty(ref _canAddTabs, value);`
	`45`	`+ AddTabCommand.NotifyCanExecuteChanged();`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,11 @@`
`13`	`13`	`*/`
`14`	`14`
`15`	`15`	`using CommonServiceLocator;`
`16`		`-using GalaSoft.MvvmLight;`
`17`		`-using GalaSoft.MvvmLight.Ioc;`
	`16`	`+using CommunityToolkit.Mvvm.DependencyInjection;`
	`17`	`+using Microsoft.Extensions.DependencyInjection;`
	`18`	`+using System.ComponentModel;`
	`19`	`+using System.Windows.Navigation;`
	`20`	`+`
`18`	`21`
`19`	`22`	`namespace Demo.ViewModel`
`20`	`23`	`{`
`@@ -29,51 +32,54 @@ public class ViewModelLocator`
`29`	`32`	`/// </summary>`
`30`	`33`	`public ViewModelLocator()`
`31`	`34`	`{`
`32`		`- ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);`
`33`		`-`
`34`		`- if (ViewModelBase.IsInDesignModeStatic)`
	`35`	`+ if (DesignerProperties.GetIsInDesignMode(new System.Windows.DependencyObject()))`
`35`	`36`	`{`
`36`	`37`	`// Create design time view services and models`
`37`		`- SimpleIoc.Default.Register<IViewModelMainWindow, SampleData.SampleViewModelMainWindow>();`
`38`		`- SimpleIoc.Default.Register<IViewModelPinnedTabExampleWindow, SampleData.SampleViewModelPinnedTabExampleWindow>();`
`39`		`- SimpleIoc.Default.Register<IViewModelCustomStyleExampleWindow, SampleData.SampleViewModelCustomStyleExampleWindow>();`
	`38`	`+ Ioc.Default.ConfigureServices(`
	`39`	`+ new ServiceCollection()`
	`40`	`+ .AddSingleton<IViewModelMainWindow, SampleData.SampleViewModelMainWindow>()`
	`41`	`+ .AddSingleton<IViewModelPinnedTabExampleWindow, SampleData.SampleViewModelPinnedTabExampleWindow>()`
	`42`	`+ .AddSingleton<IViewModelCustomStyleExampleWindow, SampleData.SampleViewModelCustomStyleExampleWindow>()`
	`43`	`+ .BuildServiceProvider());`
`40`	`44`	`}`
`41`	`45`	`else`
`42`	`46`	`{`
`43`	`47`	`// Create run time view services and models`
`44`		`- SimpleIoc.Default.Register<IViewModelMainWindow, ViewModelMainWindow>();`
`45`		`- SimpleIoc.Default.Register<IViewModelPinnedTabExampleWindow, ViewModelPinnedTabExampleWindow>();`
`46`		`- SimpleIoc.Default.Register<IViewModelCustomStyleExampleWindow, ViewModelCustomStyleExampleWindow>();`
	`48`	`+ Ioc.Default.ConfigureServices(`
	`49`	`+ new ServiceCollection()`
	`50`	`+ .AddSingleton<IViewModelMainWindow, ViewModelMainWindow>()`
	`51`	`+ .AddSingleton<IViewModelPinnedTabExampleWindow, ViewModelPinnedTabExampleWindow>()`
	`52`	`+ .AddSingleton<IViewModelCustomStyleExampleWindow, ViewModelCustomStyleExampleWindow>()`
	`53`	`+ .BuildServiceProvider());`
`47`	`54`	`}`
`48`		`-`
`49`	`55`	`}`
`50`	`56`
`51`	`57`	`public IViewModelCustomStyleExampleWindow VieWModelCustomStyleExampleWindow`
`52`	`58`	`{`
`53`		`- get`
	`59`	`+ get`
`54`	`60`	`{`
`55`		`- return ServiceLocator.Current.GetInstance<IViewModelCustomStyleExampleWindow>();`
	`61`	`+ return Ioc.Default.GetService<IViewModelCustomStyleExampleWindow>();`
`56`	`62`	`}`
`57`	`63`	`}`
`58`	`64`
`59`	`65`	`public IViewModelMainWindow ViewModelMainWindow`
`60`	`66`	`{`
`61`	`67`	`get`
`62`	`68`	`{`
`63`		`- return ServiceLocator.Current.GetInstance<IViewModelMainWindow>();`
	`69`	`+ return Ioc.Default.GetService<IViewModelMainWindow>();`
`64`	`70`	`}`
`65`	`71`	`}`
`66`	`72`
`67`	`73`	`public IViewModelPinnedTabExampleWindow ViewModelPinnedTabExampleWindow`
`68`	`74`	`{`
`69`	`75`	`get`
`70`	`76`	`{`
`71`		`- return ServiceLocator.Current.GetInstance<IViewModelPinnedTabExampleWindow>();`
	`77`	`+ return Ioc.Default.GetService<IViewModelPinnedTabExampleWindow>();`
`72`	`78`	`}`
`73`	`79`
`74`	`80`	`}`
`75`	`81`
`76`		`-`
	`82`	`+`
`77`	`83`	`public static void Cleanup()`
`78`	`84`	`{`
`79`	`85`	`// TODO Clear the ViewModels`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public bool CanMoveTabs`
`15`	`15`	`{`
`16`	`16`	`if (_canMoveTabs != value)`
`17`	`17`	`{`
`18`		`- Set(() => CanMoveTabs, ref _canMoveTabs, value);`
	`18`	`+ SetProperty(ref _canMoveTabs, value);`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`
`@@ -28,7 +28,7 @@ public bool ShowAddButton`
`28`	`28`	`{`
`29`	`29`	`if (_showAddButton != value)`
`30`	`30`	`{`
`31`		`- Set(() => ShowAddButton, ref _showAddButton, value);`
	`31`	`+ SetProperty(ref _showAddButton, value);`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-using System.ComponentModel;`
	`1`	`+using CommunityToolkit.Mvvm.Input;`
	`2`	`+using System.ComponentModel;`
`2`	`3`	`using System.Linq;`
`3`	`4`	`using System.Windows.Data;`
`4`		`-using GalaSoft.MvvmLight.Command;`
`5`	`5`
`6`	`6`	`namespace Demo.ViewModel`
`7`	`7`	`{`