chore: 更新至 .Net 9

Author: KiyanYang

src/DotVast.HashTool.WinUI.Core.Tests/DotVast.HashTool.WinUI.Core.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>DotVast.HashTool.WinUI.Core.Tests</RootNamespace>
 
     <IsPackable>false</IsPackable>

src/DotVast.HashTool.WinUI.Core/DotVast.HashTool.WinUI.Core.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>DotVast.HashTool.WinUI.Core</RootNamespace>
   </PropertyGroup>
 </Project>

src/DotVast.HashTool.WinUI/DotVast.HashTool.WinUI.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <Platforms>x64;arm64</Platforms>

src/DotVast.HashTool.WinUI/Models/HashOption.cs

@@ -7,7 +7,7 @@
 
 namespace DotVast.HashTool.WinUI.Models;
 
-public sealed class HashOption : ObservableObject
+public sealed partial class HashOption : ObservableObject
 {
     public HashKind Kind
     {

src/DotVast.HashTool.WinUI/Models/HashResult.cs

@@ -21,7 +21,7 @@ public sealed class HashResult(string path, IReadOnlyList<HashResultItem> data)
     public IReadOnlyList<HashResultItem> Data { get; } = data;
 }
 
-public sealed class HashResultItem : ObservableObject
+public sealed partial class HashResultItem : ObservableObject
 {
     private readonly HashOption _hashOption;
     private readonly byte[] _hashValue;

src/DotVast.HashTool.WinUI/Services/PageService.cs

@@ -2,31 +2,29 @@
 // Licensed under the MIT License.
 
 using DotVast.HashTool.WinUI.Enums;
-using DotVast.HashTool.WinUI.ViewModels;
 using DotVast.HashTool.WinUI.Views;
 
-using Microsoft.UI.Xaml.Controls;
-
 namespace DotVast.HashTool.WinUI.Services;
 
 public sealed class PageService : IPageService
 {
-    private readonly Dictionary<PageKey, Type> _pages = [];
+    private readonly Lock _lock = new();
+    private readonly Dictionary<PageKey, Type> _pages = new()
+        {
+            { PageKey.SettingsPage, typeof(SettingsPage)},
+            { PageKey.HomePage, typeof(HomePage)},
+            { PageKey.TasksPage, typeof(TasksPage)},
+            { PageKey.ResultsPage, typeof(ResultsPage)},
+            { PageKey.LicensesPage, typeof(LicensesPage)},
+            { PageKey.HashSettingsPage, typeof(HashSettingsPage)},
+        };
 
-    public PageService()
-    {
-        Configure<SettingsViewModel, SettingsPage>(PageKey.SettingsPage);
-        Configure<HomeViewModel, HomePage>(PageKey.HomePage);
-        Configure<TasksViewModel, TasksPage>(PageKey.TasksPage);
-        Configure<ResultsViewModel, ResultsPage>(PageKey.ResultsPage);
-        Configure<LicensesViewModel, LicensesPage>(PageKey.LicensesPage);
-        Configure<HashSettingsViewModel, HashSettingsPage>(PageKey.HashSettingsPage);
-    }
+    public PageService() { }
 
     public Type GetPageType(PageKey key)
     {
         Type? pageType;
-        lock (_pages)
+        lock (_lock)
         {
             if (!_pages.TryGetValue(key, out pageType))
             {
@@ -36,25 +34,4 @@ public Type GetPageType(PageKey key)
 
         return pageType;
     }
-
-    private void Configure<VM, V>(PageKey key)
-        where VM : IViewModel
-        where V : Page, IView<VM>
-    {
-        lock (_pages)
-        {
-            if (_pages.ContainsKey(key))
-            {
-                throw new ArgumentException($"The key {key} is already configured in PageService");
-            }
-
-            var type = typeof(V);
-            if (_pages.ContainsValue(type))
-            {
-                throw new ArgumentException($"This type is already configured with key {_pages.First(p => p.Value == type).Key}");
-            }
-
-            _pages.Add(key, type);
-        }
-    }
 }