更新推包脚本，更新类库说明

3 years ago · 22fa3e7020
parent 2cf0c7df54
commit 22fa3e7020
19 changed files with 27 additions and 1425 deletions
--- a/ZhonTai.sln
+++ b/ZhonTai.sln
@ -49,7 +49,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4A1F23C8
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{A6C50476-5236-4FD3-8C29-6449494846C0}"
 	ProjectSection(SolutionItems) = preProject
-		build\common.props = build\common.props
+		build\pkg.props = build\pkg.props
 	EndProjectSection
 EndProject
 Global
--- a/build/common.props
+++ b/build/common.props
--- a/build/pack&push.ps1
+++ b/build/pack&push.ps1
@ -2,7 +2,11 @@

 $buildFolder = (Get-Item -Path "./" -Verbose).FullName
 $rootFolder = Join-Path $buildFolder "../"
-$apiKey = ""
+$apiKey = $args[0]
+if ([System.String]::IsNullOrWhiteSpace($apiKey)) 
+{
+    $apiKey = $env:NUGET_KEY
+}
 $sourceUrl = "http://localhost:5000/v3/index.json"

 Write-Host "buildFolder:" $buildFolder
@ -40,7 +44,9 @@ $projects = (
    "src\plates\ZhonTai.Plate.Personal\ZhonTai.Plate.Personnel.Domain",
    "src\plates\ZhonTai.Plate.Personal\ZhonTai.Plate.Personnel.HttpApi",
    "src\plates\ZhonTai.Plate.Personal\ZhonTai.Plate.Personnel.Repository",
-    "src\plates\ZhonTai.Plate.Personal\ZhonTai.Plate.Personnel.Service"
+    "src\plates\ZhonTai.Plate.Personal\ZhonTai.Plate.Personnel.Service",
+    "src\shared\ZhonTai.Common",
+    "src\shared\ZhonTai.Tools"
 )

 Write-Host "dotnet pack -- start"
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@ -0,0 +1,3 @@
+<Project>
+	<Import Project="..\build\pkg.props" />
+</Project>
--- a/src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/ZhonTai.Plate.Admin.Domain.csproj
+++ b/src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/ZhonTai.Plate.Admin.Domain.csproj
@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)\build\common.props"></Import>
-	
  <PropertyGroup>
-    <Description>中台Admin后端实体库</Description>
+    <Description>中台Admin后端Admin实体库</Description>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
--- a/src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/ZhonTai.Plate.Admin.HttpApi.csproj
+++ b/src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/ZhonTai.Plate.Admin.HttpApi.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+	  <Description>中台Admin后端Admin接口库</Description>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
--- a/src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Repository/ZhonTai.Plate.Admin.Repository.csproj
+++ b/src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Repository/ZhonTai.Plate.Admin.Repository.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)\build\common.props"></Import>
  <PropertyGroup>
-    <Description>中台Admin后端仓储库</Description>
+    <Description>中台Admin后端Admin仓储库</Description>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
--- a/src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/ZhonTai.Plate.Admin.Service.Contracts.csproj
+++ b/src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/ZhonTai.Plate.Admin.Service.Contracts.csproj
@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>ZhonTai.Plate.Admin.Service</RootNamespace>
--- a/src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/ZhonTai.Plate.Admin.Service.csproj
+++ b/src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/ZhonTai.Plate.Admin.Service.csproj
@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)\build\common.props"></Import>
-	
  <PropertyGroup>
-    <Description>中台Admin后端服务库</Description>
+    <Description>中台Admin后端Admin服务库</Description>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
--- a/src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Domain/ZhonTai.Plate.Personnel.Domain.csproj
+++ b/src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Domain/ZhonTai.Plate.Personnel.Domain.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)\build\common.props"></Import>
  <PropertyGroup>
-    <Description>中台Admin后端实体库</Description>
+    <Description>中台Admin后端人事实体库</Description>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
--- a/src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.HttpApi/ZhonTai.Plate.Personnel.HttpApi.csproj
+++ b/src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.HttpApi/ZhonTai.Plate.Personnel.HttpApi.csproj
@ -1,17 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+	    <Description>中台Admin后端人事接口库</Description>
+    </PropertyGroup>

-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
    <DocumentationFile>F:\zhontai\Admin\src\plates\ZhonTai.Plate.Personal\ZhonTai.Plate.Personnel.HttpApi\ZhonTai.Plate.Personnel.HttpApi.xml</DocumentationFile>
    <NoWarn>1701;1702;1591</NoWarn>
-  </PropertyGroup>
+    </PropertyGroup>

-  <ItemGroup>
+    <ItemGroup>
    <ProjectReference Include="..\..\ZhonTai.Plate.Admin\ZhonTai.Plate.Admin.HttpApi.Shared\ZhonTai.Plate.Admin.HttpApi.Shared.csproj" />
    <ProjectReference Include="..\ZhonTai.Plate.Personnel.Service.Contracts\ZhonTai.Plate.Personnel.Service.Contracts.csproj" />
-  </ItemGroup>
+    </ItemGroup>

 </Project>
--- a/src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Repository/ZhonTai.Plate.Personnel.Repository.csproj
+++ b/src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Repository/ZhonTai.Plate.Personnel.Repository.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)\build\common.props"></Import>
  <PropertyGroup>
-    <Description>中台Admin后端仓储库</Description>
+    <Description>中台Admin后端人事仓储库</Description>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
--- a/src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service.Contracts/ZhonTai.Plate.Personnel.Service.Contracts.csproj
+++ b/src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service.Contracts/ZhonTai.Plate.Personnel.Service.Contracts.csproj
@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>ZhonTai.Plate.Personnel.Service</RootNamespace>
--- a/src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service/ZhonTai.Plate.Personnel.Service.csproj
+++ b/src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service/ZhonTai.Plate.Personnel.Service.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)\build\common.props"></Import>
  <PropertyGroup>
-    <Description>中台Admin后端服务库</Description>
+    <Description>中台Admin后端人事服务库</Description>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
--- a/src/shared/ZhonTai.Common/ZhonTai.Common.csproj
+++ b/src/shared/ZhonTai.Common/ZhonTai.Common.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="$(SolutionDir)\build\common.props"></Import>
    <PropertyGroup>
 	    <Description>中台Admin后端通用库</Description>
+	    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
    </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
--- a/src/shared/ZhonTai.Common/ZhonTai.Common.xml
+++ b/src/shared/ZhonTai.Common/ZhonTai.Common.xml
--- a/src/shared/ZhonTai.Tools/ZhonTai.Tools.csproj
+++ b/src/shared/ZhonTai.Tools/ZhonTai.Tools.csproj
@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)\build\common.props"></Import>
 	<PropertyGroup>
 		<Description>中台Admin工具库</Description>
 	</PropertyGroup>
--- a/src/tests/ZhonTai.Plate.Admin.Tests/ZhonTai.Plate.Admin.Tests.csproj
+++ b/src/tests/ZhonTai.Plate.Admin.Tests/ZhonTai.Plate.Admin.Tests.csproj
@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <IsPackable>false</IsPackable>
--- a/src/tests/ZhonTai.Plate.Personnel.Tests/ZhonTai.Plate.Personnel.Tests.csproj
+++ b/src/tests/ZhonTai.Plate.Personnel.Tests/ZhonTai.Plate.Personnel.Tests.csproj
@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <IsPackable>false</IsPackable>