From 5caab24e2b79f14f201702d9c9577188d836080e Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 3 Mar 2021 21:06:34 +0000
Subject: [PATCH 01/10] Add daily compliance template

---
 .vsts-ci/misc-analysis.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml
index 327e5528107..dafd5a60f60 100644
--- a/.vsts-ci/misc-analysis.yml
+++ b/.vsts-ci/misc-analysis.yml
@@ -16,10 +16,14 @@ pr:
     - feature*
 
 resources:
-- repo: self
-  clean: true
+  repositories:
+  - repository: ComplianceRepo
+    type: github
+    name: PowerShell/compliance
+    ref: dailyBuildComp
+
 jobs:
-- template: templates/credscan.yml
+- template: ci-compliance.yml@ComplianceRepo
 
 - job: Linux_CI
 
@@ -28,6 +32,11 @@ jobs:
   pool:
     name: Hosted Ubuntu 1604
   steps:
+  - checkout: self
+    clean: true
+  - checkout: ComplianceRepo
+  - template: dailyBuildCompliance.yml@ComplianceRepo
+
   - powershell: |
       Get-ChildItem -Path env:
     displayName: Capture Environment

From 5d2db9cfb5adc8cedf460a4de979986f25ee05dd Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 3 Mar 2021 21:11:32 +0000
Subject: [PATCH 02/10] add endpoint

---
 .vsts-ci/misc-analysis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml
index dafd5a60f60..acfb59cf7af 100644
--- a/.vsts-ci/misc-analysis.yml
+++ b/.vsts-ci/misc-analysis.yml
@@ -19,6 +19,7 @@ resources:
   repositories:
   - repository: ComplianceRepo
     type: github
+    endpoint: PowerShell
     name: PowerShell/compliance
     ref: dailyBuildComp
 

From 88a336c29a8cf229f6e5b619bc2996228ece1c43 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 3 Mar 2021 21:14:30 +0000
Subject: [PATCH 03/10] add job

---
 .vsts-ci/misc-analysis.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml
index acfb59cf7af..b32203fed7e 100644
--- a/.vsts-ci/misc-analysis.yml
+++ b/.vsts-ci/misc-analysis.yml
@@ -24,14 +24,23 @@ resources:
     ref: dailyBuildComp
 
 jobs:
-- template: ci-compliance.yml@ComplianceRepo
+- job: CI_Compliance
+  displayName: Markdown and Common Tests
+
+  pool:
+    vmImage: windows-latest
+  steps:
+  - checkout: self
+    clean: true
+  - checkout: ComplianceRepo
+  - template: ci-compliance.yml@ComplianceRepo
 
 - job: Linux_CI
 
   displayName: Markdown and Common Tests
 
   pool:
-    name: Hosted Ubuntu 1604
+    vmImage: ubuntu-16.04
   steps:
   - checkout: self
     clean: true

From c744ae4e0c04b8f4b5426e77bd9e64072d61bf23 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 3 Mar 2021 21:17:18 +0000
Subject: [PATCH 04/10] cleanup

---
 .vsts-ci/misc-analysis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml
index b32203fed7e..3385bbb725d 100644
--- a/.vsts-ci/misc-analysis.yml
+++ b/.vsts-ci/misc-analysis.yml
@@ -36,7 +36,6 @@ jobs:
   - template: ci-compliance.yml@ComplianceRepo
 
 - job: Linux_CI
-
   displayName: Markdown and Common Tests
 
   pool:

From 52e7dacab7d4218d4bf1e63f56cfa9543a83d2e0 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 3 Mar 2021 21:19:09 +0000
Subject: [PATCH 05/10] fix job title

---
 .vsts-ci/misc-analysis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml
index 3385bbb725d..a9e6abcbe67 100644
--- a/.vsts-ci/misc-analysis.yml
+++ b/.vsts-ci/misc-analysis.yml
@@ -25,7 +25,7 @@ resources:
 
 jobs:
 - job: CI_Compliance
-  displayName: Markdown and Common Tests
+  displayName: CI Compliance
 
   pool:
     vmImage: windows-latest

