chore: update to electron 11 (#110759)

* chore: bump electron@11.0.0-beta.4

* build: add mac arm64 target

* chore: bump electron@11.0.1

* fix: remove macOS workaround for devtools with custom titlebar

https://github.com/electron/electron/pull/26395

* chore: bump vscode-windows-ca-certs@0.3.0

* chore: bump electron@11.0.2

* fixup! remove macOS workaround for devtools with custom titlebar

20 files changed, 131 insertions, 65 deletions

diff --git a/build/.cachesalt b/build/.cachesalt
index 0e8a2d8b1a6..0afdafd1118 100644
--- a/build/.cachesalt
+++ b/build/.cachesalt
@@ -1 +1 @@
-2020-11-23T10:00:34.612Z
+2020-11-23T17:57:03.428Z
diff --git a/build/azure-pipelines/darwin/continuous-build-darwin.yml b/build/azure-pipelines/darwin/continuous-build-darwin.yml
index 954e5bca636..3711d5c21d8 100644
--- a/build/azure-pipelines/darwin/continuous-build-darwin.yml
+++ b/build/azure-pipelines/darwin/continuous-build-darwin.yml
@@ -1,7 +1,7 @@
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.14.1"
+    versionSpec: "12.18.3"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:
diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index 8f13bfb5b9b..e73ba836973 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -21,7 +21,7 @@ steps:
 
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.14.1"
+    versionSpec: "12.18.3"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:
@@ -54,99 +54,154 @@ steps:
   displayName: Merge distro
 
 - script: |
+    echo -n $VSCODE_ARCH > .build/arch
+  displayName: Prepare arch cache flag
+
+- script: |
     npx https://aka.ms/enablesecurefeed standAlone
   displayName: Switch to Terrapin packages
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
-    keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+    keyfile: '.build/arch, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
     vstsFeed: 'npm-vscode'
 
 - script: |
     set -e
-    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
+    sudo xcode-select -s /Applications/Xcode_12.2.app
+  displayName: Switch to Xcode 12
+  condition: eq(variables['VSCODE_ARCH'], 'arm64')
+
+- script: |
+    set -e
+    npm install -g node-gyp@7.1.0
+    node-gyp --version
+  displayName: Update node-gyp
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+
+- script: |
+    set -e
+    export npm_config_arch=$(VSCODE_ARCH)
+    export npm_config_node_gyp=$(which node-gyp)
+    export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
+    ls /Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
+    CHILD_CONCURRENCY=1 yarn --frozen-lockfile --verbose
   displayName: Install dependencies
   condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
   inputs:
-    keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+    keyfile: '.build/arch, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
     vstsFeed: 'npm-vscode'
   condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
 - script: |
     set -e
+    export npm_config_arch=$(VSCODE_ARCH)
+    export npm_config_node_gyp=$(which node-gyp)
+    export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
+    ls /Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
     yarn postinstall
   displayName: Run postinstall scripts
   condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
 
 - script: |
     set -e
+    export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
+    ls /Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
+    yarn electron-rebuild
+  displayName: Rebuild native modules for ARM64
+  condition: eq(variables['VSCODE_ARCH'], 'arm64')
+
+- script: |
+    set -e
     node build/azure-pipelines/mixin
   displayName: Mix in quality
 
 - script: |
     set -e
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-darwin-min-ci
+      yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
+  displayName: Build
+
+- script: |
+    set -e
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
       yarn gulp vscode-reh-darwin-min-ci
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
       yarn gulp vscode-reh-web-darwin-min-ci
-  displayName: Build
+  displayName: Build reh
+  condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
+
+- script: |
+    set -e
+    yarn electron $(VSCODE_ARCH)
+  displayName: Download Electron
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+- script: |
+    set -e
+    security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+    security default-keychain -s $(agent.tempdirectory)/buildagent.keychain
+    security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+    echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12
+    security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
+    security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
+    VSCODE_ARCH="$(VSCODE_ARCH)" DEBUG=electron-osx-sign* node build/darwin/sign.js
+  displayName: Set Hardened Entitlements
 
 - script: |
     set -e
     ./scripts/test.sh --build --tfs "Unit Tests"
   displayName: Run unit tests (Electron)
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
     set -e
     yarn test-browser --build --browser chromium --browser webkit --browser firefox --tfs "Browser Unit Tests"
   displayName: Run unit tests (Browser)
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
     # Figure out the full absolute path of the product we just built
     # 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)/VSCode-darwin
+    APP_ROOT=$(agent.builddirectory)/VSCode-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)/vscode-reh-darwin" \
     ./scripts/test-integration.sh --build --tfs "Integration Tests"
   displayName: Run integration tests (Electron)
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  condition: and(succeeded(),  eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
     set -e
     VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
     ./resources/server/test/test-web-integration.sh --browser webkit
   displayName: Run integration tests (Browser)
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
     set -e
-    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
+    APP_ROOT=$(agent.builddirectory)/VSCode-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)/vscode-reh-darwin" \
     ./resources/server/test/test-remote-integration.sh
   displayName: Run remote integration tests (Electron)
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
     set -e
