From d2770b4831109e259546a3c67ae0c25ec6ca08ad Mon Sep 17 00:00:00 2001
From: tangge233 <tangge233@qq.com>
Date: Sun, 21 Dec 2025 20:17:30 +0800
Subject: [PATCH 1/4] chore: update dependencies

---
 PCL.Neo.Core/PCL.Neo.Core.csproj | 16 ++++++++--------
 PCL.Neo/PCL.Neo.csproj           | 24 ++++++++++++------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/PCL.Neo.Core/PCL.Neo.Core.csproj b/PCL.Neo.Core/PCL.Neo.Core.csproj
index 5437133..7d5d398 100644
--- a/PCL.Neo.Core/PCL.Neo.Core.csproj
+++ b/PCL.Neo.Core/PCL.Neo.Core.csproj
@@ -1,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.2" />
+    <PackageReference Include="Avalonia" Version="11.3.10" />
     <PackageReference Include="LZMA-SDK" Version="22.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.7" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.7" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.1" />
     <PackageReference Include="SevenZip" Version="19.0.0" />
-    <PackageReference Include="SkiaSharp" Version="3.119.0" />
-    <PackageReference Include="System.Reactive" Version="6.0.1" />
-    <PackageReference Include="System.Reactive.Linq" Version="6.0.1" />
+    <PackageReference Include="SkiaSharp" Version="3.119.1" />
+    <PackageReference Include="System.Reactive" Version="6.1.0" />
+    <PackageReference Include="System.Reactive.Linq" Version="6.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/PCL.Neo/PCL.Neo.csproj b/PCL.Neo/PCL.Neo.csproj
index 876c771..d6370ab 100644
--- a/PCL.Neo/PCL.Neo.csproj
+++ b/PCL.Neo/PCL.Neo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -29,24 +29,24 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.2" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.2" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.2" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.2" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.2" />
+    <PackageReference Include="Avalonia" Version="11.3.10" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.10" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.10" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.10" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.10" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.2">
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.10">
       <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
       <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="DotNet.Bundle" Version="0.9.13" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
     <PackageReference Include="LZMA-SDK" Version="22.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.7" />
-    <PackageReference Include="System.Reactive" Version="6.0.1" />
-    <PackageReference Include="System.Reactive.Linq" Version="6.0.1" />
-    <PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.2" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.1" />
+    <PackageReference Include="System.Reactive" Version="6.1.0" />
+    <PackageReference Include="System.Reactive.Linq" Version="6.1.0" />
+    <PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.9" />
   </ItemGroup>
 
   <ItemGroup>

From 4a7d3543b5176c1da9dc6bd572783575576017ac Mon Sep 17 00:00:00 2001
From: tangge233 <tangge233@qq.com>
Date: Sun, 21 Dec 2025 20:25:16 +0800
Subject: [PATCH 2/4] fix: ci build error

---
 .github/workflows/build.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a74fc25..004950e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -103,10 +103,10 @@ jobs:
                   dotnet publish -r win-x86 --self-contained true -p:PublishSingleFile=true -p:TrimMode=copyused
                   dotnet publish -r win-x64 --self-contained true -p:PublishSingleFile=true -p:TrimMode=copyused
                   dotnet publish -r win-arm64 --self-contained true -p:PublishSingleFile=true -p:TrimMode=copyused
-                  mv ./bin/Release/net9.0/win-x86/publish/PCL.Neo.exe ./bin/Release/net9.0/win-x86/publish/PCL.Neo.win.x86.exe
-                  mv ./bin/Release/net9.0/win-x64/publish/PCL.Neo.exe ./bin/Release/net9.0/win-x64/publish/PCL.Neo.win.x64.exe
-                  mv ./bin/Release/net9.0/win-arm64/publish/PCL.Neo.exe ./bin/Release/net9.0/win-arm64/publish/PCL.Neo.win.arm64.exe
-                  cd ./bin/Release/net9.0/
+                  mv ./bin/Release/net10.0/win-x86/publish/PCL.Neo.exe ./bin/Release/net10.0/win-x86/publish/PCL.Neo.win.x86.exe
+                  mv ./bin/Release/net10.0/win-x64/publish/PCL.Neo.exe ./bin/Release/net10.0/win-x64/publish/PCL.Neo.win.x64.exe
+                  mv ./bin/Release/net10.0/win-arm64/publish/PCL.Neo.exe ./bin/Release/net10.0/win-arm64/publish/PCL.Neo.win.arm64.exe
+                  cd ./bin/Release/net10.0/
                   cd ./win-x86/
                   zip -9 -r "../PCL.Neo.win.x86.zip" "./publish"
                   cd ../
@@ -120,16 +120,16 @@ jobs:
               with:
                 name: win.x64
                 path: |
-                    PCL.Neo/bin/Release/net9.0/PCL.Neo.win.x64.zip
+                    PCL.Neo/bin/Release/net10.0/PCL.Neo.win.x64.zip
             - name: UploadArtifacts win.x86
               uses: actions/upload-artifact@v4
               with:
                     name: win.x86
                     path: |
-                        PCL.Neo/bin/Release/net9.0/PCL.Neo.win.x86.zip
+                        PCL.Neo/bin/Release/net10.0/PCL.Neo.win.x86.zip
             - name: UploadArtifacts win.arm64
               uses: actions/upload-artifact@v4
               with:
                     name: win.arm64
                     path: |
