From 7d43f741c241ff449a170d56a34712af92fbf848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Mon, 7 Sep 2020 14:17:14 +0200
Subject: [PATCH 01/23] arm64 build pipeline

---
 .../linux/product-build-linux.yml             | 33 ++++++++------
 build/azure-pipelines/linux/publish.sh        | 43 ++++++++++---------
 build/azure-pipelines/product-build.yml       | 10 ++++-
 3 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index 21d963042c8..2651a0e3fe5 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -3,6 +3,7 @@ steps:
     mkdir -p .build
     echo -n $BUILD_SOURCEVERSION > .build/commit
     echo -n $VSCODE_QUALITY > .build/quality
+    echo -n $VSCODE_ARCH > .build/arch
   displayName: Prepare cache flag
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
@@ -54,19 +55,19 @@ steps:
 
 - 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
+    CHILD_CONCURRENCY=1 yarn --frozen-lockfile --arch=$(VSCODE_ARCH)
   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'))
@@ -85,30 +86,30 @@ steps:
 - script: |
     set -e
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-linux-x64-min-ci
+      yarn gulp vscode-linux-$(VSCODE_ARCH)-min-ci
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-reh-linux-x64-min-ci
+      yarn gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-reh-web-linux-x64-min-ci
+      yarn gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci
   displayName: Build
 
 - script: |
     set -e
     service xvfb start
   displayName: Start xvfb
-  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
     DISPLAY=:10 ./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
     DISPLAY=:10 yarn test-browser --build --browser chromium --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
@@ -121,14 +122,14 @@ steps:
     VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-x64" \
     DISPLAY=:10 ./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-linux-x64" \
     DISPLAY=:10 ./resources/server/test/test-web-integration.sh --browser chromium
   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
@@ -138,11 +139,11 @@ steps:
     VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-x64" \
     DISPLAY=:10 ./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'))
 
 - task: PublishPipelineArtifact@0
   inputs:
-    artifactName: crash-dump-linux
+    artifactName: 'crash-dump-linux-$(VSCODE_ARCH)'
     targetPath: .build/crashes
   displayName: 'Publish Crash Reports'
   continueOnError: true
@@ -161,6 +162,7 @@ steps:
     yarn gulp "vscode-linux-x64-build-rpm"
     yarn gulp "vscode-linux-x64-prepare-snap"
   displayName: Build packages
+  condition: and(succeeded(), eq(variables['VSCODE_ARCH', 'x64']))
 
 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
   inputs:
@@ -180,20 +182,23 @@ steps:
       ]
     SessionTimeout: 120
   displayName: Codesign rpm
+  condition: and(succeeded(), eq(variables['VSCODE_ARCH', 'x64']))
 
 - script: |
     set -e
     AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
     AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+    VSCODE_ARCH="$(VSCODE_ARCH)" \
     ./build/azure-pipelines/linux/publish.sh
   displayName: Publish
 
 - task: PublishPipelineArtifact@0
   displayName: 'Publish Pipeline Artifact'
   inputs:
-    artifactName: snap-x64
+    artifactName: 'snap-$(VSCODE_ARCH)'
     targetPath: .build/linux/snap-tarball
+  condition: and(succeeded(), eq(variables['VSCODE_ARCH', 'x64']))
 
 - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
   displayName: 'Component Detection'
diff --git a/build/azure-pipelines/linux/publish.sh b/build/azure-pipelines/linux/publish.sh
index 7e360be6cb4..e90b6c909d6 100755
--- a/build/azure-pipelines/linux/publish.sh
+++ b/build/azure-pipelines/linux/publish.sh
@@ -4,11 +4,10 @@ REPO="$(pwd)"
 ROOT="$REPO/.."
 
 # Publish tarball
-PLATFORM_LINUX="linux-x64"
+PLATFORM_LINUX="linux-$VSCODE_ARCH"
 BUILDNAME="VSCode-$PLATFORM_LINUX"
-BUILD="$ROOT/$BUILDNAME"
 BUILD_VERSION="$(date +%s)"
-[ -z "$VSCODE_QUALITY" ] && TARBALL_FILENAME="code-$BUILD_VERSION.tar.gz" || TARBALL_FILENAME="code-$VSCODE_QUALITY-$BUILD_VERSION.tar.gz"
+[ -z "$VSCODE_QUALITY" ] && TARBALL_FILENAME="code-$VSCODE_ARCH-$BUILD_VERSION.tar.gz" || TARBALL_FILENAME="code-$VSCODE_QUALITY-$VSCODE_ARCH-$BUILD_VERSION.tar.gz"
 TARBALL_PATH="$ROOT/$TARBALL_FILENAME"
 
 rm -rf $ROOT/code-*.tar.*
@@ -27,25 +26,27 @@ rm -rf $ROOT/vscode-server-*.tar.*
 
 node build/azure-pipelines/common/createAsset.js "server-$PLATFORM_LINUX" archive-unsigned "$SERVER_TARBALL_FILENAME" "$SERVER_TARBALL_PATH"
 
-# Publish DEB
-PLATFORM_DEB="linux-deb-x64"
-DEB_ARCH="amd64"
-DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
-DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
+if [ "$VSCODE_ARCH" == "x64" ]; then
+	# Publish DEB
+	PLATFORM_DEB="linux-deb-$VSCODE_ARCH"
+	DEB_ARCH="amd64"
+	DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
+	DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
 
-node build/azure-pipelines/common/createAsset.js "$PLATFORM_DEB" package "$DEB_FILENAME" "$DEB_PATH"
+	node build/azure-pipelines/common/createAsset.js "$PLATFORM_DEB" package "$DEB_FILENAME" "$DEB_PATH"
 
