fix: 移除openapi测试项目.

colinin · Feb 18, 2024 · 4447845 · 4447845
1 parent e0fe2f1
commit 4447845
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 36 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -20,15 +20,11 @@ jobs:
       uses: nuget/setup-nuget@v1
       with:
         nuget-version: '5.x'
-    - name: Build All
-      run: .\build-aspnetcore-build-sln.ps1 -f
-      working-directory: .\build
-      shell: powershell
     - name: Pack All Packages
       run: .\build-aspnetcore-publish-sln.ps1 -f
       working-directory: .\build
       shell: powershell
     - name: Publish Packages
       run:
-        dotnet nuget push ./aspnet-core/Publish/nupkgs/LINGYUN.*.nupkg --api-key ${{ secrets.NUGETKEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
+        dotnet nuget push ./aspnet-core/LocalNuget/LINGYUN.*.nupkg --api-key ${{ secrets.NUGETKEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate --no-symbols
 
diff --git a/aspnet-core/LINGYUN.MicroService.Common.sln b/aspnet-core/LINGYUN.MicroService.Common.sln
@@ -196,8 +196,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.OpenApi", "fram
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.OpenApi.Authorization", "framework\open-api\LINGYUN.Abp.OpenApi.Authorization\LINGYUN.Abp.OpenApi.Authorization.csproj", "{3CE350AF-5574-46EC-8120-8542350AED20}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.OpenApi.Tests", "tests\LINGYUN.Abp.OpenApi.Tests\LINGYUN.Abp.OpenApi.Tests.csproj", "{6C75799E-4B46-434D-BE1B-4AD71DF49686}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cli", "cli", "{FE372F22-80A2-4859-9330-949C27CA94ED}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Cli", "framework\cli\LINGYUN.Abp.Cli\LINGYUN.Abp.Cli.csproj", "{33007EF7-BC1D-4B32-ACDA-6B9117200FAD}"
@@ -629,10 +627,6 @@ Global
 		{3CE350AF-5574-46EC-8120-8542350AED20}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3CE350AF-5574-46EC-8120-8542350AED20}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3CE350AF-5574-46EC-8120-8542350AED20}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6C75799E-4B46-434D-BE1B-4AD71DF49686}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C75799E-4B46-434D-BE1B-4AD71DF49686}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C75799E-4B46-434D-BE1B-4AD71DF49686}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6C75799E-4B46-434D-BE1B-4AD71DF49686}.Release|Any CPU.Build.0 = Release|Any CPU
 		{33007EF7-BC1D-4B32-ACDA-6B9117200FAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{33007EF7-BC1D-4B32-ACDA-6B9117200FAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{33007EF7-BC1D-4B32-ACDA-6B9117200FAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -927,7 +921,6 @@ Global
 		{8C688427-DD35-4F0B-86DA-6F536D3852D5} = {02EA4E78-5891-43BC-944F-3E52FEE032E4}
 		{2C8A6B4C-D6B2-44FE-9EF5-EC7480D2A6B2} = {8C688427-DD35-4F0B-86DA-6F536D3852D5}
 		{3CE350AF-5574-46EC-8120-8542350AED20} = {8C688427-DD35-4F0B-86DA-6F536D3852D5}
-		{6C75799E-4B46-434D-BE1B-4AD71DF49686} = {B86C21A4-73B7-471E-B73A-B4B905EC9435}
 		{FE372F22-80A2-4859-9330-949C27CA94ED} = {02EA4E78-5891-43BC-944F-3E52FEE032E4}
 		{33007EF7-BC1D-4B32-ACDA-6B9117200FAD} = {FE372F22-80A2-4859-9330-949C27CA94ED}
 		{B9592989-9F76-413C-8612-96E8C0CFA041} = {7FDFB22F-1BFF-4E05-9427-78B7A8461D50}

diff --git a/aspnet-core/common.props b/aspnet-core/common.props
@@ -1,20 +1,22 @@
 <Project>
-  <PropertyGroup>
-    <LangVersion>latest</LangVersion>
-    <Version>8.0.3</Version>
-    <Authors>colin</Authors>
-    <NoWarn>$(NoWarn);CS1591;CS0436;CS8618;NU1803</NoWarn>
-    <PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/colinin/abp-next-admin</RepositoryUrl>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-  </PropertyGroup>
+	<PropertyGroup>
+		<LangVersion>latest</LangVersion>
+		<Version>8.0.3</Version>
+		<Authors>colin</Authors>
+		<NoWarn>$(NoWarn);CS1591;CS0436;CS8618;NU1803</NoWarn>
+		<PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>
+		<PackageOutputPath>$(SolutionDir)LocalNuget</PackageOutputPath>
+		<PackageVersion>8.0.3</PackageVersion>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<RepositoryType>git</RepositoryType>
+		<RepositoryUrl>https://github.com/colinin/abp-next-admin</RepositoryUrl>
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+	</PropertyGroup>
 
-  <ItemGroup>
-	  <Compile Remove="LocalNuget\**" />
-	  <EmbeddedResource Remove="LocalNuget\**" />
-	  <None Remove="LocalNuget\**" />
+	<ItemGroup>
+		<Compile Remove="LocalNuget\**" />
+		<EmbeddedResource Remove="LocalNuget\**" />
+		<None Remove="LocalNuget\**" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -23,14 +25,14 @@
 		<None Remove="Logs\**" />
 	</ItemGroup>
 
-  <ItemGroup>
-	  <Compile Remove="Modules\**" />
-	  <EmbeddedResource Remove="Modules\**" />
-	  <None Remove="Modules\**" />
+	<ItemGroup>
+		<Compile Remove="Modules\**" />
+		<EmbeddedResource Remove="Modules\**" />
+		<None Remove="Modules\**" />
 	</ItemGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>$(SolutionDir)LocalNuget</OutputPath>
-  </PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<OutputPath>$(SolutionDir)LocalNuget</OutputPath>
+	</PropertyGroup>
 
 </Project>
diff --git a/build/build-aspnetcore-publish-sln.ps1 b/build/build-aspnetcore-publish-sln.ps1
@@ -2,8 +2,8 @@
 
 # Build all solutions
 foreach ($solution in $solutionArray) {  
-    $packPath = $rootFolder + "/../aspnet-core/Publish/nupkgs"
-    dotnet pack -c Release -o $packPath --include-source --include-symbols $solution.File --no-cache
+    #dotnet pack -c Release --include-source --include-symbols $solution.File --no-cache
+    dotnet build -c Release $solution.File --no-cache
 }
 
 Set-Location $rootFolder