From fbb4d9c6d9afdc1f3d86a0fe4979433dabd6db65 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 3 Mar 2021 21:21:39 +0000
Subject: [PATCH 06/10] fix directory

---
 .vsts-ci/misc-analysis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml
index a9e6abcbe67..69693d31050 100644
--- a/.vsts-ci/misc-analysis.yml
+++ b/.vsts-ci/misc-analysis.yml
@@ -71,11 +71,13 @@ jobs:
     condition: ne(variables['Build.Reason'], 'PullRequest')
 
   - bash: |
+      cd PowerShell
       mdspell '**/*.md' '!**/Pester/**/*.md' --ignore-numbers --ignore-acronyms --report --en-us;
     displayName: Test Spelling in Markdown
     condition: succeededOrFailed()
 
   - powershell: |
+      cd PowerShell
       Import-module ./build.psm1
       $path = Join-Path -Path $pwd -ChildPath './commonTestResults.xml'
       $results = invoke-pester -Script ./test/common -OutputFile $path -OutputFormat NUnitXml -PassThru
@@ -86,6 +88,7 @@ jobs:
       }
     displayName: Run Common Tests
     condition: succeededOrFailed()
+
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
     inputs:

From cfa7b586bce9e8011d262f3f748110d6b258bdad Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 3 Mar 2021 22:10:37 +0000
Subject: [PATCH 07/10] use template to run cg

---
 .vsts-ci/misc-analysis.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml
index 69693d31050..5d0b3ec440c 100644
--- a/.vsts-ci/misc-analysis.yml
+++ b/.vsts-ci/misc-analysis.yml
@@ -32,7 +32,10 @@ jobs:
   steps:
   - checkout: self
     clean: true
+    path: '$(Build.SourcesDirectory)\PowerShell'
+
   - checkout: ComplianceRepo
+
   - template: ci-compliance.yml@ComplianceRepo
 
 - job: Linux_CI
@@ -43,8 +46,8 @@ jobs:
   steps:
   - checkout: self
     clean: true
+
   - checkout: ComplianceRepo
-  - template: dailyBuildCompliance.yml@ComplianceRepo
 
   - powershell: |
       Get-ChildItem -Path env:
@@ -71,13 +74,12 @@ jobs:
     condition: ne(variables['Build.Reason'], 'PullRequest')
 
   - bash: |
-      cd PowerShell
       mdspell '**/*.md' '!**/Pester/**/*.md' --ignore-numbers --ignore-acronyms --report --en-us;
     displayName: Test Spelling in Markdown
     condition: succeededOrFailed()
+    workingDirectory: '$(Build.SourcesDirectory)\PowerShell'
 
-  - powershell: |
-      cd PowerShell
+  - pwsh: |
       Import-module ./build.psm1
       $path = Join-Path -Path $pwd -ChildPath './commonTestResults.xml'
       $results = invoke-pester -Script ./test/common -OutputFile $path -OutputFormat NUnitXml -PassThru
@@ -88,9 +90,9 @@ jobs:
       }
     displayName: Run Common Tests
     condition: succeededOrFailed()
+    workingDirectory: '$(Build.SourcesDirectory)\PowerShell'
+
+  - template: dailyBuildCompliance.yml@ComplianceRepo
+    parameters:
+      sourceScanPath: '$(Build.SourcesDirectory)\PowerShell'
 
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: 'Component Detection'
-    inputs:
-      sourceScanPath: '$(Build.SourcesDirectory)'
-      snapshotForceEnabled: true

From c319ccf9eba2d86af5db2165d2a219ce6532a097 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 3 Mar 2021 22:17:28 +0000
Subject: [PATCH 08/10] fix checkout paths

---
 .vsts-ci/misc-analysis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml
index 5d0b3ec440c..3a385643d34 100644
--- a/.vsts-ci/misc-analysis.yml
+++ b/.vsts-ci/misc-analysis.yml
@@ -32,7 +32,7 @@ jobs:
   steps:
   - checkout: self
     clean: true
-    path: '$(Build.SourcesDirectory)\PowerShell'
+    path: PowerShell
 
   - checkout: ComplianceRepo
 
