From b1db53b023a82168f14b2a70c38803757ed47a6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E6=98=9F=E7=B9=81?= Date: Tue, 2 Dec 2025 14:57:57 +0800 Subject: [PATCH 1/2] chore: remove STJ reference for net8.0 and above --- .github/workflows/ci.yml | 2 +- Directory.Build.props | 2 +- src/Cnblogs.DashScope.AI/Cnblogs.DashScope.AI.csproj | 1 - src/Cnblogs.DashScope.Core/Cnblogs.DashScope.Core.csproj | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0af6bf5..100004c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: push: branches: [ "main" ] pull_request: - branches: [ "main" ] + branches: [ "main", "staging" ] jobs: test-net6: diff --git a/Directory.Build.props b/Directory.Build.props index 3eaabd9..c98ba0c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - net6.0 + net6.0;net8.0 enable enable Cnblogs diff --git a/src/Cnblogs.DashScope.AI/Cnblogs.DashScope.AI.csproj b/src/Cnblogs.DashScope.AI/Cnblogs.DashScope.AI.csproj index 4685740..2421d51 100644 --- a/src/Cnblogs.DashScope.AI/Cnblogs.DashScope.AI.csproj +++ b/src/Cnblogs.DashScope.AI/Cnblogs.DashScope.AI.csproj @@ -1,6 +1,5 @@  - net8.0 Cnblogs.DashScope.AI true Cnblogs;Dashscope;Microsoft.Extensions.AI;Sdk;Embedding; diff --git a/src/Cnblogs.DashScope.Core/Cnblogs.DashScope.Core.csproj b/src/Cnblogs.DashScope.Core/Cnblogs.DashScope.Core.csproj index 7dd23dd..837c127 100644 --- a/src/Cnblogs.DashScope.Core/Cnblogs.DashScope.Core.csproj +++ b/src/Cnblogs.DashScope.Core/Cnblogs.DashScope.Core.csproj @@ -13,7 +13,7 @@ - + From df6e542713ce8da3831ecff281c0a64f7fb25dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E6=98=9F=E7=B9=81?= Date: Tue, 2 Dec 2025 15:10:06 +0800 Subject: [PATCH 2/2] chore: split Directory.Build.props --- .github/workflows/ci.yml | 4 ++-- Directory.Build.props => src/Directory.Build.props | 0 test/Directory.Build.props | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) rename Directory.Build.props => src/Directory.Build.props (100%) create mode 100644 test/Directory.Build.props diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 100004c..3c0e5ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,9 +15,9 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Build - run: dotnet build src/Cnblogs.DashScope.AspNetCore -c Release + run: dotnet build src/Cnblogs.DashScope.AspNetCore -c Release -p:TargetFramework=net6.0 - name: Test - run: dotnet test test/Cnblogs.DashScope.Sdk.UnitTests -c Release + run: dotnet test test/Cnblogs.DashScope.Sdk.UnitTests -c Release -p:TargetFramework=net6.0 test-net8: runs-on: ubuntu-latest container: mcr.microsoft.com/dotnet/sdk:8.0 diff --git a/Directory.Build.props b/src/Directory.Build.props similarity index 100% rename from Directory.Build.props rename to src/Directory.Build.props diff --git a/test/Directory.Build.props b/test/Directory.Build.props new file mode 100644 index 0000000..aed0aa4 --- /dev/null +++ b/test/Directory.Build.props @@ -0,0 +1,8 @@ + + + net6.0 + enable + enable + + +