diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a74fc25c..48ae10be 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,13 +100,13 @@ 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 - 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/ + 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 + 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 diff --git a/PCL.Neo.Core/PCL.Neo.Core.csproj b/PCL.Neo.Core/PCL.Neo.Core.csproj index 54371334..92f3a6b7 100644 --- a/PCL.Neo.Core/PCL.Neo.Core.csproj +++ b/PCL.Neo.Core/PCL.Neo.Core.csproj @@ -1,26 +1,25 @@  - net9.0 + net10.0 enable enable true - + - - - + + + - - - + + + - diff --git a/PCL.Neo.Tests/PCL.Neo.Tests.csproj b/PCL.Neo.Tests/PCL.Neo.Tests.csproj index 48322a87..2366c67d 100644 --- a/PCL.Neo.Tests/PCL.Neo.Tests.csproj +++ b/PCL.Neo.Tests/PCL.Neo.Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 false diff --git a/PCL.Neo/PCL.Neo.csproj b/PCL.Neo/PCL.Neo.csproj index 876c7719..f44c0819 100644 --- a/PCL.Neo/PCL.Neo.csproj +++ b/PCL.Neo/PCL.Neo.csproj @@ -1,7 +1,7 @@ WinExe - net9.0 + net10.0 enable true app.manifest @@ -16,7 +16,11 @@ PCL.Neo Assets/Icon.ico 1.0 - false + true + partial + true + true + true @@ -29,24 +33,24 @@ - - - - - + + + + + - + None All - + - - - - + + + + diff --git a/mac-publish-assets/package-mac.sh b/mac-publish-assets/package-mac.sh index e023cfa5..3a8d0fd0 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"