added support for preview 13 & CommunityToolkit.Mvvm

vniehues · Feb 19, 2022 · c37e950 · c37e950
1 parent 8924926
commit c37e950
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/samples/mavvmApp/ViewModels/MainPageViewModel.cs b/samples/mavvmApp/ViewModels/MainPageViewModel.cs
@@ -1,12 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
 using mavvm;
 using Microsoft.Maui.Controls;
 
 namespace mavvmApp.ViewModels
 {
-    public class MainPageViewModel : BindableBase
+    public class MainPageViewModel : ObservableObject
     {
         string _title;
         public string Title
@@ -17,15 +18,15 @@ public string Title
             }
             set
             {
-                SetPropertyValue(ref _title, value);
+                SetProperty(ref _title, value);
             }
         }
 
         private int _count;
         public int Count
         {
             get { return this._count; }
-            set { this.SetPropertyValue(ref this._count, value); }
+            set { this.SetProperty(ref this._count, value); }
         }
 
         public Command CountUpCommand { get; set; }

diff --git a/samples/mavvmApp/mavvmApp.csproj b/samples/mavvmApp/mavvmApp.csproj
@@ -53,6 +53,12 @@
 	<ItemGroup>
 	  <ProjectReference Include="..\..\src\mavvm\mavvm.csproj" />
 	</ItemGroup>
+	<ItemGroup>
+	  <None Remove="CommunityToolkit.Mvvm" />
+	</ItemGroup>
+	<ItemGroup>
+	  <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0-preview1" />
+	</ItemGroup>
 	<PropertyGroup Condition="$(TargetFramework.Contains('-windows'))">
 		<OutputType>WinExe</OutputType>
 		<RuntimeIdentifier>win-x64</RuntimeIdentifier>

diff --git a/src/mavvm/Extensions/MavvmBuilderExtensions.cs b/src/mavvm/Extensions/MavvmBuilderExtensions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Hosting;
@@ -16,7 +17,7 @@ public static class MavvmBuilderExtensions
         /// <returns></returns>
         public static MauiAppBuilder AddRoute<TView, TViewModel>(this MauiAppBuilder builder)
             where TView : ContentPage, new()
-            where TViewModel : BindableBase
+            where TViewModel : class, INotifyPropertyChanged
         {
             var routeName = typeof(TViewModel).Name;
             Routing.UnRegisterRoute(routeName);

diff --git a/src/mavvm/Factories/MavvmResolveRouteFactory.cs b/src/mavvm/Factories/MavvmResolveRouteFactory.cs
@@ -1,11 +1,12 @@
 using System;
+using System.ComponentModel;
 using mavvm.Interfaces;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.Controls;
 
 namespace mavvm
 {
-    public class MavvmResolveRouteFactory<TView, TViewModel> : RouteFactory where TView : ContentPage, new() where TViewModel : BindableBase
+    public class MavvmResolveRouteFactory<TView, TViewModel> : RouteFactory where TView : ContentPage, new() where TViewModel : class, INotifyPropertyChanged
     {
 
         public override Element GetOrCreate(IServiceProvider services)

diff --git a/src/mavvm/mavvm.csproj b/src/mavvm/mavvm.csproj
@@ -12,7 +12,7 @@
 		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-android'">21.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.18362.0</SupportedOSPlatformVersion>
 		<PackageId>mavvm</PackageId>
-		<PackageVersion>0.9.6</PackageVersion>
+		<PackageVersion>0.10.1</PackageVersion>
 		<Authors>Vincent Niehues</Authors>
 		<Copyright>Vincent Niehues 2021</Copyright>
 		<Owners>Vincent Niehues</Owners>