@@ -46,6 +46,7 @@ jobs:
   steps:
   - checkout: self
     clean: true
+    path: PowerShell
 
   - checkout: ComplianceRepo
 
@@ -90,9 +91,9 @@ jobs:
       }
     displayName: Run Common Tests
     condition: succeededOrFailed()
-    workingDirectory: '$(Build.SourcesDirectory)\PowerShell'
+    workingDirectory: '$(Build.SourcesDirectory)/PowerShell'
 
   - template: dailyBuildCompliance.yml@ComplianceRepo
     parameters:
-      sourceScanPath: '$(Build.SourcesDirectory)\PowerShell'
+      sourceScanPath: '$(Build.SourcesDirectory)/PowerShell'
 

From aa837f80fef5c7a1c3783bda74935311a39017f0 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 3 Mar 2021 22:24:02 +0000
Subject: [PATCH 09/10] fix repoPath

---
 .vsts-ci/misc-analysis.yml | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml
index 3a385643d34..9dec77f76e6 100644
--- a/.vsts-ci/misc-analysis.yml
+++ b/.vsts-ci/misc-analysis.yml
@@ -23,16 +23,25 @@ resources:
     name: PowerShell/compliance
     ref: dailyBuildComp
 
+variables:
+  - name: repoFolder
+    value: PowerShell
+
 jobs:
 - job: CI_Compliance
   displayName: CI Compliance
 
   pool:
     vmImage: windows-latest
+
+  variables:
+    - name: repoPath
+      value: $(Agent.BuildDirectory)\$(repoFolder)
+
   steps:
   - checkout: self
     clean: true
-    path: PowerShell
+    path: $(repoFolder)
 
   - checkout: ComplianceRepo
 
@@ -43,10 +52,15 @@ jobs:
 
   pool:
     vmImage: ubuntu-16.04
+
+  variables:
+    - name: repoPath
+      value: $(Agent.BuildDirectory)/$(repoFolder)
+
   steps:
   - checkout: self
     clean: true
-    path: PowerShell
+    path: $(repoFolder)
 
   - checkout: ComplianceRepo
 
@@ -78,7 +92,7 @@ jobs:
       mdspell '**/*.md' '!**/Pester/**/*.md' --ignore-numbers --ignore-acronyms --report --en-us;
     displayName: Test Spelling in Markdown
     condition: succeededOrFailed()
-    workingDirectory: '$(Build.SourcesDirectory)\PowerShell'
+    workingDirectory: '$(repoPath)'
 
   - pwsh: |
       Import-module ./build.psm1
@@ -91,9 +105,8 @@ jobs:
       }
     displayName: Run Common Tests
     condition: succeededOrFailed()
-    workingDirectory: '$(Build.SourcesDirectory)/PowerShell'
+    workingDirectory: '$(repoPath)'
 
   - template: dailyBuildCompliance.yml@ComplianceRepo
     parameters:
-      sourceScanPath: '$(Build.SourcesDirectory)/PowerShell'
-
+      sourceScanPath: '$(repoPath)'

From 2bcca9bcc669d10d79c23a9de2514e1aa281e500 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 4 Mar 2021 00:38:37 +0000
Subject: [PATCH 10/10] use master compliance branch

---
 .vsts-ci/misc-analysis.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml
index 9dec77f76e6..c068a1e7295 100644
--- a/.vsts-ci/misc-analysis.yml
+++ b/.vsts-ci/misc-analysis.yml
@@ -21,7 +21,7 @@ resources:
     type: github
     endpoint: PowerShell
     name: PowerShell/compliance
-    ref: dailyBuildComp
+    ref: master
 
 variables:
   - name: repoFolder
@@ -84,10 +84,6 @@ jobs:
     displayName: Install mdspell
     condition: succeededOrFailed()
 
-  - powershell:  Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhmmss"))"
-    displayName: Set Build Name for Non-PR
-    condition: ne(variables['Build.Reason'], 'PullRequest')
-
   - bash: |
       mdspell '**/*.md' '!**/Pester/**/*.md' --ignore-numbers --ignore-acronyms --report --en-us;
     displayName: Test Spelling in Markdown