Add Apple Silicon build and Universal build for macOS

README.md

@@ -25,7 +25,9 @@ Go to our [download page](https://aka.ms/getazuredatastudio) for more specific i
 - [Windows User Installer - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/win32-x64-user/insider)
 - [Windows System Installer - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/win32-x64/insider)
 - [Windows ZIP - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/win32-x64-archive/insider)
-- [macOS ZIP - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/darwin/insider)
+- [macOS ZIP (Universal) - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/darwin-universal/insider)
+- [macOS ZIP (Intel Chip) - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/darwin/insider)
+- [macOS ZIP (Apple Silicon) - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/darwin-arm64/insider)
 - [Linux TAR.GZ - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/linux-x64/insider)
 
 See the [change log](https://github.com/Microsoft/azuredatastudio/blob/main/CHANGELOG.md) for additional details of what's in this release.

build/.cachesalt

@@ -1 +1 @@
-2021-11-19T02:27:18.022Z
+2022-10-06T02:27:18.022Z

build/azure-pipelines/darwin/sql-product-build-darwin-signing.yml

@@ -9,12 +9,12 @@ steps:
     displayName: 'Download Build Artifacts'
     inputs:
       downloadType: specific
-      itemPattern: 'drop/darwin/archive/azuredatastudio-darwin-unsigned.zip'
+      itemPattern: 'drop/darwin/archive/azuredatastudio-darwin-$(VSCODE_ARCH)-unsigned.zip'
       downloadPath: '$(Build.SourcesDirectory)/.build/'
 
   - script: |
       pushd $(Build.SourcesDirectory)/.build/drop/darwin/archive
-      mv azuredatastudio-darwin-unsigned.zip azuredatastudio-darwin.zip
+      mv azuredatastudio-darwin-$(VSCODE_ARCH)-unsigned.zip azuredatastudio-darwin-$(VSCODE_ARCH).zip
     displayName: 'Rename the file'
 
   - task: UseDotNet@2
@@ -29,7 +29,7 @@ steps:
     inputs:
       ConnectedServiceName: 'Code Signing'
       FolderPath: '$(Build.SourcesDirectory)/.build/drop/darwin/archive'
-      Pattern: 'azuredatastudio-darwin.zip'
+      Pattern: 'azuredatastudio-darwin-$(VSCODE_ARCH).zip'
       signConfigType: inlineSignParams
       inlineOperation: |
         [
@@ -47,7 +47,7 @@ steps:
     condition: and(succeeded(), eq(variables['signed'], true))
 
   - script: |
-      zip -d $(Build.SourcesDirectory)/.build/drop/darwin/archive/azuredatastudio-darwin.zip "*.pkg"
+      zip -d $(Build.SourcesDirectory)/.build/drop/darwin/archive/azuredatastudio-darwin-$(VSCODE_ARCH).zip "*.pkg"
     displayName: Clean Archive
     condition: and(succeeded(), eq(variables['signed'], true))
 
@@ -56,7 +56,7 @@ steps:
     inputs:
       ConnectedServiceName: 'Code Signing'
       FolderPath: '$(Build.SourcesDirectory)/.build/drop/darwin/archive'
-      Pattern: 'azuredatastudio-darwin.zip'
+      Pattern: 'azuredatastudio-darwin-$(VSCODE_ARCH).zip'
       signConfigType: inlineSignParams
       inlineOperation: |
         [

build/azure-pipelines/darwin/sql-product-build-darwin.yml

@@ -52,7 +52,7 @@ steps:
 
   - script: |
       mkdir -p .build
-      node build/azure-pipelines/common/sql-computeNodeModulesCacheKey.js > .build/yarnlockhash
+      node build/azure-pipelines/common/sql-computeNodeModulesCacheKey.js $(NPM_CONFIG_ARCH) > .build/yarnlockhash
     displayName: Prepare yarn cache key
 
   - task: Cache@2
@@ -71,6 +71,7 @@ steps:
 
   - script: |
       set -e
+      export npm_config_arch=$(NPM_CONFIG_ARCH)
       CHILD_CONCURRENCY=1 yarn --frozen-lockfile
     displayName: Install dependencies
     env:
@@ -99,10 +100,11 @@ steps:
   - script: |
       set -e
       yarn gulp package-rebuild-extensions
-      yarn gulp vscode-darwin-x64-min-ci
+      yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
     displayName: Build
     env:
       VSCODE_MIXIN_PASSWORD: $(github-distro-mixin-password)
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))
 
   - script: |
       set -e
@@ -115,7 +117,7 @@ steps:
       # including the remote server and configure the integration tests
       # to run with these builds instead of running out of sources.
       set -e
-      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-x64
+      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-$(VSCODE_ARCH)
       APP_NAME="`ls $APP_ROOT | head -n 1`"
       INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
       VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/azuredatastudio-reh-darwin" \
@@ -127,12 +129,13 @@ steps:
       set -e
       yarn gulp compile-extensions
     displayName: Compile Extensions
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))
 
   # Per https://developercommunity.visualstudio.com/t/variablesexpressions-dont-work-with-continueonerro/1187733 we can't use variables
   # in continueOnError directly so instead make two copies of the task and only run one or the other based on the SMOKE_FAIL_ON_ERROR value
   - script: |
       set -e
