From a55cb9ca9b2e75b57e2a242e1a346d0960f1f1b0 Mon Sep 17 00:00:00 2001
From: travis plunk <github@ez13.net>
Date: Wed, 11 May 2022 10:44:45 -0700
Subject: [PATCH 1/7] Add a finalize template

---
 tools/releaseBuild/azureDevOps/releaseBuild.yml              | 2 ++
 .../azureDevOps/templates/compliance/compliance.yml          | 2 ++
 tools/releaseBuild/azureDevOps/templates/json.yml            | 2 ++
 tools/releaseBuild/azureDevOps/templates/linux.yml           | 4 ++++
 .../releaseBuild/azureDevOps/templates/mac-file-signing.yml  | 2 ++
 .../releaseBuild/azureDevOps/templates/mac-package-build.yml | 2 ++
 .../azureDevOps/templates/mac-package-signing.yml            | 2 ++
 tools/releaseBuild/azureDevOps/templates/mac.yml             | 2 ++
 tools/releaseBuild/azureDevOps/templates/step/finalize.yml   | 5 +++++
 tools/releaseBuild/azureDevOps/templates/testartifacts.yml   | 2 ++
 .../azureDevOps/templates/windows-hosted-build.yml           | 2 ++
 .../azureDevOps/templates/windows-package-signing.yml        | 2 ++
 .../releaseBuild/azureDevOps/templates/windows-packaging.yml | 2 ++
 13 files changed, 31 insertions(+)
 create mode 100644 tools/releaseBuild/azureDevOps/templates/step/finalize.yml

diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml
index 916f90c7a5b..4ae32ad430f 100644
--- a/tools/releaseBuild/azureDevOps/releaseBuild.yml
+++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml
@@ -227,3 +227,5 @@ stages:
             Get-Content "$(Build.StagingDirectory)\release.json"
             Write-Host "##vso[artifact.upload containerfolder=metadata;artifactname=metadata]$(Build.StagingDirectory)\release.json"
           displayName: Create and upload release.json file to build artifact
+
+        - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
index e81bdcf3709..eb0400bc3fe 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
@@ -88,3 +88,5 @@ jobs:
     inputs:
       sourceScanPath: '$(Build.SourcesDirectory)\tools'
       snapshotForceEnabled: true
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/json.yml b/tools/releaseBuild/azureDevOps/templates/json.yml
index 714978022a5..1d6c10b8f3e 100644
--- a/tools/releaseBuild/azureDevOps/templates/json.yml
+++ b/tools/releaseBuild/azureDevOps/templates/json.yml
@@ -53,3 +53,5 @@ jobs:
     inputs:
       sourceScanPath: '$(Build.SourcesDirectory)\tools'
       snapshotForceEnabled: true
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml
index 6dd44eb219c..92224a74d04 100644
--- a/tools/releaseBuild/azureDevOps/templates/linux.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux.yml
@@ -153,6 +153,8 @@ jobs:
     condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
     workingDirectory: $(PowerShellRoot)
 
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
+
 - job: upload_${{ parameters.buildName }}
   displayName: ${{ parameters.uploadDisplayName }} ${{ parameters.buildName }}
   dependsOn: build_${{ parameters.buildName }}
@@ -335,3 +337,5 @@ jobs:
     parameters:
       artifactPath: '$(Build.StagingDirectory)\signedPackages\release'
       condition: and(and(succeeded(), eq(variables['SHOULD_SIGN'], 'true')),eq(variables['buildName'], 'RPM'))
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
index a5c5a0811ec..5af4295994e 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
@@ -118,3 +118,5 @@ jobs:
       inputs:
         sourceScanPath: '$(repoRoot)\tools'
         snapshotForceEnabled: true
+
+    - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
index 69c683156d8..e61ea99004f 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
@@ -133,3 +133,5 @@ jobs:
     inputs:
       sourceScanPath: '$(PowerShellRoot)/tools'
       snapshotForceEnabled: true
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
index e41d0609d4c..c0fea010973 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
@@ -130,3 +130,5 @@ jobs:
     inputs:
       sourceScanPath: '$(repoRoot)/tools'
       snapshotForceEnabled: true
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/mac.yml b/tools/releaseBuild/azureDevOps/templates/mac.yml
index 9634c3bdb57..776382c952d 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac.yml
@@ -59,3 +59,5 @@ jobs:
     inputs:
       sourceScanPath: '$(Build.SourcesDirectory)/tools'
       snapshotForceEnabled: true
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/step/finalize.yml b/tools/releaseBuild/azureDevOps/templates/step/finalize.yml
new file mode 100644
index 00000000000..277d0e364a9
--- /dev/null
+++ b/tools/releaseBuild/azureDevOps/templates/step/finalize.yml
@@ -0,0 +1,5 @@
+steps:
+  - pwsh: |
+      throw "Jobs with an Issue will not work for release. Please fix the issue and try again."
+    displayName: Fail jobs with SucceededWithIssues status
+    condition: eq('$(Agent.JobStatus)','SucceededWithIssues')
diff --git a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml b/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
index 38d9ee0d158..99122b59de6 100644
--- a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
+++ b/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
@@ -57,3 +57,5 @@ jobs:
       BuildTestPackage -runtime linux-musl-x64
 
     displayName: Build test package and upload
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
index 16554ae7d41..1201edf98b7 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
@@ -78,3 +78,5 @@ jobs:
     inputs:
       sourceScanPath: '$(PowerShellRoot)\tools'
       snapshotForceEnabled: true
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
index 66bf7af7b3d..c2e3f4d1c1c 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
@@ -134,3 +134,5 @@ jobs:
     inputs:
       sourceScanPath: '$(repoRoot)\tools'
       snapshotForceEnabled: true
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
index 956eb19d855..7cd0f5e33a4 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -353,3 +353,5 @@ jobs:
       }
     displayName: Clean up local Clone
     condition: always()
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml

