From 4447845381da7275ff4a2bd27ec5128a9d4a9c8c Mon Sep 17 00:00:00 2001 From: colin Date: Sun, 18 Feb 2024 16:42:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4openapi=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E9=A1=B9=E7=9B=AE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish.yml | 6 +-- aspnet-core/LINGYUN.MicroService.Common.sln | 7 ---- aspnet-core/common.props | 46 +++++++++++---------- build/build-aspnetcore-publish-sln.ps1 | 4 +- 4 files changed, 27 insertions(+), 36 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6c999303a..79f9fda4c 100644 --- 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 index 47af7517f..fc7e1cd2d 100644 --- 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 index 54ec69ae9..d4f024e65 100644 --- a/aspnet-core/common.props +++ b/aspnet-core/common.props @@ -1,20 +1,22 @@ - - latest - 8.0.3 - colin - $(NoWarn);CS1591;CS0436;CS8618;NU1803 - https://github.com/colinin/abp-next-admin - MIT - git - https://github.com/colinin/abp-next-admin - true - + + latest + 8.0.3 + colin + $(NoWarn);CS1591;CS0436;CS8618;NU1803 + https://github.com/colinin/abp-next-admin + $(SolutionDir)LocalNuget + 8.0.3 + MIT + git + https://github.com/colinin/abp-next-admin + true + - - - - + + + + @@ -23,14 +25,14 @@ - - - - + + + + - - $(SolutionDir)LocalNuget - + + $(SolutionDir)LocalNuget + \ No newline at end of file diff --git a/build/build-aspnetcore-publish-sln.ps1 b/build/build-aspnetcore-publish-sln.ps1 index f628961d0..75edd7471 100644 --- 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 \ No newline at end of file