-    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
+    APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
     APP_NAME="`ls $APP_ROOT | head -n 1`"
     yarn smoketest --build "$APP_ROOT/$APP_NAME"
   continueOnError: true
   displayName: Run smoke tests (Electron)
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
     set -e
@@ -154,11 +209,11 @@ steps:
     yarn smoketest --web --headless
   continueOnError: true
   displayName: Run smoke tests (Browser)
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - task: PublishPipelineArtifact@0
   inputs:
-    artifactName: crash-dump-macos
+    artifactName: crash-dump-macos-$(VSCODE_ARCH)
     targetPath: .build/crashes
   displayName: 'Publish Crash Reports'
   continueOnError: true
@@ -173,25 +228,14 @@ steps:
 
 - script: |
     set -e
-    security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
-    security default-keychain -s $(agent.tempdirectory)/buildagent.keychain
-    security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
-    echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12
-    security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
-    security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
-    DEBUG=electron-osx-sign* node build/darwin/sign.js
-  displayName: Set Hardened Entitlements
-
-- script: |
-    set -e
-    pushd $(agent.builddirectory)/VSCode-darwin && zip -r -X -y $(agent.builddirectory)/VSCode-darwin.zip * && popd
+    pushd $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) && zip -r -X -y $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip * && popd
   displayName: Archive build
 
 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
   inputs:
     ConnectedServiceName: 'ESRP CodeSign'
     FolderPath: '$(agent.builddirectory)'
-    Pattern: 'VSCode-darwin.zip'
+    Pattern: 'VSCode-darwin-$(VSCODE_ARCH).zip'
     signConfigType: inlineSignParams
     inlineOperation: |
       [
@@ -212,11 +256,11 @@ steps:
   displayName: Codesign
 
 - script: |
-    zip -d $(agent.builddirectory)/VSCode-darwin.zip "*.pkg"
+    zip -d $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip "*.pkg"
   displayName: Clean Archive
 
 - script: |
-    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
+    APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
     APP_NAME="`ls $APP_ROOT | head -n 1`"
     BUNDLE_IDENTIFIER=$(node -p "require(\"$APP_ROOT/$APP_NAME/Contents/Resources/app/product.json\").darwinBundleIdentifier")
     echo "##vso[task.setvariable variable=BundleIdentifier]$BUNDLE_IDENTIFIER"
@@ -226,7 +270,7 @@ steps:
   inputs:
     ConnectedServiceName: 'ESRP CodeSign'
     FolderPath: '$(agent.builddirectory)'
-    Pattern: 'VSCode-darwin.zip'
+    Pattern: 'VSCode-darwin-$(VSCODE_ARCH).zip'
     signConfigType: inlineSignParams
     inlineOperation: |
       [
@@ -248,10 +292,11 @@ steps:
 
 - script: |
     set -e
-    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
+    APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
     APP_NAME="`ls $APP_ROOT | head -n 1`"
     "$APP_ROOT/$APP_NAME/Contents/Resources/app/bin/code" --export-default-configuration=.build
   displayName: Verify start after signing (export configuration)
+  condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
 
 - script: |
     set -e
@@ -267,6 +312,7 @@ steps:
     AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
     yarn gulp upload-vscode-configuration
   displayName: Upload configuration (for Bing settings search)
+  condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
   continueOnError: true
 
 - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
diff --git a/build/azure-pipelines/darwin/publish.sh b/build/azure-pipelines/darwin/publish.sh
index 51ac2e6355d..c9f5b4bab53 100755
--- a/build/azure-pipelines/darwin/publish.sh
+++ b/build/azure-pipelines/darwin/publish.sh
@@ -1,12 +1,18 @@
 #!/usr/bin/env bash
 set -e
 
+# Publish DEB
+case $VSCODE_ARCH in
+	x64) ASSET_ID="darwin" ;;
+	arm64) ASSET_ID="darwin-arm64" ;;
+esac
+
 # publish the build
 node build/azure-pipelines/common/createAsset.js \
-	darwin \
+	"$ASSET_ID" \
 	archive \
-	"VSCode-darwin-$VSCODE_QUALITY.zip" \
-	../VSCode-darwin.zip
+	"VSCode-$ASSET_ID.zip" \
+	../VSCode-darwin-$VSCODE_ARCH.zip
 
 if [ "$VSCODE_ARCH" == "x64" ]; then
 	# package Remote Extension Host