-# Publish RPM
-PLATFORM_RPM="linux-rpm-x64"
-RPM_ARCH="x86_64"
-RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
-RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME"
+	# Publish RPM
+	PLATFORM_RPM="linux-rpm-$VSCODE_ARCH"
+	RPM_ARCH="x86_64"
+	RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
+	RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME"
 
-node build/azure-pipelines/common/createAsset.js "$PLATFORM_RPM" package "$RPM_FILENAME" "$RPM_PATH"
+	node build/azure-pipelines/common/createAsset.js "$PLATFORM_RPM" package "$RPM_FILENAME" "$RPM_PATH"
 
-# Publish Snap
-# Pack snap tarball artifact, in order to preserve file perms
-mkdir -p $REPO/.build/linux/snap-tarball
-SNAP_TARBALL_PATH="$REPO/.build/linux/snap-tarball/snap-x64.tar.gz"
-rm -rf $SNAP_TARBALL_PATH
-(cd .build/linux && tar -czf $SNAP_TARBALL_PATH snap)
+	# Publish Snap
+	# Pack snap tarball artifact, in order to preserve file perms
+	mkdir -p $REPO/.build/linux/snap-tarball
+	SNAP_TARBALL_PATH="$REPO/.build/linux/snap-tarball/snap-$VSCODE_ARCH.tar.gz"
+	rm -rf $SNAP_TARBALL_PATH
+	(cd .build/linux && tar -czf $SNAP_TARBALL_PATH snap)
+fi
diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index 1f3a0805086..54754215922 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -13,6 +13,9 @@ resources:
   - container: vscode-x64
     image: vscodehub.azurecr.io/vscode-linux-build-agent:x64
     endpoint: VSCodeHub
+  - container: vscode-arm64
+    image: vscodehub.azurecr.io/vscode-linux-build-agent:buster-arm64
+    endpoint: VSCodeHub
   - container: snapcraft
     image: snapcore/snapcraft:stable
 
@@ -64,6 +67,8 @@ stages:
   - job: Linux
     condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
     container: vscode-x64
+    variables:
+      VSCODE_ARCH: x64
     steps:
     - template: linux/product-build-linux.yml
 
@@ -72,6 +77,8 @@ stages:
     - Linux
     condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
     container: snapcraft
+    variables:
+      VSCODE_ARCH: x64
     steps:
     - template: linux/snap-build-linux.yml
 
@@ -84,10 +91,11 @@ stages:
 
   - job: LinuxArm64
     condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX_ARM64'], 'true'))
+    container: vscode-arm64
     variables:
       VSCODE_ARCH: arm64
     steps:
-    - template: linux/product-build-linux-multiarch.yml
+    - template: linux/product-build-linux.yml
 
   - job: LinuxAlpine
     condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX_ALPINE'], 'true'))

From 45f9763c834a8f3f2927a4ec7ff765abe4023f30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Mon, 7 Sep 2020 14:19:34 +0200
Subject: [PATCH 02/23] fix conditions

---
 .../linux/product-build-linux.yml              | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index 2651a0e3fe5..fa2a562e814 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -97,19 +97,19 @@ steps:
     set -e
     service xvfb start
   displayName: Start xvfb
-  condition: and(succeeded(), eq(variables['VSCODE_ARCH', 'x64']), 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
     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'))
+  condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
     set -e
     DISPLAY=:10 yarn test-browser --build --browser chromium --tfs "Browser Unit Tests"
   displayName: Run unit tests (Browser)
-  condition: and(succeeded(), eq(variables['VSCODE_ARCH', 'x64']), 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
@@ -122,14 +122,14 @@ steps:
     VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-x64" \
     DISPLAY=:10 ./scripts/test-integration.sh --build --tfs "Integration Tests"
   displayName: Run integration tests (Electron)
-  condition: and(succeeded(), eq(variables['VSCODE_ARCH', 'x64']), 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-linux-x64" \
     DISPLAY=:10 ./resources/server/test/test-web-integration.sh --browser chromium
   displayName: Run integration tests (Browser)
-  condition: and(succeeded(), eq(variables['VSCODE_ARCH', 'x64']), 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
@@ -139,7 +139,7 @@ steps:
     VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-x64" \
     DISPLAY=:10 ./resources/server/test/test-remote-integration.sh
   displayName: Run remote integration tests (Electron)
-  condition: and(succeeded(), eq(variables['VSCODE_ARCH', 'x64']), 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:
@@ -162,7 +162,7 @@ steps:
     yarn gulp "vscode-linux-x64-build-rpm"
     yarn gulp "vscode-linux-x64-prepare-snap"
   displayName: Build packages
-  condition: and(succeeded(), eq(variables['VSCODE_ARCH', 'x64']))
+  condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
 
 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
   inputs:
@@ -182,7 +182,7 @@ steps:
       ]
     SessionTimeout: 120
   displayName: Codesign rpm
-  condition: and(succeeded(), eq(variables['VSCODE_ARCH', 'x64']))
+  condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
 
 - script: |
     set -e
@@ -198,7 +198,7 @@ steps:
   inputs:
     artifactName: 'snap-$(VSCODE_ARCH)'
     targetPath: .build/linux/snap-tarball
-  condition: and(succeeded(), eq(variables['VSCODE_ARCH', 'x64']))
+  condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
 
 - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
   displayName: 'Component Detection'

From 7f57a448517c74395cbb18e7dce5559eb3373f2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Mon, 7 Sep 2020 14:35:46 +0200
Subject: [PATCH 03/23] distro

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 09d7e57699e..b7490377512 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.50.0",
-  "distro": "a2863a9e80e1f2a5d4bdb01c4ac5154c9d7d133d",
+  "distro": "e7785c415611ea4e39b1f5e6ccc87fda019bfbd2",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -193,4 +193,4 @@
     "windows-mutex": "0.3.0",
     "windows-process-tree": "0.2.4"
   }
-}
+}
\ No newline at end of file

From 2f3491ab754bf36711c3d7a731967c377b136cba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Mon, 7 Sep 2020 14:51:11 +0200
Subject: [PATCH 04/23] fix compile cache

---
 build/azure-pipelines/product-compile.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
index ab0dbb932c6..cef693d4576 100644
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -3,11 +3,12 @@ steps:
     mkdir -p .build
     echo -n $BUILD_SOURCEVERSION > .build/commit
     echo -n $VSCODE_QUALITY > .build/quality
+    echo -n $VSCODE_ARCH > .build/arch
   displayName: Prepare cache flag
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
-    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
+    keyfile: '.build/arch, build/.cachesalt, .build/commit, .build/quality'
     targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true
@@ -54,7 +55,7 @@ steps:
 
 - 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'
   condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
@@ -67,7 +68,7 @@ steps:
 
 - 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['CacheExists-Compilation'], 'true'), ne(variables['CacheRestored'], 'true'))

