From 84f60868132f14423168321113d435a1f9e90577 Mon Sep 17 00:00:00 2001
From: Richard Townsend <Richard.Townsend@arm.com>
Date: Wed, 20 Nov 2019 16:50:53 +0000
Subject: [PATCH 01/11] build: build ia32 remote extension for Windows on Arm

Because the remote part of the code can run under emulation (like
ripgrep), temporarily build this portion for ia32 until the underlying
problem is resolved.
---
 build/npm/postinstall.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
index 7a2320d828933..c977469febd80 100644
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -23,9 +23,17 @@ function yarnInstall(location, opts) {
 	const args = original.filter(arg => arg === '--ignore-optional' || arg === '--frozen-lockfile');
 
 	console.log(`Installing dependencies in ${location}...`);
+	const oldConfigArch = process.env['npm_config_arch']
+	if (location.startsWith("remote") && oldConfigArch == "arm64") {
+		// Temporarily set remote arch to x86, because remote portion builds
+		// against node, which is not consistently supported on Windows on Arm
+		// (yet).
+		process.env["npm_config_arch"] = "ia32"
+	}
 	console.log(`$ yarn ${args.join(' ')}`);
 	const result = cp.spawnSync(yarn, args, opts);
-
+	// Restore the architecture, if temporarily swapped.
+	process.env["npm_config_arch"] = oldConfigArch
 	if (result.error || result.status !== 0) {
 		process.exit(1);
 	}

From a3b66c9563f3e1fc3e7f331876b23e9497ee98c6 Mon Sep 17 00:00:00 2001
From: Richard Townsend <Richard.Townsend@arm.com>
Date: Wed, 20 Nov 2019 19:37:23 +0000
Subject: [PATCH 02/11] build: add skeletal gulp targets for Windows on Arm

---
 build/gulpfile.reh.js          | 3 +++
 build/gulpfile.vscode.js       | 1 +
 build/gulpfile.vscode.win32.js | 6 +++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
index f2ea1bd37010b..f537401b88721 100644
--- a/build/gulpfile.reh.js
+++ b/build/gulpfile.reh.js
@@ -25,6 +25,7 @@ const cp = require('child_process');
 const REPO_ROOT = path.dirname(__dirname);
 
 const BUILD_TARGETS = [
+	{ platform: 'win32', arch: 'arm64', pkgTarget: 'node8-win-arm64' },
 	{ platform: 'win32', arch: 'ia32', pkgTarget: 'node8-win-x86' },
 	{ platform: 'win32', arch: 'x64', pkgTarget: 'node8-win-x64' },
 	{ platform: 'darwin', arch: null, pkgTarget: 'node8-macos-x64' },
@@ -37,6 +38,7 @@ const BUILD_TARGETS = [
 
 const noop = () => { return Promise.resolve(); };
 
+gulp.task('vscode-reh-win32-arm64-min', noop);
 gulp.task('vscode-reh-win32-ia32-min', noop);
 gulp.task('vscode-reh-win32-x64-min', noop);
 gulp.task('vscode-reh-darwin-min', noop);
@@ -45,6 +47,7 @@ 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-arm64-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);
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 4906bfdb1a24c..a8360873d8233 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -324,6 +324,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 const buildRoot = path.dirname(root);
 
 const BUILD_TARGETS = [
+	{ platform: 'win32', arch: 'arm64' },
 	{ platform: 'win32', arch: 'ia32' },
 	{ platform: 'win32', arch: 'x64' },
 	{ platform: 'darwin', arch: null, opts: { stats: true } },
diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
index 497fc553c038a..8e928594c2e54 100644
--- a/build/gulpfile.vscode.win32.js
+++ b/build/gulpfile.vscode.win32.js
@@ -110,8 +110,10 @@ function defineWin32SetupTasks(arch, target) {
 	gulp.task(task.define(`vscode-win32-${arch}-${target}-setup`, task.series(cleanTask, buildWin32Setup(arch, target))));
 }
 
+defineWin32SetupTasks('arm64', 'system');
 defineWin32SetupTasks('ia32', 'system');
 defineWin32SetupTasks('x64', 'system');
+defineWin32SetupTasks('arm64', 'user');
 defineWin32SetupTasks('ia32', 'user');
 defineWin32SetupTasks('x64', 'user');
 
@@ -125,6 +127,7 @@ function archiveWin32Setup(arch) {
 	};
 }
 
+gulp.task(task.define('vscode-win32-arm64-archive', task.series(util.rimraf(zipDir('arm64')), archiveWin32Setup('arm64'))));
 gulp.task(task.define('vscode-win32-ia32-archive', task.series(util.rimraf(zipDir('ia32')), archiveWin32Setup('ia32'))));
 gulp.task(task.define('vscode-win32-x64-archive', task.series(util.rimraf(zipDir('x64')), archiveWin32Setup('x64'))));
 
@@ -142,10 +145,11 @@ function updateIcon(executablePath) {
 	};
 }
 
+gulp.task(task.define('vscode-win32-arm64-inno-updater', task.series(copyInnoUpdater('ia32'), updateIcon(path.join(buildPath('ia32'), 'tools', 'inno_updater.exe')))));
 gulp.task(task.define('vscode-win32-ia32-inno-updater', task.series(copyInnoUpdater('ia32'), updateIcon(path.join(buildPath('ia32'), 'tools', 'inno_updater.exe')))));
 gulp.task(task.define('vscode-win32-x64-inno-updater', task.series(copyInnoUpdater('x64'), updateIcon(path.join(buildPath('x64'), 'tools', 'inno_updater.exe')))));
 
 // CodeHelper.exe icon
-
+gulp.task(task.define('vscode-win32-arm64-code-helper', task.series(updateIcon(path.join(buildPath('ia32'), 'resources', 'app', 'out', 'vs', 'platform', 'files', 'node', 'watcher', 'win32', 'CodeHelper.exe')))));
 gulp.task(task.define('vscode-win32-ia32-code-helper', task.series(updateIcon(path.join(buildPath('ia32'), 'resources', 'app', 'out', 'vs', 'platform', 'files', 'node', 'watcher', 'win32', 'CodeHelper.exe')))));
 gulp.task(task.define('vscode-win32-x64-code-helper', task.series(updateIcon(path.join(buildPath('x64'), 'resources', 'app', 'out', 'vs', 'platform', 'files', 'node', 'watcher', 'win32', 'CodeHelper.exe')))));

From 9df55b7f1bed9d2ad08d2d0d023ef822bd38c99a Mon Sep 17 00:00:00 2001
From: Richard Townsend <Richard.Townsend@arm.com>
Date: Wed, 20 Nov 2019 19:38:12 +0000
Subject: [PATCH 03/11] build: read npm_config_arch whilst getting electron

With this change applied, gulp gets the right version of electron for
the target architecture.
---
 build/lib/electron.js | 3 +++
 build/lib/electron.ts | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/build/lib/electron.js b/build/lib/electron.js
index b38a1f6edc90d..dfcb1628666a6 100644
--- a/build/lib/electron.js
+++ b/build/lib/electron.js
@@ -99,6 +99,9 @@ function getElectron(arch) {
     };
 }
 async function main(arch = process.arch) {
+    if (process.env["npm_config_arch"]) {
+        arch = process.env["npm_config_arch"];
+    }
     const version = getElectronVersion();
     const electronPath = path.join(root, '.build', 'electron');
     const versionFile = path.join(electronPath, 'version');
diff --git a/build/lib/electron.ts b/build/lib/electron.ts
index 86c7afcf31218..6aed82316397d 100644
--- a/build/lib/electron.ts
+++ b/build/lib/electron.ts
@@ -108,6 +108,9 @@ function getElectron(arch: string): () => NodeJS.ReadWriteStream {
 }
 
 async function main(arch = process.arch): Promise<void> {
+	if (process.env["npm_config_arch"]) {
+		arch = process.env["npm_config_arch"] as string;
+	}
 	const version = getElectronVersion();
 	const electronPath = path.join(root, '.build', 'electron');
 	const versionFile = path.join(electronPath, 'version');

From c97d0b6e6ae39959f1c002aab29e8fac6e9104ba Mon Sep 17 00:00:00 2001
From: Richard Townsend <Richard.Townsend@arm.com>
Date: Fri, 6 Dec 2019 13:52:28 +0000
Subject: [PATCH 04/11] fix: address review comments

---
 build/lib/electron.js    | 5 +----
 build/lib/electron.ts    | 5 +----
 build/npm/postinstall.js | 9 +++------
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/build/lib/electron.js b/build/lib/electron.js
index dfcb1628666a6..bdea0e300299e 100644
--- a/build/lib/electron.js
+++ b/build/lib/electron.js
@@ -98,10 +98,7 @@ function getElectron(arch) {
             .pipe(vfs.dest('.build/electron'));
     };
 }
-async function main(arch = process.arch) {
-    if (process.env["npm_config_arch"]) {
-        arch = process.env["npm_config_arch"];
-    }
+async function main(arch = process.env["npm_config_arch"] || process.arch) {
     const version = getElectronVersion();
     const electronPath = path.join(root, '.build', 'electron');
     const versionFile = path.join(electronPath, 'version');
diff --git a/build/lib/electron.ts b/build/lib/electron.ts
index 6aed82316397d..a20f702c26f0f 100644
--- a/build/lib/electron.ts
+++ b/build/lib/electron.ts
@@ -107,10 +107,7 @@ function getElectron(arch: string): () => NodeJS.ReadWriteStream {
 	};
 }
 
-async function main(arch = process.arch): Promise<void> {
-	if (process.env["npm_config_arch"]) {
-		arch = process.env["npm_config_arch"] as string;
-	}
+async function main(arch = process.env["npm_config_arch"] || process.arch): Promise<void> {
 	const version = getElectronVersion();
 	const electronPath = path.join(root, '.build', 'electron');
 	const versionFile = path.join(electronPath, 'version');
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
index c977469febd80..a1ffb21f1b1e1 100644
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -23,17 +23,14 @@ function yarnInstall(location, opts) {
 	const args = original.filter(arg => arg === '--ignore-optional' || arg === '--frozen-lockfile');
 
 	console.log(`Installing dependencies in ${location}...`);
-	const oldConfigArch = process.env['npm_config_arch']
-	if (location.startsWith("remote") && oldConfigArch == "arm64") {
-		// Temporarily set remote arch to x86, because remote portion builds
+	if (location.startsWith("remote") && process.env["npm_config_arch"] == "arm64") {
+		// Temporarily set remote arch to x86, because the remote portion builds
 		// against node, which is not consistently supported on Windows on Arm
 		// (yet).
-		process.env["npm_config_arch"] = "ia32"
+		opts.npm_config_arch = "ia32"
 	}
 	console.log(`$ yarn ${args.join(' ')}`);
 	const result = cp.spawnSync(yarn, args, opts);
-	// Restore the architecture, if temporarily swapped.
-	process.env["npm_config_arch"] = oldConfigArch
 	if (result.error || result.status !== 0) {
 		process.exit(1);
 	}

From 2260c133e25f6e8488224be0cae6e54b9a21ce8a Mon Sep 17 00:00:00 2001
From: Richard Townsend <Richard.Townsend@arm.com>
Date: Thu, 16 Jan 2020 15:12:42 +0000
Subject: [PATCH 05/11] fix: address further review comments

---
 build/gulpfile.reh.js          |  2 --
 build/gulpfile.vscode.win32.js |  3 ---
 build/npm/postinstall.js       | 21 +++++++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
index f537401b88721..0f0417a81ed22 100644
--- a/build/gulpfile.reh.js
+++ b/build/gulpfile.reh.js
@@ -38,7 +38,6 @@ const BUILD_TARGETS = [
 
 const noop = () => { return Promise.resolve(); };
 
-gulp.task('vscode-reh-win32-arm64-min', noop);
 gulp.task('vscode-reh-win32-ia32-min', noop);
 gulp.task('vscode-reh-win32-x64-min', noop);
 gulp.task('vscode-reh-darwin-min', noop);
@@ -47,7 +46,6 @@ 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-arm64-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);
diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
index 8e928594c2e54..d69e06c4b26ce 100644
--- a/build/gulpfile.vscode.win32.js
+++ b/build/gulpfile.vscode.win32.js
@@ -110,10 +110,8 @@ function defineWin32SetupTasks(arch, target) {
 	gulp.task(task.define(`vscode-win32-${arch}-${target}-setup`, task.series(cleanTask, buildWin32Setup(arch, target))));
 }
 
-defineWin32SetupTasks('arm64', 'system');
 defineWin32SetupTasks('ia32', 'system');
 defineWin32SetupTasks('x64', 'system');
-defineWin32SetupTasks('arm64', 'user');
 defineWin32SetupTasks('ia32', 'user');
 defineWin32SetupTasks('x64', 'user');
 
@@ -145,7 +143,6 @@ function updateIcon(executablePath) {
 	};
 }
 
-gulp.task(task.define('vscode-win32-arm64-inno-updater', task.series(copyInnoUpdater('ia32'), updateIcon(path.join(buildPath('ia32'), 'tools', 'inno_updater.exe')))));
 gulp.task(task.define('vscode-win32-ia32-inno-updater', task.series(copyInnoUpdater('ia32'), updateIcon(path.join(buildPath('ia32'), 'tools', 'inno_updater.exe')))));
 gulp.task(task.define('vscode-win32-x64-inno-updater', task.series(copyInnoUpdater('x64'), updateIcon(path.join(buildPath('x64'), 'tools', 'inno_updater.exe')))));
 
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
index a1ffb21f1b1e1..eb92d5c38333e 100644
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -23,12 +23,6 @@ function yarnInstall(location, opts) {
 	const args = original.filter(arg => arg === '--ignore-optional' || arg === '--frozen-lockfile');
 
 	console.log(`Installing dependencies in ${location}...`);
-	if (location.startsWith("remote") && process.env["npm_config_arch"] == "arm64") {
-		// Temporarily set remote arch to x86, because the remote portion builds
-		// against node, which is not consistently supported on Windows on Arm
-		// (yet).
-		opts.npm_config_arch = "ia32"
-	}
 	console.log(`$ yarn ${args.join(' ')}`);
 	const result = cp.spawnSync(yarn, args, opts);
 	if (result.error || result.status !== 0) {
@@ -36,11 +30,22 @@ function yarnInstall(location, opts) {
 	}
 }
 
+function remoteOpts() {
+	opts = {};
+	if (process.env["npm_config_arch"] == "arm64") {
+		// Temporarily set remote arch to x86, because the remote portion builds
+		// against node, which is not consistently supported on Windows on Arm
+		// (yet).
+		opts.npm_config_arch = "ia32"
+	}
+	return opts;
+}
+
 yarnInstall('extensions'); // node modules shared by all extensions
 
-yarnInstall('remote'); // node modules used by vscode server
+yarnInstall('remote', remoteOpts()); // node modules used by vscode server
 
-yarnInstall('remote/web'); // node modules used by vscode web
+yarnInstall('remote/web', remoteOpts()); // node modules used by vscode web
 
 const allExtensionFolders = fs.readdirSync('extensions');
 const extensions = allExtensionFolders.filter(e => {

From 86ddd49cf46ec8c95d43cc7c4b67d4c67cab73cf Mon Sep 17 00:00:00 2001
From: Richard Townsend <Richard.Townsend@arm.com>
Date: Wed, 19 Feb 2020 19:17:07 +0000
Subject: [PATCH 06/11] fix: fallback to ia32

---
 build/npm/postinstall.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
index eb92d5c38333e..b6efdd1315c50 100644
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -36,7 +36,8 @@ function remoteOpts() {
 		// Temporarily set remote arch to x86, because the remote portion builds
 		// against node, which is not consistently supported on Windows on Arm
 		// (yet).
-		opts.npm_config_arch = "ia32"
+		opts.env = JSON.parse(JSON.stringify(process.env))
+		opts.env["npm_config_arch"] = "ia32"
 	}
 	return opts;
 }

From 38126cdc1aaf15380d6a98dbecb1c4d6588887ff Mon Sep 17 00:00:00 2001
From: Richard Townsend <Richard.Townsend@arm.com>
Date: Fri, 21 Feb 2020 13:26:17 +0000
Subject: [PATCH 07/11] deps: vscode-sqlite3@4.0.10

Updates sqlite3 to a version containing a build fix for Windows on Arm.
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 09843bf7d2884..5be4489e28b8d 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "vscode-nsfw": "1.2.8",
     "vscode-proxy-agent": "^0.5.2",
     "vscode-ripgrep": "^1.5.8",
-    "vscode-sqlite3": "4.0.9",
+    "vscode-sqlite3": "4.0.10",
     "vscode-textmate": "4.4.0",
     "xterm": "4.5.0-beta.4",
     "xterm-addon-search": "0.5.0",
diff --git a/yarn.lock b/yarn.lock
index a820c6344acae..410408035c27e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9691,10 +9691,10 @@ vscode-ripgrep@^1.5.8:
   resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.5.8.tgz#32cb33da6d1a9ca8f5de8c2813ed5114fd55fc11"
   integrity sha512-l6Pv/t1Jk63RU+kEkMO04XxnNRYdyzuesizj9AzFpcfrUxxpAjEJBK1qO9Mov30UUGZl7uDUBn+uCv9koaHPPA==
 
-vscode-sqlite3@4.0.9:
-  version "4.0.9"
-  resolved "https://registry.yarnpkg.com/vscode-sqlite3/-/vscode-sqlite3-4.0.9.tgz#cad04964aff1e39121dd8c7cdb87c64a71bad9ce"
-  integrity sha512-g/xnAn4sgkVO+px/DfC7kpmCQ666W124tfMSVpbnQXsjMHlLhi4Urz4wPhS9YEFPz1Orl6h6MUF6wptzI6QFdg==
+vscode-sqlite3@4.0.10:
+  version "4.0.10"
+  resolved "https://registry.yarnpkg.com/vscode-sqlite3/-/vscode-sqlite3-4.0.10.tgz#cf34cd98e5a49b24d3bb5ff5f2058744931f7cee"
+  integrity sha512-oYH3Nff3AMfbZpDiOhUh+hVtxClwrXBt9SGHGed+RcKf1Z4/fkLpfaldZeWgn4YBHFjNJjJ8HHRRfVvB8fXj1w==
   dependencies:
     nan "^2.14.0"
 

From 9267738647437d5950812705e2f2f064843a7284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Tue, 14 Apr 2020 13:21:06 +0200
Subject: [PATCH 08/11] address feedback

---
 build/gulpfile.reh.js    |  1 -
 build/lib/electron.js    |  3 ++-
 build/lib/electron.ts    |  2 +-
 build/npm/postinstall.js | 16 ++--------------
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
index 0f0417a81ed22..f2ea1bd37010b 100644
--- a/build/gulpfile.reh.js
+++ b/build/gulpfile.reh.js
@@ -25,7 +25,6 @@ const cp = require('child_process');
 const REPO_ROOT = path.dirname(__dirname);
 
 const BUILD_TARGETS = [
-	{ platform: 'win32', arch: 'arm64', pkgTarget: 'node8-win-arm64' },
 	{ platform: 'win32', arch: 'ia32', pkgTarget: 'node8-win-x86' },
 	{ platform: 'win32', arch: 'x64', pkgTarget: 'node8-win-x64' },
 	{ platform: 'darwin', arch: null, pkgTarget: 'node8-macos-x64' },
diff --git a/build/lib/electron.js b/build/lib/electron.js
index bdea0e300299e..abf6baab419b7 100644
--- a/build/lib/electron.js
+++ b/build/lib/electron.js
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.config = exports.getElectronVersion = void 0;
 const fs = require("fs");
 const path = require("path");
 const vfs = require("vinyl-fs");
@@ -98,7 +99,7 @@ function getElectron(arch) {
             .pipe(vfs.dest('.build/electron'));
     };
 }
-async function main(arch = process.env["npm_config_arch"] || process.arch) {
+async function main(arch = process.arch) {
     const version = getElectronVersion();
     const electronPath = path.join(root, '.build', 'electron');
     const versionFile = path.join(electronPath, 'version');
diff --git a/build/lib/electron.ts b/build/lib/electron.ts
index a20f702c26f0f..86c7afcf31218 100644
--- a/build/lib/electron.ts
+++ b/build/lib/electron.ts
@@ -107,7 +107,7 @@ function getElectron(arch: string): () => NodeJS.ReadWriteStream {
 	};
 }
 
-async function main(arch = process.env["npm_config_arch"] || process.arch): Promise<void> {
+async function main(arch = process.arch): Promise<void> {
 	const version = getElectronVersion();
 	const electronPath = path.join(root, '.build', 'electron');
 	const versionFile = path.join(electronPath, 'version');
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
index b6efdd1315c50..deb19821129dd 100644
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -30,23 +30,11 @@ function yarnInstall(location, opts) {
 	}
 }
 
-function remoteOpts() {
-	opts = {};
-	if (process.env["npm_config_arch"] == "arm64") {
-		// Temporarily set remote arch to x86, because the remote portion builds
-		// against node, which is not consistently supported on Windows on Arm
-		// (yet).
-		opts.env = JSON.parse(JSON.stringify(process.env))
-		opts.env["npm_config_arch"] = "ia32"
-	}
-	return opts;
-}
-
 yarnInstall('extensions'); // node modules shared by all extensions
 
-yarnInstall('remote', remoteOpts()); // node modules used by vscode server
+yarnInstall('remote'); // node modules used by vscode server
 
-yarnInstall('remote/web', remoteOpts()); // node modules used by vscode web
+yarnInstall('remote/web'); // node modules used by vscode web
 
 const allExtensionFolders = fs.readdirSync('extensions');
 const extensions = allExtensionFolders.filter(e => {

From 82860b3a83a5b7f5ed3da4412217cdff8fbcbfa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Tue, 14 Apr 2020 13:23:25 +0200
Subject: [PATCH 09/11] :lipstick:

---
 build/lib/electron.js    | 1 -
 build/npm/postinstall.js | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/lib/electron.js b/build/lib/electron.js
index abf6baab419b7..b38a1f6edc90d 100644
--- a/build/lib/electron.js
+++ b/build/lib/electron.js
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.config = exports.getElectronVersion = void 0;
 const fs = require("fs");
 const path = require("path");
 const vfs = require("vinyl-fs");
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
index deb19821129dd..7a2320d828933 100644
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -25,6 +25,7 @@ function yarnInstall(location, opts) {
 	console.log(`Installing dependencies in ${location}...`);
 	console.log(`$ yarn ${args.join(' ')}`);
 	const result = cp.spawnSync(yarn, args, opts);
+
 	if (result.error || result.status !== 0) {
 		process.exit(1);
 	}

From b925790680bbf184b44e9941336177557f6128d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Tue, 14 Apr 2020 13:25:01 +0200
Subject: [PATCH 10/11] fix arm64

---
 build/gulpfile.vscode.win32.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
index d69e06c4b26ce..4a58d4a27b167 100644
--- a/build/gulpfile.vscode.win32.js
+++ b/build/gulpfile.vscode.win32.js
@@ -125,9 +125,9 @@ function archiveWin32Setup(arch) {
 	};
 }
 
-gulp.task(task.define('vscode-win32-arm64-archive', task.series(util.rimraf(zipDir('arm64')), archiveWin32Setup('arm64'))));
 gulp.task(task.define('vscode-win32-ia32-archive', task.series(util.rimraf(zipDir('ia32')), archiveWin32Setup('ia32'))));
 gulp.task(task.define('vscode-win32-x64-archive', task.series(util.rimraf(zipDir('x64')), archiveWin32Setup('x64'))));
+gulp.task(task.define('vscode-win32-arm64-archive', task.series(util.rimraf(zipDir('arm64')), archiveWin32Setup('arm64'))));
 
 function copyInnoUpdater(arch) {
 	return () => {
@@ -147,6 +147,6 @@ gulp.task(task.define('vscode-win32-ia32-inno-updater', task.series(copyInnoUpda
 gulp.task(task.define('vscode-win32-x64-inno-updater', task.series(copyInnoUpdater('x64'), updateIcon(path.join(buildPath('x64'), 'tools', 'inno_updater.exe')))));
 
 // CodeHelper.exe icon
-gulp.task(task.define('vscode-win32-arm64-code-helper', task.series(updateIcon(path.join(buildPath('ia32'), 'resources', 'app', 'out', 'vs', 'platform', 'files', 'node', 'watcher', 'win32', 'CodeHelper.exe')))));
 gulp.task(task.define('vscode-win32-ia32-code-helper', task.series(updateIcon(path.join(buildPath('ia32'), 'resources', 'app', 'out', 'vs', 'platform', 'files', 'node', 'watcher', 'win32', 'CodeHelper.exe')))));
 gulp.task(task.define('vscode-win32-x64-code-helper', task.series(updateIcon(path.join(buildPath('x64'), 'resources', 'app', 'out', 'vs', 'platform', 'files', 'node', 'watcher', 'win32', 'CodeHelper.exe')))));
+gulp.task(task.define('vscode-win32-arm64-code-helper', task.series(updateIcon(path.join(buildPath('arm64'), 'resources', 'app', 'out', 'vs', 'platform', 'files', 'node', 'watcher', 'win32', 'CodeHelper.exe')))));

From 2e0cf81197c92eb6e73bd6f7db9d5e9b4f5806d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Tue, 14 Apr 2020 13:26:29 +0200
Subject: [PATCH 11/11] :lipstick:

---
 build/gulpfile.vscode.js       | 2 +-
 build/gulpfile.vscode.win32.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index a8360873d8233..2feb8098319fd 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -324,9 +324,9 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 const buildRoot = path.dirname(root);
 
 const BUILD_TARGETS = [
-	{ platform: 'win32', arch: 'arm64' },
 	{ platform: 'win32', arch: 'ia32' },
 	{ platform: 'win32', arch: 'x64' },
+	{ platform: 'win32', arch: 'arm64' },
 	{ platform: 'darwin', arch: null, opts: { stats: true } },
 	{ platform: 'linux', arch: 'ia32' },
 	{ platform: 'linux', arch: 'x64' },
diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
index 4a58d4a27b167..b0956371451a7 100644
--- a/build/gulpfile.vscode.win32.js
+++ b/build/gulpfile.vscode.win32.js
@@ -147,6 +147,7 @@ gulp.task(task.define('vscode-win32-ia32-inno-updater', task.series(copyInnoUpda
 gulp.task(task.define('vscode-win32-x64-inno-updater', task.series(copyInnoUpdater('x64'), updateIcon(path.join(buildPath('x64'), 'tools', 'inno_updater.exe')))));
 
 // CodeHelper.exe icon
+
 gulp.task(task.define('vscode-win32-ia32-code-helper', task.series(updateIcon(path.join(buildPath('ia32'), 'resources', 'app', 'out', 'vs', 'platform', 'files', 'node', 'watcher', 'win32', 'CodeHelper.exe')))));
 gulp.task(task.define('vscode-win32-x64-code-helper', task.series(updateIcon(path.join(buildPath('x64'), 'resources', 'app', 'out', 'vs', 'platform', 'files', 'node', 'watcher', 'win32', 'CodeHelper.exe')))));
 gulp.task(task.define('vscode-win32-arm64-code-helper', task.series(updateIcon(path.join(buildPath('arm64'), 'resources', 'app', 'out', 'vs', 'platform', 'files', 'node', 'watcher', 'win32', 'CodeHelper.exe')))));