diff --git a/build/azure-pipelines/distro-build.yml b/build/azure-pipelines/distro-build.yml
index f9bdf7fef8e..15526080abb 100644
--- a/build/azure-pipelines/distro-build.yml
+++ b/build/azure-pipelines/distro-build.yml
@@ -8,7 +8,7 @@ pr:
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.14.1"
+    versionSpec: "12.18.3"
 
 - task: AzureKeyVault@1
   displayName: 'Azure Key Vault: Get Secrets'
diff --git a/build/azure-pipelines/exploration-build.yml b/build/azure-pipelines/exploration-build.yml
index cf1ced09dc8..a6a7dfe71a6 100644
--- a/build/azure-pipelines/exploration-build.yml
+++ b/build/azure-pipelines/exploration-build.yml
@@ -11,7 +11,7 @@ pr:
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.14.1"
+    versionSpec: "12.18.3"
 
 - task: AzureKeyVault@1
   displayName: 'Azure Key Vault: Get Secrets'
diff --git a/build/azure-pipelines/linux/continuous-build-linux.yml b/build/azure-pipelines/linux/continuous-build-linux.yml
index 58e14ab0dcd..4bc21fc89a7 100644
--- a/build/azure-pipelines/linux/continuous-build-linux.yml
+++ b/build/azure-pipelines/linux/continuous-build-linux.yml
@@ -10,7 +10,7 @@ steps:
 
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.14.1"
+    versionSpec: "12.18.3"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:
diff --git a/build/azure-pipelines/linux/product-build-alpine.yml b/build/azure-pipelines/linux/product-build-alpine.yml
index d58a2de2907..ce4a620f843 100644
--- a/build/azure-pipelines/linux/product-build-alpine.yml
+++ b/build/azure-pipelines/linux/product-build-alpine.yml
@@ -21,7 +21,7 @@ steps:
 
   - task: NodeTool@0
     inputs:
-      versionSpec: "12.14.1"
+      versionSpec: "12.18.3"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
     inputs:
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index ebbc419a591..45d2cc29988 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -21,7 +21,7 @@ steps:
 
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.14.1"
+    versionSpec: "12.18.3"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:
@@ -102,12 +102,6 @@ steps:
 
 - script: |
     set -e
-    service xvfb start
-  displayName: Start xvfb
-  condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
-- script: |
-    set -e
     DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
   displayName: Run unit tests (Electron)
   condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
diff --git a/build/azure-pipelines/linux/snap-build-linux.yml b/build/azure-pipelines/linux/snap-build-linux.yml
index 9084a9f6093..1cd7eb70c64 100644
--- a/build/azure-pipelines/linux/snap-build-linux.yml
+++ b/build/azure-pipelines/linux/snap-build-linux.yml
@@ -1,7 +1,7 @@
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "12.14.1"
+      versionSpec: "12.18.3"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
     inputs:
diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index 1c45de07f3e..28e3f2b4d05 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -11,8 +11,9 @@ schedules:
 resources:
   containers:
   - container: vscode-x64
-    image: vscodehub.azurecr.io/vscode-linux-build-agent:x64
+    image: vscodehub.azurecr.io/vscode-linux-build-agent:bionic
     endpoint: VSCodeHub
+    options: --user 0:0
   - container: vscode-arm64
     image: vscodehub.azurecr.io/vscode-linux-build-agent:stretch-arm64
     endpoint: VSCodeHub
@@ -27,7 +28,7 @@ stages:
   jobs:
   - job: Compile
     pool:
-      vmImage: 'Ubuntu-16.04'
+      vmImage: 'Ubuntu-18.04'
     container: vscode-x64
     steps:
     - template: product-compile.yml
@@ -68,7 +69,7 @@ stages:
   - Compile
   condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'))
   pool:
-    vmImage: 'Ubuntu-16.04'
+    vmImage: 'Ubuntu-18.04'
   jobs:
   - job: Linux
     condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
@@ -134,14 +135,30 @@ stages:
     steps:
     - template: darwin/product-build-darwin.yml
 
+- stage: macOSARM64
+  dependsOn:
+  - Compile
+  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'))
+  pool:
+    vmImage: macOS-latest
+  jobs:
+  - job: macOSARM64
+    condition: and(succeeded(), eq(variables['VSCODE_BUILD_MACOS_ARM64'], 'true'))
+    timeoutInMinutes: 90
+    variables:
+      VSCODE_ARCH: arm64
+    steps:
+    - template: darwin/product-build-darwin.yml
+
 - stage: Mooncake
   dependsOn:
   - Windows
   - Linux
   - macOS
+  - macOSARM64
   condition: and(succeededOrFailed(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'))
   pool:
-    vmImage: 'Ubuntu-16.04'
+    vmImage: 'Ubuntu-18.04'
   jobs:
   - job: SyncMooncake
     displayName: Sync Mooncake
@@ -153,9 +170,10 @@ stages:
   - Windows
   - Linux
   - macOS
+  - macOSARM64
   condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), or(eq(variables['VSCODE_RELEASE'], 'true'), and(or(eq(variables['VSCODE_QUALITY'], 'insider'), eq(variables['VSCODE_QUALITY'], 'exploration')), eq(variables['Build.Reason'], 'Schedule'))))
   pool:
