From 7c05015946d67611a1768f2a67374a2e997b53fc Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 13 Dec 2021 12:33:19 -0800
Subject: [PATCH 1/2] Update macos build image and root folder for build

---
 .../azureDevOps/templates/cloneToOfficialPath.yml    |  2 +-
 tools/releaseBuild/azureDevOps/templates/mac.yml     | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/cloneToOfficialPath.yml b/tools/releaseBuild/azureDevOps/templates/cloneToOfficialPath.yml
index 0a52f887671..4985433aed0 100644
--- a/tools/releaseBuild/azureDevOps/templates/cloneToOfficialPath.yml
+++ b/tools/releaseBuild/azureDevOps/templates/cloneToOfficialPath.yml
@@ -1,7 +1,7 @@
 steps:
   - powershell: |
       $dirSeparatorChar = [system.io.path]::DirectorySeparatorChar
-      $nativePath = "${dirSeparatorChar}PowerShell"
+      $nativePath = "${env:HOME}${dirSeparatorChar}PowerShell"
       Write-Host "##vso[task.setvariable variable=PowerShellRoot]$nativePath"
 
       if ((Test-Path "$nativePath")) {
diff --git a/tools/releaseBuild/azureDevOps/templates/mac.yml b/tools/releaseBuild/azureDevOps/templates/mac.yml
index 6bf7814d93b..b5998de0576 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac.yml
@@ -6,7 +6,7 @@ jobs:
   displayName: Build macOS ${{ parameters.buildArchitecture }}
   condition: succeeded()
   pool:
-    vmImage: internal-macos-10.14
+    vmImage: internal-macos-11
   variables:
     # Turn off Homebrew analytics
     - name: HOMEBREW_NO_ANALYTICS
@@ -28,11 +28,11 @@ jobs:
 
   - pwsh: |
       # create folder
-      sudo mkdir /PowerShell
+      sudo mkdir "${env:HOME}/PowerShell"
 
       # make the current user the owner
-      sudo chown $env:USER /PowerShell
-    displayName: 'Create /PowerShell'
+      sudo chown $env:USER "${env:HOME}/PowerShell"
+    displayName: 'Create ${env:HOME}/PowerShell'
 
   - template: cloneToOfficialPath.yml
 
@@ -46,7 +46,9 @@ jobs:
 
   - pwsh: |
       $env:AzDevOpsFeedPAT2 = '$(AzDevOpsFeedPAT2)'
-      $(Build.SourcesDirectory)/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -ReleaseTag $(ReleaseTagVar) -Destination $(System.ArtifactsDirectory) -Symbols -location $(PowerShellRoot) -Build -ArtifactName macosBinResults -Runtime 'osx-${{ parameters.buildArchitecture }}'
+      # Add -SkipReleaseChecks as a mitigation to unblock release.
+      # macos-10.15 does not allow creating a folder under root. Hence, moving the folder.
+      $(Build.SourcesDirectory)/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -ReleaseTag $(ReleaseTagVar) -Destination $(System.ArtifactsDirectory) -Symbols -location $(PowerShellRoot) -Build -ArtifactName macosBinResults -Runtime 'osx-${{ parameters.buildArchitecture }}' -SkipReleaseChecks
       $env:AzDevOpsFeedPAT2 = $null
     displayName: 'Build'
 

From 1b749554d4b3e8568074115c1d1b6324155a7d13 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 13 Dec 2021 13:38:25 -0800
Subject: [PATCH 2/2] Update package yaml as well

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

diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
index 989cdbda039..f36383e5b00 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
@@ -8,7 +8,7 @@ jobs:
   dependsOn: MacFileSigningJob_${{ parameters.buildArchitecture }}
   condition: succeeded()
   pool:
-    vmImage: internal-macos-10.14
+    vmImage: internal-macos-11
   variables:
     # Turn off Homebrew analytics
     - name: HOMEBREW_NO_ANALYTICS