Merge branch 'master' into arm64-v2

build.sh

@@ -19,6 +19,9 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
   export npm_config_target_arch="$BUILDARCH"
   ../update_settings.sh
 
+  # apply patches
+  patch -u src/vs/platform/update/electron-main/updateService.win32.ts -i ../patches/update-cache-path.patch
+
   yarn
   yarn postinstall
   mv product.json product.json.bak

patches/update-cache-path.patch

@@ -0,0 +1,11 @@
+--- vscode/src/vs/platform/update/electron-main/updateService.win32.ts	2019-12-08 15:09:44.000000000 -0800
++++ src/src/vs/platform/update/electron-main/updateService.win32.ts	2019-12-08 15:12:56.000000000 -0800
+@@ -55,7 +55,7 @@
+ 
+ 	@memoize
+ 	get cachePath(): Promise<string> {
+-		const result = path.join(tmpdir(), `vscode-update-${product.target}-${process.arch}`);
++		const result = path.join(tmpdir(), `vscodium-update-${product.target}-${process.arch}`);
+ 		return pfs.mkdirp(result, undefined).then(() => result);
+ 	}
+