From f7684f6caa89c03d6cdc43a6cb1ab054b9b1f3ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Mon, 7 Sep 2020 15:39:06 +0200
Subject: [PATCH 05/23] distro

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index b7490377512..5b781b34044 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.50.0",
-  "distro": "e7785c415611ea4e39b1f5e6ccc87fda019bfbd2",
+  "distro": "4aa8fa3bae3eb0120881b7de0756ace5ce7091ca",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -193,4 +193,4 @@
     "windows-mutex": "0.3.0",
     "windows-process-tree": "0.2.4"
   }
-}
\ No newline at end of file
+}

From c434a70e89d207afe6a1cf453ac159b234872a68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Mon, 7 Sep 2020 19:45:51 +0200
Subject: [PATCH 06/23] fix compilation cache

---
 build/azure-pipelines/linux/product-build-linux.yml | 5 ++++-
 build/azure-pipelines/product-compile.yml           | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index fa2a562e814..45f581540b1 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -3,7 +3,6 @@ steps:
     mkdir -p .build
     echo -n $BUILD_SOURCEVERSION > .build/commit
     echo -n $VSCODE_QUALITY > .build/quality
-    echo -n $VSCODE_ARCH > .build/arch
   displayName: Prepare cache flag
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
@@ -53,6 +52,10 @@ steps:
     git merge $(node -p "require('./package.json').distro")
   displayName: Merge distro
 
+- script: |
+    echo -n $VSCODE_ARCH > .build/arch
+  displayName: Prepare arch cache flag
+
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
     keyfile: '.build/arch, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
index cef693d4576..2eff40b53d1 100644
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -3,12 +3,11 @@ steps:
     mkdir -p .build
     echo -n $BUILD_SOURCEVERSION > .build/commit
     echo -n $VSCODE_QUALITY > .build/quality
-    echo -n $VSCODE_ARCH > .build/arch
   displayName: Prepare cache flag
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
-    keyfile: '.build/arch, build/.cachesalt, .build/commit, .build/quality'
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
     targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true
@@ -53,6 +52,10 @@ steps:
   displayName: Merge distro
   condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
+- script: |
+    echo -n $VSCODE_ARCH > .build/arch
+  displayName: Prepare arch cache flag
+
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
     keyfile: '.build/arch, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'

From 23e743d14ecfc0f486297af6ad226c3c3f75229f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Tue, 8 Sep 2020 09:41:23 +0200
Subject: [PATCH 07/23] cleanup gulpfile reh

---
 build/gulpfile.reh.js | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
