From 7a5643c6f7f994689c4064175744e1fb135a98d7 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 22 Feb 2021 19:04:29 +0000
Subject: [PATCH 1/4] add exe upload after signing

---
 .../azureDevOps/templates/upload.yml            | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tools/releaseBuild/azureDevOps/templates/upload.yml b/tools/releaseBuild/azureDevOps/templates/upload.yml
index a8f32b19679..3c91a21ecb3 100644
--- a/tools/releaseBuild/azureDevOps/templates/upload.yml
+++ b/tools/releaseBuild/azureDevOps/templates/upload.yml
@@ -39,6 +39,23 @@ steps:
     resourceGroup: '$(StorageResourceGroup)'
   condition: succeeded()
 
+- template: upload-final-results.yml
+  parameters:
+    artifactPath: $(System.ArtifactsDirectory)\signed
+    artifactFilter: PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.exe
+    condition: and(succeeded(), eq('${{ parameters.msi }}', 'yes'))
+
+- task: AzureFileCopy@4
+  displayName: 'upload signed zip to Azure - ${{ parameters.architecture }}'
+  inputs:
+    SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.exe'
+    azureSubscription: '$(AzureFileCopySubscription)'
+    Destination: AzureBlob
+    storage: '$(StorageAccount)'
+    ContainerName: '$(AzureVersion)-private'
+    resourceGroup: '$(StorageResourceGroup)'
+  condition: and(succeeded(), eq('${{ parameters.msi }}', 'yes'))
+
 # Disable upload task as the symbols package is not currently used and we want to avoid publishing this in releases
 #- task: AzureFileCopy@4
 #  displayName: 'upload pbd zip to Azure - ${{ parameters.architecture }}'

From 1d6c1694c27eb698c0aa4eee3fb239989aed53f5 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 22 Feb 2021 19:02:19 +0000
Subject: [PATCH 2/4] download exe for signing

---
 .../azureDevOps/templates/windows-package-signing.yml            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
index 070a0840991..e1b5e378def 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
@@ -48,6 +48,7 @@ jobs:
         pattern: |
           **\*.msi
           **\*.msix
+          **\*.exe
         useMinimatch: true
         shouldSign: $(SHOULD_SIGN)
 

From f5b2ecc518866bd52e7d346b6be35d25878ebbdd Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 22 Feb 2021 19:01:28 +0000
Subject: [PATCH 3/4] upload exe after packaging

---
 .../PowerShellPackage.ps1                                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
index e90e4220ffc..f9d84dfeaf2 100644
--- a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
+++ b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
@@ -149,7 +149,7 @@ try{
 
         Write-Verbose "Exporting packages ..." -Verbose
 
-        Get-ChildItem $location\*.msi,$location\*.zip,$location\*.wixpdb,$location\*.msix | ForEach-Object {
+        Get-ChildItem $location\*.msi,$location\*.zip,$location\*.wixpdb,$location\*.msix,$location\*.exe | ForEach-Object {
             $file = $_.FullName
             Write-Verbose "Copying $file to $destination" -Verbose
             Copy-Item -Path $file -Destination "$destination\" -Force

From 0471c4da67e049e78f1464bac76772e4041b3ccd Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 22 Feb 2021 21:36:22 +0000
Subject: [PATCH 4/4] fix task name

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

diff --git a/tools/releaseBuild/azureDevOps/templates/upload.yml b/tools/releaseBuild/azureDevOps/templates/upload.yml
index 3c91a21ecb3..7a617b86422 100644
--- a/tools/releaseBuild/azureDevOps/templates/upload.yml
+++ b/tools/releaseBuild/azureDevOps/templates/upload.yml
@@ -46,7 +46,7 @@ steps:
     condition: and(succeeded(), eq('${{ parameters.msi }}', 'yes'))
 
 - task: AzureFileCopy@4
-  displayName: 'upload signed zip to Azure - ${{ parameters.architecture }}'
+  displayName: 'upload signed exe to Azure - ${{ parameters.architecture }}'
   inputs:
     SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.exe'
     azureSubscription: '$(AzureFileCopySubscription)'