From ab25e5d4e42d7c7409a84750601b4769493f889a Mon Sep 17 00:00:00 2001
From: cgm507 <57236424+cgm507@users.noreply.github.com>
Date: Sun, 3 Nov 2019 08:09:08 -0800
Subject: [PATCH 01/10] Add BuildAngular.bat step
[skip ci]
---
azure-pipelines.yml | 48 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
create mode 100644 azure-pipelines.yml
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
new file mode 100644
index 0000000..353093f
--- /dev/null
+++ b/azure-pipelines.yml
@@ -0,0 +1,48 @@
+# 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)'
+
+call %~dp0\GenerateTypeScript.bat
+if not "%errorlevel%"=="0" exit /b 1
+
+cd %~dp0\angular
+call npm install
+if not "%errorlevel%"=="0" exit /b 1
+
+call npm run build-prod
+if not "%errorlevel%"=="0" exit /b 1
+
+cd ..
+powershell %~dp0\..\..\deploy\TransformIndex.ps1 -SourcePath %~dp0\angular\dist\index.html -TargetPath %~dp0\angular\dist\index.cshtml
+if not "%errorlevel%"=="0" exit /b 1
\ No newline at end of file
From 5009bfb31e74e14137048099e954068634de102d Mon Sep 17 00:00:00 2001
From: cgm507 <57236424+cgm507@users.noreply.github.com>
Date: Sun, 3 Nov 2019 08:35:03 -0800
Subject: [PATCH 02/10] commit 1
[skip ci]
---
azure-pipelines-1.yml | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 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..6d41783
--- /dev/null
+++ b/azure-pipelines-1.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 3eab77fce407f83cdaddd56b82cc9eb5a1ed7c5f Mon Sep 17 00:00:00 2001
From: cgm507 <57236424+cgm507@users.noreply.github.com>
Date: Sun, 3 Nov 2019 10:00:30 -0800
Subject: [PATCH 03/10] adding buildangular bat
[skip ci]
---
azure-pipelines.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 353093f..d53cb91 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -20,7 +20,9 @@ steps:
- task: NuGetCommand@2
inputs:
restoreSolution: '$(solution)'
-
+- task: BatchScript@1
+ inputs:
+ filename: 'src/PokerLeagueManager.UI.Web/BuildAngular.bat'
- task: VSBuild@1
inputs:
solution: '$(solution)'
From 0869a3675fe722509392ab9ccecce2760b6fa119 Mon Sep 17 00:00:00 2001
From: cgm507 <57236424+cgm507@users.noreply.github.com>
Date: Sun, 3 Nov 2019 10:03:07 -0800
Subject: [PATCH 04/10] Update azure-pipelines.yml for Azure Pipelines
---
azure-pipelines.yml | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d53cb91..82e8ed4 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -33,18 +33,4 @@ steps:
- task: VSTest@2
inputs:
platform: '$(buildPlatform)'
- configuration: '$(buildConfiguration)'
-
-call %~dp0\GenerateTypeScript.bat
-if not "%errorlevel%"=="0" exit /b 1
-
-cd %~dp0\angular
-call npm install
-if not "%errorlevel%"=="0" exit /b 1
-
-call npm run build-prod
-if not "%errorlevel%"=="0" exit /b 1
-
-cd ..
-powershell %~dp0\..\..\deploy\TransformIndex.ps1 -SourcePath %~dp0\angular\dist\index.html -TargetPath %~dp0\angular\dist\index.cshtml
-if not "%errorlevel%"=="0" exit /b 1
\ No newline at end of file
+ configuration: '$(buildConfiguration)'
\ No newline at end of file
From ad2fdf00fd0ee2fb5283d141e3d4b22fbc7808b1 Mon Sep 17 00:00:00 2001
From: cgm507 <57236424+cgm507@users.noreply.github.com>
Date: Sun, 3 Nov 2019 10:28:12 -0800
Subject: [PATCH 05/10] 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..9f5664a 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 @@
- Recent Games - Dylan is Awesome
+ Recent Games - don't splash the pot.
Sign In
From 01f2503f3f810097832fac533a6b2c5cfcbaed4e Mon Sep 17 00:00:00 2001
From: cgm507 <57236424+cgm507@users.noreply.github.com>
Date: Sun, 3 Nov 2019 13:42:11 -0800
Subject: [PATCH 06/10] Updated path for file to be changed
new file location: src/PokerLeagueManager.UI.Web/angular/src/app/navbar/navbar.component.html
---
docs/02-Build.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/02-Build.md b/docs/02-Build.md
index d935c4e..15ca1fa 100644
--- a/docs/02-Build.md
+++ b/docs/02-Build.md
@@ -11,7 +11,7 @@
- Be sure to check Include Administrators
## Create, Submit, and Complete a Pull Request
-- Suggest changing this file: src/PokerLeagueManager.UI.Web/angular/src/navbar/navbar.component.html
+- Suggest changing this file: src/PokerLeagueManager.UI.Web/angular/src/app/navbar/navbar.component.html
- Add some text after "Recent Games", we'll be able to see this change later after we deploy
## Update build to Publish Build Artifacts
From ac554dbcb4a59a3857492e0ef2b71e58153fa6d0 Mon Sep 17 00:00:00 2001
From: cgm507 <57236424+cgm507@users.noreply.github.com>
Date: Mon, 11 Nov 2019 10:31:49 -0800
Subject: [PATCH 07/10] New build pipeline with BuildAngular bat
ASP.NET template [skip ci]
---
azure-pipelines-2.yml | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 azure-pipelines-2.yml
diff --git a/azure-pipelines-2.yml b/azure-pipelines-2.yml
new file mode 100644
index 0000000..7a5e812
--- /dev/null
+++ b/azure-pipelines-2.yml
@@ -0,0 +1,37 @@
+# ASP.NET
+- task: BatchScript@1
+ inputs:
+ filename: 'https://github.com/cgm507/Ignite2019/blob/master/src/PokerLeagueManager.UI.Web/BuildAngular.bat'
+# 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 da50f3a6b16635f34fb2d7a754b4860c4ddcaed5 Mon Sep 17 00:00:00 2001
From: cgm507 <57236424+cgm507@users.noreply.github.com>
Date: Mon, 11 Nov 2019 10:35:29 -0800
Subject: [PATCH 08/10] Updated step for BuildAngular/bat
Moved to 'steps:'
---
azure-pipelines-2.yml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/azure-pipelines-2.yml b/azure-pipelines-2.yml
index 7a5e812..86fdc74 100644
--- a/azure-pipelines-2.yml
+++ b/azure-pipelines-2.yml
@@ -1,7 +1,4 @@
# ASP.NET
-- task: BatchScript@1
- inputs:
- filename: 'https://github.com/cgm507/Ignite2019/blob/master/src/PokerLeagueManager.UI.Web/BuildAngular.bat'
# 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
@@ -19,7 +16,9 @@ variables:
steps:
- task: NuGetToolInstaller@1
-
+- task: BatchScript@1
+ inputs:
+ filename: 'https://github.com/cgm507/Ignite2019/blob/master/src/PokerLeagueManager.UI.Web/BuildAngular.bat'
- task: NuGetCommand@2
inputs:
restoreSolution: '$(solution)'
From d23b2482370bd997b2344e611c3ca7501464a4c4 Mon Sep 17 00:00:00 2001
From: cgm507 <57236424+cgm507@users.noreply.github.com>
Date: Mon, 11 Nov 2019 10:39:33 -0800
Subject: [PATCH 09/10] Update filename for BuildAngular
changed from https URL to filepath: 'src/PokerLeagueManager.UI.Web/BuildAngular.bat'
---
azure-pipelines-2.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/azure-pipelines-2.yml b/azure-pipelines-2.yml
index 86fdc74..7b65884 100644
--- a/azure-pipelines-2.yml
+++ b/azure-pipelines-2.yml
@@ -18,7 +18,7 @@ steps:
- task: NuGetToolInstaller@1
- task: BatchScript@1
inputs:
- filename: 'https://github.com/cgm507/Ignite2019/blob/master/src/PokerLeagueManager.UI.Web/BuildAngular.bat'
+ filename: 'src/PokerLeagueManager.UI.Web/BuildAngular.bat'
- task: NuGetCommand@2
inputs:
restoreSolution: '$(solution)'
From 767162e6254701cc29188ff05d340fb1899f4d19 Mon Sep 17 00:00:00 2001
From: cgm507 <57236424+cgm507@users.noreply.github.com>
Date: Mon, 11 Nov 2019 13:06:29 -0600
Subject: [PATCH 10/10] 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 9f5664a..6b5951f 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 @@
- Recent Games - don't splash the pot.
+ Recent Games - Don't splash the pot!
Sign In