index f2ea1bd3701..5f367d1f077 100644
--- a/build/gulpfile.reh.js
+++ b/build/gulpfile.reh.js
@@ -37,19 +37,11 @@ const BUILD_TARGETS = [
 
 const noop = () => { return Promise.resolve(); };
 
-gulp.task('vscode-reh-win32-ia32-min', noop);
-gulp.task('vscode-reh-win32-x64-min', noop);
-gulp.task('vscode-reh-darwin-min', noop);
-gulp.task('vscode-reh-linux-x64-min', noop);
-gulp.task('vscode-reh-linux-armhf-min', noop);
-gulp.task('vscode-reh-linux-arm64-min', noop);
-gulp.task('vscode-reh-linux-alpine-min', noop);
-
-gulp.task('vscode-reh-web-win32-ia32-min', noop);
-gulp.task('vscode-reh-web-win32-x64-min', noop);
-gulp.task('vscode-reh-web-darwin-min', noop);
-gulp.task('vscode-reh-web-linux-x64-min', noop);
-gulp.task('vscode-reh-web-linux-alpine-min', noop);
+BUILD_TARGETS.forEach(({ platform, arch }) => {
+	for (const target of ['reh', 'reh-web']) {
+		gulp.task(`vscode-${target}-${platform}${ arch ? `-${arch}` : '' }-min`, noop);
+	}
+});
 
 function getNodeVersion() {
 	const yarnrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8');

From 47d8a2560605b5b6b013719f7f385ec9750cae9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Tue, 8 Sep 2020 09:41:28 +0200
Subject: [PATCH 08/23] build vscode armhf

---
 build/azure-pipelines/product-build.yml | 6 +++++-
 build/gulpfile.vscode.js                | 4 ++--
 build/gulpfile.vscode.linux.js          | 6 +++---
 build/lib/electron.js                   | 2 +-
 build/lib/electron.ts                   | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index 54754215922..a80379e7606 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -16,6 +16,9 @@ resources:
   - container: vscode-arm64
     image: vscodehub.azurecr.io/vscode-linux-build-agent:buster-arm64
     endpoint: VSCodeHub
+  - container: vscode-armhf
+    image: vscodehub.azurecr.io/vscode-linux-build-agent:buster-armhf
+    endpoint: VSCodeHub
   - container: snapcraft
     image: snapcore/snapcraft:stable
 
@@ -84,10 +87,11 @@ stages:
 
   - job: LinuxArmhf
     condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX_ARMHF'], 'true'))
+    container: vscode-armhf
     variables:
       VSCODE_ARCH: armhf
     steps:
-    - template: linux/product-build-linux-multiarch.yml
+    - template: linux/product-build-linux.yml
 
   - job: LinuxArm64
     condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX_ARM64'], 'true'))
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 2c86b2808e0..d046aa71ed2 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -263,7 +263,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		let result = all
 			.pipe(util.skipDirectories())
 			.pipe(util.fixWin32DirectoryPermissions())
-			.pipe(electron(_.extend({}, config, { platform, arch, ffmpegChromium: true })))
+			.pipe(electron(_.extend({}, config, { platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: true })))
 			.pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version'], { dot: true }));
 
 		if (platform === 'linux') {
@@ -324,7 +324,7 @@ const BUILD_TARGETS = [
 	{ platform: 'darwin', arch: null, opts: { stats: true } },
 	{ platform: 'linux', arch: 'ia32' },
 	{ platform: 'linux', arch: 'x64' },
-	{ platform: 'linux', arch: 'arm' },
+	{ platform: 'linux', arch: 'armhf' },
 	{ platform: 'linux', arch: 'arm64' },
 ];
 BUILD_TARGETS.forEach(buildTarget => {
diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
index e8e0c1541d0..f11a49d1670 100644
--- a/build/gulpfile.vscode.linux.js
+++ b/build/gulpfile.vscode.linux.js
@@ -23,7 +23,7 @@ const commit = util.getVersion(root);
 const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
 
 function getDebPackageArch(arch) {
-	return { x64: 'amd64', arm: 'armhf', arm64: 'arm64' }[arch];
+	return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64' }[arch];
 }
 
 function prepareDebPackage(arch) {
@@ -115,7 +115,7 @@ function getRpmBuildPath(rpmArch) {
 }
 
 function getRpmPackageArch(arch) {
-	return { x64: 'x86_64', arm: 'armhf', arm64: 'arm64' }[arch];
+	return { x64: 'x86_64', armhf: 'armhf', arm64: 'arm64' }[arch];
 }
 
 function prepareRpmPackage(arch) {
@@ -246,7 +246,7 @@ function buildSnapPackage(arch) {
 
 const BUILD_TARGETS = [
 	{ arch: 'x64' },
-	{ arch: 'arm' },
+	{ arch: 'armhf' },
 	{ arch: 'arm64' },
 ];
 
diff --git a/build/lib/electron.js b/build/lib/electron.js
index bb71f14c12d..3c7a876d607 100644
--- a/build/lib/electron.js
+++ b/build/lib/electron.js
@@ -82,7 +82,7 @@ function getElectron(arch) {
     return () => {
         const electronOpts = _.extend({}, exports.config, {
             platform: process.platform,
-            arch,
+            arch: arch === 'armhf' ? 'arm' : arch,
             ffmpegChromium: true,
             keepDefaultApp: true
         });
diff --git a/build/lib/electron.ts b/build/lib/electron.ts
index e0beca78079..e969aa8ecba 100644
--- a/build/lib/electron.ts
+++ b/build/lib/electron.ts
@@ -88,7 +88,7 @@ function getElectron(arch: string): () => NodeJS.ReadWriteStream {
 	return () => {
 		const electronOpts = _.extend({}, config, {
 			platform: process.platform,
-			arch,
+			arch: arch === 'armhf' ? 'arm' : arch,
 			ffmpegChromium: true,
 			keepDefaultApp: true
 		});

From 54d8e4ea0c9e2cd486c659aa97a3781078624278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Tue, 8 Sep 2020 09:43:22 +0200
Subject: [PATCH 09/23] update distro

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5b781b34044..5e05dbde40c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.50.0",
-  "distro": "4aa8fa3bae3eb0120881b7de0756ace5ce7091ca",
+  "distro": "072600857f7c674daf79daa6ae00cd4d4851f04b",
   "author": {
     "name": "Microsoft Corporation"
   },

From 41a90e7c50ecefa655866d5e20d3a66342ba5d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Tue, 8 Sep 2020 10:46:54 +0200
Subject: [PATCH 10/23] fix yarn arch

---
 build/azure-pipelines/linux/product-build-linux.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index 45f581540b1..4e98b487da6 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -64,7 +64,7 @@ steps:
 
 - script: |
     set -e
-    CHILD_CONCURRENCY=1 yarn --frozen-lockfile --arch=$(VSCODE_ARCH)
+    CHILD_CONCURRENCY=1 npm_config_arch=$(VSCODE_ARCH) yarn --frozen-lockfile
   displayName: Install dependencies
   condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 

From e73d8797cac618422c50e1e53c71f4335186f78a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Tue, 8 Sep 2020 11:33:29 +0200
Subject: [PATCH 11/23] fix armhf build

---
 build/azure-pipelines/linux/product-build-linux.yml | 2 +-
 build/azure-pipelines/product-build.yml             | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index 4e98b487da6..91dc644e4f7 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -64,7 +64,7 @@ steps:
 
 - script: |
     set -e
-    CHILD_CONCURRENCY=1 npm_config_arch=$(VSCODE_ARCH) yarn --frozen-lockfile
+    CHILD_CONCURRENCY=1 npm_config_arch=$(NPM_ARCH) yarn --frozen-lockfile
   displayName: Install dependencies
   condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index a80379e7606..c45f6926f4f 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -72,6 +72,7 @@ stages:
     container: vscode-x64
     variables:
       VSCODE_ARCH: x64
+      NPM_ARCH: x64
     steps:
     - template: linux/product-build-linux.yml
 
@@ -90,6 +91,7 @@ stages:
     container: vscode-armhf
     variables:
       VSCODE_ARCH: armhf
+      NPM_ARCH: arm
     steps:
     - template: linux/product-build-linux.yml
 
@@ -98,6 +100,7 @@ stages:
     container: vscode-arm64
     variables:
       VSCODE_ARCH: arm64
+      NPM_ARCH: arm64
     steps:
     - template: linux/product-build-linux.yml
 

From 0f550c2acb5a232917962213f8a5d4f3b9dac573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Tue, 8 Sep 2020 14:45:42 +0200
Subject: [PATCH 12/23] another attempt

---
 build/azure-pipelines/product-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index c45f6926f4f..3e091e69149 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -91,7 +91,7 @@ stages:
     container: vscode-armhf
     variables:
       VSCODE_ARCH: armhf
-      NPM_ARCH: arm
+      NPM_ARCH: armv7l
     steps:
     - template: linux/product-build-linux.yml
 

From 1003166b7d2eb8ba1dd3e3517b56846cd063ede0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Tue, 8 Sep 2020 16:24:51 +0200
Subject: [PATCH 13/23] :lipstick:

---
 build/gulpfile.vscode.linux.js | 36 ++++++++++++----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
index f11a49d1670..f0a7dcf3284 100644
--- a/build/gulpfile.vscode.linux.js
+++ b/build/gulpfile.vscode.linux.js
@@ -250,29 +250,19 @@ const BUILD_TARGETS = [
 	{ arch: 'arm64' },
 ];
 
-BUILD_TARGETS.forEach((buildTarget) => {
-	const arch = buildTarget.arch;
+BUILD_TARGETS.forEach(({ arch }) => {
+	const debArch = getDebPackageArch(arch);
+	const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(util.rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch)));
+	const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, task.series(prepareDebTask, buildDebPackage(arch)));
+	gulp.task(buildDebTask);
 
-	{
-		const debArch = getDebPackageArch(arch);
-		const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(util.rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch)));
-		// gulp.task(prepareDebTask);
-		const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, task.series(prepareDebTask, buildDebPackage(arch)));
-		gulp.task(buildDebTask);
-	}
+	const rpmArch = getRpmPackageArch(arch);
+	const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(util.rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch)));
+	const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, task.series(prepareRpmTask, buildRpmPackage(arch)));
+	gulp.task(buildRpmTask);
 
-	{
-		const rpmArch = getRpmPackageArch(arch);
-		const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(util.rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch)));
-		// gulp.task(prepareRpmTask);
-		const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, task.series(prepareRpmTask, buildRpmPackage(arch)));
-		gulp.task(buildRpmTask);
-	}
-
-	{
-		const prepareSnapTask = task.define(`vscode-linux-${arch}-prepare-snap`, task.series(util.rimraf(`.build/linux/snap/${arch}`), prepareSnapPackage(arch)));
-		gulp.task(prepareSnapTask);
-		const buildSnapTask = task.define(`vscode-linux-${arch}-build-snap`, task.series(prepareSnapTask, buildSnapPackage(arch)));
-		gulp.task(buildSnapTask);
-	}
+	const prepareSnapTask = task.define(`vscode-linux-${arch}-prepare-snap`, task.series(util.rimraf(`.build/linux/snap/${arch}`), prepareSnapPackage(arch)));
+	gulp.task(prepareSnapTask);
+	const buildSnapTask = task.define(`vscode-linux-${arch}-build-snap`, task.series(prepareSnapTask, buildSnapPackage(arch)));
+	gulp.task(buildSnapTask);
 });

From 1f99a829e6f07edc2b5d50f494b715dbc3b7c8fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Tue, 8 Sep 2020 16:29:14 +0200
Subject: [PATCH 14/23] produce deb, rpm packages

---
 .../linux/product-build-linux.yml             | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index 91dc644e4f7..39b43f0007c 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -119,27 +119,27 @@ 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)/VSCode-linux-x64
+    APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
     APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
     INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
-    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-x64" \
+    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
     DISPLAY=:10 ./scripts/test-integration.sh --build --tfs "Integration Tests"
   displayName: Run integration tests (Electron)
   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-linux-x64" \
+    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-$(VSCODE_ARCH)" \
     DISPLAY=:10 ./resources/server/test/test-web-integration.sh --browser chromium
   displayName: Run integration tests (Browser)
   condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
     set -e
-    APP_ROOT=$(agent.builddirectory)/VSCode-linux-x64
+    APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
     APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
     INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
-    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-x64" \
+    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
     DISPLAY=:10 ./resources/server/test/test-remote-integration.sh
   displayName: Run remote integration tests (Electron)
   condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
@@ -161,16 +161,20 @@ steps:
 
 - script: |
     set -e
-    yarn gulp "vscode-linux-x64-build-deb"
-    yarn gulp "vscode-linux-x64-build-rpm"
-    yarn gulp "vscode-linux-x64-prepare-snap"
-  displayName: Build packages
+    yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-deb"
+    yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-rpm"
+  displayName: Build deb, rpm packages
+
+- script: |
+    set -e
+    yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
+  displayName: Prepare snap package
   condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
 
 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
   inputs:
     ConnectedServiceName: 'ESRP CodeSign'
-    FolderPath: '.build/linux/rpm/x86_64'
+    FolderPath: '.build/linux/rpm'
     Pattern: '*.rpm'
     signConfigType: inlineSignParams
     inlineOperation: |
@@ -185,7 +189,6 @@ steps:
       ]
     SessionTimeout: 120
   displayName: Codesign rpm