-    vmImage: 'Ubuntu-16.04'
+    vmImage: 'Ubuntu-18.04'
   jobs:
   - job: BuildService
     displayName: Build Service
diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
index 0f3357ddc83..a086149f053 100644
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -16,7 +16,7 @@ steps:
 
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.14.1"
+    versionSpec: "12.18.3"
   condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
diff --git a/build/azure-pipelines/publish-types/publish-types.yml b/build/azure-pipelines/publish-types/publish-types.yml
index 10b6aa4e16a..f3dfc213a7b 100644
--- a/build/azure-pipelines/publish-types/publish-types.yml
+++ b/build/azure-pipelines/publish-types/publish-types.yml
@@ -9,7 +9,7 @@ pr: none
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.14.1"
+    versionSpec: "12.18.3"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:
diff --git a/build/azure-pipelines/sync-mooncake.yml b/build/azure-pipelines/sync-mooncake.yml
index 49dfc9ced80..810024fced1 100644
--- a/build/azure-pipelines/sync-mooncake.yml
+++ b/build/azure-pipelines/sync-mooncake.yml
@@ -1,7 +1,7 @@
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.14.1"
+    versionSpec: "12.18.3"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:
diff --git a/build/azure-pipelines/web/product-build-web.yml b/build/azure-pipelines/web/product-build-web.yml
index d7b4ac42485..f7588916064 100644
--- a/build/azure-pipelines/web/product-build-web.yml
+++ b/build/azure-pipelines/web/product-build-web.yml
@@ -21,7 +21,7 @@ steps:
 
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.14.1"
+    versionSpec: "12.18.3"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:
diff --git a/build/azure-pipelines/win32/continuous-build-win32.yml b/build/azure-pipelines/win32/continuous-build-win32.yml
index 6107eacc66c..6dd508a7c81 100644
--- a/build/azure-pipelines/win32/continuous-build-win32.yml
+++ b/build/azure-pipelines/win32/continuous-build-win32.yml
@@ -1,7 +1,7 @@
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.14.1"
+    versionSpec: "12.18.3"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:
diff --git a/build/azure-pipelines/win32/product-build-win32-arm64.yml b/build/azure-pipelines/win32/product-build-win32-arm64.yml
index c536ed13eeb..29c795dfe15 100644
--- a/build/azure-pipelines/win32/product-build-win32-arm64.yml
+++ b/build/azure-pipelines/win32/product-build-win32-arm64.yml
@@ -21,7 +21,7 @@ steps:
 
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.14.1"
+    versionSpec: "12.18.3"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index db56dc95451..66f8c265140 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -21,7 +21,7 @@ steps:
 
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.14.1"
+    versionSpec: "12.18.3"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:
diff --git a/build/darwin/sign.ts b/build/darwin/sign.ts
index ee5d2eeb17b..538dc97adf1 100644
--- a/build/darwin/sign.ts
+++ b/build/darwin/sign.ts
@@ -13,6 +13,7 @@ import * as product from '../../product.json';
 async function main(): Promise<void> {
 	const buildDir = process.env['AGENT_BUILDDIRECTORY'];
 	const tempDir = process.env['AGENT_TEMPDIRECTORY'];
+	const arch = process.env['VSCODE_ARCH'];
 
 	if (!buildDir) {
 		throw new Error('$AGENT_BUILDDIRECTORY not set');
@@ -23,7 +24,7 @@ async function main(): Promise<void> {
 	}
 
 	const baseDir = path.dirname(__dirname);
-	const appRoot = path.join(buildDir, 'VSCode-darwin');
+	const appRoot = path.join(buildDir, `VSCode-darwin-${arch}`);
 	const appName = product.nameLong + '.app';
 	const appFrameworkPath = path.join(appRoot, appName, 'Contents', 'Frameworks');
 	const helperAppBaseName = product.nameShort;
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 3c8bbe5b87f..4dbcd883f2e 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -326,7 +326,8 @@ const BUILD_TARGETS = [
 	{ platform: 'win32', arch: 'ia32' },
 	{ platform: 'win32', arch: 'x64' },
 	{ platform: 'win32', arch: 'arm64' },
-	{ platform: 'darwin', arch: null, opts: { stats: true } },
+	{ platform: 'darwin', arch: 'x64', opts: { stats: true } },
+	{ platform: 'darwin', arch: 'arm64', opts: { stats: true } },
 	{ platform: 'linux', arch: 'ia32' },
 	{ platform: 'linux', arch: 'x64' },
 	{ platform: 'linux', arch: 'armhf' },