Use CommunityToolkit.Mvvm for .NET build

ConfuserEx/BoolToVisibilityConverter.cs

@@ -11,12 +11,12 @@ internal class BoolToVisibilityConverter : IValueConverter {
 
 		public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
 			Debug.Assert(value is bool);
-			Debug.Assert(targetType == typeof(Visibility));
+			Debug.Assert(targetType == typeof(Visibility) || targetType == typeof(Visibility?), $"Expected Visibility or Nullable<Visibility>, but {targetType} given.");
 			return (bool)value ? Visibility.Visible : Visibility.Collapsed;
 		}
 
 		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) {
 			throw new NotSupportedException();
 		}
 	}
-}
+}

ConfuserEx/ConfuserEx.csproj

@@ -15,8 +15,9 @@
   </PropertyGroup>
 
   <ItemGroup Label="Nuget Dependencies">
-    <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
-    <PackageReference Include="Ookii.Dialogs.Wpf" Version="4.0.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" Condition="$(TargetFramework) != 'net472'" />
+    <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" Condition="$(TargetFramework) == 'net472'" />
+    <PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup Label="Project Dependencies">

ConfuserEx/FileDragDrop.cs

@@ -5,9 +5,14 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Input;
+using System.Windows.Input;
+#if NET
+using CommunityToolkit.Mvvm.Input;
+using DragDropCommand = CommunityToolkit.Mvvm.Input.RelayCommand<System.Tuple<System.Windows.UIElement, System.Windows.IDataObject>>;
+#else
+using GalaSoft.MvvmLight.CommandWpf;
+#endif
 using ConfuserEx.ViewModel;
-using GalaSoft.MvvmLight.CommandWpf;
 
 namespace ConfuserEx {
 	public class FileDragDrop {
@@ -108,12 +113,13 @@ static void OnDrop(object sender, DragEventArgs e) {
 					cmd.Execute(e.Data);
 			}
 			e.Handled = true;
-		}
-
-
+		}
+
+#if NETFRAMEWORK
 		class DragDropCommand : RelayCommand<Tuple<UIElement, IDataObject>> {
 			public DragDropCommand(Action<Tuple<UIElement, IDataObject>> execute, Func<Tuple<UIElement, IDataObject>, bool> canExecute)
 				: base(execute, canExecute) { }
-		}
+		}
+#endif
 	}
-}
+}

ConfuserEx/ViewModel/UI/AboutTabVM.cs

@@ -2,9 +2,13 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Windows.Input;
-using System.Windows.Media.Imaging;
-using GalaSoft.MvvmLight.CommandWpf;
-
+using System.Windows.Media.Imaging;
+#if NET
+using CommunityToolkit.Mvvm.Input;
+#else
+using GalaSoft.MvvmLight.CommandWpf;
+#endif
+
 namespace ConfuserEx.ViewModel {
 	internal class AboutTabVM : TabViewModel {
 		public AboutTabVM(AppVM app)
@@ -20,4 +24,4 @@ public ICommand LaunchBrowser {
 
 		public BitmapSource Icon { get; private set; }
 	}
-}
+}

ConfuserEx/ViewModel/UI/AppVM.cs

@@ -7,8 +7,12 @@
 using System.Windows.Input;
 using System.Xml;
 using Confuser.Core;
-using Confuser.Core.Project;
-using GalaSoft.MvvmLight.CommandWpf;
+using Confuser.Core.Project;
+#if NET
+using CommunityToolkit.Mvvm.Input;
+#else
+using GalaSoft.MvvmLight.CommandWpf;
+#endif
 using Ookii.Dialogs.Wpf;
 
 namespace ConfuserEx.ViewModel {

ConfuserEx/ViewModel/UI/ProjectTabVM.cs

@@ -5,8 +5,12 @@
 using System.Windows;
 using System.Windows.Input;
 using Confuser.Core.Project;
-using ConfuserEx.Views;
-using GalaSoft.MvvmLight.CommandWpf;
+using ConfuserEx.Views;
+#if NET
+using CommunityToolkit.Mvvm.Input;
+#else
+using GalaSoft.MvvmLight.CommandWpf;
+#endif
 using Ookii.Dialogs.Wpf;
 
 namespace ConfuserEx.ViewModel {

ConfuserEx/ViewModel/UI/ProtectTabVM.cs

@@ -6,9 +6,13 @@
 using System.Windows.Input;
 using System.Windows.Media;
 using Confuser.Core;
-using Confuser.Core.Project;
-using GalaSoft.MvvmLight.CommandWpf;
-
+using Confuser.Core.Project;
+#if NET
+using CommunityToolkit.Mvvm.Input;
+#else
+using GalaSoft.MvvmLight.CommandWpf;
+#endif
+
 namespace ConfuserEx.ViewModel {
 	internal class ProtectTabVM : TabViewModel, ILogger {
 		readonly Paragraph documentContent;

ConfuserEx/ViewModel/UI/SettingsTabVM.cs

@@ -7,9 +7,13 @@
 using System.Windows.Input;
 using Confuser.Core;
 using Confuser.Core.Project;
-using ConfuserEx.Views;
-using GalaSoft.MvvmLight.CommandWpf;
-
+using ConfuserEx.Views;
+#if NET
+using CommunityToolkit.Mvvm.Input;
+#else
+using GalaSoft.MvvmLight.CommandWpf;
+#endif
+
 namespace ConfuserEx.ViewModel {
 	internal class SettingsTabVM : TabViewModel {
 		bool hasPacker;

ConfuserEx/Views/ProjectRuleView.xaml.cs

@@ -5,9 +5,13 @@
 using System.Windows.Media;
 using Confuser.Core;
 using Confuser.Core.Project;
-using ConfuserEx.ViewModel;
-using GalaSoft.MvvmLight.CommandWpf;
-
+using ConfuserEx.ViewModel;
+#if NET
+using CommunityToolkit.Mvvm.Input;
+#else
+using GalaSoft.MvvmLight.CommandWpf;
+#endif
+
 namespace ConfuserEx.Views {
 	public partial class ProjectRuleView : Window {
 		readonly ProjectVM proj;
@@ -43,7 +47,12 @@ public override void OnApplyTemplate() {
 				prots.SelectedIndex = selIndex >= rule.Protections.Count ? rule.Protections.Count - 1 : selIndex;
 			}, () => prots.SelectedIndex != -1);
 
-			prots.SelectionChanged += (sender, args) => (RemoveBtn.Command as RelayCommand)?.RaiseCanExecuteChanged();
+			prots.SelectionChanged += (sender, args) => (RemoveBtn.Command as RelayCommand)?
+#if NETFRAMEWORK
+				.RaiseCanExecuteChanged();
+#else
+				.NotifyCanExecuteChanged();
+#endif
 		}
 
 		public void Cleanup() {

ConfuserEx/Views/ProjectTabAdvancedView.xaml.cs

@@ -1,8 +1,12 @@
 using System;
 using System.Diagnostics;
 using System.Windows;
-using ConfuserEx.ViewModel;
-using GalaSoft.MvvmLight.CommandWpf;
+using ConfuserEx.ViewModel;
+#if NET
+using CommunityToolkit.Mvvm.Input;
+#else
+using GalaSoft.MvvmLight.CommandWpf;
+#endif
 using Ookii.Dialogs.Wpf;
 
 namespace ConfuserEx.Views {
@@ -61,4 +65,4 @@ public override void OnApplyTemplate() {
 			}, () => ProbePaths.SelectedIndex != -1);
 		}
 	}
-}
+}