-  condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
 
 - script: |
     set -e

From 034f6fc5ba9f0f00983f2aeb559af411b2fb22e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Tue, 8 Sep 2020 20:57:07 +0200
Subject: [PATCH 15/23] fix rpm

---
 build/gulpfile.vscode.linux.js        |   2 +-
 resources/linux/rpm/dependencies.json | 132 +++++++++++++++++++++++++-
 2 files changed, 132 insertions(+), 2 deletions(-)

diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
index f0a7dcf3284..3efb4ebf1f4 100644
--- a/build/gulpfile.vscode.linux.js
+++ b/build/gulpfile.vscode.linux.js
@@ -115,7 +115,7 @@ function getRpmBuildPath(rpmArch) {
 }
 
 function getRpmPackageArch(arch) {
-	return { x64: 'x86_64', armhf: 'armhf', arm64: 'arm64' }[arch];
+	return { x64: 'x86_64', armhf: 'armv7hl', arm64: 'aarch64' }[arch];
 }
 
 function prepareRpmPackage(arch) {
diff --git a/resources/linux/rpm/dependencies.json b/resources/linux/rpm/dependencies.json
index 34f127e1ae5..07e2b307fcd 100644
--- a/resources/linux/rpm/dependencies.json
+++ b/resources/linux/rpm/dependencies.json
@@ -63,5 +63,135 @@
 		"libxcb.so.1()(64bit)",
 		"libxkbfile.so.1()(64bit)",
 		"libsecret-1.so.0()(64bit)"
+	],
+	"aarch64": [
+		"libpthread.so.0()(aarch64)",
+		"libpthread.so.0(GLIBC_2.2.5)(aarch64)",
+		"libpthread.so.0(GLIBC_2.3.2)(aarch64)",
+		"libpthread.so.0(GLIBC_2.3.3)(aarch64)",
+		"libgtk-3.so.0()(aarch64)",
+		"libgdk-x11-2.0.so.0()(aarch64)",
+		"libatk-1.0.so.0()(aarch64)",
+		"libgio-2.0.so.0()(aarch64)",
+		"libpangocairo-1.0.so.0()(aarch64)",
+		"libgdk_pixbuf-2.0.so.0()(aarch64)",
+		"libcairo.so.2()(aarch64)",
+		"libpango-1.0.so.0()(aarch64)",
+		"libfreetype.so.6()(aarch64)",
+		"libfontconfig.so.1()(aarch64)",
+		"libgobject-2.0.so.0()(aarch64)",
+		"libdbus-1.so.3()(aarch64)",
+		"libXi.so.6()(aarch64)",
+		"libXcursor.so.1()(aarch64)",
+		"libXdamage.so.1()(aarch64)",
+		"libXrandr.so.2()(aarch64)",
+		"libXcomposite.so.1()(aarch64)",
+		"libXext.so.6()(aarch64)",
+		"libXfixes.so.3()(aarch64)",
+		"libXrender.so.1()(aarch64)",
+		"libX11.so.6()(aarch64)",
+		"libXss.so.1()(aarch64)",
+		"libXtst.so.6()(aarch64)",
+		"libgmodule-2.0.so.0()(aarch64)",
+		"librt.so.1()(aarch64)",
+		"libglib-2.0.so.0()(aarch64)",
+		"libnss3.so()(aarch64)",
+		"libnssutil3.so()(aarch64)",
+		"libsmime3.so()(aarch64)",
+		"libnspr4.so()(aarch64)",
+		"libasound.so.2()(aarch64)",
+		"libcups.so.2()(aarch64)",
+		"libdl.so.2()(aarch64)",
+		"libexpat.so.1()(aarch64)",
+		"libstdc++.so.6()(aarch64)",
+		"libstdc++.so.6(GLIBCXX_3.4)(aarch64)",
+		"libstdc++.so.6(GLIBCXX_3.4.10)(aarch64)",
+		"libstdc++.so.6(GLIBCXX_3.4.11)(aarch64)",
+		"libstdc++.so.6(GLIBCXX_3.4.14)(aarch64)",
+		"libstdc++.so.6(GLIBCXX_3.4.15)(aarch64)",
+		"libstdc++.so.6(GLIBCXX_3.4.9)(aarch64)",
+		"libm.so.6()(aarch64)",
+		"libm.so.6(GLIBC_2.2.5)(aarch64)",
+		"libgcc_s.so.1()(aarch64)",
+		"libgcc_s.so.1(GCC_3.0)(aarch64)",
+		"libgcc_s.so.1(GCC_4.0.0)(aarch64)",
+		"libc.so.6()(aarch64)",
+		"libc.so.6(GLIBC_2.11)(aarch64)",
+		"libc.so.6(GLIBC_2.2.5)(aarch64)",
+		"libc.so.6(GLIBC_2.3)(aarch64)",
+		"libc.so.6(GLIBC_2.3.2)(aarch64)",
+		"libc.so.6(GLIBC_2.3.4)(aarch64)",
+		"libc.so.6(GLIBC_2.4)(aarch64)",
+		"libc.so.6(GLIBC_2.6)(aarch64)",
+		"libc.so.6(GLIBC_2.7)(aarch64)",
+		"libc.so.6(GLIBC_2.9)(aarch64)",
+		"libxcb.so.1()(aarch64)",
+		"libxkbfile.so.1()(aarch64)",
+		"libsecret-1.so.0()(aarch64)"
+	],
+	"armv7hl": [
+		"libpthread.so.0()(armv7hl)",
+		"libpthread.so.0(GLIBC_2.2.5)(armv7hl)",
+		"libpthread.so.0(GLIBC_2.3.2)(armv7hl)",
+		"libpthread.so.0(GLIBC_2.3.3)(armv7hl)",
+		"libgtk-3.so.0()(armv7hl)",
+		"libgdk-x11-2.0.so.0()(armv7hl)",
+		"libatk-1.0.so.0()(armv7hl)",
+		"libgio-2.0.so.0()(armv7hl)",
+		"libpangocairo-1.0.so.0()(armv7hl)",
+		"libgdk_pixbuf-2.0.so.0()(armv7hl)",
+		"libcairo.so.2()(armv7hl)",
+		"libpango-1.0.so.0()(armv7hl)",
+		"libfreetype.so.6()(armv7hl)",
+		"libfontconfig.so.1()(armv7hl)",
+		"libgobject-2.0.so.0()(armv7hl)",
+		"libdbus-1.so.3()(armv7hl)",
+		"libXi.so.6()(armv7hl)",
+		"libXcursor.so.1()(armv7hl)",
+		"libXdamage.so.1()(armv7hl)",
+		"libXrandr.so.2()(armv7hl)",
+		"libXcomposite.so.1()(armv7hl)",
+		"libXext.so.6()(armv7hl)",
+		"libXfixes.so.3()(armv7hl)",
+		"libXrender.so.1()(armv7hl)",
+		"libX11.so.6()(armv7hl)",
+		"libXss.so.1()(armv7hl)",
+		"libXtst.so.6()(armv7hl)",
+		"libgmodule-2.0.so.0()(armv7hl)",
+		"librt.so.1()(armv7hl)",
+		"libglib-2.0.so.0()(armv7hl)",
+		"libnss3.so()(armv7hl)",
+		"libnssutil3.so()(armv7hl)",
+		"libsmime3.so()(armv7hl)",
+		"libnspr4.so()(armv7hl)",
+		"libasound.so.2()(armv7hl)",
+		"libcups.so.2()(armv7hl)",
+		"libdl.so.2()(armv7hl)",
+		"libexpat.so.1()(armv7hl)",
+		"libstdc++.so.6()(armv7hl)",
+		"libstdc++.so.6(GLIBCXX_3.4)(armv7hl)",
+		"libstdc++.so.6(GLIBCXX_3.4.10)(armv7hl)",
+		"libstdc++.so.6(GLIBCXX_3.4.11)(armv7hl)",
+		"libstdc++.so.6(GLIBCXX_3.4.14)(armv7hl)",
+		"libstdc++.so.6(GLIBCXX_3.4.15)(armv7hl)",
+		"libstdc++.so.6(GLIBCXX_3.4.9)(armv7hl)",
+		"libm.so.6()(armv7hl)",
+		"libm.so.6(GLIBC_2.2.5)(armv7hl)",
+		"libgcc_s.so.1()(armv7hl)",
+		"libgcc_s.so.1(GCC_3.0)(armv7hl)",
+		"libgcc_s.so.1(GCC_4.0.0)(armv7hl)",
+		"libc.so.6()(armv7hl)",
+		"libc.so.6(GLIBC_2.11)(armv7hl)",
+		"libc.so.6(GLIBC_2.2.5)(armv7hl)",
+		"libc.so.6(GLIBC_2.3)(armv7hl)",
+		"libc.so.6(GLIBC_2.3.2)(armv7hl)",
+		"libc.so.6(GLIBC_2.3.4)(armv7hl)",
+		"libc.so.6(GLIBC_2.4)(armv7hl)",
+		"libc.so.6(GLIBC_2.6)(armv7hl)",
+		"libc.so.6(GLIBC_2.7)(armv7hl)",
+		"libc.so.6(GLIBC_2.9)(armv7hl)",
+		"libxcb.so.1()(armv7hl)",
+		"libxkbfile.so.1()(armv7hl)",
+		"libsecret-1.so.0()(armv7hl)"
 	]
