From 6ae7769ea15d83c56d556d6a5affd5d177490182 Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Wed, 22 Sep 2021 15:19:52 +0200 Subject: [PATCH 01/29] Set up PxWeb CI with Azure Pipelines Azure pipeline from pxweb fork [skip ci] --- azure-pipelines.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 000000000..6d417832f --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,34 @@ +# ASP.NET +# Build and test ASP.NET projects. +# Add steps that publish symbols, save build artifacts, deploy, and more: +# https://docs.microsoft.com/azure/devops/pipelines/apps/aspnet/build-aspnet-4 + +trigger: +- master + +pool: + vmImage: 'windows-latest' + +variables: + solution: '**/*.sln' + buildPlatform: 'Any CPU' + buildConfiguration: 'Release' + +steps: +- task: NuGetToolInstaller@1 + +- task: NuGetCommand@2 + inputs: + restoreSolution: '$(solution)' + +- task: VSBuild@1 + inputs: + solution: '$(solution)' + msbuildArgs: '/p:DeployOnBuild=true /p:WebPublishMethod=Package /p:PackageAsSingleFile=true /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.artifactStagingDirectory)"' + platform: '$(buildPlatform)' + configuration: '$(buildConfiguration)' + +- task: VSTest@2 + inputs: + platform: '$(buildPlatform)' + configuration: '$(buildConfiguration)' From f452a11b03a9aab8ee11a4377525c54c0193c92b Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Wed, 22 Sep 2021 16:05:17 +0200 Subject: [PATCH 02/29] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6d417832f..17cdb6af8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,7 +10,7 @@ pool: vmImage: 'windows-latest' variables: - solution: '**/*.sln' + solution: 'PCAxis.PX-Web.sln' buildPlatform: 'Any CPU' buildConfiguration: 'Release' From 279c5b0d26a891860f8315f876d0a1d236879e63 Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Wed, 22 Sep 2021 16:06:17 +0200 Subject: [PATCH 03/29] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 17cdb6af8..6f302fa06 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,7 +4,7 @@ # https://docs.microsoft.com/azure/devops/pipelines/apps/aspnet/build-aspnet-4 trigger: -- master +- azure-pipelines pool: vmImage: 'windows-latest' From 1fceb93a99b1e265486fac6078a8249b6f4d86d3 Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Thu, 23 Sep 2021 09:48:40 +0200 Subject: [PATCH 04/29] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6f302fa06..d9d2396b8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,7 +3,7 @@ # Add steps that publish symbols, save build artifacts, deploy, and more: # https://docs.microsoft.com/azure/devops/pipelines/apps/aspnet/build-aspnet-4 -trigger: +pr: - azure-pipelines pool: From 8f5a34b7f78042ca8e413a29791adb4740b4319c Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Thu, 23 Sep 2021 11:41:49 +0200 Subject: [PATCH 05/29] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d9d2396b8..6f302fa06 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,7 +3,7 @@ # Add steps that publish symbols, save build artifacts, deploy, and more: # https://docs.microsoft.com/azure/devops/pipelines/apps/aspnet/build-aspnet-4 -pr: +trigger: - azure-pipelines pool: From 21c020950c096b79230e9f1a2b66385e8d03b5ac Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Thu, 23 Sep 2021 14:16:25 +0200 Subject: [PATCH 06/29] Add or update the Azure App Service build and deployment workflow config --- .github/workflows/azure-pipelines_pxcloud.yml | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 .github/workflows/azure-pipelines_pxcloud.yml diff --git a/.github/workflows/azure-pipelines_pxcloud.yml b/.github/workflows/azure-pipelines_pxcloud.yml new file mode 100644 index 000000000..e9c8036a4 --- /dev/null +++ b/.github/workflows/azure-pipelines_pxcloud.yml @@ -0,0 +1,57 @@ +# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy +# More GitHub Actions for Azure: https://github.com/Azure/actions + +name: Build and deploy ASP app to Azure Web App - PXCloud + +on: + push: + branches: + - azure-pipelines + workflow_dispatch: + +jobs: + build: + runs-on: windows-latest + + steps: + - uses: actions/checkout@v2 + + - name: Setup MSBuild path + uses: microsoft/setup-msbuild@v1.0.2 + + - name: Setup NuGet + uses: NuGet/setup-nuget@v1.0.5 + + - name: Restore NuGet packages + run: nuget restore + + - name: Publish to folder + run: msbuild /nologo /verbosity:m /t:Build /t:pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="\published\" + + - name: Upload artifact for deployment job + uses: actions/upload-artifact@v2 + with: + name: ASP-app + path: '/published/**' + + deploy: + runs-on: windows-latest + needs: build + environment: + name: 'Production' + url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} + + steps: + - name: Download artifact from build job + uses: actions/download-artifact@v2 + with: + name: ASP-app + + - name: Deploy to Azure Web App + id: deploy-to-webapp + uses: azure/webapps-deploy@v2 + with: + app-name: 'PXCloud' + slot-name: 'Production' + publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_E15A159B9FD044A2A80EE2EEBA69A9B2 }} + package: . From 4c1c917d382bc23a80f2775049a33af38514b930 Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Fri, 24 Sep 2021 16:38:42 +0200 Subject: [PATCH 07/29] Add or update the Azure App Service build and deployment workflow config --- .../workflows/azure-pipelines_pxcloud2.yml | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 .github/workflows/azure-pipelines_pxcloud2.yml diff --git a/.github/workflows/azure-pipelines_pxcloud2.yml b/.github/workflows/azure-pipelines_pxcloud2.yml new file mode 100644 index 000000000..daac47f13 --- /dev/null +++ b/.github/workflows/azure-pipelines_pxcloud2.yml @@ -0,0 +1,57 @@ +# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy +# More GitHub Actions for Azure: https://github.com/Azure/actions + +name: Build and deploy ASP app to Azure Web App - PXCloud2 + +on: + push: + branches: + - azure-pipelines + workflow_dispatch: + +jobs: + build: + runs-on: windows-latest + + steps: + - uses: actions/checkout@v2 + + - name: Setup MSBuild path + uses: microsoft/setup-msbuild@v1.0.2 + + - name: Setup NuGet + uses: NuGet/setup-nuget@v1.0.5 + + - name: Restore NuGet packages + run: nuget restore + + - name: Publish to folder + run: msbuild /nologo /verbosity:m /t:Build /t:pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="\published\" + + - name: Upload artifact for deployment job + uses: actions/upload-artifact@v2 + with: + name: ASP-app + path: '/published/**' + + deploy: + runs-on: windows-latest + needs: build + environment: + name: 'Production' + url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} + + steps: + - name: Download artifact from build job + uses: actions/download-artifact@v2 + with: + name: ASP-app + + - name: Deploy to Azure Web App + id: deploy-to-webapp + uses: azure/webapps-deploy@v2 + with: + app-name: 'PXCloud2' + slot-name: 'Production' + publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_0C291CE2EEA14BC2BB5F6A6972930634 }} + package: . From 8f594b066ab375f0dec43fe75f7045c94a4dca16 Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Fri, 24 Sep 2021 16:42:33 +0200 Subject: [PATCH 08/29] Update azure-pipelines_pxcloud2.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Endra til kun å bygge pxweb --- .github/workflows/azure-pipelines_pxcloud2.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/azure-pipelines_pxcloud2.yml b/.github/workflows/azure-pipelines_pxcloud2.yml index daac47f13..16eb93a52 100644 --- a/.github/workflows/azure-pipelines_pxcloud2.yml +++ b/.github/workflows/azure-pipelines_pxcloud2.yml @@ -23,10 +23,10 @@ jobs: uses: NuGet/setup-nuget@v1.0.5 - name: Restore NuGet packages - run: nuget restore + run: nuget restore PCAxis.PX-Web.sln - name: Publish to folder - run: msbuild /nologo /verbosity:m /t:Build /t:pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="\published\" + run: msbuild PCAxis.PX-Web.sln /nologo /verbosity:m /t:Build /t:pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="\published\" - name: Upload artifact for deployment job uses: actions/upload-artifact@v2 From 187ae620c7b36bbd718f7d9e4830bad594bdf6f0 Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Mon, 27 Sep 2021 14:57:35 +0200 Subject: [PATCH 09/29] Add or update the Azure App Service build and deployment workflow config --- .../workflows/azure-pipelines_pxinthesky.yml | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 .github/workflows/azure-pipelines_pxinthesky.yml diff --git a/.github/workflows/azure-pipelines_pxinthesky.yml b/.github/workflows/azure-pipelines_pxinthesky.yml new file mode 100644 index 000000000..4a393d346 --- /dev/null +++ b/.github/workflows/azure-pipelines_pxinthesky.yml @@ -0,0 +1,57 @@ +# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy +# More GitHub Actions for Azure: https://github.com/Azure/actions + +name: Build and deploy ASP app to Azure Web App - PxInTheSky + +on: + push: + branches: + - azure-pipelines + workflow_dispatch: + +jobs: + build: + runs-on: windows-latest + + steps: + - uses: actions/checkout@v2 + + - name: Setup MSBuild path + uses: microsoft/setup-msbuild@v1.0.2 + + - name: Setup NuGet + uses: NuGet/setup-nuget@v1.0.5 + + - name: Restore NuGet packages + run: nuget restore + + - name: Publish to folder + run: msbuild /nologo /verbosity:m /t:Build /t:pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="\published\" + + - name: Upload artifact for deployment job + uses: actions/upload-artifact@v2 + with: + name: ASP-app + path: '/published/**' + + deploy: + runs-on: windows-latest + needs: build + environment: + name: 'Production' + url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} + + steps: + - name: Download artifact from build job + uses: actions/download-artifact@v2 + with: + name: ASP-app + + - name: Deploy to Azure Web App + id: deploy-to-webapp + uses: azure/webapps-deploy@v2 + with: + app-name: 'PxInTheSky' + slot-name: 'Production' + publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_DCC2747B96F44CC488C3BBB93A44693B }} + package: . From 41f4cd5667f3bd2acca0a6a50e4fe5337edf9ab1 Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Tue, 28 Sep 2021 09:09:29 +0200 Subject: [PATCH 10/29] update target dir --- .github/workflows/azure-pipelines_pxinthesky.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/azure-pipelines_pxinthesky.yml b/.github/workflows/azure-pipelines_pxinthesky.yml index 4a393d346..ad648a79a 100644 --- a/.github/workflows/azure-pipelines_pxinthesky.yml +++ b/.github/workflows/azure-pipelines_pxinthesky.yml @@ -26,7 +26,7 @@ jobs: run: nuget restore - name: Publish to folder - run: msbuild /nologo /verbosity:m /t:Build /t:pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="\published\" + run: msbuild /nologo /verbosity:m /t:Build /t:PxWeb /p:_PackageTempDir="\published\" - name: Upload artifact for deployment job uses: actions/upload-artifact@v2 From 67c53200192c96f949e463681c4cb8868602543d Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Tue, 28 Sep 2021 11:35:11 +0200 Subject: [PATCH 11/29] Update azure-pipelines_pxinthesky.yml --- .github/workflows/azure-pipelines_pxinthesky.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/azure-pipelines_pxinthesky.yml b/.github/workflows/azure-pipelines_pxinthesky.yml index ad648a79a..aef636439 100644 --- a/.github/workflows/azure-pipelines_pxinthesky.yml +++ b/.github/workflows/azure-pipelines_pxinthesky.yml @@ -26,7 +26,7 @@ jobs: run: nuget restore - name: Publish to folder - run: msbuild /nologo /verbosity:m /t:Build /t:PxWeb /p:_PackageTempDir="\published\" + run: msbuild PCAxis.PX-Web_without_tests /nologo /verbosity:m /t:Build /t:PxWeb /p:_PackageTempDir="\published\" - name: Upload artifact for deployment job uses: actions/upload-artifact@v2 From 7dd82cf55510573aa81ccb49da2d1bb9a1b57317 Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Tue, 28 Sep 2021 11:44:50 +0200 Subject: [PATCH 12/29] Update azure-pipelines_pxinthesky.yml --- .github/workflows/azure-pipelines_pxinthesky.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/azure-pipelines_pxinthesky.yml b/.github/workflows/azure-pipelines_pxinthesky.yml index aef636439..46b2a76fb 100644 --- a/.github/workflows/azure-pipelines_pxinthesky.yml +++ b/.github/workflows/azure-pipelines_pxinthesky.yml @@ -26,7 +26,7 @@ jobs: run: nuget restore - name: Publish to folder - run: msbuild PCAxis.PX-Web_without_tests /nologo /verbosity:m /t:Build /t:PxWeb /p:_PackageTempDir="\published\" + run: msbuild PCAxis.PX-Web_without_tests /p:Configuration=Release /p:DeployOnBuild=true /p:PublishProfile=FolderProfile - name: Upload artifact for deployment job uses: actions/upload-artifact@v2 From f50ebaba7e658e683fd661dd26aea3ef25538436 Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Tue, 28 Sep 2021 11:52:55 +0200 Subject: [PATCH 13/29] Update azure-pipelines_pxinthesky.yml --- .github/workflows/azure-pipelines_pxinthesky.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/azure-pipelines_pxinthesky.yml b/.github/workflows/azure-pipelines_pxinthesky.yml index 46b2a76fb..2930f0570 100644 --- a/.github/workflows/azure-pipelines_pxinthesky.yml +++ b/.github/workflows/azure-pipelines_pxinthesky.yml @@ -23,16 +23,16 @@ jobs: uses: NuGet/setup-nuget@v1.0.5 - name: Restore NuGet packages - run: nuget restore + run: nuget restore PCAxis.PX-Web_without_tests.sln - name: Publish to folder - run: msbuild PCAxis.PX-Web_without_tests /p:Configuration=Release /p:DeployOnBuild=true /p:PublishProfile=FolderProfile + run: msbuild PCAxis.PX-Web_without_tests.sln /p:Configuration=Release /p:DeployOnBuild=true /p:PublishProfile=FolderProfile - name: Upload artifact for deployment job uses: actions/upload-artifact@v2 with: name: ASP-app - path: '/published/**' + path: bin\Release\Publish deploy: runs-on: windows-latest From 4261322d33f42f988efd96edd80637ece4b4b8cd Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Tue, 28 Sep 2021 12:14:24 +0200 Subject: [PATCH 14/29] Update azure-pipelines_pxinthesky.yml --- .../workflows/azure-pipelines_pxinthesky.yml | 53 +++++++++---------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/.github/workflows/azure-pipelines_pxinthesky.yml b/.github/workflows/azure-pipelines_pxinthesky.yml index 2930f0570..17abde9cc 100644 --- a/.github/workflows/azure-pipelines_pxinthesky.yml +++ b/.github/workflows/azure-pipelines_pxinthesky.yml @@ -28,30 +28,29 @@ jobs: - name: Publish to folder run: msbuild PCAxis.PX-Web_without_tests.sln /p:Configuration=Release /p:DeployOnBuild=true /p:PublishProfile=FolderProfile - - name: Upload artifact for deployment job - uses: actions/upload-artifact@v2 - with: - name: ASP-app - path: bin\Release\Publish - - deploy: - runs-on: windows-latest - needs: build - environment: - name: 'Production' - url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} - - steps: - - name: Download artifact from build job - uses: actions/download-artifact@v2 - with: - name: ASP-app - - - name: Deploy to Azure Web App - id: deploy-to-webapp - uses: azure/webapps-deploy@v2 - with: - app-name: 'PxInTheSky' - slot-name: 'Production' - publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_DCC2747B96F44CC488C3BBB93A44693B }} - package: . +# - name: Upload artifact for deployment job +# uses: actions/upload-artifact@v2 +# with: +# name: ASP-app +# path: bin\Release\Publish +# + # deploy: + # runs-on: windows-latest + # needs: build + # environment: + # name: 'Production' + # url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} + # + # steps: + # uses: actions/download-artifact@v2 + # with: + # name: ASP-app +# +# - name: Deploy to Azure Web App +# id: deploy-to-webapp +# uses: azure/webapps-deploy@v2 +# with: +# app-name: 'PxInTheSky' +# slot-name: 'Production' +# publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_DCC2747B96F44CC488C3BBB93A44693B }} +# package: . From c42e7d60fa43d8e64bff90b6d75b94d19895e6ea Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Tue, 28 Sep 2021 12:20:44 +0200 Subject: [PATCH 15/29] Update azure-pipelines_pxinthesky.yml --- .github/workflows/azure-pipelines_pxinthesky.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/azure-pipelines_pxinthesky.yml b/.github/workflows/azure-pipelines_pxinthesky.yml index 17abde9cc..20010b228 100644 --- a/.github/workflows/azure-pipelines_pxinthesky.yml +++ b/.github/workflows/azure-pipelines_pxinthesky.yml @@ -23,10 +23,10 @@ jobs: uses: NuGet/setup-nuget@v1.0.5 - name: Restore NuGet packages - run: nuget restore PCAxis.PX-Web_without_tests.sln + run: nuget restore PCAxis.PX-Web.sln - name: Publish to folder - run: msbuild PCAxis.PX-Web_without_tests.sln /p:Configuration=Release /p:DeployOnBuild=true /p:PublishProfile=FolderProfile + run: msbuild PCAxis.PX-Web.sln /p:Configuration=Release /p:DeployOnBuild=true /p:PublishProfile=FolderProfile # - name: Upload artifact for deployment job # uses: actions/upload-artifact@v2 From 6c32956bf2ffe8e4ba6abc08ef63a2f020258f13 Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Tue, 28 Sep 2021 12:33:13 +0200 Subject: [PATCH 16/29] Update azure-pipelines_pxcloud2.yml --- .github/workflows/azure-pipelines_pxcloud2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/azure-pipelines_pxcloud2.yml b/.github/workflows/azure-pipelines_pxcloud2.yml index 16eb93a52..d72371a38 100644 --- a/.github/workflows/azure-pipelines_pxcloud2.yml +++ b/.github/workflows/azure-pipelines_pxcloud2.yml @@ -26,7 +26,7 @@ jobs: run: nuget restore PCAxis.PX-Web.sln - name: Publish to folder - run: msbuild PCAxis.PX-Web.sln /nologo /verbosity:m /t:Build /t:pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="\published\" + run: msbuild PCAxis.PX-Web.sln /nologo /verbosity:m /t:Build /t:PxWeb\pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="\published\" - name: Upload artifact for deployment job uses: actions/upload-artifact@v2 From dc93338861a74bf8936cd1261b4f37c67bd62d1a Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Tue, 28 Sep 2021 12:46:32 +0200 Subject: [PATCH 17/29] Update azure-pipelines_pxcloud2.yml --- .github/workflows/azure-pipelines_pxcloud2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/azure-pipelines_pxcloud2.yml b/.github/workflows/azure-pipelines_pxcloud2.yml index d72371a38..e748bf4f8 100644 --- a/.github/workflows/azure-pipelines_pxcloud2.yml +++ b/.github/workflows/azure-pipelines_pxcloud2.yml @@ -26,7 +26,7 @@ jobs: run: nuget restore PCAxis.PX-Web.sln - name: Publish to folder - run: msbuild PCAxis.PX-Web.sln /nologo /verbosity:m /t:Build /t:PxWeb\pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="\published\" + run: msbuild PCAxis.PX-Web.sln /nologo /verbosity:m /t:Build /t:PxWeb /p:_PackageTempDir="\published\" - name: Upload artifact for deployment job uses: actions/upload-artifact@v2 From 3c93fb220343d19eee9224fd73a1cc2880dd20de Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Tue, 28 Sep 2021 12:55:09 +0200 Subject: [PATCH 18/29] Update azure-pipelines_pxcloud2.yml --- .../workflows/azure-pipelines_pxcloud2.yml | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/azure-pipelines_pxcloud2.yml b/.github/workflows/azure-pipelines_pxcloud2.yml index e748bf4f8..258e94533 100644 --- a/.github/workflows/azure-pipelines_pxcloud2.yml +++ b/.github/workflows/azure-pipelines_pxcloud2.yml @@ -28,30 +28,30 @@ jobs: - name: Publish to folder run: msbuild PCAxis.PX-Web.sln /nologo /verbosity:m /t:Build /t:PxWeb /p:_PackageTempDir="\published\" - - name: Upload artifact for deployment job - uses: actions/upload-artifact@v2 - with: - name: ASP-app - path: '/published/**' - - deploy: - runs-on: windows-latest - needs: build - environment: - name: 'Production' - url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} - - steps: - - name: Download artifact from build job - uses: actions/download-artifact@v2 - with: - name: ASP-app - - - name: Deploy to Azure Web App - id: deploy-to-webapp - uses: azure/webapps-deploy@v2 - with: - app-name: 'PXCloud2' - slot-name: 'Production' - publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_0C291CE2EEA14BC2BB5F6A6972930634 }} - package: . +# - name: Upload artifact for deployment job +# uses: actions/upload-artifact@v2 +# with: +# name: ASP-app +# path: '/published/**' +# +# deploy: +# runs-on: windows-latest +# needs: build +# environment: +# name: 'Production' +# url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} +# +# steps: +# - name: Download artifact from build job +# uses: actions/download-artifact@v2 +# with: +# name: ASP-app +# +# - name: Deploy to Azure Web App +# id: deploy-to-webapp +# uses: azure/webapps-deploy@v2 +# with: +# app-name: 'PXCloud2' +# slot-name: 'Production' +# publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_0C291CE2EEA14BC2BB5F6A6972930634 }} +# package: . From dae1bc9adf0f19a402cdf1c2aaa22ce401ae5313 Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Tue, 28 Sep 2021 13:02:52 +0200 Subject: [PATCH 19/29] Delete msbuild.yml --- .github/workflows/msbuild.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 .github/workflows/msbuild.yml diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml deleted file mode 100644 index 90b74e82a..000000000 --- a/.github/workflows/msbuild.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: MSBuild - -on: push - -jobs: - build: - - runs-on: windows-2019 - - strategy: - matrix: - configuration: [Debug, Release] - - steps: - - - uses: actions/checkout@v2 - - - uses: microsoft/setup-msbuild@v1 - - - uses: NuGet/setup-nuget@v1 - - - name: Restore NuGet packages - run: nuget restore - - - name: Build the application - run: msbuild /p:Configuration=$env:Configuration - env: - Configuration: ${{ matrix.configuration }} From d2b027bc4864e05e2ddc25d455f6cd22cd259c8d Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Tue, 28 Sep 2021 13:03:04 +0200 Subject: [PATCH 20/29] Delete buildOnPullRequest.yml --- .github/workflows/buildOnPullRequest.yml | 26 ------------------------ 1 file changed, 26 deletions(-) delete mode 100644 .github/workflows/buildOnPullRequest.yml diff --git a/.github/workflows/buildOnPullRequest.yml b/.github/workflows/buildOnPullRequest.yml deleted file mode 100644 index 6664b3bd7..000000000 --- a/.github/workflows/buildOnPullRequest.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: .NET - -on: - pull_request: - branches: [ master ] - -jobs: - build: - - runs-on: [windows-latest] - - steps: - - uses: actions/checkout@v2 - - - name: setup-msbuild - uses: microsoft/setup-msbuild@v1 - - - name: Setup NuGet - uses: NuGet/setup-nuget@v1.0.5 - - - name: Restore Nuget Packages - run: nuget restore PCAxis.PX-Web.sln - - - name: Build the solution - run: msbuild PCAxis.PX-Web.sln - From aab63a76b1e352e35c25a8d826569f8dbefb914d Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Tue, 28 Sep 2021 13:03:26 +0200 Subject: [PATCH 21/29] Delete azure-pipelines_pxcloud.yml --- .github/workflows/azure-pipelines_pxcloud.yml | 57 ------------------- 1 file changed, 57 deletions(-) delete mode 100644 .github/workflows/azure-pipelines_pxcloud.yml diff --git a/.github/workflows/azure-pipelines_pxcloud.yml b/.github/workflows/azure-pipelines_pxcloud.yml deleted file mode 100644 index e9c8036a4..000000000 --- a/.github/workflows/azure-pipelines_pxcloud.yml +++ /dev/null @@ -1,57 +0,0 @@ -# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy -# More GitHub Actions for Azure: https://github.com/Azure/actions - -name: Build and deploy ASP app to Azure Web App - PXCloud - -on: - push: - branches: - - azure-pipelines - workflow_dispatch: - -jobs: - build: - runs-on: windows-latest - - steps: - - uses: actions/checkout@v2 - - - name: Setup MSBuild path - uses: microsoft/setup-msbuild@v1.0.2 - - - name: Setup NuGet - uses: NuGet/setup-nuget@v1.0.5 - - - name: Restore NuGet packages - run: nuget restore - - - name: Publish to folder - run: msbuild /nologo /verbosity:m /t:Build /t:pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="\published\" - - - name: Upload artifact for deployment job - uses: actions/upload-artifact@v2 - with: - name: ASP-app - path: '/published/**' - - deploy: - runs-on: windows-latest - needs: build - environment: - name: 'Production' - url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} - - steps: - - name: Download artifact from build job - uses: actions/download-artifact@v2 - with: - name: ASP-app - - - name: Deploy to Azure Web App - id: deploy-to-webapp - uses: azure/webapps-deploy@v2 - with: - app-name: 'PXCloud' - slot-name: 'Production' - publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_E15A159B9FD044A2A80EE2EEBA69A9B2 }} - package: . From c5cd946cfa991b461b23d180913f827985fac218 Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Tue, 28 Sep 2021 13:03:45 +0200 Subject: [PATCH 22/29] Delete azure-pipelines_pxinthesky.yml --- .../workflows/azure-pipelines_pxinthesky.yml | 56 ------------------- 1 file changed, 56 deletions(-) delete mode 100644 .github/workflows/azure-pipelines_pxinthesky.yml diff --git a/.github/workflows/azure-pipelines_pxinthesky.yml b/.github/workflows/azure-pipelines_pxinthesky.yml deleted file mode 100644 index 20010b228..000000000 --- a/.github/workflows/azure-pipelines_pxinthesky.yml +++ /dev/null @@ -1,56 +0,0 @@ -# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy -# More GitHub Actions for Azure: https://github.com/Azure/actions - -name: Build and deploy ASP app to Azure Web App - PxInTheSky - -on: - push: - branches: - - azure-pipelines - workflow_dispatch: - -jobs: - build: - runs-on: windows-latest - - steps: - - uses: actions/checkout@v2 - - - name: Setup MSBuild path - uses: microsoft/setup-msbuild@v1.0.2 - - - name: Setup NuGet - uses: NuGet/setup-nuget@v1.0.5 - - - name: Restore NuGet packages - run: nuget restore PCAxis.PX-Web.sln - - - name: Publish to folder - run: msbuild PCAxis.PX-Web.sln /p:Configuration=Release /p:DeployOnBuild=true /p:PublishProfile=FolderProfile - -# - name: Upload artifact for deployment job -# uses: actions/upload-artifact@v2 -# with: -# name: ASP-app -# path: bin\Release\Publish -# - # deploy: - # runs-on: windows-latest - # needs: build - # environment: - # name: 'Production' - # url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} - # - # steps: - # uses: actions/download-artifact@v2 - # with: - # name: ASP-app -# -# - name: Deploy to Azure Web App -# id: deploy-to-webapp -# uses: azure/webapps-deploy@v2 -# with: -# app-name: 'PxInTheSky' -# slot-name: 'Production' -# publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_DCC2747B96F44CC488C3BBB93A44693B }} -# package: . From 3491a6e0b1ed6840588513a9356e835f9ac7dc22 Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Tue, 28 Sep 2021 13:10:19 +0200 Subject: [PATCH 23/29] Update azure-pipelines_pxcloud2.yml --- .github/workflows/azure-pipelines_pxcloud2.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/azure-pipelines_pxcloud2.yml b/.github/workflows/azure-pipelines_pxcloud2.yml index 258e94533..4acbf2106 100644 --- a/.github/workflows/azure-pipelines_pxcloud2.yml +++ b/.github/workflows/azure-pipelines_pxcloud2.yml @@ -28,12 +28,12 @@ jobs: - name: Publish to folder run: msbuild PCAxis.PX-Web.sln /nologo /verbosity:m /t:Build /t:PxWeb /p:_PackageTempDir="\published\" -# - name: Upload artifact for deployment job -# uses: actions/upload-artifact@v2 -# with: -# name: ASP-app -# path: '/published/**' -# + - name: Upload artifact for deployment job + uses: actions/upload-artifact@v2 + with: + name: ASP-app + path: '/published/**' + # deploy: # runs-on: windows-latest # needs: build From ba6d32a26c0551a35186bacc26c3b128546dc2c7 Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Tue, 28 Sep 2021 13:18:02 +0200 Subject: [PATCH 24/29] Update azure-pipelines_pxcloud2.yml --- .github/workflows/azure-pipelines_pxcloud2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/azure-pipelines_pxcloud2.yml b/.github/workflows/azure-pipelines_pxcloud2.yml index 4acbf2106..8b1298f7f 100644 --- a/.github/workflows/azure-pipelines_pxcloud2.yml +++ b/.github/workflows/azure-pipelines_pxcloud2.yml @@ -26,7 +26,7 @@ jobs: run: nuget restore PCAxis.PX-Web.sln - name: Publish to folder - run: msbuild PCAxis.PX-Web.sln /nologo /verbosity:m /t:Build /t:PxWeb /p:_PackageTempDir="\published\" + run: msbuild PCAxis.PX-Web.sln /nologo /verbosity:m /p:DeployOnBuild /t:PxWeb /p:_PackageTempDir="\published\" - name: Upload artifact for deployment job uses: actions/upload-artifact@v2 From fdbd970af8fb5b90e2648d1826b4443e14e65e48 Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Tue, 28 Sep 2021 13:21:13 +0200 Subject: [PATCH 25/29] Update azure-pipelines_pxcloud2.yml --- .github/workflows/azure-pipelines_pxcloud2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/azure-pipelines_pxcloud2.yml b/.github/workflows/azure-pipelines_pxcloud2.yml index 8b1298f7f..89dd37d2a 100644 --- a/.github/workflows/azure-pipelines_pxcloud2.yml +++ b/.github/workflows/azure-pipelines_pxcloud2.yml @@ -26,7 +26,7 @@ jobs: run: nuget restore PCAxis.PX-Web.sln - name: Publish to folder - run: msbuild PCAxis.PX-Web.sln /nologo /verbosity:m /p:DeployOnBuild /t:PxWeb /p:_PackageTempDir="\published\" + run: msbuild PCAxis.PX-Web.sln /nologo /verbosity:m /p:DeployOnBuild /p:_PackageTempDir="\published\" - name: Upload artifact for deployment job uses: actions/upload-artifact@v2 From 763922f1de00b90b7a8e7edca34ab099932ccf3f Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Tue, 28 Sep 2021 13:32:11 +0200 Subject: [PATCH 26/29] Update azure-pipelines_pxcloud2.yml --- .github/workflows/azure-pipelines_pxcloud2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/azure-pipelines_pxcloud2.yml b/.github/workflows/azure-pipelines_pxcloud2.yml index 89dd37d2a..5ec430149 100644 --- a/.github/workflows/azure-pipelines_pxcloud2.yml +++ b/.github/workflows/azure-pipelines_pxcloud2.yml @@ -26,7 +26,7 @@ jobs: run: nuget restore PCAxis.PX-Web.sln - name: Publish to folder - run: msbuild PCAxis.PX-Web.sln /nologo /verbosity:m /p:DeployOnBuild /p:_PackageTempDir="\published\" + run: msbuild PCAxis.PX-Web.sln /nologo /verbosity:m /p:DeployOnBuild=TRUE /p:_PackageTempDir="\published\" - name: Upload artifact for deployment job uses: actions/upload-artifact@v2 From b5e1bd5847235949f2d5e54e06184eab0b74ab11 Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Tue, 28 Sep 2021 13:37:45 +0200 Subject: [PATCH 27/29] Update azure-pipelines_pxcloud2.yml --- .github/workflows/azure-pipelines_pxcloud2.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/azure-pipelines_pxcloud2.yml b/.github/workflows/azure-pipelines_pxcloud2.yml index 5ec430149..b2c86c273 100644 --- a/.github/workflows/azure-pipelines_pxcloud2.yml +++ b/.github/workflows/azure-pipelines_pxcloud2.yml @@ -34,13 +34,13 @@ jobs: name: ASP-app path: '/published/**' -# deploy: -# runs-on: windows-latest -# needs: build -# environment: -# name: 'Production' -# url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} -# + deploy: + runs-on: windows-latest + needs: build + environment: + name: 'Production' + url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} + # steps: # - name: Download artifact from build job # uses: actions/download-artifact@v2 From ed8860f00fa7f858a8d242b593ae32fb2ad049ad Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Tue, 28 Sep 2021 13:40:39 +0200 Subject: [PATCH 28/29] Update azure-pipelines_pxcloud2.yml --- .../workflows/azure-pipelines_pxcloud2.yml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/azure-pipelines_pxcloud2.yml b/.github/workflows/azure-pipelines_pxcloud2.yml index b2c86c273..014cdd869 100644 --- a/.github/workflows/azure-pipelines_pxcloud2.yml +++ b/.github/workflows/azure-pipelines_pxcloud2.yml @@ -41,17 +41,17 @@ jobs: name: 'Production' url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} -# steps: -# - name: Download artifact from build job -# uses: actions/download-artifact@v2 -# with: -# name: ASP-app -# -# - name: Deploy to Azure Web App -# id: deploy-to-webapp -# uses: azure/webapps-deploy@v2 -# with: -# app-name: 'PXCloud2' -# slot-name: 'Production' -# publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_0C291CE2EEA14BC2BB5F6A6972930634 }} -# package: . + steps: + - name: Download artifact from build job + uses: actions/download-artifact@v2 + with: + name: ASP-app + + - name: Deploy to Azure Web App + id: deploy-to-webapp + uses: azure/webapps-deploy@v2 + with: + app-name: 'PXCloud2' + slot-name: 'Production' + publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_0C291CE2EEA14BC2BB5F6A6972930634 }} + package: . From 4632e5c25ea369706efb6c0709836ab77c823998 Mon Sep 17 00:00:00 2001 From: PerIngeVaaje <60141320+PerIngeVaaje@users.noreply.github.com> Date: Wed, 29 Sep 2021 11:15:41 +0200 Subject: [PATCH 29/29] Update azure-pipelines_pxcloud2.yml --- .github/workflows/azure-pipelines_pxcloud2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/azure-pipelines_pxcloud2.yml b/.github/workflows/azure-pipelines_pxcloud2.yml index 014cdd869..0755f983f 100644 --- a/.github/workflows/azure-pipelines_pxcloud2.yml +++ b/.github/workflows/azure-pipelines_pxcloud2.yml @@ -1,7 +1,7 @@ # Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy # More GitHub Actions for Azure: https://github.com/Azure/actions -name: Build and deploy ASP app to Azure Web App - PXCloud2 +name: Build and deploy to PXCloud2 on: push: