Merge pull request #515 from Freeesia/copilot/migrate-to-dotnet-10

Freeesia · web-flow · commit ec3c446f54a9 · 2025-12-06T22:06:11.000+09:00
Migrate to .NET 10
diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
@@ -75,6 +75,9 @@ jobs:
           key: ${{ runner.os }}-licenses-${{ hashFiles('**/*.csproj') }} #hash of project files
           restore-keys: |
             ${{ runner.os }}-licenses-
+      - uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: 10.0.x
       - run: |
           dotnet tool restore
           dotnet restore
@@ -85,7 +88,7 @@ jobs:
             -ji include-projects.json `
             -d licenses `
             -fo licenses\third-party-licenses.txt `
-            -f net8.0 `
+            -f net10.0 `
             -err
       - uses: actions/upload-artifact@v5
         with:
@@ -116,7 +119,7 @@ jobs:
             ${{ runner.os }}-nuget-
       - uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 10.0.x
       - uses: gittools/actions/gitversion/setup@v4.2.0
         with:
           versionSpec: "6.x"
@@ -179,7 +182,7 @@ jobs:
             ${{ runner.os }}-nuget-
       - uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 10.0.x
       - uses: actions/download-artifact@v6
         with:
           path: artifacts
diff --git a/.github/workflows/dotnet-package.yml b/.github/workflows/dotnet-package.yml
@@ -19,7 +19,7 @@ jobs:
             ${{ runner.os }}-nuget-
       - uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 10.0.x
       - uses: gittools/actions/gitversion/setup@v4.2.0
         with:
           versionSpec: "6.x"
diff --git a/ColorThief/ColorThief.Bench/ColorThief.Bench.csproj b/ColorThief/ColorThief.Bench/ColorThief.Bench.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net10.0-windows10.0.20348.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/ColorThief/ColorThief.Test/ColorThief.Test.csproj b/ColorThief/ColorThief.Test/ColorThief.Test.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net10.0-windows10.0.20348.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>StudioFreesia.ColorThief.Test</RootNamespace>
diff --git a/ColorThief/ColorThief/ColorThief.csproj b/ColorThief/ColorThief/ColorThief.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net10.0-windows10.0.20348.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>StudioFreesia.ColorThief</RootNamespace>
diff --git a/Composition.WindowsRuntimeHelpers/Composition.WindowsRuntimeHelpers.csproj b/Composition.WindowsRuntimeHelpers/Composition.WindowsRuntimeHelpers.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net10.0-windows10.0.19041.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -17,12 +17,12 @@
     <PackageVersion Include="ksemenenko.ColorThief" Version="1.1.1.4" />
     <PackageVersion Include="LLamaSharp.Backend.Cuda12.Windows" Version="0.25.0" />
     <PackageVersion Include="MdXaml" Version="1.27.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.100" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
     <PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.4.6" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
@@ -39,9 +39,8 @@
     <PackageVersion Include="Quickenshtein" Version="1.5.1" />
     <PackageVersion Include="Sentry.Extensions.Logging" Version="5.16.0" />
     <PackageVersion Include="SharpDX.Direct3D11" Version="4.2.0" />
-    <PackageVersion Include="System.Drawing.Common" Version="9.0.9" />
+    <PackageVersion Include="System.Drawing.Common" Version="10.0.0" />
     <PackageVersion Include="System.Interactive" Version="6.0.3" />
-    <PackageVersion Include="System.Linq.Async" Version="6.0.3" />
     <PackageVersion Include="TesseractOCR" Version="5.5.1" />
     <PackageVersion Include="ValueTaskSupplement" Version="1.1.0" />
     <PackageVersion Include="Wacton.Unicolour" Version="6.3.0" />
diff --git a/Plugins/Directory.Build.props b/Plugins/Directory.Build.props
@@ -2,7 +2,7 @@
   <!-- 上位階層の Directory.Build.props をインクルード -->
   <Import Project="$(MSBuildProjectDirectory)\..\..\Directory.Build.props" Condition="Exists('$(MSBuildProjectDirectory)\..\..\Directory.Build.props')" />
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
   </PropertyGroup>
 
@@ -14,7 +14,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="PropertyTools" ExcludeAssets="runtime" />
-    <PackageReference Include="System.Linq.Async" ExcludeAssets="runtime" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Plugins/WindowTranslator.Plugin.BergamotTranslatorPlugin/WindowTranslator.Plugin.BergamotTranslatorPlugin.csproj b/Plugins/WindowTranslator.Plugin.BergamotTranslatorPlugin/WindowTranslator.Plugin.BergamotTranslatorPlugin.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/Plugins/WindowTranslator.Plugin.ColorThiefPlugin.Tests/WindowTranslator.Plugin.ColorThiefPlugin.Tests.csproj b/Plugins/WindowTranslator.Plugin.ColorThiefPlugin.Tests/WindowTranslator.Plugin.ColorThiefPlugin.Tests.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net10.0-windows10.0.20348.0</TargetFramework>
   </PropertyGroup><ItemGroup>
     <PackageReference Include="coverlet.collector" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
diff --git a/Plugins/WindowTranslator.Plugin.ColorThiefPlugin/WindowTranslator.Plugin.ColorThiefPlugin.csproj b/Plugins/WindowTranslator.Plugin.ColorThiefPlugin/WindowTranslator.Plugin.ColorThiefPlugin.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net10.0-windows10.0.20348.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Plugins/WindowTranslator.Plugin.FoMPlugin/WindowTranslator.Plugin.FoMPlugin.csproj b/Plugins/WindowTranslator.Plugin.FoMPlugin/WindowTranslator.Plugin.FoMPlugin.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net10.0-windows10.0.20348.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
diff --git a/Plugins/WindowTranslator.Plugin.GoogleAIPlugin/WindowTranslator.Plugin.GoogleAIPlugin.csproj b/Plugins/WindowTranslator.Plugin.GoogleAIPlugin/WindowTranslator.Plugin.GoogleAIPlugin.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net10.0-windows10.0.20348.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="CsvHelper" />
diff --git a/Plugins/WindowTranslator.Plugin.GoogleAppsSctiptPlugin/GasTranslator.cs b/Plugins/WindowTranslator.Plugin.GoogleAppsSctiptPlugin/GasTranslator.cs
@@ -114,15 +114,10 @@ private static string Decrypt(string cipherTextBase64)
 
         // 固定または属性等で管理する salt
         byte[] salt = Encoding.UTF8.GetBytes("wX9&7QjrkK%@");
-
-        // PBKDF2 を使って、パスワードから鍵と IV を生成
-        using var pdb = new Rfc2898DeriveBytes(password, salt, 10000, HashAlgorithmName.SHA256);
-        byte[] key = pdb.GetBytes(32); // 256 ビット（AES-256 用）
-        byte[] iv = pdb.GetBytes(16);  // 128 ビット（IV のサイズ）
-
         using var aes = Aes.Create();
-        aes.Key = key;
-        aes.IV = iv;
+        // PBKDF2 を使って、パスワードから鍵と IV を生成
+        aes.Key = Rfc2898DeriveBytes.Pbkdf2(password, salt, 10000, HashAlgorithmName.SHA256, 32);
+        aes.IV = Rfc2898DeriveBytes.Pbkdf2(password, salt, 10000, HashAlgorithmName.SHA256, 16);
         aes.Padding = PaddingMode.PKCS7;
 
         using var decryptor = aes.CreateDecryptor(aes.Key, aes.IV);
diff --git a/Plugins/WindowTranslator.Plugin.LLMPlugin/WindowTranslator.Plugin.LLMPlugin.csproj b/Plugins/WindowTranslator.Plugin.LLMPlugin/WindowTranslator.Plugin.LLMPlugin.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net10.0-windows10.0.20348.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="CsvHelper" />
diff --git a/Plugins/WindowTranslator.Plugin.OneOcrPlugin/WindowTranslator.Plugin.OneOcrPlugin.csproj b/Plugins/WindowTranslator.Plugin.OneOcrPlugin/WindowTranslator.Plugin.OneOcrPlugin.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net10.0-windows10.0.20348.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/Plugins/WindowTranslator.Plugin.PLaMoPlugin/WindowTranslator.Plugin.PLaMoPlugin.csproj b/Plugins/WindowTranslator.Plugin.PLaMoPlugin/WindowTranslator.Plugin.PLaMoPlugin.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="LLamaSharp" />
diff --git a/Plugins/WindowTranslator.Plugin.TesseractOCRPlugin/WindowTranslator.Plugin.TesseractOCRPlugin.csproj b/Plugins/WindowTranslator.Plugin.TesseractOCRPlugin/WindowTranslator.Plugin.TesseractOCRPlugin.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net10.0-windows10.0.20348.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Sandbox/Sandbox.csproj b/Sandbox/Sandbox.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net10.0-windows10.0.20348.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <UserSecretsId>1cda64be-8678-4eb9-a533-77744fa3438c</UserSecretsId>
diff --git a/WindowTranslator.Abstractions/WindowTranslator.Abstractions.csproj b/WindowTranslator.Abstractions/WindowTranslator.Abstractions.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net8.0-windows10.0.20348.0</TargetFrameworks>
+    <TargetFrameworks>net10.0;net10.0-windows10.0.20348.0</TargetFrameworks>
     <RootNamespace>WindowTranslator</RootNamespace>
     <IsPackable>true</IsPackable>
     <PackageIcon>wt.png</PackageIcon>
diff --git a/WindowTranslator/Modules/Capture/WindowsGraphicsCapture.cs b/WindowTranslator/Modules/Capture/WindowsGraphicsCapture.cs
@@ -62,7 +62,7 @@ private async void FramePool_FrameArrived(Direct3D11CaptureFramePool sender, obj
             await this.processing.WaitAsync();
             using var rel = new DisposeAction(() => this.processing.Release());
             this.logger.LogDebug("TryGetNextFrame");
-            using var frame = framePool.TryGetNextFrame();
+            using var frame = sender.TryGetNextFrame();
             if (frame is null)
             {
                 return;
@@ -89,7 +89,7 @@ private async void FramePool_FrameArrived(Direct3D11CaptureFramePool sender, obj
             this.cts.Token.ThrowIfCancellationRequested();
             this.lastSize = frame.ContentSize;
             this.logger.LogDebug($"フレームプール再生成:({this.lastSize.Width}, {this.lastSize.Height})");
-            framePool.Recreate(device, DirectXPixelFormat.B8G8R8A8UIntNormalized, 1, lastSize);
+            sender.Recreate(device, DirectXPixelFormat.B8G8R8A8UIntNormalized, 1, lastSize);
         }
         catch (ObjectDisposedException)
         {
diff --git a/WindowTranslator/WindowTranslator.csproj b/WindowTranslator/WindowTranslator.csproj
diff --git a/hwnd-adorner/Demo/Demo.csproj b/hwnd-adorner/Demo/Demo.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows7.0</TargetFramework>
+    <TargetFramework>net10.0-windows7.0</TargetFramework>
     <OutputType>WinExe</OutputType>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
diff --git a/hwnd-adorner/HwndExtensions/HwndExtensions.csproj b/hwnd-adorner/HwndExtensions/HwndExtensions.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows7.0</TargetFramework>
+    <TargetFramework>net10.0-windows7.0</TargetFramework>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
   <ItemGroup>