-}
\ No newline at end of file
+}

From 799db29ff57d8969fbe856e010676cb7e80cdbda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Wed, 9 Sep 2020 08:55:52 +0200
Subject: [PATCH 16/23] install dot net core sdk

---
 build/azure-pipelines/linux/product-build-linux.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index 39b43f0007c..270beb898a0 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -171,6 +171,12 @@ steps:
   displayName: Prepare snap package
   condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
 
+# needed for code signing
+- task: UseDotNet@2
+  displayName: 'Install .NET Core SDK 2.x'
+  inputs:
+    version: 2.x
+
 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
   inputs:
     ConnectedServiceName: 'ESRP CodeSign'

From 0a2801b3df0943dddb3c43e83ce0b0b38e04279c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Wed, 9 Sep 2020 09:03:10 +0200
Subject: [PATCH 17/23] update distro

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1d04db1ccf5..2b1df662edc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.50.0",
-  "distro": "072600857f7c674daf79daa6ae00cd4d4851f04b",
+  "distro": "ed835987521462369e4cc7f402bb64026de40c10",
   "author": {
     "name": "Microsoft Corporation"
   },

From c4b273b3c39422eba6a74bec2e3de4150c9b2e2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Wed, 9 Sep 2020 09:09:44 +0200
Subject: [PATCH 18/23] update distro

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2b1df662edc..a1625fa79ca 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.50.0",
-  "distro": "ed835987521462369e4cc7f402bb64026de40c10",
+  "distro": "2eef91bd5c0c8f6bab1fa8b17425ca835971fd0a",
   "author": {
     "name": "Microsoft Corporation"
   },

