From ec7636e9ad87a4575c53707e1712d5f856eb20ef Mon Sep 17 00:00:00 2001 From: glenn-steckler <57322287+glenn-steckler@users.noreply.github.com> Date: Sun, 3 Nov 2019 10:29:40 -0500 Subject: [PATCH 1/7] Set up CI with Azure Pipelines [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 0000000..6d41783 --- /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 6fa749cd9a82162c5843ad53cb86a213d6663d6d Mon Sep 17 00:00:00 2001 From: glenn-steckler <57322287+glenn-steckler@users.noreply.github.com> Date: Sun, 3 Nov 2019 11:05:42 -0500 Subject: [PATCH 2/7] Set up CI with Azure Pipelines - 2 [skip ci] --- azure-pipelines-1.yml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 azure-pipelines-1.yml diff --git a/azure-pipelines-1.yml b/azure-pipelines-1.yml new file mode 100644 index 0000000..a89e4d2 --- /dev/null +++ b/azure-pipelines-1.yml @@ -0,0 +1,38 @@ +# 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: BatchScript@1 + inputs: + filename: 'src/PokerLeagueManager.UI.Web' + +- 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 4df7075da31aab0330dbfc7940677472087fd44f Mon Sep 17 00:00:00 2001 From: glenn-steckler <57322287+glenn-steckler@users.noreply.github.com> Date: Sun, 3 Nov 2019 11:11:40 -0500 Subject: [PATCH 3/7] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6d41783..68a6493 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,6 +21,10 @@ steps: inputs: restoreSolution: '$(solution)' +- task: BatchScript@1 + inputs: + filename: 'src/PokerLeagueManager.UI.Web/' + - task: VSBuild@1 inputs: solution: '$(solution)' From fb214bf0a49b915fabdaed13e76c601551cc095f Mon Sep 17 00:00:00 2001 From: glenn-steckler <57322287+glenn-steckler@users.noreply.github.com> Date: Sun, 3 Nov 2019 11:21:01 -0500 Subject: [PATCH 4/7] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 68a6493..c92664a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,9 +21,11 @@ steps: inputs: restoreSolution: '$(solution)' +- task: BatchScript@1 - task: BatchScript@1 inputs: - filename: 'src/PokerLeagueManager.UI.Web/' + filename: 'src/PokerLeagueManager.UI.Web/BuildAngular.bat' + - task: VSBuild@1 inputs: From 49c56c7797f80f96f31f42fd3ecdad0b6931ed72 Mon Sep 17 00:00:00 2001 From: glenn-steckler <57322287+glenn-steckler@users.noreply.github.com> Date: Sun, 3 Nov 2019 11:24:43 -0500 Subject: [PATCH 5/7] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c92664a..85d318a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,7 +21,6 @@ steps: inputs: restoreSolution: '$(solution)' -- task: BatchScript@1 - task: BatchScript@1 inputs: filename: 'src/PokerLeagueManager.UI.Web/BuildAngular.bat' From 74ea8707c0ed292d16c84a47e01f228f6c3f76e4 Mon Sep 17 00:00:00 2001 From: glenn-steckler <57322287+glenn-steckler@users.noreply.github.com> Date: Sun, 3 Nov 2019 11:49:30 -0500 Subject: [PATCH 6/7] Update navbar.component.html --- .../angular/src/app/navbar/navbar.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PokerLeagueManager.UI.Web/angular/src/app/navbar/navbar.component.html b/src/PokerLeagueManager.UI.Web/angular/src/app/navbar/navbar.component.html index 254481e..a338eb5 100644 --- a/src/PokerLeagueManager.UI.Web/angular/src/app/navbar/navbar.component.html +++ b/src/PokerLeagueManager.UI.Web/angular/src/app/navbar/navbar.component.html @@ -2,7 +2,7 @@ -