NewLife/AntJob

打包 AntJob.Web 时,把 AntJob.Data 打包进去,避免发布两个nuget包
大石头 authored at 2026-04-16 20:13:36
55eef96
Tree
1 Parent(s) e2d179e
Summary: 3 changed files with 14 additions and 3 deletions.
Modified +0 -1
Modified +0 -1
Modified +14 -1
Modified +0 -1
diff --git a/.github/workflows/publish-beta.yml b/.github/workflows/publish-beta.yml
index 9f82445..1887e77 100644
--- a/.github/workflows/publish-beta.yml
+++ b/.github/workflows/publish-beta.yml
@@ -34,7 +34,6 @@ jobs:
       run: |
         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
         WebPackTargetFrameworks='net8.0;net10.0' dotnet pack --version-suffix ${{ env.VERSION }} -c Release -o out AntJob.Web/AntJob.Web.csproj
     - name: Publish
       run: |
Modified +0 -1
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 3a28b6d..0cc16cc 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -26,7 +26,6 @@ jobs:
       run: |
         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
         WebPackTargetFrameworks='net8.0;net10.0' dotnet pack --version-suffix ${{ env.VERSION }} -c Release -o out AntJob.Web/AntJob.Web.csproj
     - name: Publish
       run: |
Modified +14 -1
diff --git a/AntJob.Web/AntJob.Web.csproj b/AntJob.Web/AntJob.Web.csproj
index 2601ad6..3010e74 100644
--- a/AntJob.Web/AntJob.Web.csproj
+++ b/AntJob.Web/AntJob.Web.csproj
@@ -35,9 +35,22 @@
     <PackageReference Include="NewLife.Stardust.Extensions" Version="3.7.2026.403" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\AntJob.Data\AntJob.Data.csproj" />
+    <ProjectReference Include="..\AntJob.Data\AntJob.Data.csproj">
+      <PrivateAssets>all</PrivateAssets>
+    </ProjectReference>
     <ProjectReference Include="..\AntJob\AntJob.csproj" />
   </ItemGroup>
+
+  <PropertyGroup>
+    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeDataBuildOutput</TargetsForTfmSpecificBuildOutput>
+  </PropertyGroup>
+  <Target Name="IncludeDataBuildOutput">
+    <ItemGroup>
+      <BuildOutputInPackage Include="$(OutputPath)AntJob.Data.dll" />
+      <BuildOutputInPackage Include="$(OutputPath)AntJob.Data.xml" />
+    </ItemGroup>
+  </Target>
+
   <ItemGroup>
     <Folder Include="Services\" />
   </ItemGroup>