From 079b1918a513600ee0e7d2a9c7eb3082b52649a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Wed, 9 Sep 2020 09:18:30 +0200
Subject: [PATCH 19/23] distro

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a1625fa79ca..f85c894f80e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.50.0",
-  "distro": "2eef91bd5c0c8f6bab1fa8b17425ca835971fd0a",
+  "distro": "7d3851461457124c16c9ab4b223500bc48e35d05",
   "author": {
     "name": "Microsoft Corporation"
   },

From 0bc0291c5e9de6ecc5ba68f94f107955d32111d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Wed, 9 Sep 2020 13:49:46 +0200
Subject: [PATCH 20/23] publish arm deb and rpm

---
 build/azure-pipelines/linux/publish.sh | 42 ++++++++++++++++----------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/build/azure-pipelines/linux/publish.sh b/build/azure-pipelines/linux/publish.sh
index e90b6c909d6..e0462b819dc 100755
--- a/build/azure-pipelines/linux/publish.sh
+++ b/build/azure-pipelines/linux/publish.sh
@@ -26,23 +26,33 @@ rm -rf $ROOT/vscode-server-*.tar.*
 
 node build/azure-pipelines/common/createAsset.js "server-$PLATFORM_LINUX" archive-unsigned "$SERVER_TARBALL_FILENAME" "$SERVER_TARBALL_PATH"
 