-      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-x64
+      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-$(VSCODE_ARCH)
       APP_NAME="`ls $APP_ROOT | head -n 1`"
       yarn smoketest --build "$APP_ROOT/$APP_NAME" --screenshots "$(build.artifactstagingdirectory)/smokeshots" --log "$(build.artifactstagingdirectory)/logs/darwin/smoke.log" --extensionsDir "$(build.sourcesdirectory)/extensions"
     displayName: Run smoke tests (Electron) (Continue on Error)
@@ -141,7 +144,7 @@ steps:
 
   - script: |
       set -e
-      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-x64
+      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-$(VSCODE_ARCH)
       APP_NAME="`ls $APP_ROOT | head -n 1`"
       yarn smoketest --build "$APP_ROOT/$APP_NAME" --screenshots "$(build.artifactstagingdirectory)/smokeshots" --log "$(build.artifactstagingdirectory)/logs/darwin/smoke.log" --extensionsDir "$(build.sourcesdirectory)/extensions"
     displayName: Run smoke tests (Electron) (Fail on Error)
@@ -156,9 +159,25 @@ steps:
   #   continueOnError: true
   #   condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
+  - task: DownloadBuildArtifacts@0
+    displayName: 'Download arm64 and x64 packages'
+    inputs:
+      downloadType: specific
+      itemPattern: 'drop/darwin/archive/azuredatastudio-darwin-@(arm64|x64)-unsigned.zip'
+      downloadPath: $(agent.builddirectory)
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
+
+  - script: |
+      set -e
+      unzip $(agent.builddirectory)/drop/darwin/archive/azuredatastudio-darwin-x64-unsigned.zip -d $(agent.builddirectory)/azuredatastudio-darwin-x64
+      unzip $(agent.builddirectory)/drop/darwin/archive/azuredatastudio-darwin-arm64-unsigned.zip -d $(agent.builddirectory)/azuredatastudio-darwin-arm64
+      DEBUG=* node build/darwin/create-universal-app.js
+    displayName: Create Universal App
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
+
   - script: |
       set -e
-      pushd ../azuredatastudio-darwin-x64
+      pushd ../azuredatastudio-darwin-$(VSCODE_ARCH)
       ls
 
       echo "Cleaning the application"
@@ -188,17 +207,17 @@ steps:
   - script: |
       set -e
       mkdir -p .build/darwin/archive
-      pushd ../azuredatastudio-darwin-x64
-      ditto -c -k --keepParent *.app $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin.zip
+      pushd ../azuredatastudio-darwin-$(VSCODE_ARCH)
+      ditto -c -k --keepParent *.app $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin-$(VSCODE_ARCH).zip
       popd
     displayName: 'Archive (no signing)'
     condition: and(succeeded(), eq(variables['signed'], false))
 
   - script: |
       set -e
       mkdir -p .build/darwin/archive
-      pushd ../azuredatastudio-darwin-x64
-      ditto -c -k --keepParent *.app $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin-unsigned.zip
+      pushd ../azuredatastudio-darwin-$(VSCODE_ARCH)
+      ditto -c -k --keepParent *.app $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin-$(VSCODE_ARCH)-unsigned.zip
       popd
     displayName: 'Archive'
     condition: and(succeeded(), eq(variables['signed'], true))

build/azure-pipelines/darwin/sql-publish.ps1

@@ -13,12 +13,22 @@ $Version = $VersionJson.version
 $Quality = $VersionJson.quality
 $CommitId = $VersionJson.commit
 
-$ZipName = "azuredatastudio-darwin.zip"
-$Zip = "$artifactsDir\darwin\archive\$ZipName"
-$UploadName = "azuredatastudio-macos-$Version"
+$Flavors = "x64","arm64","universal"
+$FlavorSuffixes = "","-arm64","-universal"
 
-If (-NOT ($Quality -eq "stable")) {
-	$UploadName = "$UploadName-$Quality"
-}
+For($i = 0; $i -lt $Flavors.Length; $i++)
+{
+	$Flavor = $Flavors[$i]
+	$FlavorSuffix = $FlavorSuffixes[$i]
+	$ZipName = "azuredatastudio-darwin-$Flavor.zip"
+	$Zip = "$artifactsDir\darwin\archive\$ZipName"
+	$UploadName = "azuredatastudio-macos$FlavorSuffix-$Version"
+
+	If (-NOT ($Quality -eq "stable")) {
+		$UploadName = "$UploadName-$Quality"
+	}
 
-node $sourcesDir\build\azure-pipelines\common\publish.js $Quality darwin archive "$UploadName.zip" $Version true $Zip $CommitId
+	$Platform = "darwin$FlavorSuffix"
+
+	node $sourcesDir\build\azure-pipelines\common\publish.js $Quality $Platform archive "$UploadName.zip" $Version true $Zip $CommitId
+}