From 20d9be7e41c9dd1ad4e4b0d88db565e5eb35f5b9 Mon Sep 17 00:00:00 2001
From: travis plunk <github@ez13.net>
Date: Wed, 11 May 2022 10:50:08 -0700
Subject: [PATCH 2/7] add finalize to prep

---
 .../releaseBuild/azureDevOps/templates/checkAzureContainer.yml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml b/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
index 49082849e9b..d7e8e40b8b5 100644
--- a/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
+++ b/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
@@ -47,4 +47,4 @@ jobs:
             }
         }
 
-
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml

From 3683819a30609831b1ad66a03ead8469d1aad713 Mon Sep 17 00:00:00 2001
From: travis plunk <github@ez13.net>
Date: Wed, 11 May 2022 10:54:34 -0700
Subject: [PATCH 3/7] update display name

---
 tools/releaseBuild/azureDevOps/templates/step/finalize.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/step/finalize.yml b/tools/releaseBuild/azureDevOps/templates/step/finalize.yml
index 277d0e364a9..47bc3e19d7b 100644
--- a/tools/releaseBuild/azureDevOps/templates/step/finalize.yml
+++ b/tools/releaseBuild/azureDevOps/templates/step/finalize.yml
@@ -1,5 +1,5 @@
 steps:
   - pwsh: |
       throw "Jobs with an Issue will not work for release. Please fix the issue and try again."
-    displayName: Fail jobs with SucceededWithIssues status
+    displayName: Check for SucceededWithIssues
     condition: eq('$(Agent.JobStatus)','SucceededWithIssues')

From 230fca0465ce38192544967342038b6acb9e088d Mon Sep 17 00:00:00 2001
From: travis plunk <github@ez13.net>
Date: Wed, 11 May 2022 10:57:27 -0700
Subject: [PATCH 4/7] Add condition

---
 tools/releaseBuild/azureDevOps/templates/step/finalize.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/step/finalize.yml b/tools/releaseBuild/azureDevOps/templates/step/finalize.yml
index 47bc3e19d7b..72a677fec9a 100644
--- a/tools/releaseBuild/azureDevOps/templates/step/finalize.yml
+++ b/tools/releaseBuild/azureDevOps/templates/step/finalize.yml
@@ -2,4 +2,4 @@ steps:
   - pwsh: |
       throw "Jobs with an Issue will not work for release. Please fix the issue and try again."
     displayName: Check for SucceededWithIssues
-    condition: eq('$(Agent.JobStatus)','SucceededWithIssues')
+    condition: eq(variables['Agent.JobStatus'],'SucceededWithIssues')

From 5b10f299ce8f2c0f5cc11a8484b7b3b396d4a473 Mon Sep 17 00:00:00 2001
From: travis plunk <github@ez13.net>
Date: Wed, 11 May 2022 10:58:30 -0700
Subject: [PATCH 5/7] revert me: add fake issue

---
 tools/releaseBuild/azureDevOps/templates/step/finalize.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/releaseBuild/azureDevOps/templates/step/finalize.yml b/tools/releaseBuild/azureDevOps/templates/step/finalize.yml
index 72a677fec9a..8efeae3cd65 100644
--- a/tools/releaseBuild/azureDevOps/templates/step/finalize.yml
+++ b/tools/releaseBuild/azureDevOps/templates/step/finalize.yml
@@ -1,4 +1,9 @@
 steps:
+  - pwsh: |
+      throw "Fake issue"
+    displayName: Force SucceededWithIssues
+    continueOnError: true
+
   - pwsh: |
       throw "Jobs with an Issue will not work for release. Please fix the issue and try again."
     displayName: Check for SucceededWithIssues

From 2e63d37a743e5c6090930e301d241b58fcb4b993 Mon Sep 17 00:00:00 2001
From: travis plunk <github@ez13.net>
Date: Wed, 11 May 2022 11:03:20 -0700
Subject: [PATCH 6/7] fix display name

---
 tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml b/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
index d7e8e40b8b5..af6451004e4 100644
--- a/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
+++ b/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
@@ -22,6 +22,7 @@ jobs:
       UseJson: no
 
   - task: AzurePowerShell@4
+    displayName: Check if blob exists and delete if specified
     inputs:
       azureSubscription: '$(AzureFileCopySubscription)'
       scriptType: inlineScript

From 6888a175b07a69a8c5b344dbad6de63d1a4cf6e0 Mon Sep 17 00:00:00 2001
From: travis plunk <github@ez13.net>
Date: Wed, 11 May 2022 11:03:34 -0700
Subject: [PATCH 7/7] Revert "revert me: add fake issue"

This reverts commit 5b10f299ce8f2c0f5cc11a8484b7b3b396d4a473.
---
 tools/releaseBuild/azureDevOps/templates/step/finalize.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/step/finalize.yml b/tools/releaseBuild/azureDevOps/templates/step/finalize.yml
index 8efeae3cd65..72a677fec9a 100644
--- a/tools/releaseBuild/azureDevOps/templates/step/finalize.yml
+++ b/tools/releaseBuild/azureDevOps/templates/step/finalize.yml
@@ -1,9 +1,4 @@
 steps:
-  - pwsh: |
-      throw "Fake issue"
-    displayName: Force SucceededWithIssues
-    continueOnError: true
-
   - pwsh: |
       throw "Jobs with an Issue will not work for release. Please fix the issue and try again."
     displayName: Check for SucceededWithIssues