feat: Add .NET 9.0 support, update packages, and refactor

Updated Directory.build.props to support net8.0 and net9.0, and updated MyNet package versions. Remove ICommand interface. Use System.Windows.Input.ICommand. Updated Fody in MyNet.UI.csproj to 6.9.1. Changed namespaces in IDisplayMode.cs and IDisplayViewModel.cs. BREAKING CHANGE: Add .NET 9.0 support. Remove ICommand interface.
sandre58 · Dec 21, 2024 · cbcf314 · cbcf314
1 parent 308f8ef
commit cbcf314
Show file tree

Hide file tree

Showing 46 changed files with 57 additions and 36 deletions.
diff --git a/src/Directory.build.props b/src/Directory.build.props
@@ -12,7 +12,7 @@
 
 <!-- Configuration -->
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <BaseOutputPath>bin</BaseOutputPath>
     <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
     <Configuration Condition="'$(Configuration)' == ''">Release</Configuration>

diff --git a/src/MyNet.UI/Busy/Models/Busy.cs b/src/MyNet.UI/Busy/Models/Busy.cs
@@ -2,6 +2,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Windows.Input;
 using MyNet.Observable;
 using MyNet.UI.Commands;
 

diff --git a/src/MyNet.UI/Commands/CommandsManager.cs b/src/MyNet.UI/Commands/CommandsManager.cs
@@ -2,6 +2,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Windows.Input;
 
 namespace MyNet.UI.Commands
 {

diff --git a/src/MyNet.UI/Commands/ICommand.cs b/src/MyNet.UI/Commands/ICommand.cs
diff --git a/src/MyNet.UI/Commands/ICommandFactory.cs b/src/MyNet.UI/Commands/ICommandFactory.cs
@@ -2,6 +2,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Windows.Input;
 
 namespace MyNet.UI.Commands
 {

diff --git a/src/MyNet.UI/Commands/RelayCommand.cs b/src/MyNet.UI/Commands/RelayCommand.cs
@@ -2,6 +2,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Windows.Input;
 
 namespace MyNet.UI.Commands
 {

diff --git a/src/MyNet.UI/Commands/RelayCommandFactory.cs b/src/MyNet.UI/Commands/RelayCommandFactory.cs
@@ -2,6 +2,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Windows.Input;
 
 namespace MyNet.UI.Commands
 {

diff --git a/src/MyNet.UI/Locators/NamingConvention.cs b/src/MyNet.UI/Locators/NamingConvention.cs
@@ -172,7 +172,7 @@ public static string ResolveNamingConvention(Dictionary<string, string> constant
         {
             var fullnamespace = GetParentPath(value);
             var separator = GetParentSeparator(fullnamespace) ?? string.Empty;
-            var namespaces = fullnamespace.Split(new[] { separator }, StringSplitOptions.RemoveEmptyEntries).ToList();
+            var namespaces = fullnamespace.Split([separator], StringSplitOptions.RemoveEmptyEntries).ToList();
 
             var result = conventionToUse;
 

diff --git a/src/MyNet.UI/MyNet.UI.csproj b/src/MyNet.UI/MyNet.UI.csproj
@@ -15,18 +15,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fody" Version="6.8.2">
+    <PackageReference Include="Fody" Version="6.9.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="PropertyChanged.Fody" Version="4.1.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="MyNet.DynamicData.Extensions" Version="2.2.1-pre.1" />
-    <PackageReference Include="MyNet.Observable" Version="6.0.1-pre.7" />
-    <PackageReference Include="MyNet.Observable.Collections" Version="6.0.1-pre.7" />
-    <PackageReference Include="MyNet.Observable.Translatables" Version="6.0.1-pre.7" />
-    <PackageReference Include="MyNet.Utilities" Version="5.2.1-pre.6" />
+    <PackageReference Include="MyNet.DynamicData.Extensions" Version="3.0.0" />
+    <PackageReference Include="MyNet.Observable" Version="7.0.0" />
+    <PackageReference Include="MyNet.Observable.Collections" Version="7.0.0" />
+    <PackageReference Include="MyNet.Observable.Translatables" Version="7.0.0" />
+    <PackageReference Include="MyNet.Utilities" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/MyNet.UI/Services/Handlers/FileNotification.cs b/src/MyNet.UI/Services/Handlers/FileNotification.cs
@@ -2,6 +2,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Windows.Input;
 using MyNet.UI.Commands;
 using MyNet.UI.Notifications;
 using MyNet.UI.Resources;

diff --git a/src/MyNet.UI/Services/Providers/RecentFilesControllerProvider.cs b/src/MyNet.UI/Services/Providers/RecentFilesControllerProvider.cs
@@ -3,8 +3,8 @@
 
 using System;
 using System.ComponentModel;
+using System.Windows.Input;
 using MyNet.Observable;
-using MyNet.UI.Commands;
 using MyNet.UI.ViewModels.FileHistory;
 using MyNet.UI.ViewModels.List;
 using MyNet.UI.ViewModels.List.Filtering;

diff --git a/src/MyNet.UI/ViewModels/Dialogs/DialogViewModel.cs b/src/MyNet.UI/ViewModels/Dialogs/DialogViewModel.cs
@@ -3,6 +3,7 @@
 
 using System.ComponentModel;
 using System.Threading.Tasks;
+using System.Windows.Input;
 using MyNet.Observable;
 using MyNet.Observable.Attributes;
 using MyNet.UI.Commands;

diff --git a/src/MyNet.UI/ViewModels/Display/DisplayMode.cs b/src/MyNet.UI/ViewModels/Display/DisplayMode.cs
@@ -3,8 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Globalization;
+using System.Windows.Input;
 using MyNet.Observable.Attributes;
 using MyNet.Observable.Translatables;
 using MyNet.UI.Commands;

diff --git a/src/MyNet.UI/ViewModels/Display/DisplayViewModel.cs b/src/MyNet.UI/ViewModels/Display/DisplayViewModel.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Windows.Input;
 using MyNet.Observable;
 using MyNet.UI.Commands;
 
@@ -29,9 +30,9 @@ public DisplayViewModel(IEnumerable<IDisplayMode> allowedModes, IDisplayMode? de
 
         public void SetMode<T>() where T : IDisplayMode => Mode = AllowedModes.OfType<T>().FirstOrDefault();
 
-        public void SetMode(Type type) => Mode = AllowedModes.Where(x => x.GetType() == type).FirstOrDefault();
+        public void SetMode(Type type) => Mode = AllowedModes.FirstOrDefault(x => x.GetType() == type);
 
-        public void SetMode(string key) => Mode = AllowedModes.Where(x => x.Key == key).FirstOrDefault();
+        public void SetMode(string key) => Mode = AllowedModes.FirstOrDefault(x => x.Key == key);
 
         public DisplayViewModel AddMode(IDisplayMode mode, bool isDefault = false)
         {

diff --git a/src/MyNet.UI/ViewModels/Display/IDisplayMode.cs b/src/MyNet.UI/ViewModels/Display/IDisplayMode.cs
@@ -3,7 +3,7 @@
 
 using MyNet.Observable;
 
-namespace MyNet.UI.ViewModels
+namespace MyNet.UI.ViewModels.Display
 {
     public interface IDisplayMode : IProvideValue<string>
     {

diff --git a/src/MyNet.UI/ViewModels/Display/IDisplayViewModel.cs b/src/MyNet.UI/ViewModels/Display/IDisplayViewModel.cs
@@ -5,7 +5,7 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 
-namespace MyNet.UI.ViewModels
+namespace MyNet.UI.ViewModels.Display
 {
     public interface IDisplayViewModel : INotifyPropertyChanged
     {

diff --git a/src/MyNet.UI/ViewModels/Edition/EditionViewModel.cs b/src/MyNet.UI/ViewModels/Edition/EditionViewModel.cs
@@ -5,6 +5,7 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Windows.Input;
 using MyNet.Observable.Attributes;
 using MyNet.UI.Commands;
 using MyNet.UI.Dialogs;

diff --git a/src/MyNet.UI/ViewModels/Edition/StringListEditionViewModel.cs b/src/MyNet.UI/ViewModels/Edition/StringListEditionViewModel.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Windows.Input;
 using DynamicData.Binding;
 using MyNet.DynamicData.Extensions;
 using MyNet.Observable;

diff --git a/src/MyNet.UI/ViewModels/Export/ExportViewModelBase.cs b/src/MyNet.UI/ViewModels/Export/ExportViewModelBase.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Windows.Input;
 using MyNet.Humanizer;
 using MyNet.UI.Commands;
 using MyNet.UI.Resources;

diff --git a/src/MyNet.UI/ViewModels/Export/FileExportByColumnsViewModelBase.cs b/src/MyNet.UI/ViewModels/Export/FileExportByColumnsViewModelBase.cs
@@ -7,6 +7,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Windows.Input;
 using DynamicData;
 using DynamicData.Binding;
 using MyNet.Observable.Attributes;

diff --git a/src/MyNet.UI/ViewModels/Export/FileExportViewModelBase.cs b/src/MyNet.UI/ViewModels/Export/FileExportViewModelBase.cs
@@ -6,6 +6,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.IO;
 using System.Threading.Tasks;
+using System.Windows.Input;
 using MyNet.Observable.Attributes;
 using MyNet.UI.Commands;
 using MyNet.UI.Dialogs;

diff --git a/src/MyNet.UI/ViewModels/FileHistory/RecentFileViewModel.cs b/src/MyNet.UI/ViewModels/FileHistory/RecentFileViewModel.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
+using System.Windows.Input;
 using MyNet.Observable;
 using MyNet.UI.Busy;
 using MyNet.UI.Commands;

diff --git a/src/MyNet.UI/ViewModels/IListViewModel.cs b/src/MyNet.UI/ViewModels/IListViewModel.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections;
 using System.Collections.ObjectModel;
+using MyNet.UI.ViewModels.Display;
 using MyNet.UI.ViewModels.List;
 using MyNet.UI.ViewModels.List.Filtering;
 using MyNet.UI.ViewModels.List.Grouping;

diff --git a/src/MyNet.UI/ViewModels/Import/ImportDialogViewModel.cs b/src/MyNet.UI/ViewModels/Import/ImportDialogViewModel.cs
@@ -11,7 +11,6 @@
 using MyNet.UI.Selection;
 using MyNet.UI.Toasting;
 using MyNet.UI.Toasting.Settings;
-using MyNet.UI.ViewModels.Dialogs;
 using MyNet.UI.ViewModels.List;
 using MyNet.Utilities.Providers;
 

diff --git a/src/MyNet.UI/ViewModels/Import/ImportablesListViewModel.cs b/src/MyNet.UI/ViewModels/Import/ImportablesListViewModel.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Reactive.Linq;
+using System.Windows.Input;
 using DynamicData;
 using MyNet.Observable.Attributes;
 using MyNet.Observable.Collections.Providers;

diff --git a/src/MyNet.UI/ViewModels/List/Filtering/AdvancedFiltersViewModel.cs b/src/MyNet.UI/ViewModels/List/Filtering/AdvancedFiltersViewModel.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Windows.Input;
 using MyNet.UI.Commands;
 using MyNet.Utilities;
 

diff --git a/src/MyNet.UI/ViewModels/List/Filtering/ExtendedFiltersViewModel.cs b/src/MyNet.UI/ViewModels/List/Filtering/ExtendedFiltersViewModel.cs
@@ -15,7 +15,7 @@ namespace MyNet.UI.ViewModels.List.Filtering
 {
     public class ExtendedFiltersViewModel : FiltersViewModel
     {
-        private IReadOnlyCollection<IFilterViewModel> _defaultFilters;
+        private ReadOnlyCollection<IFilterViewModel> _defaultFilters;
 
         public override bool IsReadOnly => true;
 
@@ -27,7 +27,7 @@ public class ExtendedFiltersViewModel : FiltersViewModel
 
         public ObservableCollection<DisplayWrapper<IEnumerable<IFilterViewModel>>> PresetFilters { get; } = [];
 
-        public DisplayWrapper<IEnumerable<IFilterViewModel>>? SelectedPresetFilter { get; private set; }
+        public DisplayWrapper<IEnumerable<IFilterViewModel>>? SelectedPresetFilter { get; set; }
 
         public ExtendedFiltersViewModel(IDictionary<string, Func<IFilterViewModel>> allowedFilters, SpeedFiltersViewModel speedFilters, IEnumerable<IFilterViewModel>? defaultFilters = null)
             : this(allowedFilters.Select(x => new FilterProviderViewModel(x.Key, x.Value)), speedFilters, defaultFilters) { }

diff --git a/src/MyNet.UI/ViewModels/List/Filtering/FiltersViewModel.cs b/src/MyNet.UI/ViewModels/List/Filtering/FiltersViewModel.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
+using System.Windows.Input;
 using DynamicData;
 using DynamicData.Binding;
 using MyNet.DynamicData.Extensions;

diff --git a/src/MyNet.UI/ViewModels/List/Grouping/GroupingViewModel.cs b/src/MyNet.UI/ViewModels/List/Grouping/GroupingViewModel.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
+using System.Windows.Input;
 using DynamicData;
 using DynamicData.Binding;
 using DynamicData.Kernel;

diff --git a/src/MyNet.UI/ViewModels/List/IListParametersProvider.cs b/src/MyNet.UI/ViewModels/List/IListParametersProvider.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Stéphane ANDRE. All Right Reserved.
 // See the LICENSE file in the project root for more information.
 
+using MyNet.UI.ViewModels.Display;
 using MyNet.UI.ViewModels.List.Filtering;
 using MyNet.UI.ViewModels.List.Grouping;
 using MyNet.UI.ViewModels.List.Sorting;

diff --git a/src/MyNet.UI/ViewModels/List/IPagingViewModel.cs b/src/MyNet.UI/ViewModels/List/IPagingViewModel.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.ComponentModel;
-using MyNet.UI.Commands;
+using System.Windows.Input;
 
 namespace MyNet.UI.ViewModels.List
 {

diff --git a/src/MyNet.UI/ViewModels/List/ListDialogViewModel.cs b/src/MyNet.UI/ViewModels/List/ListDialogViewModel.cs
@@ -1,11 +1,12 @@
 // Copyright (c) Stéphane ANDRE. All Right Reserved.
 // See the LICENSE file in the project root for more information.
 
+using System.Windows.Input;
 using MyNet.Observable.Attributes;
 using MyNet.UI.Commands;
 using MyNet.UI.ViewModels.Workspace;
 
-namespace MyNet.UI.ViewModels.Dialogs
+namespace MyNet.UI.ViewModels.List
 {
     [CanBeValidatedForDeclaredClassOnly(false)]
     [CanSetIsModifiedAttributeForDeclaredClassOnly(false)]

diff --git a/src/MyNet.UI/ViewModels/List/ListViewModelBase.cs b/src/MyNet.UI/ViewModels/List/ListViewModelBase.cs
@@ -10,6 +10,7 @@
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using System.Threading.Tasks;
+using System.Windows.Input;
 using DynamicData;
 using DynamicData.Binding;
 using DynamicData.Operators;
@@ -23,6 +24,7 @@
 using MyNet.UI.Dialogs;
 using MyNet.UI.Dialogs.Models;
 using MyNet.UI.Resources;
+using MyNet.UI.ViewModels.Display;
 using MyNet.UI.ViewModels.List.Filtering;
 using MyNet.UI.ViewModels.List.Grouping;
 using MyNet.UI.ViewModels.List.Sorting;

diff --git a/src/MyNet.UI/ViewModels/List/Paging/PagingViewModel.cs b/src/MyNet.UI/ViewModels/List/Paging/PagingViewModel.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Windows.Input;
 using MyNet.Observable;
 using MyNet.UI.Collections;
 using MyNet.UI.Commands;

diff --git a/src/MyNet.UI/ViewModels/List/SelectionDialogViewModel.cs b/src/MyNet.UI/ViewModels/List/SelectionDialogViewModel.cs
@@ -4,13 +4,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Windows.Input;
 using DynamicData;
 using MyNet.Observable.Attributes;
 using MyNet.Observable.Collections.Providers;
 using MyNet.UI.Commands;
 using MyNet.UI.Resources;
 using MyNet.UI.Selection;
-using MyNet.UI.ViewModels.Dialogs;
 using MyNet.Utilities.Providers;
 
 namespace MyNet.UI.ViewModels.List

diff --git a/src/MyNet.UI/ViewModels/List/SelectionListViewModel.cs b/src/MyNet.UI/ViewModels/List/SelectionListViewModel.cs
@@ -6,6 +6,7 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Reactive.Linq;
+using System.Windows.Input;
 using DynamicData;
 using DynamicData.Binding;
 using MyNet.Observable.Attributes;
@@ -27,8 +28,7 @@ public abstract class SelectionListViewModel<T, TCollection> : WrapperListViewMo
                 where T : notnull
     {
         protected SelectionListViewModel(TCollection collection,
-                                         IListParametersProvider? parametersProvider = null,
-                                         SelectionMode? selectionMode = null) : base(collection, parametersProvider)
+                                         IListParametersProvider? parametersProvider = null) : base(collection, parametersProvider)
         {
             SelectCommand = CommandsManager.CreateNotNull<T>(Collection.Select, CanSelect);
             SelectItemsCommand = CommandsManager.CreateNotNull<IEnumerable<T>>(Collection.Select, CanSelect);

diff --git a/src/MyNet.UI/ViewModels/List/Sorting/ISortingViewModel.cs b/src/MyNet.UI/ViewModels/List/Sorting/ISortingViewModel.cs
@@ -2,7 +2,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using MyNet.UI.Commands;
+using System.Windows.Input;
 
 namespace MyNet.UI.ViewModels.List.Sorting
 {

diff --git a/src/MyNet.UI/ViewModels/List/Sorting/SortingViewModel.cs b/src/MyNet.UI/ViewModels/List/Sorting/SortingViewModel.cs
@@ -7,6 +7,7 @@
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Linq;
+using System.Windows.Input;
 using DynamicData;
 using DynamicData.Binding;
 using MyNet.DynamicData.Extensions;
@@ -51,7 +52,7 @@ public class SortingViewModel : EditableObject, ISortingViewModel, ICollection<I
 
         public SortingViewModel() : this([]) { }
 
-        public SortingViewModel(string defaultProperty, ListSortDirection listSortDirection = ListSortDirection.Ascending) : this(new[] { defaultProperty }) { }
+        public SortingViewModel(string defaultProperty, ListSortDirection listSortDirection = ListSortDirection.Ascending) : this(new Dictionary<string, ListSortDirection> { { defaultProperty, listSortDirection } }) { }
 
         public SortingViewModel(IList<string> defaultProperties) : this(defaultProperties.ToDictionary(x => x, _ => ListSortDirection.Ascending)) { }