-                        PCL.Neo/bin/Release/net9.0/PCL.Neo.win.arm64.zip
+                        PCL.Neo/bin/Release/net10.0/PCL.Neo.win.arm64.zip

From c38c3f992837f93a8db26ae689981a88185757aa Mon Sep 17 00:00:00 2001
From: tangge233 <tangge233@qq.com>
Date: Sun, 21 Dec 2025 21:28:56 +0800
Subject: [PATCH 3/4] perf(ci): single file on windows

---
 .github/workflows/build.yml        | 6 +++---
 PCL.Neo.Core/PCL.Neo.Core.csproj   | 1 -
 PCL.Neo.Tests/PCL.Neo.Tests.csproj | 2 +-
 PCL.Neo/PCL.Neo.csproj             | 6 +++++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 004950e..48ae10b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -100,9 +100,9 @@ jobs:
               run: |
                   cd ./PCL.Neo
                   sudo su
-                  dotnet publish -r win-x86 --self-contained true -p:PublishSingleFile=true -p:TrimMode=copyused
-                  dotnet publish -r win-x64 --self-contained true -p:PublishSingleFile=true -p:TrimMode=copyused
-                  dotnet publish -r win-arm64 --self-contained true -p:PublishSingleFile=true -p:TrimMode=copyused
+                  dotnet publish -r win-x86
+                  dotnet publish -r win-x64
+                  dotnet publish -r win-arm64
                   mv ./bin/Release/net10.0/win-x86/publish/PCL.Neo.exe ./bin/Release/net10.0/win-x86/publish/PCL.Neo.win.x86.exe
                   mv ./bin/Release/net10.0/win-x64/publish/PCL.Neo.exe ./bin/Release/net10.0/win-x64/publish/PCL.Neo.win.x64.exe
                   mv ./bin/Release/net10.0/win-arm64/publish/PCL.Neo.exe ./bin/Release/net10.0/win-arm64/publish/PCL.Neo.win.arm64.exe
diff --git a/PCL.Neo.Core/PCL.Neo.Core.csproj b/PCL.Neo.Core/PCL.Neo.Core.csproj
index 7d5d398..92f3a6b 100644
--- a/PCL.Neo.Core/PCL.Neo.Core.csproj
+++ b/PCL.Neo.Core/PCL.Neo.Core.csproj
@@ -20,7 +20,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
     <PackageReference Include="Tomlyn" Version="0.19.0" />
     <PackageReference Include="UltimateLogSystem" Version="1.1.0" />
   </ItemGroup>
diff --git a/PCL.Neo.Tests/PCL.Neo.Tests.csproj b/PCL.Neo.Tests/PCL.Neo.Tests.csproj
index 48322a8..2366c67 100644
--- a/PCL.Neo.Tests/PCL.Neo.Tests.csproj
+++ b/PCL.Neo.Tests/PCL.Neo.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/PCL.Neo/PCL.Neo.csproj b/PCL.Neo/PCL.Neo.csproj
index d6370ab..f44c081 100644
--- a/PCL.Neo/PCL.Neo.csproj
+++ b/PCL.Neo/PCL.Neo.csproj
@@ -16,7 +16,11 @@
     <CFBundleExecutable>PCL.Neo</CFBundleExecutable>
     <CFBundleIconFile>Assets/Icon.ico</CFBundleIconFile>
     <CFBundleShortVersionString>1.0</CFBundleShortVersionString>
-    <PublishTrimmed>false</PublishTrimmed>
+    <PublishTrimmed>true</PublishTrimmed>
+    <TrimMode>partial</TrimMode>
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
   </PropertyGroup>
 
   <ItemGroup>

From c2e06c80399ad12094254a6bdc2be6c5c103c692 Mon Sep 17 00:00:00 2001
From: tangge233 <tangge233@qq.com>
Date: Sun, 21 Dec 2025 21:52:31 +0800
Subject: [PATCH 4/4] fix(ci): macos build fail

---
 mac-publish-assets/package-mac.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mac-publish-assets/package-mac.sh b/mac-publish-assets/package-mac.sh
index e023cfa..3a8d0fd 100644
--- a/mac-publish-assets/package-mac.sh
+++ b/mac-publish-assets/package-mac.sh
@@ -18,7 +18,7 @@ mkdir -p x64
 
 # 打包 arm64 版本
 APP_NAME_ARM64="arm64/PCL.Neo.app"
-PUBLISH_OUTPUT_DIRECTORY_ARM64="../PCL.Neo/bin/Release/net9.0/osx-arm64/publish/."
+PUBLISH_OUTPUT_DIRECTORY_ARM64="../PCL.Neo/bin/Release/net10.0/osx-arm64/publish/."
 
 if [ -d "$APP_NAME_ARM64" ]; then
     rm -rf "$APP_NAME_ARM64"
@@ -45,7 +45,7 @@ cp -a $PUBLISH_OUTPUT_DIRECTORY_ARM64/* "$APP_NAME_ARM64/Contents/MacOS/"
 
 # 打包 x64 版本
 APP_NAME_X64="x64/PCL.Neo.app"
-PUBLISH_OUTPUT_DIRECTORY_X64="../PCL.Neo/bin/Release/net9.0/osx-x64/publish/."
+PUBLISH_OUTPUT_DIRECTORY_X64="../PCL.Neo/bin/Release/net10.0/osx-x64/publish/."
 
 if [ -d "$APP_NAME_X64" ]; then
     rm -rf "$APP_NAME_X64"