增强AntJob.Web多目标打包及CI输出路径灵活性 调整csproj以支持动态TargetFrameworks和输出路径,提升多目标打包兼容性。CI流程中通过环境变量控制打包目标,避免输出目录冲突,便于灵活扩展和维护。智能大石头 authored at 2026-03-10 23:41:36
diff --git a/.github/workflows/publish-beta.yml b/.github/workflows/publish-beta.yml
index d4f95c3..9f82445 100644
--- a/.github/workflows/publish-beta.yml
+++ b/.github/workflows/publish-beta.yml
@@ -35,7 +35,7 @@ jobs:
dotnet pack --version-suffix ${{ env.VERSION }} -c Release -o out AntJob/AntJob.csproj
dotnet pack --version-suffix ${{ env.VERSION }} -c Release -o out AntJob.Extensions/AntJob.Extensions.csproj
dotnet pack --version-suffix ${{ env.VERSION }} -c Release -o out AntJob.Data/AntJob.Data.csproj
- dotnet pack --version-suffix ${{ env.VERSION }} -c Release -o out AntJob.Web/AntJob.Web.csproj
+ WebPackTargetFrameworks='net8.0;net10.0' dotnet pack --version-suffix ${{ env.VERSION }} -c Release -o out AntJob.Web/AntJob.Web.csproj
- name: Publish
run: |
dotnet nuget push ./out/*.nupkg --skip-duplicate --source https://nuget.pkg.github.com/NewLifeX/index.json --api-key ${{ github.token }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index c2304f3..3a28b6d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -27,7 +27,7 @@ jobs:
dotnet pack --version-suffix ${{ env.VERSION }} -c Release -o out AntJob/AntJob.csproj
dotnet pack --version-suffix ${{ env.VERSION }} -c Release -o out AntJob.Extensions/AntJob.Extensions.csproj
dotnet pack --version-suffix ${{ env.VERSION }} -c Release -o out AntJob.Data/AntJob.Data.csproj
- dotnet pack --version-suffix ${{ env.VERSION }} -c Release -o out AntJob.Web/AntJob.Web.csproj
+ WebPackTargetFrameworks='net8.0;net10.0' dotnet pack --version-suffix ${{ env.VERSION }} -c Release -o out AntJob.Web/AntJob.Web.csproj
- name: Publish
run: |
dotnet nuget push ./out/*.nupkg --skip-duplicate --source https://nuget.pkg.github.com/NewLifeX/index.json --api-key ${{ github.token }}
diff --git a/AntJob.Server/AntJob.Server.csproj b/AntJob.Server/AntJob.Server.csproj
index b0f7ece..07a8972 100644
--- a/AntJob.Server/AntJob.Server.csproj
+++ b/AntJob.Server/AntJob.Server.csproj
@@ -29,6 +29,7 @@
<Content Include="favicon.ico" />
</ItemGroup>
<ItemGroup>
+ <PackageReference Include="NewLife.MySql" Version="1.0.2026.302" />
<PackageReference Include="NewLife.Redis" Version="6.5.2026.303" />
</ItemGroup>
<ItemGroup>
diff --git a/AntJob.Web/AntJob.Web.csproj b/AntJob.Web/AntJob.Web.csproj
index e5496cf..4316747 100644
--- a/AntJob.Web/AntJob.Web.csproj
+++ b/AntJob.Web/AntJob.Web.csproj
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<AssemblyName>AntWeb</AssemblyName>
- <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
+ <TargetFramework>net10.0</TargetFramework>
+ <TargetFrameworks Condition="'$(PackageTargetFrameworks)' != ''">$(PackageTargetFrameworks)</TargetFrameworks>
<AssemblyTitle>蚂蚁调度管理</AssemblyTitle>
<Description>AntJob 可视化管理平台,提供任务调度、监控、日志查询和集群管理功能。</Description>
<Company>新生命开发团队</Company>
@@ -13,7 +14,7 @@
<AssemblyVersion>$(VersionPrefix).*</AssemblyVersion>
<Deterministic>false</Deterministic>
<OutputPath>..\Bin\Web</OutputPath>
- <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+ <AppendTargetFrameworkToOutputPath Condition="'$(PackageTargetFrameworks)' == ''">false</AppendTargetFrameworkToOutputPath>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>latest</LangVersion>
<IsPackable>true</IsPackable>
@@ -29,6 +30,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Cube.Core" Version="6.9.2026.303" />
+ <PackageReference Include="NewLife.MySql" Version="1.0.2026.302" />
<PackageReference Include="NewLife.Remoting.Extensions" Version="3.7.2026.302" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="3.7.2026.307" />
</ItemGroup>