From 1c2e1848b58907881650f740658e58abc9bac3b6 Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Wed, 3 Dec 2025 22:14:33 +0800 Subject: [PATCH] feat: support for .net 10.0. --- .github/workflows/build.yml | 2 +- .github/workflows/bump-up-version.yml | 2 +- .github/workflows/dotnet-format.yml | 2 +- .github/workflows/push-to-myget.yml | 2 +- build/build.config.xml | 1 + .../HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj | 2 +- src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj | 2 +- src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj | 2 +- .../HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs | 2 ++ 9 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c46dde1b..741576ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: - name: Setup .NET Core SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: '9.0.x' + dotnet-version: '10.0.x' - name: Build working-directory: ./build diff --git a/.github/workflows/bump-up-version.yml b/.github/workflows/bump-up-version.yml index 4b1ba60e..2af40bea 100644 --- a/.github/workflows/bump-up-version.yml +++ b/.github/workflows/bump-up-version.yml @@ -22,7 +22,7 @@ jobs: - name: Setup .NET Core SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: '9.0.x' + dotnet-version: '10.0.x' - name: Publish working-directory: ./build diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml index e43b9aa9..c525e53d 100644 --- a/.github/workflows/dotnet-format.yml +++ b/.github/workflows/dotnet-format.yml @@ -19,7 +19,7 @@ jobs: - name: Setup .NET Core SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: '9.0.x' + dotnet-version: '10.0.x' # 代码文件编码规范机器人，详细请看 [dotnet 在 GitHub 的 Action 上部署自动代码编码规范机器人](https://blog.lindexi.com/post/dotnet-%E5%9C%A8-GitHub-%E7%9A%84-Action-%E4%B8%8A%E9%83%A8%E7%BD%B2%E8%87%AA%E5%8A%A8%E4%BB%A3%E7%A0%81%E7%BC%96%E7%A0%81%E8%A7%84%E8%8C%83%E6%9C%BA%E5%99%A8%E4%BA%BA.html) - name: Install dotnetCampus.EncodingNormalior diff --git a/.github/workflows/push-to-myget.yml b/.github/workflows/push-to-myget.yml index 457fefda..b1623c51 100644 --- a/.github/workflows/push-to-myget.yml +++ b/.github/workflows/push-to-myget.yml @@ -14,7 +14,7 @@ jobs: - name: Setup .NET Core SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: '9.0.x' + dotnet-version: '10.0.x' - name: setup nuget.exe uses: NuGet/setup-nuget@v1.0.5 diff --git a/build/build.config.xml b/build/build.config.xml index 15be80c8..9ad68576 100644 --- a/build/build.config.xml +++ b/build/build.config.xml @@ -20,5 +20,6 @@ + diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj index 0704ed8c..90802bae 100644 --- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj +++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj @@ -3,7 +3,7 @@ WinExe HandyControlDemo HandyControlDemo - netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows;net10.0-windows ..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico 0108;MSB3026;MSB3061;SYSLIB0014 NETSDK1138 diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj index a343260c..d90c72e8 100644 --- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj +++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj @@ -2,7 +2,7 @@ HandyControl HandyControl - netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows;net10.0-windows Contains some simple and commonly used WPF controls HandyControl snupkg diff --git a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj index ab5f95bb..8e7163bc 100644 --- a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj +++ b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj @@ -3,7 +3,7 @@ true HandyControlDemoCode HandyControlDemoCode - netcoreapp3.0;netcoreapp3.1;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows + netcoreapp3.0;netcoreapp3.1;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows;net10.0-windows MSB3026;MSB3061 NETSDK1138 diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs b/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs index e05e4bb8..cab763c8 100644 --- a/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs +++ b/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs @@ -42,6 +42,8 @@ internal class VersionHelper var netVersion = ".NET 8.0"; #elif NET9_0 var netVersion = ".NET 9.0"; +#elif NET10_0 + var netVersion = ".NET 10.0"; #elif NETCOREAPP3_0 var netVersion = ".NET CORE 3.0"; #elif NETCOREAPP3_1