+# Publish DEB
+case $VSCODE_ARCH in
+	x64) DEB_ARCH="amd64" ;;
+	*) DEB_ARCH="$VSCODE_ARCH" ;;
+esac
+
+PLATFORM_DEB="linux-deb-$VSCODE_ARCH"
+DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
+DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
+
+node build/azure-pipelines/common/createAsset.js "$PLATFORM_DEB" package "$DEB_FILENAME" "$DEB_PATH"
+
+# Publish RPM
+case $VSCODE_ARCH in
+	x64) RPM_ARCH="amd64" ;;
+	armhf) RPM_ARCH="armv7hl" ;;
+	arm64) RPM_ARCH="aarch64" ;;
+	*) RPM_ARCH="$VSCODE_ARCH" ;;
+esac
+
+PLATFORM_RPM="linux-rpm-$VSCODE_ARCH"
+RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
+RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME"
+
+node build/azure-pipelines/common/createAsset.js "$PLATFORM_RPM" package "$RPM_FILENAME" "$RPM_PATH"
+
 if [ "$VSCODE_ARCH" == "x64" ]; then
-	# Publish DEB
-	PLATFORM_DEB="linux-deb-$VSCODE_ARCH"
-	DEB_ARCH="amd64"
-	DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
-	DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
-
-	node build/azure-pipelines/common/createAsset.js "$PLATFORM_DEB" package "$DEB_FILENAME" "$DEB_PATH"
-
-	# Publish RPM
-	PLATFORM_RPM="linux-rpm-$VSCODE_ARCH"
-	RPM_ARCH="x86_64"
-	RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
-	RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME"
-
-	node build/azure-pipelines/common/createAsset.js "$PLATFORM_RPM" package "$RPM_FILENAME" "$RPM_PATH"
-
 	# Publish Snap
 	# Pack snap tarball artifact, in order to preserve file perms
 	mkdir -p $REPO/.build/linux/snap-tarball

From f481704216ba220da1546d4f7eb87bd6b4f6c2ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Wed, 9 Sep 2020 14:08:53 +0200
Subject: [PATCH 21/23] distro

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f85c894f80e..ebeaa4b11ba 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.50.0",
-  "distro": "7d3851461457124c16c9ab4b223500bc48e35d05",
+  "distro": "7d8ba0b3c315aa37b4f5a11a93e6e34e4d2c8abe",
   "author": {
     "name": "Microsoft Corporation"
   },

From e05b06ec876df55c5877042510812f3703d30e71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Wed, 9 Sep 2020 15:07:00 +0200
Subject: [PATCH 22/23] fix arch

---
 build/azure-pipelines/linux/publish.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/azure-pipelines/linux/publish.sh b/build/azure-pipelines/linux/publish.sh
index e0462b819dc..72fe2ad7b30 100755
--- a/build/azure-pipelines/linux/publish.sh
+++ b/build/azure-pipelines/linux/publish.sh
@@ -40,7 +40,7 @@ node build/azure-pipelines/common/createAsset.js "$PLATFORM_DEB" package "$DEB_F
 
 # Publish RPM
 case $VSCODE_ARCH in
-	x64) RPM_ARCH="amd64" ;;
+	x64) RPM_ARCH="x86_64" ;;
 	armhf) RPM_ARCH="armv7hl" ;;
 	arm64) RPM_ARCH="aarch64" ;;
 	*) RPM_ARCH="$VSCODE_ARCH" ;;

From 8684731436d8e69a44ff306a5e0c6d66571047ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Fri, 11 Sep 2020 07:57:46 +0200
Subject: [PATCH 23/23] update distro

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ebeaa4b11ba..b89236e2944 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.50.0",
-  "distro": "7d8ba0b3c315aa37b4f5a11a93e6e34e4d2c8abe",
+  "distro": "3729948d337954299b7e3b183f66034d51e4ad69",
   "author": {
     "name": "Microsoft Corporation"
   },