Enable ARM64 packaging for macOS (#15768)

TravisEz13 · adityapatwardhan · commit ce6a9d150f61 · 2022-03-10T15:12:14.000-08:00
# Conflicts:
#	tools/packaging/packaging.psm1
#	tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
#	tools/releaseBuild/azureDevOps/templates/mac.yml
diff --git a/tools/ci.psm1 b/tools/ci.psm1
@@ -16,8 +16,8 @@ if(Test-Path $dotNetPath)
 }
 
 # import build into the global scope so it can be used by packaging
-Import-Module (Join-Path $repoRoot 'build.psm1') -Scope Global
-Import-Module (Join-Path $repoRoot 'tools\packaging') -Scope Global
+Import-Module (Join-Path $repoRoot 'build.psm1') -Verbose -Scope Global
+Import-Module (Join-Path $repoRoot 'tools\packaging') -Verbose -Scope Global
 
 # import the windows specific functcion only in Windows PowerShell or on Windows
 if($PSVersionTable.PSEdition -eq 'Desktop' -or $IsWindows)
diff --git a/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 b/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1
@@ -42,15 +42,18 @@ param (
     [ValidatePattern("-signed.zip$")]
     [string]$BuildZip,
 
-    [string]$ArtifactName = 'result'
+
+    [string]$ArtifactName = 'result',
+
+    [switch]$SkipReleaseChecks
 )
 
 $repoRoot = $location
 
-if ($Build.IsPresent -or $PSCmdlet.ParameterSetName -eq 'packageSigned') {
-    $releaseTagParam = @{ }
+if ($Build -or $PSCmdlet.ParameterSetName -eq 'packageSigned') {
+    $releaseTagParam = @{}
     if ($ReleaseTag) {
-        $releaseTagParam = @{ 'ReleaseTag' = $ReleaseTag }
+        $releaseTagParam['ReleaseTag'] = $ReleaseTag
 
         #Remove the initial 'v' from the ReleaseTag
         $version = $ReleaseTag -replace '^v'
@@ -65,13 +68,14 @@ if ($Build.IsPresent -or $PSCmdlet.ParameterSetName -eq 'packageSigned') {
 
 Push-Location
 try {
+    $pspackageParams = @{ SkipReleaseChecks = $SkipReleaseChecks; MacOSRuntime = $Runtime }
     Write-Verbose -Message "Init..." -Verbose
     Set-Location $repoRoot
     Import-Module "$repoRoot/build.psm1"
     Import-Module "$repoRoot/tools/packaging"
     Sync-PSTags -AddRemoteIfMissing
 
-    if ($BootStrap.IsPresent) {
+    if ($BootStrap) {
         Start-PSBootstrap -Package
     }
 
@@ -81,15 +85,15 @@ try {
 
         Remove-Item -Path $BuildZip
 
-        Start-PSPackage @releaseTagParam
+        Start-PSPackage @pspackageParams @releaseTagParam
         switch ($ExtraPackage) {
-            "tar" { Start-PSPackage -Type tar @releaseTagParam }
+            "tar" { Start-PSPackage -Type tar @pspackageParams @releaseTagParam }
         }
 
         if ($LTS) {
-            Start-PSPackage @releaseTagParam -LTS
+            Start-PSPackage @pspackageParams @releaseTagParam -LTS
             switch ($ExtraPackage) {
-                "tar" { Start-PSPackage -Type tar @releaseTagParam -LTS }
+                "tar" { Start-PSPackage -Type tar @pspackageParams @releaseTagParam -LTS }
             }
         }
     }
@@ -121,7 +125,7 @@ try {
     Pop-Location
 }
 
-if ($Build.IsPresent -or $PSCmdlet.ParameterSetName -eq 'packageSigned') {
+if ($Build -or $PSCmdlet.ParameterSetName -eq 'packageSigned') {
     $macPackages = Get-ChildItem "$repoRoot/powershell*" -Include *.pkg, *.tar.gz, *.zip
     foreach ($macPackage in $macPackages) {
         $filePath = $macPackage.FullName

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ if(Test-Path $dotNetPath)`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`# import build into the global scope so it can be used by packaging`
`19`		`-Import-Module (Join-Path $repoRoot 'build.psm1') -Scope Global`
`20`		`-Import-Module (Join-Path $repoRoot 'tools\packaging') -Scope Global`
	`19`	`+Import-Module (Join-Path $repoRoot 'build.psm1') -Verbose -Scope Global`
	`20`	`+Import-Module (Join-Path $repoRoot 'tools\packaging') -Verbose -Scope Global`
`21`	`21`
`22`	`22`	`# import the windows specific functcion only in Windows PowerShell or on Windows`
`23`	`23`	`if($PSVersionTable.PSEdition -eq 'Desktop' -or $IsWindows)`