Forráskód Böngészése

修复推包未生成对应库xml文件的问题
修复无swagger文档的xml文件启动会异常的问题

zhontai 3 éve
szülő
commit
a69659a87d

+ 6 - 4
build/pkg.props

@@ -1,14 +1,16 @@
 <Project>
   <PropertyGroup>
-    <Version>1.8.0</Version>
+    <Version>2.0.0</Version>
 	<TargetFramework>net6.0</TargetFramework>
 	<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+	<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	<Authors>xiaoxue</Authors>
 	<Company>xiaoxue</Company>
 	<PackageLicenseExpression>MIT</PackageLicenseExpression>
-	<PackageProjectUrl>https://github.com/zhontai/ZhonTai</PackageProjectUrl>
-	<RepositoryUrl>https://github.com/zhontai/ZhonTai</RepositoryUrl>
+	<PackageProjectUrl>https://admin.zhontai.net</PackageProjectUrl>
+	<RepositoryUrl>https://github.com/zhontai/Admin.Core</RepositoryUrl>
 	<RepositoryType>git</RepositoryType>
-	<PackageTags>ZhonTai Admin;WebApi</PackageTags>
+	<PackageTags>ZhonTai AdminApi;WebApi</PackageTags>
+	<NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
 </Project>

+ 3 - 0
build/pkg_push.ps1

@@ -39,12 +39,15 @@ Remove-Item "$nuGetOutputFolder/*" -recurse
 $projects = (
     "src\plates\ZhonTai.Plate.Admin\ZhonTai.Plate.Admin.Domain",
     "src\plates\ZhonTai.Plate.Admin\ZhonTai.Plate.Admin.HttpApi",
+	"src\plates\ZhonTai.Plate.Admin\ZhonTai.Plate.Admin.HttpApi.Shared",
     "src\plates\ZhonTai.Plate.Admin\ZhonTai.Plate.Admin.Repository",
     "src\plates\ZhonTai.Plate.Admin\ZhonTai.Plate.Admin.Service",
+	"src\plates\ZhonTai.Plate.Admin\ZhonTai.Plate.Admin.Service.Contracts",
     "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.Contracts",
     "src\shared\ZhonTai.Common",
     "src\shared\ZhonTai.Tools"
 )

+ 8 - 7
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi.Shared/BaseStartup.cs

@@ -229,13 +229,14 @@ namespace ZhonTai.Plate.Admin.HttpApi.Shared
                     options.ResolveConflictingActions(apiDescription => apiDescription.First());
                     options.CustomSchemaIds(x => x.FullName);
 
-                    options.IncludeXmlComments(Path.Combine(basePath, "ZhonTai.Common.xml"));
-                    options.IncludeXmlComments(Path.Combine(basePath, "ZhonTai.Plate.Admin.Domain.xml"));
-                    options.IncludeXmlComments(Path.Combine(basePath, "ZhonTai.Plate.Admin.Service.Contracts.xml"));
-                    options.IncludeXmlComments(Path.Combine(basePath, "ZhonTai.Plate.Admin.HttpApi.xml"));
-                    options.IncludeXmlComments(Path.Combine(basePath, "ZhonTai.Plate.Personnel.Domain.xml"));
-                    options.IncludeXmlComments(Path.Combine(basePath, "ZhonTai.Plate.Personnel.Service.Contracts.xml"));
-                    options.IncludeXmlComments(Path.Combine(basePath, "ZhonTai.Plate.Personnel.HttpApi.xml"));
+                    string[] xmlFiles = Directory.GetFiles(basePath, "*.xml");
+                    if (xmlFiles.Length > 0)
+                    {
+                        foreach (var xmlFile in xmlFiles)
+                        {
+                            options.IncludeXmlComments(xmlFile, true);
+                        }
+                    }
 
                     #region 添加设置Token的按钮
 

+ 3 - 3
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi.Shared/ZhonTai.Plate.Admin.HttpApi.Shared.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    </PropertyGroup>
+	<PropertyGroup>
+		<Description>中台Admin后端Admin接口共享库</Description>
+	</PropertyGroup>
 	
 	<ItemGroup>
 		<PackageReference Include="AspNetCoreRateLimit" Version="4.0.1" />

+ 1 - 1
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/ZhonTai.Plate.Admin.Service.Contracts.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+	<Description>中台Admin后端Admin服务契约库</Description>
     <RootNamespace>ZhonTai.Plate.Admin.Service</RootNamespace>
   </PropertyGroup>
 

+ 1 - 1
src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service.Contracts/ZhonTai.Plate.Personnel.Service.Contracts.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <Description>中台Admin后端人事服务契约库</Description>
     <RootNamespace>ZhonTai.Plate.Personnel.Service</RootNamespace>
   </PropertyGroup>
 

+ 0 - 1
src/shared/ZhonTai.Common/ZhonTai.Common.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
 	    <Description>中台Admin后端通用库</Description>
-	    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">