From 92d3cf9070eb4aeb7b7a59b17282a177a1785c18 Mon Sep 17 00:00:00 2001
From: leeframpton <61736432+leeframpton@users.noreply.github.com>
Date: Thu, 15 Apr 2021 17:17:36 +0100
Subject: [PATCH 1/3] update template

---
 Resources/AzureDevOps/azure-pipelines.yml | 35 ++++++++++++++++++-----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/Resources/AzureDevOps/azure-pipelines.yml b/Resources/AzureDevOps/azure-pipelines.yml
index 3acdb79..b6f9840 100644
--- a/Resources/AzureDevOps/azure-pipelines.yml
+++ b/Resources/AzureDevOps/azure-pipelines.yml
@@ -2,6 +2,7 @@ variables:
     SolutionBaseName: '__SolutionBaseName__'
     BuildPlatform: 'any cpu'
     BuildConfiguration: 'release'
+    ArmTemplateRoot: "$(System.DefaultWorkingDirectory)/Resources/ArmTemplates"
 
 resources:
   repositories:
@@ -12,20 +13,40 @@ resources:
     ref: refs/tags/v1.11.2
     endpoint: 'GitHub (ESFA)'
 
+pool:
+  name: NCS - CI and CD
+  demands:
+  - msbuild
+  - visualstudio
+
+trigger: 
+  branches:
+    include: 
+    - dev
+    - master
+
+pr:
+  branches:
+    include: 
+    - dev
+    - master
+
 stages:
 - stage: Build
-  displayName: Build, Test and Analyze
   jobs:
-  - job: BuildTestAndAnalyze
-    pool:
-      name: NCS - CI and CD
-      demands:
-      - msbuild
-      - visualstudio
+  - job:
+    displayName: Build and test application & templates"
     steps:
+    - template: /AzureDevOpsTemplates/Build/StepTemplates/dfc-arm-build.yml@dfc-devops
+      parameters:
+        ArmTemplateRoot: '${{ variables.ArmTemplateRoot }}'
+        SolutionBaseName: '${{ variables.SolutionBaseName }}'
+
     - template: AzureDevOpsTemplates\Build\StepTemplates\dfc-dotnetcore-build-sonar.yml@dfc-devops
       parameters:
         SolutionBaseName: $(SolutionBaseName)
         BuildPlatform: $(BuildPlatform)
         BuildConfiguration: $(BuildConfiguration)
         DotNetCoreVersion: '3.1.100'
+        PublishWebApp: true
+        TestSuffix: UnitTests

From efc8ee0b640e92379374274c1c5c43504eb8feb7 Mon Sep 17 00:00:00 2001
From: leeframpton <61736432+leeframpton@users.noreply.github.com>
Date: Thu, 15 Apr 2021 17:31:49 +0100
Subject: [PATCH 2/3] tweak template

---
 Resources/AzureDevOps/azure-pipelines.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Resources/AzureDevOps/azure-pipelines.yml b/Resources/AzureDevOps/azure-pipelines.yml
index b6f9840..14166eb 100644
--- a/Resources/AzureDevOps/azure-pipelines.yml
+++ b/Resources/AzureDevOps/azure-pipelines.yml
@@ -37,11 +37,6 @@ stages:
   - job:
     displayName: Build and test application & templates"
     steps:
-    - template: /AzureDevOpsTemplates/Build/StepTemplates/dfc-arm-build.yml@dfc-devops
-      parameters:
-        ArmTemplateRoot: '${{ variables.ArmTemplateRoot }}'
-        SolutionBaseName: '${{ variables.SolutionBaseName }}'
-
     - template: AzureDevOpsTemplates\Build\StepTemplates\dfc-dotnetcore-build-sonar.yml@dfc-devops
       parameters:
         SolutionBaseName: $(SolutionBaseName)
@@ -50,3 +45,8 @@ stages:
         DotNetCoreVersion: '3.1.100'
         PublishWebApp: true
         TestSuffix: UnitTests
+
+    # - template: /AzureDevOpsTemplates/Build/StepTemplates/dfc-arm-build.yml@dfc-devops
+    #   parameters:
+    #     ArmTemplateRoot: '${{ variables.ArmTemplateRoot }}'
+    #     SolutionBaseName: '${{ variables.SolutionBaseName }}'

From 9fbd8ac162ab38238317a63a4276b1d2111f20da Mon Sep 17 00:00:00 2001
From: leeframpton <61736432+leeframpton@users.noreply.github.com>
Date: Thu, 15 Apr 2021 17:37:27 +0100
Subject: [PATCH 3/3] additional tweaks

---
 Resources/AzureDevOps/azure-pipelines.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Resources/AzureDevOps/azure-pipelines.yml b/Resources/AzureDevOps/azure-pipelines.yml
index 14166eb..d06f9f7 100644
--- a/Resources/AzureDevOps/azure-pipelines.yml
+++ b/Resources/AzureDevOps/azure-pipelines.yml
@@ -43,8 +43,6 @@ stages:
         BuildPlatform: $(BuildPlatform)
         BuildConfiguration: $(BuildConfiguration)
         DotNetCoreVersion: '3.1.100'
-        PublishWebApp: true
-        TestSuffix: UnitTests
 
     # - template: /AzureDevOpsTemplates/Build/StepTemplates/dfc-arm-build.yml@dfc-devops
     #   parameters: