Merge from vscode 0a7364f00514c46c9caceece15e1f82f82e3712f

2026-01-13 17:22:15 -05:00 · 2020-07-22 03:06:57 +00:00
parent 53ec7585a9
commit 1b7b54ce14
229 changed files with 5099 additions and 3188 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -764,6 +764,18 @@
                    "*" // node modules
                ]
            },
+            {
+                "target": "**/{vs,sql}/code/browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/**/{common,browser}/**",
+                    "**/{vs,sql}/base/parts/**/{common,browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser}/**",
+                    "**/{vs,sql}/code/**/{common,browser}/**",
+                    "**/{vs,sql}/workbench/workbench.web.api"
+                ]
+            },
            {
                "target": "**/{vs,sql}/code/node/**",
                "restrictions": [
@@ -834,6 +846,18 @@
                    "**/{vs,sql}/workbench/workbench.common.main"
                ]
            },
+            {
+                "target": "**/src/{vs,sql}/workbench/workbench.web.api.ts",
+                "restrictions": [
+                    "vs/nls",
+                    "**/{vs,sql}/base/**/{common,browser}/**",
+                    "**/{vs,sql}/base/parts/**/{common,browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser}/**",
+                    "**/{vs,sql}/editor/**",
+                    "**/{vs,sql}/workbench/**/{common,browser}/**",
+                    "**/{vs,sql}/workbench/workbench.web.main"
+                ]
+            },
            {
                "target": "**/src/{vs,sql}/workbench/workbench.sandbox.main.ts",
                "restrictions": [
--- a/.yarnrc
+++ b/.yarnrc
@@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "8.3.3"
+target "9.1.0"
 runtime "electron"
--- 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.13.0"
+    versionSpec: "12.14.1"

 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3 # {{SQL CARBON EDIT}} update version
  inputs:
--- 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.13.0"
+    versionSpec: "12.14.1"

 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
  inputs:
--- a/build/azure-pipelines/distro-build.yml
+++ b/build/azure-pipelines/distro-build.yml
@@ -11,7 +11,7 @@ pr:
 steps:
 - task: NodeTool@0
  inputs:
-    versionSpec: "12.13.0"
+    versionSpec: "12.14.1"

 - task: AzureKeyVault@1
  displayName: 'Azure Key Vault: Get Secrets'
--- 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.13.0"
+    versionSpec: "12.14.1"

 - task: AzureKeyVault@1
  displayName: 'Azure Key Vault: Get Secrets'
--- 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.13.0"
+    versionSpec: "12.14.1"

 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
  inputs:
--- a/build/azure-pipelines/linux/product-build-linux-multiarch.yml
+++ b/build/azure-pipelines/linux/product-build-linux-multiarch.yml
@@ -21,7 +21,7 @@ steps:

 - task: NodeTool@0
  inputs:
-    versionSpec: "12.13.0"
+    versionSpec: "12.14.1"

 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
  inputs:
--- 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.13.0"
+    versionSpec: "12.14.1"

 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
  inputs:
--- 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.13.0"
+    versionSpec: "12.14.1"

 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
  inputs:
--- 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.13.0"
+    versionSpec: "12.14.1"
  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))

 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
--- 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.13.0"
+    versionSpec: "12.14.1"

 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
  inputs:
--- 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.13.0"
+    versionSpec: "12.14.1"

 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
  inputs:
--- 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.13.0"
+    versionSpec: "12.14.1"

 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
  inputs:
--- 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.13.0"
+    versionSpec: "12.14.1"

 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3 # {{SQL CARBON EDIT}} update version
  inputs:
--- 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.13.0"
+    versionSpec: "12.14.1"

 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
  inputs:
--- 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.13.0"
+    versionSpec: "12.14.1"

 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
  inputs:
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -97,6 +97,7 @@ const vscodeResources = [
 	'out-build/sql/media/icons/*.svg',
 	'out-build/sql/workbench/parts/notebook/media/**/*.svg',
 	'out-build/sql/setup.js', // {{SQL CARBON EDIT}} end
+	'out-build/vs/code/electron-sandbox/processExplorer/processExplorer.js',
 	'out-build/vs/platform/auth/common/auth.css',
 	'!**/test/**'
 ];
--- a/build/lib/i18n.resources.json
+++ b/build/lib/i18n.resources.json
@@ -246,10 +246,6 @@
 			"name": "vs/workbench/services/configurationResolver",
 			"project": "vscode-workbench"
 		},
-		{
-			"name": "vs/workbench/services/crashReporter",
-			"project": "vscode-workbench"
-		},
 		{
 			"name": "vs/workbench/services/dialogs",
 			"project": "vscode-workbench"
--- a/build/package.json
+++ b/build/package.json
@@ -49,7 +49,7 @@
    "rollup-plugin-commonjs": "^10.1.0",
    "rollup-plugin-node-resolve": "^5.2.0",
    "terser": "4.3.8",
-    "typescript": "^4.0.0-dev.20200708",
+    "typescript": "^4.0.0-dev.20200715",
    "vsce": "1.48.0",
    "vscode-telemetry-extractor": "^1.6.0",
    "xml2js": "^0.4.17"
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -3539,10 +3539,10 @@ typescript@^3.0.1:
  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
  integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==

-typescript@^4.0.0-dev.20200708:
-  version "4.0.0-dev.20200708"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200708.tgz#9cf526945590456f34b158b180a6f8a2e0b57306"
-  integrity sha512-A1brZPJRwkm2pxOSTIOVqLvrhF1swfLvDAgN+jRP/yUWNn+0OqbfunuY/jvRbtkEP4/AWZ+M2P625Y+JDN/j2A==
+typescript@^4.0.0-dev.20200715:
+  version "4.0.0-dev.20200715"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200715.tgz#d65961a5a6f13fde95a6f4db5f5946f15e4c59bc"
+  integrity sha512-gmPXoWktfXeutmWTM6el9U4vIn5kqOHGI1OESSOhPtLWrxodKqLfFuMygQtOUTtGjKLFQRFAJhHEwUhHZNOURA==

 typical@^4.0.0:
  version "4.0.0"
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "chromium",
 					"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
-					"commitHash": "052d3b44972e6d94ef40054d46c150b7cdd7a5d8"
+					"commitHash": "894fb9eb56c6cbda65e3c3ae9ada6d4cb5850cc9"
 				}
 			},
 			"licenseDetail": [
@@ -40,7 +40,7 @@
 				"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 			],
 			"isOnlyProductionDependency": true,
-			"version": "80.0.3987.165"
+			"version": "83.0.4103.122"
 		},
 		{
 			"component": {
@@ -48,11 +48,11 @@
 				"git": {
 					"name": "nodejs",
 					"repositoryUrl": "https://github.com/nodejs/node",
-					"commitHash": "42cce5a9d0fd905bf4ad7a2528c36572dfb8b5ad"
+					"commitHash": "9622fed3fb2cffcea9efff6c8cb4cc2def99d75d"
 				}
 			},
 			"isOnlyProductionDependency": true,
-			"version": "12.13.0"
+			"version": "12.14.1"
 		},
 		{
 			"component": {
@@ -60,12 +60,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "87fd06bc96bce8f46ca05b8315657fd230bcac85"
+					"commitHash": "a822d2639a9c9c2c670e91d73f78e921865ce38e"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "8.3.3"
+			"version": "9.1.0"
 		},
 		{
 			"component": {
--- a/extensions/big-data-cluster/yarn.lock
+++ b/extensions/big-data-cluster/yarn.lock
@@ -264,9 +264,9 @@ glob@7.1.2:
    path-is-absolute "^1.0.0"

 glob@^7.1.2:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
  dependencies:
    fs.realpath "^1.0.0"
    inflight "^1.0.4"
@@ -533,9 +533,9 @@ safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==

 semver@^5.4.1:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
-  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==

 source-map-support@^0.5.0:
  version "0.5.12"
--- a/extensions/extension-editing/extension.webpack.config.js
+++ b/extensions/extension-editing/extension.webpack.config.js
@@ -14,6 +14,9 @@ module.exports = withDefaults({
 	entry: {
 		extension: './src/extensionEditingMain.ts',
 	},
+	output: {
+		filename: 'extensionEditingMain.js'
+	},
 	externals: {
 		'../../../product.json': 'commonjs ../../../product.json',
 		'typescript': 'commonjs typescript'
--- a/extensions/github-authentication/package.json
+++ b/extensions/github-authentication/package.json
@@ -12,7 +12,8 @@
    "Other"
  ],
  "activationEvents": [
-    "*"
+    "*",
+    "onAuthenticationRequest:github"
  ],
  "contributes": {
    "commands": [
--- a/extensions/github-authentication/src/github.ts
+++ b/extensions/github-authentication/src/github.ts
@@ -141,7 +141,12 @@ export class GitHubAuthenticationProvider {

 	private async tokenToSession(token: string, scopes: string[]): Promise<vscode.AuthenticationSession> {
 		const userInfo = await this._githubServer.getUserInfo(token);
-		return new vscode.AuthenticationSession(uuid(), token, { label: userInfo.accountName, id: userInfo.id }, scopes);
+		return {
+			id: uuid(),
+			accessToken: token,
+			account: { label: userInfo.accountName, id: userInfo.id },
+			scopes
+		};
 	}

 	private async setToken(session: vscode.AuthenticationSession): Promise<void> {
--- a/extensions/github-authentication/src/githubServer.ts
+++ b/extensions/github-authentication/src/githubServer.ts
@@ -67,15 +67,26 @@ function parseQuery(uri: vscode.Uri) {
 export class GitHubServer {
 	private _statusBarItem: vscode.StatusBarItem | undefined;

+	private isTestEnvironment(url: vscode.Uri): boolean {
+		return url.authority === 'vscode-web-test-playground.azurewebsites.net' || url.authority.startsWith('localhost:');
+	}
+
 	public async login(scopes: string): Promise<string> {
 		Logger.info('Logging in...');
 		this.updateStatusBarItem(true);

 		const state = uuid();
 		const callbackUri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://vscode.github-authentication/did-authenticate`));
-		const uri = vscode.Uri.parse(`https://${AUTH_RELAY_SERVER}/authorize/?callbackUri=${encodeURIComponent(callbackUri.toString())}&scope=${scopes}&state=${state}&responseType=code&authServer=https://github.com`);

-		await vscode.env.openExternal(uri);
+		if (this.isTestEnvironment(callbackUri)) {
+			const token = await vscode.window.showInputBox({ prompt: 'Token', ignoreFocusOut: true });
+			if (!token) { throw new Error('Sign in failed: No token provided'); }
+			this.updateStatusBarItem(false);
+			return token;
+		} else {
+			const uri = vscode.Uri.parse(`https://${AUTH_RELAY_SERVER}/authorize/?callbackUri=${encodeURIComponent(callbackUri.toString())}&scope=${scopes}&state=${state}&responseType=code&authServer=https://github.com`);
+			await vscode.env.openExternal(uri);
+		}

 		return Promise.race([
 			promiseFromEvent(uriHandler.event, exchangeCodeForToken(state)),
--- a/extensions/github/package.json
+++ b/extensions/github/package.json
@@ -57,7 +57,7 @@
    "watch": "gulp watch-extension:github"
  },
  "dependencies": {
-    "@octokit/rest": "^17.9.1",
+    "@octokit/rest": "^18.0.1",
    "tunnel": "^0.0.6",
    "vscode-nls": "^4.1.2"
  },
--- a/extensions/github/src/auth.ts
+++ b/extensions/github/src/auth.ts
@@ -34,10 +34,12 @@ let _octokit: Promise<Octokit> | undefined;

 export function getOctokit(): Promise<Octokit> {
 	if (!_octokit) {
-		_octokit = getSession().then(session => {
+		_octokit = getSession().then(async session => {
 			const token = session.accessToken;
 			const agent = getAgent();

+			const { Octokit } = await import('@octokit/rest');
+
 			return new Octokit({
 				request: { agent },
 				userAgent: 'GitHub VSCode',
--- a/extensions/github/src/publish.ts
+++ b/extensions/github/src/publish.ts
@@ -46,7 +46,7 @@ export async function publishRepository(gitAPI: GitAPI, repository?: Repository)
 		folder = pick.folder.uri;
 	}

-	let quickpick = vscode.window.createQuickPick<vscode.QuickPickItem & { repo?: string, auth?: 'https' | 'ssh' }>();
+	let quickpick = vscode.window.createQuickPick<vscode.QuickPickItem & { repo?: string, auth?: 'https' | 'ssh', isPrivate?: boolean }>();
 	quickpick.ignoreFocusOut = true;

 	quickpick.placeholder = 'Repository Name';
@@ -60,6 +60,7 @@ export async function publishRepository(gitAPI: GitAPI, repository?: Repository)
 	quickpick.busy = false;

 	let repo: string | undefined;
+	let isPrivate: boolean;

 	const onDidChangeValue = async () => {
 		const sanitizedRepo = sanitizeRepositoryName(quickpick.value);
@@ -67,7 +68,10 @@ export async function publishRepository(gitAPI: GitAPI, repository?: Repository)
 		if (!sanitizedRepo) {
 			quickpick.items = [];
 		} else {
-			quickpick.items = [{ label: `$(repo) Publish to GitHub private repository`, description: `$(github) ${owner}/${sanitizedRepo}`, alwaysShow: true, repo: sanitizedRepo }];
+			quickpick.items = [
+				{ label: `$(repo) Publish to GitHub private repository`, description: `$(github) ${owner}/${sanitizedRepo}`, alwaysShow: true, repo: sanitizedRepo, isPrivate: true },
+				{ label: `$(repo) Publish to GitHub public repository`, description: `$(github) ${owner}/${sanitizedRepo}`, alwaysShow: true, repo: sanitizedRepo, isPrivate: false },
+			];
 		}
 	};

@@ -79,6 +83,7 @@ export async function publishRepository(gitAPI: GitAPI, repository?: Repository)
 		listener.dispose();

 		repo = pick?.repo;
+		isPrivate = pick?.isPrivate ?? true;

 		if (repo) {
 			try {
@@ -145,11 +150,11 @@ export async function publishRepository(gitAPI: GitAPI, repository?: Repository)
 	}

 	const githubRepository = await vscode.window.withProgress({ location: vscode.ProgressLocation.Notification, cancellable: false, title: 'Publish to GitHub' }, async progress => {
-		progress.report({ message: 'Publishing to GitHub private repository', increment: 25 });
+		progress.report({ message: `Publishing to GitHub ${isPrivate ? 'private' : 'public'} repository`, increment: 25 });

 		const res = await octokit.repos.createForAuthenticatedUser({
 			name: repo!,
-			private: true
+			private: isPrivate
 		});

 		const createdGithubRepository = res.data;
--- a/extensions/github/yarn.lock
+++ b/extensions/github/yarn.lock
@@ -3,113 +3,106 @@


 "@octokit/auth-token@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.0.tgz#b64178975218b99e4dfe948253f0673cbbb59d9f"
-  integrity sha512-eoOVMjILna7FVQf96iWc3+ZtE/ZT6y8ob8ZzcqKY1ibSQCnu4O/B7pJvzMx5cyZ/RjAff6DAdEb0O0Cjcxidkg==
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.2.tgz#10d0ae979b100fa6b72fa0e8e63e27e6d0dbff8a"
+  integrity sha512-jE/lE/IKIz2v1+/P0u4fJqv0kYwXOTujKemJMFr6FeopsxlIK3+wKDCJGnysg81XID5TgZQbIfuJ5J0lnTiuyQ==
  dependencies:
-    "@octokit/types" "^2.0.0"
+    "@octokit/types" "^5.0.0"

-"@octokit/core@^2.4.3":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@octokit/core/-/core-2.5.0.tgz#4706258893a7ac6ab35d58d2fb9f2d2ba19a41a5"
-  integrity sha512-uvzmkemQrBgD8xuGbjhxzJN1darJk9L2cS+M99cHrDG2jlSVpxNJVhoV86cXdYBqdHCc9Z995uLCczaaHIYA6Q==
+"@octokit/core@^3.0.0":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.1.1.tgz#1856745aa8fb154cf1544a2a1b82586c809c5e66"
+  integrity sha512-cQ2HGrtyNJ1IBxpTP1U5m/FkMAJvgw7d2j1q3c9P0XUuYilEgF6e4naTpsgm4iVcQeOnccZlw7XHRIUBy0ymcg==
  dependencies:
    "@octokit/auth-token" "^2.4.0"
    "@octokit/graphql" "^4.3.1"
    "@octokit/request" "^5.4.0"
-    "@octokit/types" "^2.0.0"
+    "@octokit/types" "^5.0.0"
    before-after-hook "^2.1.0"
-    universal-user-agent "^5.0.0"
+    universal-user-agent "^6.0.0"

 "@octokit/endpoint@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.1.tgz#16d5c0e7a83e3a644d1ddbe8cded6c3d038d31d7"
-  integrity sha512-pOPHaSz57SFT/m3R5P8MUu4wLPszokn5pXcB/pzavLTQf2jbU+6iayTvzaY6/BiotuRS0qyEUkx3QglT4U958A==
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.4.tgz#da3eafdee1fabd6e5b6ca311efcba26f0dd99848"
+  integrity sha512-ZJHIsvsClEE+6LaZXskDvWIqD3Ao7+2gc66pRG5Ov4MQtMvCU9wGu1TItw9aGNmRuU9x3Fei1yb+uqGaQnm0nw==
  dependencies:
-    "@octokit/types" "^2.11.1"
+    "@octokit/types" "^5.0.0"
    is-plain-object "^3.0.0"
-    universal-user-agent "^5.0.0"
+    universal-user-agent "^6.0.0"

 "@octokit/graphql@^4.3.1":
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.4.0.tgz#4540b48bbf796b837b311ba6ea5104760db530ca"
-  integrity sha512-Du3hAaSROQ8EatmYoSAJjzAz3t79t9Opj/WY1zUgxVUGfIKn0AEjg+hlOLscF6fv6i/4y/CeUvsWgIfwMkTccw==
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.5.2.tgz#33021ebf94939cf47562823851ab11fe64392274"
+  integrity sha512-SpB/JGdB7bxRj8qowwfAXjMpICUYSJqRDj26MKJAryRQBqp/ZzARsaO2LEFWzDaps0FLQoPYVGppS0HQXkBhdg==
  dependencies:
    "@octokit/request" "^5.3.0"
-    "@octokit/types" "^2.0.0"
-    universal-user-agent "^5.0.0"
+    "@octokit/types" "^5.0.0"
+    universal-user-agent "^6.0.0"

 "@octokit/plugin-paginate-rest@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.2.0.tgz#9ae0c14c1b90ec0d96d2ef1b44706b4505a91cee"
-  integrity sha512-KoNxC3PLNar8UJwR+1VMQOw2IoOrrFdo5YOiDKnBhpVbKpw+zkBKNMNKwM44UWL25Vkn0Sl3nYIEGKY+gW5ebw==
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.2.3.tgz#a6ad4377e7e7832fb4bdd9d421e600cb7640ac27"
+  integrity sha512-eKTs91wXnJH8Yicwa30jz6DF50kAh7vkcqCQ9D7/tvBAP5KKkg6I2nNof8Mp/65G0Arjsb4QcOJcIEQY+rK1Rg==
  dependencies:
-    "@octokit/types" "^2.12.1"
+    "@octokit/types" "^5.0.0"

 "@octokit/plugin-request-log@^1.0.0":
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz#eef87a431300f6148c39a7f75f8cfeb218b2547e"
  integrity sha512-ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw==

-"@octokit/plugin-rest-endpoint-methods@^3.11.1":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-3.12.0.tgz#313938ece4267e98687179cdbc32bc09e06f2379"
-  integrity sha512-cpUTZR0V2B8lz351oKLXx01BxBF3sMOhvm0glEMIS9XWSpkHCeQDPLPh8TQmepY8e+AhhgWxuWdn1PLDPQlTpw==
+"@octokit/plugin-rest-endpoint-methods@4.1.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.1.0.tgz#338c568177c4d4d753f9525af88b29cd0f091734"
+  integrity sha512-zbRTjm+xplSNlixotTVMvLJe8aRogUXS+r37wZK5EjLsNYH4j02K5XLMOWyYaSS4AJEZtPmzCcOcui4VzVGq+A==
  dependencies:
-    "@octokit/types" "^4.0.0"
+    "@octokit/types" "^5.1.0"
    deprecation "^2.3.1"

 "@octokit/request-error@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.0.tgz#94ca7293373654400fbb2995f377f9473e00834b"
-  integrity sha512-rtYicB4Absc60rUv74Rjpzek84UbVHGHJRu4fNVlZ1mCcyUPPuzFfG9Rn6sjHrd95DEsmjSt1Axlc699ZlbDkw==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.2.tgz#0e76b83f5d8fdda1db99027ea5f617c2e6ba9ed0"
+  integrity sha512-2BrmnvVSV1MXQvEkrb9zwzP0wXFNbPJij922kYBTLIlIafukrGOb+ABBT2+c6wZiuyWDH1K1zmjGQ0toN/wMWw==
  dependencies:
-    "@octokit/types" "^2.0.0"
+    "@octokit/types" "^5.0.1"
    deprecation "^2.0.0"
    once "^1.4.0"

 "@octokit/request@^5.3.0", "@octokit/request@^5.4.0":
-  version "5.4.2"
-  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.2.tgz#74f8e5bbd39dc738a1b127629791f8ad1b3193ee"
-  integrity sha512-zKdnGuQ2TQ2vFk9VU8awFT4+EYf92Z/v3OlzRaSh4RIP0H6cvW1BFPXq4XYvNez+TPQjqN+0uSkCYnMFFhcFrw==
+  version "5.4.6"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.6.tgz#e8cc8d4cfc654d30428ea92aaa62168fd5ead7eb"
+  integrity sha512-9r8Sn4CvqFI9LDLHl9P17EZHwj3ehwQnTpTE+LEneb0VBBqSiI/VS4rWIBfBhDrDs/aIGEGZRSB0QWAck8u+2g==
  dependencies:
    "@octokit/endpoint" "^6.0.1"
    "@octokit/request-error" "^2.0.0"
-    "@octokit/types" "^2.11.1"
+    "@octokit/types" "^5.0.0"
    deprecation "^2.0.0"
    is-plain-object "^3.0.0"
    node-fetch "^2.3.0"
    once "^1.4.0"
-    universal-user-agent "^5.0.0"
+    universal-user-agent "^6.0.0"

-"@octokit/rest@^17.9.1":
-  version "17.9.1"
-  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-17.9.1.tgz#ffa31614b2a2330fac82dcff8bb5e88c63fa7cbb"
-  integrity sha512-TCTqCMNs21ToN5rIx15sIETuR19WsAy9wI4GnSVY8yZxeOKzeQs8uvIeijy8Gb6DbcYGXDf+xJ1MNDePPss0DA==
+"@octokit/rest@^18.0.1":
+  version "18.0.1"
+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.0.1.tgz#46ee234770c5ff4c646f7e18708c56b6d7fa3c66"
+  integrity sha512-KLlJpgsJx88OZ0VLBH3gvUK4sfcXjr/nE0Qzyoe76dNqMzDzkSmmvILF3f2XviGgrzuP6Ie0ay/QX478Vrpn9A==
  dependencies:
-    "@octokit/core" "^2.4.3"
+    "@octokit/core" "^3.0.0"
    "@octokit/plugin-paginate-rest" "^2.2.0"
    "@octokit/plugin-request-log" "^1.0.0"
-    "@octokit/plugin-rest-endpoint-methods" "^3.11.1"
+    "@octokit/plugin-rest-endpoint-methods" "4.1.0"

-"@octokit/types@^2.0.0", "@octokit/types@^2.11.1", "@octokit/types@^2.12.1":
-  version "2.16.2"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-2.16.2.tgz#4c5f8da3c6fecf3da1811aef678fda03edac35d2"
-  integrity sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==
-  dependencies:
-    "@types/node" ">= 8"
-
-"@octokit/types@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-4.0.0.tgz#57425d275d33b02922e8822eabf57466ef243969"
-  integrity sha512-wbjL8HhCLdBOAmvPJPkMqF4bf6AWzsas78I7+slJt5LAjuAL+kTlWtXHr2V9VnOuEFItZdzfgFTpMjSBkFeVZg==
+"@octokit/types@^5.0.0", "@octokit/types@^5.0.1", "@octokit/types@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-5.1.0.tgz#4377a3f39edad3e60753fb5c3c310756f1ded57f"
+  integrity sha512-OFxUBgrEllAbdEmWp/wNmKIu5EuumKHG4sgy56vjZ8lXPgMhF05c76hmulfOdFHHYRpPj49ygOZJ8wgVsPecuA==
  dependencies:
    "@types/node" ">= 8"

 "@types/node@>= 8":
-  version "14.0.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.1.tgz#5d93e0a099cd0acd5ef3d5bde3c086e1f49ff68c"
-  integrity sha512-FAYBGwC+W6F9+huFIDtn43cpy7+SzG+atzRiTfdp3inUKL2hXnd4rG8hylJLIh4+hqrQy1P17kvJByE/z825hA==
+  version "14.0.23"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.23.tgz#676fa0883450ed9da0bb24156213636290892806"
+  integrity sha512-Z4U8yDAl5TFkmYsZdFPdjeMa57NOvnaf1tljHzhouaPEp7LCj2JKkejpI1ODviIAQuW4CcQmxkQ77rnLsOOoKw==

 "@types/node@^10.12.21":
  version "10.17.14"
@@ -121,184 +114,43 @@ before-after-hook@^2.1.0:
  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.1.0.tgz#b6c03487f44e24200dd30ca5e6a1979c5d2fb635"
  integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A==

-cross-spawn@^6.0.0:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
 deprecation@^2.0.0, deprecation@^2.3.1:
  version "2.3.1"
  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
  integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==

-end-of-stream@^1.1.0:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
-  dependencies:
-    once "^1.4.0"
-
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
-get-stream@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
-  dependencies:
-    pump "^3.0.0"
-
 is-plain-object@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.0.tgz#47bfc5da1b5d50d64110806c199359482e75a928"
-  integrity sha512-tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg==
-  dependencies:
-    isobject "^4.0.0"
-
-is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-isobject@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0"
-  integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==
-
-macos-release@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.3.0.tgz#eb1930b036c0800adebccd5f17bc4c12de8bb71f"
-  integrity sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA==
-
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.1.tgz#662d92d24c0aa4302407b0d45d21f2251c85f85b"
+  integrity sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==

 node-fetch@^2.3.0:
  version "2.6.0"
  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==

-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
-  dependencies:
-    path-key "^2.0.0"
-
-once@^1.3.1, once@^1.4.0:
+once@^1.4.0:
  version "1.4.0"
  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
  dependencies:
    wrappy "1"

-os-name@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
-  integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==
-  dependencies:
-    macos-release "^2.2.0"
-    windows-release "^3.1.0"
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
-
-path-key@^2.0.0, path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
-
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-semver@^5.5.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
-  dependencies:
-    shebang-regex "^1.0.0"
-
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
-
-signal-exit@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
-  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
-
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
-
 tunnel@^0.0.6:
  version "0.0.6"
  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==

-universal-user-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-5.0.0.tgz#a3182aa758069bf0e79952570ca757de3579c1d9"
-  integrity sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==
-  dependencies:
-    os-name "^3.1.0"
+universal-user-agent@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
+  integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==

 vscode-nls@^4.1.2:
  version "4.1.2"
  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167"
  integrity sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==

-which@^1.2.9:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-windows-release@^3.1.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.3.0.tgz#dce167e9f8be733f21c849ebd4d03fe66b29b9f0"
-  integrity sha512-2HetyTg1Y+R+rUgrKeUEhAG/ZuOmTrI1NBb3ZyAGQMYmOJjBBPe4MTodghRkmLJZHwkuPi02anbeGP+Zf401LQ==
-  dependencies:
-    execa "^1.0.0"
-
 wrappy@1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
--- a/extensions/markdown-language-features/media/index.js
+++ b/extensions/markdown-language-features/media/index.js
--- a/extensions/markdown-language-features/media/markdown.css
+++ b/extensions/markdown-language-features/media/markdown.css
@@ -131,6 +131,10 @@ p {
 	margin-bottom: 1.5em;
 }

+li > p {
+	margin-bottom: 0;
+}
+
 /* don't space 2 paragraphs too far apart */
 p + p {
 	margin-top: -0.8em;
--- a/extensions/markdown-language-features/preview-src/index.ts
+++ b/extensions/markdown-language-features/preview-src/index.ts
@@ -18,7 +18,13 @@ const settings = getSettings();

 const vscode = acquireVsCodeApi();

-const state = { ...vscode.getState(), ...getData<any>('data-state') };
+const originalState = vscode.getState();
+
+const state = {
+	...(typeof originalState === 'object' ? originalState : {}),
+	...getData<any>('data-state')
+};
+
 // Make sure to sync VS Code state here
 vscode.setState(state);

--- a/extensions/microsoft-authentication/extension-browser.webpack.config.js
+++ b/extensions/microsoft-authentication/extension-browser.webpack.config.js
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const path = require('path');
+const withBrowserDefaults = require('../shared.webpack.config').browser;
+
+module.exports = withBrowserDefaults({
+	context: __dirname,
+	node: false,
+	entry: {
+		extension: './src/extension.ts',
+	},
+	externals: {
+		'keytar': 'commonjs keytar'
+	},
+	resolve: {
+		alias: {
+			'./env/node': path.resolve(__dirname, 'src/env/browser'),
+			'./authServer': path.resolve(__dirname, 'src/env/browser/authServer'),
+			'buffer': path.resolve(__dirname, 'node_modules/buffer/index.js'),
+			'node-fetch': path.resolve(__dirname, 'node_modules/node-fetch/browser.js'),
+			'randombytes': path.resolve(__dirname, 'node_modules/randombytes/browser.js'),
+			'stream': path.resolve(__dirname, 'node_modules/stream/index.js'),
+			'uuid': path.resolve(__dirname, 'node_modules/uuid/dist/esm-browser/index.js')
+		}
+	}
+});
--- a/extensions/microsoft-authentication/extension.webpack.config.js
+++ b/extensions/microsoft-authentication/extension.webpack.config.js
@@ -7,6 +7,7 @@

 'use strict';

+const path = require('path');
 const withDefaults = require('../shared.webpack.config');

 module.exports = withDefaults({
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -12,24 +12,35 @@
 	],
 	"enableProposedApi": true,
 	"activationEvents": [
-		"*"
+		"*",
+		"onAuthenticationRequest:microsoft"
 	],
 	"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
 	"main": "./out/extension.js",
+	"browser": "./dist/browser/extension.js",
 	"scripts": {
 		"vscode:prepublish": "npm run compile",
 		"compile": "gulp compile-extension:microsoft-authentication",
-		"watch": "gulp watch-extension:microsoft-authentication"
+		"compile-web": "npx webpack-cli --config extension-browser.webpack.config --mode none",
+		"watch": "gulp watch-extension:microsoft-authentication",
+		"watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
 	},
 	"devDependencies": {
-		"typescript": "^3.7.4",
-		"tslint": "^5.12.1",
-		"@types/node": "^10.12.21",
 		"@types/keytar": "^4.0.1",
-		"@types/uuid": "^3.4.6"
+		"@types/node": "^10.12.21",
+		"@types/node-fetch": "^2.5.7",
+		"@types/randombytes": "^2.0.0",
+		"@types/sha.js": "^2.4.0",
+		"@types/uuid": "^8.0.0",
+		"typescript": "^3.7.4"
 	},
 	"dependencies": {
-		"uuid": "^3.3.3",
+		"buffer": "^5.6.0",
+		"node-fetch": "^2.6.0",
+		"randombytes": "github:rmacfarlane/randombytes#b28d4ecee46262801ea09f15fa1f1513a05c5971",
+		"sha.js": "2.4.11",
+		"stream": "0.0.2",
+		"uuid": "^8.2.0",
 		"vscode-extension-telemetry": "0.1.1",
 		"vscode-nls": "^4.1.1"
 	}
--- a/extensions/microsoft-authentication/src/AADHelper.ts
+++ b/extensions/microsoft-authentication/src/AADHelper.ts
@@ -3,15 +3,17 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

-import * as crypto from 'crypto';
-import * as https from 'https';
+import * as randomBytes from 'randombytes';
 import * as querystring from 'querystring';
 import * as vscode from 'vscode';
-import * as uuid from 'uuid';
 import { createServer, startServer } from './authServer';
+
+import { v4 as uuid } from 'uuid';
 import { keychain } from './keychain';
 import Logger from './logger';
 import { toBase64UrlEncoding } from './utils';
+import fetch from 'node-fetch';
+import { sha256 } from './env/node/sha256';

 const redirectUrl = 'https://vscode-redirect.azurewebsites.net/';
 const loginEndpointUrl = 'https://login.microsoftonline.com/';
@@ -21,7 +23,7 @@ const tenant = 'organizations';
 interface IToken {
 	accessToken?: string; // When unable to refresh due to network problems, the access token becomes undefined

-	expiresIn?: string; // How long access token is valid, in seconds
+	expiresIn?: number; // How long access token is valid, in seconds
 	expiresAt?: number; // UNIX epoch time at which token will expire
 	refreshToken: string;

@@ -54,6 +56,15 @@ interface IStoredSession {
 	}
 }

+export interface ITokenResponse {
+	access_token: string;
+	expires_in: number;
+	ext_expires_in: number;
+	refresh_token: string;
+	scope: string;
+	token_type: string;
+}
+
 function parseQuery(uri: vscode.Uri) {
 	return uri.query.split('&').reduce((prev: any, current) => {
 		const queryString = current.split('=');
@@ -208,7 +219,12 @@ export class AzureActiveDirectoryService {

 	private async convertToSession(token: IToken): Promise<vscode.AuthenticationSession> {
 		const resolvedToken = await this.resolveAccessToken(token);
-		return new vscode.AuthenticationSession(token.sessionId, resolvedToken, token.account, token.scope.split(' '));
+		return {
+			id: token.sessionId,
+			accessToken: resolvedToken,
+			account: token.account,
+			scopes: token.scope.split(' ')
+		};
 	}

 	private async resolveAccessToken(token: IToken): Promise<string> {
@@ -257,7 +273,7 @@ export class AzureActiveDirectoryService {
 				return;
 			}

-			const nonce = crypto.randomBytes(16).toString('base64');
+			const nonce = randomBytes(16).toString('base64');
 			const { server, redirectPromise, codePromise } = createServer(nonce);

 			let token: IToken | undefined;
@@ -279,8 +295,8 @@ export class AzureActiveDirectoryService {

 				const state = `${updatedPort},${encodeURIComponent(nonce)}`;

-				const codeVerifier = toBase64UrlEncoding(crypto.randomBytes(32).toString('base64'));
-				const codeChallenge = toBase64UrlEncoding(crypto.createHash('sha256').update(codeVerifier).digest('base64'));
+				const codeVerifier = toBase64UrlEncoding(randomBytes(32).toString('base64'));
+				const codeChallenge = toBase64UrlEncoding(await sha256(codeVerifier));
 				const loginUrl = `${loginEndpointUrl}${tenant}/oauth2/v2.0/authorize?response_type=code&response_mode=query&client_id=${encodeURIComponent(clientId)}&redirect_uri=${encodeURIComponent(redirectUrl)}&state=${state}&scope=${encodeURIComponent(scope)}&prompt=select_account&code_challenge_method=S256&code_challenge=${codeChallenge}`;

 				await redirectReq.res.writeHead(302, { Location: loginUrl });
@@ -341,14 +357,14 @@ export class AzureActiveDirectoryService {

 	private async loginWithoutLocalServer(scope: string): Promise<vscode.AuthenticationSession> {
 		const callbackUri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://vscode.microsoft-authentication`));
-		const nonce = crypto.randomBytes(16).toString('base64');
+		const nonce = randomBytes(16).toString('base64');
 		const port = (callbackUri.authority.match(/:([0-9]*)$/) || [])[1] || (callbackUri.scheme === 'https' ? 443 : 80);
 		const callbackEnvironment = this.getCallbackEnvironment(callbackUri);
 		const state = `${callbackEnvironment}${port},${encodeURIComponent(nonce)},${encodeURIComponent(callbackUri.query)}`;
 		const signInUrl = `${loginEndpointUrl}${tenant}/oauth2/v2.0/authorize`;
 		let uri = vscode.Uri.parse(signInUrl);
-		const codeVerifier = toBase64UrlEncoding(crypto.randomBytes(32).toString('base64'));
-		const codeChallenge = toBase64UrlEncoding(crypto.createHash('sha256').update(codeVerifier).digest('base64'));
+		const codeVerifier = toBase64UrlEncoding(randomBytes(32).toString('base64'));
+		const codeChallenge = toBase64UrlEncoding(await sha256(codeVerifier));
 		uri = uri.with({
 			query: `response_type=code&client_id=${encodeURIComponent(clientId)}&response_mode=query&redirect_uri=${redirectUrl}&state=${state}&scope=${scope}&prompt=select_account&code_challenge_method=S256&code_challenge=${codeChallenge}`
 		});
@@ -421,14 +437,13 @@ export class AzureActiveDirectoryService {
 						onDidChangeSessions.fire({ added: [], removed: [token.sessionId], changed: [] });
 					}
 				}
-			}, 1000 * (parseInt(token.expiresIn) - 30)));
+			}, 1000 * (token.expiresIn - 30)));
 		}

 		this.storeTokenData();
 	}

-	private getTokenFromResponse(buffer: Buffer[], scope: string, existingId?: string): IToken {
-		const json = JSON.parse(Buffer.concat(buffer).toString());
+	private getTokenFromResponse(json: ITokenResponse, scope: string, existingId?: string): IToken {
 		const claims = this.getTokenClaims(json.access_token);
 		return {
 			expiresIn: json.expires_in,
@@ -445,60 +460,42 @@ export class AzureActiveDirectoryService {
 	}

 	private async exchangeCodeForToken(code: string, codeVerifier: string, scope: string): Promise<IToken> {
-		return new Promise((resolve: (value: IToken) => void, reject) => {
-			Logger.info('Exchanging login code for token');
-			try {
-				const postData = querystring.stringify({
-					grant_type: 'authorization_code',
-					code: code,
-					client_id: clientId,
-					scope: scope,
-					code_verifier: codeVerifier,
-					redirect_uri: redirectUrl
-				});
+		Logger.info('Exchanging login code for token');
+		try {
+			const postData = querystring.stringify({
+				grant_type: 'authorization_code',
+				code: code,
+				client_id: clientId,
+				scope: scope,
+				code_verifier: codeVerifier,
+				redirect_uri: redirectUrl
+			});

-				const tokenUrl = vscode.Uri.parse(`${loginEndpointUrl}${tenant}/oauth2/v2.0/token`);
+			const result = await fetch(`${loginEndpointUrl}${tenant}/oauth2/v2.0/token`, {
+				method: 'POST',
+				headers: {
+					'Content-Type': 'application/x-www-form-urlencoded',
+					'Content-Length': postData.length.toString()
+				},
+				body: postData
+			});

-				const post = https.request({
-					host: tokenUrl.authority,
-					path: tokenUrl.path,
-					method: 'POST',
-					headers: {
-						'Content-Type': 'application/x-www-form-urlencoded',
-						'Content-Length': postData.length
-					}
-				}, result => {
-					const buffer: Buffer[] = [];
-					result.on('data', (chunk: Buffer) => {
-						buffer.push(chunk);
-					});
-					result.on('end', () => {
-						if (result.statusCode === 200) {
-							Logger.info('Exchanging login code for token success');
-							resolve(this.getTokenFromResponse(buffer, scope));
-						} else {
-							Logger.error('Exchanging login code for token failed');
-							reject(new Error('Unable to login.'));
-						}
-					});
-				});
-
-				post.write(postData);
-
-				post.end();
-				post.on('error', err => {
-					reject(err);
-				});
-
-			} catch (e) {
-				Logger.error(e.message);
-				reject(e);
+			if (result.ok) {
+				Logger.info('Exchanging login code for token success');
+				const json = await result.json();
+				return this.getTokenFromResponse(json, scope);
+			} else {
+				Logger.error('Exchanging login code for token failed');
+				throw new Error('Unable to login.');
 			}
-		});
+		} catch (e) {
+			Logger.error(e.message);
+			throw e;
+		}
 	}

 	private async refreshToken(refreshToken: string, scope: string, sessionId: string): Promise<IToken> {
-		return new Promise((resolve: (value: IToken) => void, reject) => {
+		try {
 			Logger.info('Refreshing token...');
 			const postData = querystring.stringify({
 				refresh_token: refreshToken,
@@ -507,40 +504,29 @@ export class AzureActiveDirectoryService {
 				scope: scope
 			});

-			const post = https.request({
-				host: 'login.microsoftonline.com',
-				path: `/${tenant}/oauth2/v2.0/token`,
+			const result = await fetch(`https://login.microsoftonline.com/${tenant}/oauth2/v2.0/token`, {
 				method: 'POST',
 				headers: {
 					'Content-Type': 'application/x-www-form-urlencoded',
-					'Content-Length': postData.length
-				}
-			}, result => {
-				const buffer: Buffer[] = [];
-				result.on('data', (chunk: Buffer) => {
-					buffer.push(chunk);
-				});
-				result.on('end', async () => {
-					if (result.statusCode === 200) {
-						const token = this.getTokenFromResponse(buffer, scope, sessionId);
-						this.setToken(token, scope);
-						Logger.info('Token refresh success');
-						resolve(token);
-					} else {
-						Logger.error('Refreshing token failed');
-						reject(new Error('Refreshing token failed.'));
-					}
-				});
+					'Content-Length': postData.length.toString()
+				},
+				body: postData
 			});

-			post.write(postData);
-
-			post.end();
-			post.on('error', err => {
-				Logger.error(err.message);
-				reject(new Error(REFRESH_NETWORK_FAILURE));
-			});
-		});
+			if (result.ok) {
+				const json = await result.json();
+				const token = this.getTokenFromResponse(json, scope, sessionId);
+				this.setToken(token, scope);
+				Logger.info('Token refresh success');
+				return token;
+			} else {
+				Logger.error('Refreshing token failed');
+				throw new Error('Refreshing token failed.');
+			}
+		} catch (e) {
+			Logger.error('Refreshing token failed');
+			throw e;
+		}
 	}

 	private clearSessionTimeout(sessionId: string): void {
--- a/extensions/microsoft-authentication/src/authServer.ts
+++ b/extensions/microsoft-authentication/src/authServer.ts
@@ -6,7 +6,6 @@
 import * as http from 'http';
 import * as url from 'url';
 import * as fs from 'fs';
-import * as net from 'net';
 import * as path from 'path';

 interface Deferred<T> {
@@ -14,58 +13,17 @@ interface Deferred<T> {
 	reject: (reason: any) => void;
 }

-const _typeof = {
-	number: 'number',
-	string: 'string',
-	undefined: 'undefined',
-	object: 'object',
-	function: 'function'
-};
-
-/**
- * @returns whether the provided parameter is undefined.
- */
-export function isUndefined(obj: any): obj is undefined {
-	return typeof (obj) === _typeof.undefined;
-}
-
-/**
- * @returns whether the provided parameter is undefined or null.
- */
-export function isUndefinedOrNull(obj: any): obj is undefined | null {
-	return isUndefined(obj) || obj === null;
-}
-
 /**
 * Asserts that the argument passed in is neither undefined nor null.
 */
-export function assertIsDefined<T>(arg: T | null | undefined): T {
-	if (isUndefinedOrNull(arg)) {
+function assertIsDefined<T>(arg: T | null | undefined): T {
+	if (typeof (arg) === 'undefined' || arg === null) {
 		throw new Error('Assertion Failed: argument is undefined or null');
 	}

 	return arg;
 }

-export function createTerminateServer(server: http.Server) {
-	const sockets: Record<number, net.Socket> = {};
-	let socketCount = 0;
-	server.on('connection', socket => {
-		const id = socketCount++;
-		sockets[id] = socket;
-		socket.on('close', () => {
-			delete sockets[id];
-		});
-	});
-	return async () => {
-		const result = new Promise<Error | undefined>(resolve => server.close(resolve));
-		for (const id in sockets) {
-			sockets[id].destroy();
-		}
-		return result;
-	};
-}
-
 export async function startServer(server: http.Server): Promise<string> {
 	let portTimer: NodeJS.Timer;

--- a/extensions/microsoft-authentication/src/env/browser/authServer.ts
+++ b/extensions/microsoft-authentication/src/env/browser/authServer.ts
@@ -0,0 +1,12 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export function startServer(_: any): any {
+	throw new Error('Not implemented');
+}
+
+export function createServer(_: any): any {
+	throw new Error('Not implemented');
+}
--- a/extensions/microsoft-authentication/src/env/browser/sha256.ts
+++ b/extensions/microsoft-authentication/src/env/browser/sha256.ts
@@ -0,0 +1,11 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+export async function sha256(s: string | Uint8Array): Promise<string> {
+	const createHash = require('sha.js');
+	return createHash('sha256').update(s).digest('base64');
+}
--- a/extensions/microsoft-authentication/src/env/node/sha256.ts
+++ b/extensions/microsoft-authentication/src/env/node/sha256.ts
@@ -0,0 +1,10 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+export async function sha256(s: string | Uint8Array): Promise<string> {
+	return (require('crypto')).createHash('sha256').update(s).digest('base64');
+}
--- a/extensions/microsoft-authentication/tsconfig.json
+++ b/extensions/microsoft-authentication/tsconfig.json
@@ -1,13 +1,21 @@
 {
-	"extends": "../shared.tsconfig.json",
 	"compilerOptions": {
-		"outDir": "./out",
+		"baseUrl": ".",
 		"experimentalDecorators": true,
-		"typeRoots": [
-			"./node_modules/@types"
-		]
+		"forceConsistentCasingInFileNames": true,
+		"lib": ["es2019"],
+		"module": "commonjs",
+		"moduleResolution": "node",
+		"noFallthroughCasesInSwitch": true,
+		"noImplicitReturns": true,
+		"noUnusedLocals": false,
+		"outDir": "dist",
+		"resolveJsonModule": true,
+		"rootDir": "src",
+		"skipLibCheck": true,
+		"sourceMap": true,
+		"strict": true,
+		"target": "es2019"
 	},
-	"include": [
-		"src/**/*"
-	]
+	"exclude": ["node_modules"]
 }
--- a/extensions/microsoft-authentication/yarn.lock
+++ b/extensions/microsoft-authentication/yarn.lock
@@ -2,22 +2,6 @@
 # yarn lockfile v1


-"@babel/code-frame@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
-  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
-  dependencies:
-    "@babel/highlight" "^7.8.3"
-
-"@babel/highlight@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797"
-  integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==
-  dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^4.0.0"
-
 "@types/keytar@^4.0.1":
  version "4.4.2"
  resolved "https://registry.yarnpkg.com/@types/keytar/-/keytar-4.4.2.tgz#49ef917d6cbb4f19241c0ab50cd35097b5729b32"
@@ -25,15 +9,42 @@
  dependencies:
    keytar "*"

+"@types/node-fetch@^2.5.7":
+  version "2.5.7"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c"
+  integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==
+  dependencies:
+    "@types/node" "*"
+    form-data "^3.0.0"
+
+"@types/node@*":
+  version "14.0.23"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.23.tgz#676fa0883450ed9da0bb24156213636290892806"
+  integrity sha512-Z4U8yDAl5TFkmYsZdFPdjeMa57NOvnaf1tljHzhouaPEp7LCj2JKkejpI1ODviIAQuW4CcQmxkQ77rnLsOOoKw==
+
 "@types/node@^10.12.21":
  version "10.17.13"
  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.13.tgz#ccebcdb990bd6139cd16e84c39dc2fb1023ca90c"
  integrity sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg==

-"@types/uuid@^3.4.6":
-  version "3.4.8"
-  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.4.8.tgz#4ba887fcef88bd9a7515ca2de336d691e3e18318"
-  integrity sha512-zHWce3allXWSmRx6/AGXKCtSOA7JjeWd2L3t4aHfysNk8mouQnWCocveaT7a4IEIlPVHp81jzlnknqTgCjCLXA==
+"@types/randombytes@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@types/randombytes/-/randombytes-2.0.0.tgz#0087ff5e60ae68023b9bc4398b406fea7ad18304"
+  integrity sha512-bz8PhAVlwN72vqefzxa14DKNT8jK/mV66CSjwdVQM/k3Th3EPKfUtdMniwZgMedQTFuywAsfjnZsg+pEnltaMA==
+  dependencies:
+    "@types/node" "*"
+
+"@types/sha.js@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/sha.js/-/sha.js-2.4.0.tgz#bce682ef860b40f419d024fa08600c3b8d24bb01"
+  integrity sha512-amxKgPy6WJTKuw8mpUwjX2BSxuBtBmZfRwIUDIuPJKNwGN8CWDli8JTg5ONTWOtcTkHIstvT7oAhhYXqEjStHQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/uuid@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.0.0.tgz#165aae4819ad2174a17476dbe66feebd549556c0"
+  integrity sha512-xSQfNcvOiE5f9dyd4Kzxbof1aTrLobL278pGLKOZI6esGfZ7ts9Ka16CzIN6Y8hFHE1C7jIBZokULhK1bOgjRw==

 ansi-regex@^2.0.0:
  version "2.1.1"
@@ -45,13 +56,6 @@ ansi-regex@^3.0.0:
  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=

-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
 applicationinsights@1.0.8:
  version "1.0.8"
  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.8.tgz#db6e3d983cf9f9405fe1ee5ba30ac6e1914537b5"
@@ -74,17 +78,15 @@ are-we-there-yet@~1.1.2:
    delegates "^1.0.0"
    readable-stream "^2.0.6"

-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=

-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+base64-js@^1.0.2:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
+  integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==

 bl@^3.0.0:
  version "3.0.0"
@@ -93,27 +95,13 @@ bl@^3.0.0:
  dependencies:
    readable-stream "^3.0.1"

-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+buffer@^5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786"
+  integrity sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==
  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-builtin-modules@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
-
-chalk@^2.0.0, chalk@^2.3.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"

 chownr@^1.1.1:
  version "1.1.3"
@@ -125,27 +113,12 @@ code-point-at@^1.0.0:
  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=

-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+combined-stream@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
  dependencies:
-    color-name "1.1.3"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
-commander@^2.12.1:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+    delayed-stream "~1.0.0"

 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
  version "1.1.0"
@@ -169,6 +142,11 @@ deep-extend@^0.6.0:
  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==

+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+
 delegates@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
@@ -191,10 +169,10 @@ diagnostic-channel@0.2.0:
  dependencies:
    semver "^5.3.0"

-diff@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+emitter-component@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/emitter-component/-/emitter-component-1.1.1.tgz#065e2dbed6959bf470679edabeaf7981d1003ab6"
+  integrity sha1-Bl4tvtaVm/RwZ57avq95gdEAOrY=

 end-of-stream@^1.1.0, end-of-stream@^1.4.1:
  version "1.4.4"
@@ -203,36 +181,25 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:
  dependencies:
    once "^1.4.0"

-escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-esutils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
-  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
-
 expand-template@^2.0.3:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
  integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==

+form-data@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682"
+  integrity sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 fs-constants@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==

-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
 gauge@~2.7.3:
  version "2.7.4"
  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -252,37 +219,17 @@ github-from-package@0.0.0:
  resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
  integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=

-glob@^7.1.1:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
 has-unicode@^2.0.0:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=

-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
+ieee754@^1.1.4:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==

-inherits@2, inherits@^2.0.3, inherits@~2.0.3:
+inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
  version "2.0.4"
  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -309,19 +256,6 @@ isarray@~1.0.0:
  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=

-js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-js-yaml@^3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 keytar@*:
  version "5.0.0"
  resolved "https://registry.yarnpkg.com/keytar/-/keytar-5.0.0.tgz#c89b6b7a4608fd7af633d9f8474b1a7eb97cbe6f"
@@ -330,18 +264,23 @@ keytar@*:
    nan "2.14.0"
    prebuild-install "5.3.3"

+mime-db@1.44.0:
+  version "1.44.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
+  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
+
+mime-types@^2.1.12:
+  version "2.1.27"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
+  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
+  dependencies:
+    mime-db "1.44.0"
+
 mimic-response@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.0.0.tgz#996a51c60adf12cb8a87d7fb8ef24c2f3d5ebb46"
  integrity sha512-8ilDoEapqA4uQ3TwS0jakGONKXVJqpy+RpM+3b7pLdOjghCrEiGp9SRkFbUHAmZW9vdnrENWHjaweIoTIJExSQ==

-minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
 minimist@0.0.8:
  version "0.0.8"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
@@ -376,6 +315,11 @@ node-abi@^2.7.0:
  dependencies:
    semver "^5.4.1"

+node-fetch@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
+  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+
 noop-logger@^0.1.1:
  version "0.1.1"
  resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
@@ -401,23 +345,13 @@ object-assign@^4.1.0:
  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=

-once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@^1.3.1, once@^1.4.0:
  version "1.4.0"
  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
  dependencies:
    wrappy "1"

-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
-
 prebuild-install@5.3.3:
  version "5.3.3"
  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.3.3.tgz#ef4052baac60d465f5ba6bf003c9c1de79b9da8e"
@@ -452,6 +386,12 @@ pump@^3.0.0:
    end-of-stream "^1.1.0"
    once "^1.3.1"

+"randombytes@github:rmacfarlane/randombytes#b28d4ecee46262801ea09f15fa1f1513a05c5971":
+  version "2.1.0"
+  resolved "https://codeload.github.com/rmacfarlane/randombytes/tar.gz/b28d4ecee46262801ea09f15fa1f1513a05c5971"
+  dependencies:
+    safe-buffer "^5.1.0"
+
 rc@^1.2.7:
  version "1.2.8"
  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
@@ -484,18 +424,16 @@ readable-stream@^3.0.1, readable-stream@^3.1.1:
    string_decoder "^1.1.1"
    util-deprecate "^1.0.1"

-resolve@^1.3.2:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.2.tgz#dbf31d0fa98b1f29aa5169783b9c290cb865fea2"
-  integrity sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ==
-  dependencies:
-    path-parse "^1.0.6"
-
 safe-buffer@^5.0.1, safe-buffer@~5.2.0:
  version "5.2.0"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==

+safe-buffer@^5.1.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
 safe-buffer@~5.1.0, safe-buffer@~5.1.1:
  version "5.1.2"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -511,6 +449,14 @@ set-blocking@~2.0.0:
  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=

+sha.js@2.4.11:
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
 signal-exit@^3.0.0:
  version "3.0.2"
  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -530,10 +476,12 @@ simple-get@^3.0.3:
    once "^1.3.1"
    simple-concat "^1.0.0"

-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+stream@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/stream/-/stream-0.0.2.tgz#7f5363f057f6592c5595f00bc80a27f5cec1f0ef"
+  integrity sha1-f1Nj8Ff2WSxVlfALyAon9c7B8O8=
+  dependencies:
+    emitter-component "^1.1.1"

 string-width@^1.0.1:
  version "1.0.2"
@@ -585,13 +533,6 @@ strip-json-comments@~2.0.1:
  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=

-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
 tar-fs@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz#677700fc0c8b337a78bee3623fdc235f21d7afad"
@@ -613,37 +554,6 @@ tar-stream@^2.0.0:
    inherits "^2.0.3"
    readable-stream "^3.1.1"

-tslib@^1.8.0, tslib@^1.8.1:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
-  integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
-
-tslint@^5.12.1:
-  version "5.20.1"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.20.1.tgz#e401e8aeda0152bc44dd07e614034f3f80c67b7d"
-  integrity sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    builtin-modules "^1.1.1"
-    chalk "^2.3.0"
-    commander "^2.12.1"
-    diff "^4.0.1"
-    glob "^7.1.1"
-    js-yaml "^3.13.1"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.1"
-    resolve "^1.3.2"
-    semver "^5.3.0"
-    tslib "^1.8.0"
-    tsutils "^2.29.0"
-
-tsutils@^2.29.0:
-  version "2.29.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
-  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
-  dependencies:
-    tslib "^1.8.1"
-
 tunnel-agent@^0.6.0:
  version "0.6.0"
  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -661,10 +571,10 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=

-uuid@^3.3.3:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+uuid@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.2.0.tgz#cb10dd6b118e2dada7d0cd9730ba7417c93d920e"
+  integrity sha512-CYpGiFTUrmI6OBMkAdjSDM0k5h8SkkiTP4WAjQgDgNB1S3Ou9VBEvr6q0Kv2H1mMk7IWfxYGpMH5sd5AvcIV2Q==

 vscode-extension-telemetry@0.1.1:
  version "0.1.1"
--- a/extensions/shared.webpack.config.js
+++ b/extensions/shared.webpack.config.js
@@ -79,7 +79,7 @@ function withNodeDefaults(/**@type WebpackConfig*/extConfig) {
 	};

 	return merge(defaultConfig, extConfig);
-};
+}


 function withBrowserDefaults(/**@type WebpackConfig*/extConfig) {
@@ -136,7 +136,7 @@ function withBrowserDefaults(/**@type WebpackConfig*/extConfig) {
 	};

 	return merge(defaultConfig, extConfig);
-};
+}


 module.exports = withNodeDefaults;
--- a/extensions/xml/xsl.language-configuration.json
+++ b/extensions/xml/xsl.language-configuration.json
@@ -4,7 +4,11 @@
 		"blockComment": ["<!--", "-->"]
 	},
 	"brackets": [
-		["<", ">"]
+		["<!--", "-->"],
+		["<", ">"],
+		["{", "}"],
+		["(", ")"],
+		["[", "]"]
 	]

 	// enhancedBrackets: [{
--- a/package.json
+++ b/package.json
@@ -135,7 +135,7 @@
    "css-loader": "^3.2.0",
    "debounce": "^1.0.0",
    "deemon": "^1.4.0",
-    "electron": "8.3.3",
+    "electron": "9.1.0",
    "eslint": "6.8.0",
    "eslint-plugin-jsdoc": "^19.1.0",
    "event-stream": "3.3.4",
--- a/remote/.yarnrc
+++ b/remote/.yarnrc
@@ -1,3 +1,3 @@
 disturl "http://nodejs.org/dist"
-target "12.4.0"
+target "12.14.1"
 runtime "node"
--- a/scripts/test-integration.bat
+++ b/scripts/test-integration.bat
@@ -37,8 +37,8 @@ if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (

 :: Tests in the extension host

-:: call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-notebook-tests\test --enable-proposed-api=vscode.vscode-notebook-tests --extensionDevelopmentPath=%~dp0\..\extensions\vscode-notebook-tests --extensionTestsPath=%~dp0\..\extensions\vscode-notebook-tests\out --disable-telemetry --crash-reporter-directory=%VSCODECRASHDIR% --no-cached-data --disable-updates --disable-extensions --user-data-dir=%VSCODEUSERDATADIR%
-:: if %errorlevel% neq 0 exit /b %errorlevel%
+REM call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-notebook-tests\test --enable-proposed-api=vscode.vscode-notebook-tests --extensionDevelopmentPath=%~dp0\..\extensions\vscode-notebook-tests --extensionTestsPath=%~dp0\..\extensions\vscode-notebook-tests\out --disable-telemetry --crash-reporter-directory=%VSCODECRASHDIR% --no-cached-data --disable-updates --disable-extensions --user-data-dir=%VSCODEUSERDATADIR%
+REM if %errorlevel% neq 0 exit /b %errorlevel%

 REM call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-api-tests\testWorkspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=%~dp0\..\extensions\vscode-api-tests --extensionTestsPath=%~dp0\..\extensions\vscode-api-tests\out\singlefolder-tests --disable-telemetry --crash-reporter-directory=%VSCODECRASHDIR% --no-cached-data --disable-updates --disable-extensions --user-data-dir=%VSCODEUSERDATADIR%
 REM if %errorlevel% neq 0 exit /b %errorlevel%
--- a/scripts/test-integration.sh
+++ b/scripts/test-integration.sh
@@ -41,7 +41,6 @@ fi
 ./scripts/test.sh --runGlob **/*.integrationTest.js "$@"

 # Tests in the extension host
-# "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/vscode-notebook-tests/test --enable-proposed-api=vscode.vscode-notebook-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-notebook-tests --extensionTestsPath=$ROOT/extensions/vscode-notebook-tests/out/ --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR
 # "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/vscode-api-tests/testWorkspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/singlefolder-tests --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR
 # "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/vscode-api-tests/testworkspace.code-workspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/workspace-tests --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR
 # "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/vscode-colorize-tests/test --extensionDevelopmentPath=$ROOT/extensions/vscode-colorize-tests --extensionTestsPath=$ROOT/extensions/vscode-colorize-tests/out --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR
@@ -49,6 +48,7 @@ fi
 # "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/typescript-language-features/test-workspace --extensionDevelopmentPath=$ROOT/extensions/typescript-language-features --extensionTestsPath=$ROOT/extensions/typescript-language-features/out/test --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR
 # "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/emmet/out/test/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/emmet --extensionTestsPath=$ROOT/extensions/emmet/out/test --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions  --user-data-dir=$VSCODEUSERDATADIR
 "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $(mktemp -d 2>/dev/null) --enable-proposed-api=vscode.git --extensionDevelopmentPath=$ROOT/extensions/git --extensionTestsPath=$ROOT/extensions/git/out/test --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR
+# "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/vscode-notebook-tests/test --enable-proposed-api=vscode.vscode-notebook-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-notebook-tests --extensionTestsPath=$ROOT/extensions/vscode-notebook-tests/out/ --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR

 "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/azurecore/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/azurecore --extensionTestsPath=$ROOT/extensions/azurecore/out/test --no-cached-data --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR

--- a/src/bootstrap-amd.js
+++ b/src/bootstrap-amd.js
@@ -14,7 +14,7 @@ const nlsConfig = bootstrap.setupNLS();

 // Bootstrap: Loader
 loader.config({
-	baseUrl: bootstrap.uriFromPath(__dirname),
+	baseUrl: bootstrap.fileUriFromPath(__dirname),
 	catchError: true,
 	nodeRequire: require,
 	nodeMain: __filename,
--- a/src/bootstrap-window.js
+++ b/src/bootstrap-window.js
@@ -21,8 +21,9 @@
 		globalThis.MonacoBootstrapWindow = factory();
 	}
 }(this, function () {
-	const path = require.__$__nodeRequire('path');
-	const bootstrap = globalThis.MonacoBootstrap;
+	const preloadGlobals = globals();
+	const sandbox = preloadGlobals.context.sandbox;
+	const safeProcess = sandbox ? preloadGlobals.process : process;

 	/**
 	 * @param {string[]} modulePaths
@@ -43,29 +44,33 @@
 		const configuration = JSON.parse(args['config'] || '{}') || {};

 		// Error handler
-		process.on('uncaughtException', function (error) {
+		safeProcess.on('uncaughtException', function (error) {
 			onUnexpectedError(error, enableDeveloperTools);
 		});

 		// Developer tools
-		const enableDeveloperTools = (process.env['VSCODE_DEV'] || !!configuration.extensionDevelopmentPath) && !configuration.extensionTestsPath;
+		const enableDeveloperTools = (safeProcess.env['VSCODE_DEV'] || !!configuration.extensionDevelopmentPath) && !configuration.extensionTestsPath;
 		let developerToolsUnbind;
 		if (enableDeveloperTools || (options && options.forceEnableDeveloperKeybindings)) {
 			developerToolsUnbind = registerDeveloperKeybindings(options && options.disallowReloadKeybinding);
 		}

-		// Correctly inherit the parent's environment
-		Object.assign(process.env, configuration.userEnv);
+		// Correctly inherit the parent's environment (TODO@sandbox non-sandboxed only)
+		if (!sandbox) {
+			Object.assign(safeProcess.env, configuration.userEnv);
+		}

-		// Enable ASAR support
-		bootstrap.enableASARSupport(path.join(configuration.appRoot, 'node_modules'));
+		// Enable ASAR support (TODO@sandbox non-sandboxed only)
+		if (!sandbox) {
+			globalThis.MonacoBootstrap.enableASARSupport(configuration.appRoot);
+		}

 		if (options && typeof options.canModifyDOM === 'function') {
 			options.canModifyDOM(configuration);
 		}

-		// Get the nls configuration into the process.env as early as possible.
-		const nlsConfig = bootstrap.setupNLS();
+		// Get the nls configuration into the process.env as early as possible  (TODO@sandbox non-sandboxed only)
+		const nlsConfig = sandbox ? { availableLanguages: {} } : globalThis.MonacoBootstrap.setupNLS();

 		let locale = nlsConfig.availableLanguages['*'] || 'en';
 		if (locale === 'zh-tw') {
@@ -76,16 +81,20 @@

 		window.document.documentElement.setAttribute('lang', locale);

-		// do not advertise AMD to avoid confusing UMD modules loaded with nodejs
-		window['define'] = undefined;
+		// do not advertise AMD to avoid confusing UMD modules loaded with nodejs (TODO@sandbox non-sandboxed only)
+		if (!sandbox) {
+			window['define'] = undefined;
+		}

-		// replace the patched electron fs with the original node fs for all AMD code
-		require.define('fs', ['original-fs'], function (originalFS) { return originalFS; });
+		// replace the patched electron fs with the original node fs for all AMD code (TODO@sandbox non-sandboxed only)
+		if (!sandbox) {
+			require.define('fs', ['original-fs'], function (originalFS) { return originalFS; });
+		}

 		window['MonacoEnvironment'] = {};

 		const loaderConfig = {
-			baseUrl: `${bootstrap.uriFromPath(configuration.appRoot)}/out`,
+			baseUrl: `${uriFromPath(configuration.appRoot)}/out`,
 			'vs/nls': nlsConfig,
 			amdModulesPattern: /^(vs|sql)\//, // {{SQL CARBON EDIT}} include sql in regex
 		};
@@ -150,7 +159,7 @@
 	 * @returns {() => void}
 	 */
 	function registerDeveloperKeybindings(disallowReloadKeybinding) {
-		const ipcRenderer = globals().ipcRenderer;
+		const ipcRenderer = preloadGlobals.ipcRenderer;

 		const extractKey = function (e) {
 			return [
@@ -163,9 +172,9 @@
 		};

 		// Devtools & reload support
-		const TOGGLE_DEV_TOOLS_KB = (process.platform === 'darwin' ? 'meta-alt-73' : 'ctrl-shift-73'); // mac: Cmd-Alt-I, rest: Ctrl-Shift-I
+		const TOGGLE_DEV_TOOLS_KB = (safeProcess.platform === 'darwin' ? 'meta-alt-73' : 'ctrl-shift-73'); // mac: Cmd-Alt-I, rest: Ctrl-Shift-I
 		const TOGGLE_DEV_TOOLS_KB_ALT = '123'; // F12
-		const RELOAD_KB = (process.platform === 'darwin' ? 'meta-82' : 'ctrl-82'); // mac: Cmd-R, rest: Ctrl-R
+		const RELOAD_KB = (safeProcess.platform === 'darwin' ? 'meta-82' : 'ctrl-82'); // mac: Cmd-R, rest: Ctrl-R

 		let listener = function (e) {
 			const key = extractKey(e);
@@ -192,7 +201,7 @@
 	 */
 	function onUnexpectedError(error, enableDeveloperTools) {
 		if (enableDeveloperTools) {
-			const ipcRenderer = globals().ipcRenderer;
+			const ipcRenderer = preloadGlobals.ipcRenderer;
 			ipcRenderer.send('vscode:openDevTools');
 		}

@@ -211,6 +220,31 @@
 		return window.vscode;
 	}

+	/**
+	 * TODO@sandbox this should not use the file:// protocol at all
+	 * and be consolidated with the fileUriFromPath() method in
+	 * bootstrap.js.
+	 *
+	 * @param {string} path
+	 * @returns {string}
+	 */
+	function uriFromPath(path) {
+		let pathName = path.replace(/\\/g, '/');
+		if (pathName.length > 0 && pathName.charAt(0) !== '/') {
+			pathName = `/${pathName}`;
+		}
+
+		/** @type {string} */
+		let uri;
+		if (safeProcess.platform === 'win32' && pathName.startsWith('//')) { // specially handle Windows UNC paths
+			uri = encodeURI(`file:${pathName}`);
+		} else {
+			uri = encodeURI(`file://${pathName}`);
+		}
+
+		return uri.replace(/#/g, '%23');
+	}
+
 	return {
 		load,
 		globals
--- a/src/bootstrap.js
+++ b/src/bootstrap.js
@@ -16,7 +16,11 @@

 	// Browser
 	else {
-		globalThis.MonacoBootstrap = factory();
+		try {
+			globalThis.MonacoBootstrap = factory();
+		} catch (error) {
+			console.warn(error); // expected when e.g. running with sandbox: true (TODO@sandbox eventually consolidate this)
+		}
 	}
 }(this, function () {
 	const Module = require('module');
@@ -40,10 +44,10 @@
 	//#region Add support for using node_modules.asar

 	/**
-	 * @param {string=} nodeModulesPath
+	 * @param {string} appRoot
 	 */
-	function enableASARSupport(nodeModulesPath) {
-		let NODE_MODULES_PATH = nodeModulesPath;
+	function enableASARSupport(appRoot) {
+		let NODE_MODULES_PATH = appRoot ? path.join(appRoot, 'node_modules') : undefined;
 		if (!NODE_MODULES_PATH) {
 			NODE_MODULES_PATH = path.join(__dirname, '../node_modules');
 		} else {
@@ -83,7 +87,7 @@
 	 * @param {string} _path
 	 * @returns {string}
 	 */
-	function uriFromPath(_path) {
+	function fileUriFromPath(_path) {
 		let pathName = path.resolve(_path).replace(/\\/g, '/');
 		if (pathName.length > 0 && pathName.charAt(0) !== '/') {
 			pathName = `/${pathName}`;
@@ -132,7 +136,7 @@
 				}

 				const bundleFile = path.join(nlsConfig._resolvedLanguagePackCoreLocation, `${bundle.replace(/\//g, '!')}.nls.json`);
-				readFile(bundleFile).then(function (content) {
+				fs.promises.readFile(bundleFile, 'utf8').then(function (content) {
 					const json = JSON.parse(content);
 					bundles[bundle] = json;

@@ -140,7 +144,7 @@
 				}).catch((error) => {
 					try {
 						if (nlsConfig._corruptedFile) {
-							writeFile(nlsConfig._corruptedFile, 'corrupted').catch(function (error) { console.error(error); });
+							fs.promises.writeFile(nlsConfig._corruptedFile, 'corrupted', 'utf8').catch(function (error) { console.error(error); });
 						}
 					} finally {
 						cb(error, undefined);
@@ -152,23 +156,6 @@
 		return nlsConfig;
 	}

-	/**
-	 * @param {string} file
-	 * @returns {Promise<string>}
-	 */
-	function readFile(file) {
-		return fs.promises.readFile(file, 'utf8');
-	}
-
-	/**
-	 * @param {string} file
-	 * @param {string} content
-	 * @returns {Promise<void>}
-	 */
-	function writeFile(file, content) {
-		return fs.promises.writeFile(file, content, 'utf8');
-	}
-
 	//#endregion


@@ -254,6 +241,6 @@
 		avoidMonkeyPatchFromAppInsights,
 		configurePortable,
 		setupNLS,
-		uriFromPath
+		fileUriFromPath
 	};
 }));
--- a/src/main.js
+++ b/src/main.js
@@ -18,7 +18,11 @@ const bootstrap = require('./bootstrap');
 const paths = require('./paths');
 /** @type {any} */
 const product = require('../product.json');
-const { app, protocol } = require('electron');
+const { app, protocol, crashReporter } = require('electron');
+
+// Disable render process reuse, we still have
+// non-context aware native modules in the renderer.
+app.allowRendererProcessReuse = false;

 // Enable portable support
 const portable = bootstrap.configurePortable(product);
@@ -38,13 +42,13 @@ if (args['nogpu']) { // {{SQL CARBON EDIT}}
 const userDataPath = getUserDataPath(args);
 app.setPath('userData', userDataPath);

-// Set temp directory based on crash-reporter-directory CLI argument
-// The crash reporter will store crashes in temp folder so we need
-// to change that location accordingly.
+// Configure static command line arguments
+const argvConfig = configureCommandlineSwitchesSync(args);

-// If a crash-reporter-directory is specified we setup the crash reporter
-// right from the beginning as early as possible to monitor all processes.
+// If a crash-reporter-directory is specified we store the crash reports
+// in the specified directory and don't upload them to the crash server.
 let crashReporterDirectory = args['crash-reporter-directory'];
+let submitURL = '';
 if (crashReporterDirectory) {
 	crashReporterDirectory = path.normalize(crashReporterDirectory);

@@ -62,23 +66,41 @@ if (crashReporterDirectory) {
 		}
 	}

-	// Crashes are stored in the temp directory by default, so we
+	// Crashes are stored in the crashDumps directory by default, so we
 	// need to change that directory to the provided one
-	console.log(`Found --crash-reporter-directory argument. Setting temp directory to be '${crashReporterDirectory}'`);
-	app.setPath('temp', crashReporterDirectory);
-
-	// Start crash reporter
-	const { crashReporter } = require('electron');
-	const productName = (product.crashReporter && product.crashReporter.productName) || product.nameShort;
-	const companyName = (product.crashReporter && product.crashReporter.companyName) || 'Microsoft';
-	crashReporter.start({
-		companyName: companyName,
-		productName: process.env['VSCODE_DEV'] ? `${productName} Dev` : productName,
-		submitURL: '',
-		uploadToServer: false
-	});
+	console.log(`Found --crash-reporter-directory argument. Setting crashDumps directory to be '${crashReporterDirectory}'`);
+	app.setPath('crashDumps', crashReporterDirectory);
+} else {
+	const appCenter = product.appCenter;
+	// Disable Appcenter crash reporting if
+	// * --crash-reporter-directory is specified
+	// * enable-crash-reporter runtime argument is set to 'false'
+	// * --disable-crash-reporter command line parameter is set
+	if (appCenter && argvConfig['enable-crash-reporter'] && !args['disable-crash-reporter']) {
+		const isWindows = (process.platform === 'win32');
+		const isLinux = (process.platform === 'linux');
+		const crashReporterId = argvConfig['crash-reporter-id'];
+		const uuidPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+		if (uuidPattern.test(crashReporterId)) {
+			submitURL = isWindows ? appCenter[process.arch === 'ia32' ? 'win32-ia32' : 'win32-x64'] : isLinux ? appCenter[`linux-x64`] : appCenter.darwin;
+			submitURL = submitURL.concat('&uid=', crashReporterId, '&iid=', crashReporterId, '&sid=', crashReporterId);
+			// Send the id for child node process that are explicitly starting crash reporter.
+			// For vscode this is ExtensionHost process currently.
+			process.argv.push('--crash-reporter-id', crashReporterId);
+		}
+	}
 }

+// Start crash reporter for all processes
+const productName = (product.crashReporter ? product.crashReporter.productName : undefined) || product.nameShort;
+const companyName = (product.crashReporter ? product.crashReporter.companyName : undefined) || 'Microsoft';
+crashReporter.start({
+	companyName: companyName,
+	productName: process.env['VSCODE_DEV'] ? `${productName} Dev` : productName,
+	submitURL,
+	uploadToServer: !crashReporterDirectory
+});
+
 // Set logs path before app 'ready' event if running portable
 // to ensure that no 'logs' folder is created on disk at a
 // location outside of the portable directory
@@ -117,9 +139,6 @@ registerListeners();
 // Cached data
 const nodeCachedDataDir = getNodeCachedDir();

-// Configure static command line arguments
-const argvConfig = configureCommandlineSwitchesSync(args);
-
 // Remove env set by snap https://github.com/microsoft/vscode/issues/85344
 if (process.env['SNAP']) {
 	delete process.env['GDK_PIXBUF_MODULE_FILE'];
@@ -261,9 +280,6 @@ function configureCommandlineSwitchesSync(cliArgs) {
 		app.commandLine.appendSwitch('js-flags', jsFlags);
 	}

-	// TODO@Deepak Electron 7 workaround for https://github.com/microsoft/vscode/issues/88873
-	app.commandLine.appendSwitch('disable-features', 'LayoutNG');
-
 	return argvConfig;
 }

--- a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf
+++ b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf
--- a/src/vs/base/common/codicons.ts
+++ b/src/vs/base/common/codicons.ts
@@ -476,6 +476,8 @@ export namespace Codicon {
 	export const record = new Codicon('record', { character: '\\eba7' });
 	export const debugAltSmall = new Codicon('debug-alt-small', { character: '\\eba8' });
 	export const vmConnect = new Codicon('vm-connect', { character: '\\eba9' });
+	export const cloud = new Codicon('cloud', { character: '\\ebaa' });
+	export const merge = new Codicon('merge', { character: '\\ebab' });
 }


--- a/src/vs/base/common/json.ts
+++ b/src/vs/base/common/json.ts
@@ -72,6 +72,7 @@ export interface JSONScanner {
 }


+
 export interface ParseError {
 	error: ParseErrorCode;
 	offset: number;
--- a/src/vs/base/common/scrollable.ts
+++ b/src/vs/base/common/scrollable.ts
@@ -332,6 +332,12 @@ export class Scrollable extends Disposable {

 		this._setState(newState);

+		if (!this._smoothScrolling) {
+			// Looks like someone canceled the smooth scrolling
+			// from the scroll event handler
+			return;
+		}
+
 		if (update.isDone) {
 			this._smoothScrolling.dispose();
 			this._smoothScrolling = null;
--- a/src/vs/base/common/uri.ts
+++ b/src/vs/base/common/uri.ts
@@ -252,7 +252,7 @@ export class URI implements UriComponents {
 			return this;
 		}

-		return new CachingURI(scheme, authority, path, query, fragment);
+		return new Uri(scheme, authority, path, query, fragment);
 	}

 	// ---- parse & validate ------------------------
@@ -266,9 +266,9 @@ export class URI implements UriComponents {
 	static parse(value: string, _strict: boolean = false): URI {
 		const match = _regexp.exec(value);
 		if (!match) {
-			return new CachingURI(_empty, _empty, _empty, _empty, _empty);
+			return new Uri(_empty, _empty, _empty, _empty, _empty);
 		}
-		return new CachingURI(
+		return new Uri(
 			match[2] || _empty,
 			percentDecode(match[4] || _empty),
 			percentDecode(match[5] || _empty),
@@ -323,11 +323,11 @@ export class URI implements UriComponents {
 			}
 		}

-		return new CachingURI('file', authority, path, _empty, _empty);
+		return new Uri('file', authority, path, _empty, _empty);
 	}

 	static from(components: { scheme: string; authority?: string; path?: string; query?: string; fragment?: string }): URI {
-		return new CachingURI(
+		return new Uri(
 			components.scheme,
 			components.authority,
 			components.path,
@@ -388,7 +388,7 @@ export class URI implements UriComponents {
 		} else if (data instanceof URI) {
 			return data;
 		} else {
-			const result = new CachingURI(data);
+			const result = new Uri(data);
 			result._formatted = (<UriState>data).external;
 			result._fsPath = (<UriState>data)._sep === _pathSepMarker ? (<UriState>data).fsPath : null;
 			return result;
@@ -414,7 +414,7 @@ interface UriState extends UriComponents {
 const _pathSepMarker = isWindows ? 1 : undefined;

 // This class exists so that URI is compatibile with vscode.Uri (API).
-class CachingURI extends URI {
+class Uri extends URI {

 	_formatted: string | null = null;
 	_fsPath: string | null = null;
--- a/src/vs/base/node/terminalEncoding.ts
+++ b/src/vs/base/node/terminalEncoding.ts
@@ -61,6 +61,10 @@ export async function resolveTerminalEncoding(verbose?: boolean): Promise<string

 			exec('chcp', (err, stdout, stderr) => {
 				if (stdout) {
+					if (verbose) {
+						console.log(`Output from "chcp" command is: ${stdout}`);
+					}
+
 					const windowsTerminalEncodingKeys = Object.keys(windowsTerminalEncodings) as Array<keyof typeof windowsTerminalEncodings>;
 					for (const key of windowsTerminalEncodingKeys) {
 						if (stdout.indexOf(key) >= 0) {
--- a/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts
+++ b/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts
@@ -5,14 +5,14 @@

 import { Menu, MenuItem, BrowserWindow, ipcMain, IpcMainEvent } from 'electron';
 import { ISerializableContextMenuItem, CONTEXT_MENU_CLOSE_CHANNEL, CONTEXT_MENU_CHANNEL, IPopupOptions } from 'vs/base/parts/contextmenu/common/contextmenu';
+import { withNullAsUndefined } from 'vs/base/common/types';

 export function registerContextMenuListener(): void {
 	ipcMain.on(CONTEXT_MENU_CHANNEL, (event: IpcMainEvent, contextMenuId: number, items: ISerializableContextMenuItem[], onClickChannel: string, options?: IPopupOptions) => {
 		const menu = createMenu(event, onClickChannel, items);
-		const window = BrowserWindow.fromWebContents(event.sender);

 		menu.popup({
-			window: window ? window : undefined,
+			window: withNullAsUndefined(BrowserWindow.fromWebContents(event.sender)),
 			x: options ? options.x : undefined,
 			y: options ? options.y : undefined,
 			positioningItem: options ? options.positioningItem : undefined,
--- a/src/vs/base/parts/sandbox/common/electronTypes.ts
+++ b/src/vs/base/parts/sandbox/common/electronTypes.ts
@@ -209,37 +209,6 @@ export interface SaveDialogReturnValue {
 	bookmark?: string;
 }

-export interface CrashReporterStartOptions {
-	companyName: string;
-	/**
-	 * URL that crash reports will be sent to as POST.
-	 */
-	submitURL: string;
-	/**
-	 * Defaults to `app.name`.
-	 */
-	productName?: string;
-	/**
-	 * Whether crash reports should be sent to the server. Default is `true`.
-	 */
-	uploadToServer?: boolean;
-	/**
-	 * Default is `false`.
-	 */
-	ignoreSystemCrashHandler?: boolean;
-	/**
-	 * An object you can define that will be sent along with the report. Only string
-	 * properties are sent correctly. Nested objects are not supported. When using
-	 * Windows, the property names and values must be fewer than 64 characters.
-	 */
-	extra?: Record<string, string>;
-	/**
-	 * Directory to store the crash reports temporarily (only used when the crash
-	 * reporter is started via `process.crashReporter.start`).
-	 */
-	crashesDirectory?: string;
-}
-
 export interface FileFilter {

 	// Docs: http://electronjs.org/docs/api/structures/file-filter
@@ -281,3 +250,62 @@ export interface MouseInputEvent extends InputEvent {
 	x: number;
 	y: number;
 }
+
+export interface CrashReporterStartOptions {
+	/**
+	 * URL that crash reports will be sent to as POST.
+	 */
+	submitURL: string;
+	/**
+	 * Defaults to `app.name`.
+	 */
+	productName?: string;
+	/**
+	 * Deprecated alias for `{ globalExtra: { _companyName: ... } }`.
+	 *
+	 * @deprecated
+	 */
+	companyName?: string;
+	/**
+	 * Whether crash reports should be sent to the server. If false, crash reports will
+	 * be collected and stored in the crashes directory, but not uploaded. Default is
+	 * `true`.
+	 */
+	uploadToServer?: boolean;
+	/**
+	 * If true, crashes generated in the main process will not be forwarded to the
+	 * system crash handler. Default is `false`.
+	 */
+	ignoreSystemCrashHandler?: boolean;
+	/**
+	 * If true, limit the number of crashes uploaded to 1/hour. Default is `false`.
+	 *
+	 * @platform darwin,win32
+	 */
+	rateLimit?: boolean;
+	/**
+	 * If true, crash reports will be compressed and uploaded with `Content-Encoding:
+	 * gzip`. Not all collection servers support compressed payloads. Default is
+	 * `false`.
+	 *
+	 * @platform darwin,win32
+	 */
+	compress?: boolean;
+	/**
+	 * Extra string key/value annotations that will be sent along with crash reports
+	 * that are generated in the main process. Only string values are supported.
+	 * Crashes generated in child processes will not contain these extra parameters to
+	 * crash reports generated from child processes, call `addExtraParameter` from the
+	 * child process.
+	 */
+	extra?: Record<string, string>;
+	/**
+	 * Extra string key/value annotations that will be sent along with any crash
+	 * reports generated in any process. These annotations cannot be changed once the
+	 * crash reporter has been started. If a key is present in both the global extra
+	 * parameters and the process-specific extra parameters, then the global one will
+	 * take precedence. By default, `productName` and the app version are included, as
+	 * well as the Electron version.
+	 */
+	globalExtra?: Record<string, string>;
+}
--- a/src/vs/base/parts/sandbox/electron-browser/preload.js
+++ b/src/vs/base/parts/sandbox/electron-browser/preload.js
@@ -7,16 +7,13 @@
 (function () {
 	'use strict';

-	const { ipcRenderer, webFrame, crashReporter } = require('electron');
+	const { ipcRenderer, webFrame, crashReporter, contextBridge } = require('electron');

-	// @ts-ignore
-	window.vscode = {
+	const globals = {

 		/**
-		 * A minimal set of methods exposed from ipcRenderer
-		 * to support communication to electron-main
-		 *
-		 * @type {typeof import('../electron-sandbox/globals').ipcRenderer}
+		 * A minimal set of methods exposed from Electron's `ipcRenderer`
+		 * to support communication to main process.
 		 */
 		ipcRenderer: {

@@ -25,9 +22,9 @@
 			 * @param {any[]} args
 			 */
 			send(channel, ...args) {
-				validateIPC(channel);
-
-				ipcRenderer.send(channel, ...args);
+				if (validateIPC(channel)) {
+					ipcRenderer.send(channel, ...args);
+				}
 			},

 			/**
@@ -35,9 +32,9 @@
 			 * @param {(event: import('electron').IpcRendererEvent, ...args: any[]) => void} listener
 			 */
 			on(channel, listener) {
-				validateIPC(channel);
-
-				ipcRenderer.on(channel, listener);
+				if (validateIPC(channel)) {
+					ipcRenderer.on(channel, listener);
+				}
 			},

 			/**
@@ -45,9 +42,9 @@
 			 * @param {(event: import('electron').IpcRendererEvent, ...args: any[]) => void} listener
 			 */
 			once(channel, listener) {
-				validateIPC(channel);
-
-				ipcRenderer.once(channel, listener);
+				if (validateIPC(channel)) {
+					ipcRenderer.once(channel, listener);
+				}
 			},

 			/**
@@ -55,16 +52,14 @@
 			 * @param {(event: import('electron').IpcRendererEvent, ...args: any[]) => void} listener
 			 */
 			removeListener(channel, listener) {
-				validateIPC(channel);
-
-				ipcRenderer.removeListener(channel, listener);
+				if (validateIPC(channel)) {
+					ipcRenderer.removeListener(channel, listener);
+				}
 			}
 		},

 		/**
-		 * Support for methods of webFrame type.
-		 *
-		 * @type {typeof import('../electron-sandbox/globals').webFrame}
+		 * Support for subset of methods of Electron's `webFrame` type.
 		 */
 		webFrame: {

@@ -72,26 +67,71 @@
 			 * @param {number} level
 			 */
 			setZoomLevel(level) {
-				webFrame.setZoomLevel(level);
+				if (typeof level === 'number') {
+					webFrame.setZoomLevel(level);
+				}
 			}
 		},

 		/**
-		 * Support for methods of crashReporter type.
-		 *
-		 * @type {typeof import('../electron-sandbox/globals').crashReporter}
+		 * Support for subset of methods of Electron's `crashReporter` type.
 		 */
 		crashReporter: {

 			/**
-			 * @param {Electron.CrashReporterStartOptions} options
+			 * @param {string} key
+			 * @param {string} value
 			 */
-			start(options) {
-				crashReporter.start(options);
+			addExtraParameter(key, value) {
+				crashReporter.addExtraParameter(key, value);
 			}
+		},
+
+		/**
+		 * Support for a subset of access to node.js global `process`.
+		 */
+		process: {
+			platform: process.platform,
+			env: process.env,
+			on:
+				/**
+				 * @param {string} type
+				 * @param {() => void} callback
+				 */
+				function (type, callback) {
+					if (validateProcessEventType(type)) {
+						process.on(type, callback);
+					}
+				}
+		},
+
+		/**
+		 * Some information about the context we are running in.
+		 */
+		context: {
+			sandbox: process.argv.includes('--enable-sandbox')
 		}
 	};

+	// Use `contextBridge` APIs to expose globals to VSCode
+	// only if context isolation is enabled, otherwise just
+	// add to the DOM global.
+	let useContextBridge = process.argv.includes('--context-isolation');
+	if (useContextBridge) {
+		try {
+			contextBridge.exposeInMainWorld('vscode', globals);
+		} catch (error) {
+			console.error(error);
+
+			useContextBridge = false;
+		}
+	}
+
+	if (!useContextBridge) {
+		// @ts-ignore
+		window.vscode = globals;
+	}
+
 	//#region Utilities

 	/**
@@ -101,6 +141,20 @@
 		if (!channel || !channel.startsWith('vscode:')) {
 			throw new Error(`Unsupported event IPC channel '${channel}'`);
 		}
+
+		return true;
+	}
+
+	/**
+	 * @param {string} type
+	 * @returns {type is 'uncaughtException'}
+	 */
+	function validateProcessEventType(type) {
+		if (type !== 'uncaughtException') {
+			throw new Error(`Unsupported process event '${type}'`);
+		}
+
+		return true;
 	}

 	//#endregion
--- a/src/vs/base/parts/sandbox/electron-sandbox/globals.ts
+++ b/src/vs/base/parts/sandbox/electron-sandbox/globals.ts
@@ -3,8 +3,6 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

-import { CrashReporterStartOptions } from 'vs/base/parts/sandbox/common/electronTypes';
-
 export const ipcRenderer = (window as any).vscode.ipcRenderer as {

 	/**
@@ -54,30 +52,48 @@ export const webFrame = (window as any).vscode.webFrame as {
 export const crashReporter = (window as any).vscode.crashReporter as {

 	/**
-	 * You are required to call this method before using any other `crashReporter` APIs
-	 * and in each process (main/renderer) from which you want to collect crash
-	 * reports. You can pass different options to `crashReporter.start` when calling
-	 * from different processes.
+	 * Set an extra parameter to be sent with the crash report. The values specified
+	 * here will be sent in addition to any values set via the `extra` option when
+	 * `start` was called.
 	 *
-	 * **Note** Child processes created via the `child_process` module will not have
-	 * access to the Electron modules. Therefore, to collect crash reports from them,
-	 * use `process.crashReporter.start` instead. Pass the same options as above along
-	 * with an additional one called `crashesDirectory` that should point to a
-	 * directory to store the crash reports temporarily. You can test this out by
-	 * calling `process.crash()` to crash the child process.
+	 * Parameters added in this fashion (or via the `extra` parameter to
+	 * `crashReporter.start`) are specific to the calling process. Adding extra
+	 * parameters in the main process will not cause those parameters to be sent along
+	 * with crashes from renderer or other child processes. Similarly, adding extra
+	 * parameters in a renderer process will not result in those parameters being sent
+	 * with crashes that occur in other renderer processes or in the main process.
 	 *
-	 * **Note:** If you need send additional/updated `extra` parameters after your
-	 * first call `start` you can call `addExtraParameter` on macOS or call `start`
-	 * again with the new/updated `extra` parameters on Linux and Windows.
-	 *
-	 * **Note:** On macOS and windows, Electron uses a new `crashpad` client for crash
-	 * collection and reporting. If you want to enable crash reporting, initializing
-	 * `crashpad` from the main process using `crashReporter.start` is required
-	 * regardless of which process you want to collect crashes from. Once initialized
-	 * this way, the crashpad handler collects crashes from all processes. You still
-	 * have to call `crashReporter.start` from the renderer or child process, otherwise
-	 * crashes from them will get reported without `companyName`, `productName` or any
-	 * of the `extra` information.
+	 * **Note:** Parameters have limits on the length of the keys and values. Key names
+	 * must be no longer than 39 bytes, and values must be no longer than 127 bytes.
+	 * Keys with names longer than the maximum will be silently ignored. Key values
+	 * longer than the maximum length will be truncated.
 	 */
-	start(options: CrashReporterStartOptions): void;
+	addExtraParameter(key: string, value: string): void;
+};
+
+export const process = (window as any).vscode.process as {
+
+	/**
+	 * The process.platform property returns a string identifying the operating system platform
+	 * on which the Node.js process is running.
+	 */
+	platform: 'win32' | 'linux' | 'darwin';
+
+	/**
+	 * The process.env property returns an object containing the user environment. See environ(7).
+	 */
+	env: { [key: string]: string | undefined };
+
+	/**
+	 * A listener on the process. Only a small subset of listener types are allowed.
+	 */
+	on: (type: string, callback: Function) => void;
+};
+
+export const context = (window as any).vscode.context as {
+
+	/**
+	 * Wether the renderer runs with `sandbox` enabled or not.
+	 */
+	sandbox: boolean;
 };
--- a/src/vs/code/browser/workbench/workbench.ts
+++ b/src/vs/code/browser/workbench/workbench.ts
@@ -12,7 +12,7 @@ import { request } from 'vs/base/parts/request/browser/request';
 import { isFolderToOpen, isWorkspaceToOpen } from 'vs/platform/windows/common/windows';
 import { isEqual } from 'vs/base/common/resources';
 import { isStandalone } from 'vs/base/browser/browser';
-import { mark } from 'vs/base/common/performance';
+import { localize } from 'vs/nls';

 interface ICredential {
 	service: string;
@@ -278,10 +278,6 @@ class WorkspaceProvider implements IWorkspaceProvider {

 (function () {

-	// Mark start of workbench
-	mark('didLoadWorkbenchMain');
-	performance.mark('workbench-start');
-
 	// Find config by checking for DOM
 	const configElement = document.getElementById('vscode-workbench-web-configuration');
 	const configElementAttribute = configElement ? configElement.getAttribute('data-settings') : undefined;
@@ -350,6 +346,11 @@ class WorkspaceProvider implements IWorkspaceProvider {
 	// Finally create workbench
 	create(document.body, {
 		...config,
+		homeIndicator: {
+			href: 'https://github.com/Microsoft/vscode',
+			icon: 'code',
+			title: localize('home', "Home")
+		},
 		workspaceProvider: new WorkspaceProvider(workspace, payload),
 		urlCallbackProvider: new PollingURLCallbackProvider(),
 		credentialsProvider: new LocalStorageCredentialsProvider()
--- a/src/vs/code/buildfile.js
+++ b/src/vs/code/buildfile.js
@@ -26,6 +26,6 @@ exports.collectModules = function () {
 		createModuleDescription('vs/code/electron-browser/sharedProcess/sharedProcessMain', []),
 		createModuleDescription('vs/code/electron-browser/issue/issueReporterMain', []),
 		createModuleDescription('vs/platform/driver/node/driver', []),
-		createModuleDescription('vs/code/electron-browser/processExplorer/processExplorerMain', [])
+		createModuleDescription('vs/code/electron-sandbox/processExplorer/processExplorerMain', [])
 	];
 };
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -82,6 +82,10 @@ import { WebviewMainService } from 'vs/platform/webview/electron-main/webviewMai
 import { IWebviewManagerService } from 'vs/platform/webview/common/webviewManagerService';
 import { createServer, AddressInfo } from 'net';
 import { IOpenExtensionWindowResult } from 'vs/platform/debug/common/extensionHostDebug';
+import { IFileService } from 'vs/platform/files/common/files';
+import { stripComments } from 'vs/base/common/json';
+import { generateUuid } from 'vs/base/common/uuid';
+import { VSBuffer } from 'vs/base/common/buffer';

 export class CodeApplication extends Disposable {
 	private windowsMainService: IWindowsMainService | undefined;
@@ -134,11 +138,6 @@ export class CodeApplication extends Disposable {
 		//
 		// !!! DO NOT CHANGE without consulting the documentation !!!
 		//
-		app.on('remote-get-guest-web-contents', event => {
-			this.logService.trace('App#on(remote-get-guest-web-contents): prevented');
-
-			event.preventDefault();
-		});
 		app.on('remote-require', (event, sender, module) => {
 			this.logService.trace('App#on(remote-require): prevented');

@@ -807,7 +806,7 @@ export class CodeApplication extends Disposable {
 		return { fileUri: URI.file(path) };
 	}

-	private afterWindowOpen(accessor: ServicesAccessor): void {
+	private async afterWindowOpen(accessor: ServicesAccessor): Promise<void> {

 		// Signal phase: after window open
 		this.lifecycleMainService.phase = LifecycleMainPhase.AfterWindowOpen;
@@ -820,6 +819,34 @@ export class CodeApplication extends Disposable {
 		if (updateService instanceof Win32UpdateService || updateService instanceof LinuxUpdateService || updateService instanceof DarwinUpdateService) {
 			updateService.initialize();
 		}
+
+		// If enable-crash-reporter argv is undefined then this is a fresh start,
+		// based on telemetry.enableCrashreporter settings, generate a UUID which
+		// will be used as crash reporter id and also update the json file.
+		try {
+			const fileService = accessor.get(IFileService);
+			const argvContent = await fileService.readFile(this.environmentService.argvResource);
+			const argvString = argvContent.value.toString();
+			const argvJSON = JSON.parse(stripComments(argvString));
+			if (argvJSON['enable-crash-reporter'] === undefined) {
+				const enableCrashReporter = this.configurationService.getValue<boolean>('telemetry.enableCrashReporter') ?? true;
+				const additionalArgvContent = [
+					'',
+					'	// Allows to disable crash reporting.',
+					'	// Should restart the app if the value is changed.',
+					`	"enable-crash-reporter": ${enableCrashReporter},`,
+					'',
+					'	// Unique id used for correlating crash reports sent from this instance.',
+					'	// Do not edit this value.',
+					`	"crash-reporter-id": "${generateUuid()}"`,
+					'}'
+				];
+				const newArgvString = argvString.substring(0, argvString.length - 2).concat(',\n', additionalArgvContent.join('\n'));
+				await fileService.writeFile(this.environmentService.argvResource, VSBuffer.fromString(newArgvString));
+			}
+		} catch (error) {
+			this.logService.error(error);
+		}
 	}

 	private handleRemoteAuthorities(): void {
--- a/src/vs/code/electron-main/auth.ts
+++ b/src/vs/code/electron-main/auth.ts
@@ -60,10 +60,12 @@ export class ProxyAuthHandler extends Disposable {
 			title: 'VS Code',
 			webPreferences: {
 				preload: URI.parse(require.toUrl('vs/base/parts/sandbox/electron-browser/preload.js')).fsPath,
-				enableWebSQL: false,
 				sandbox: true,
-				devTools: false,
+				contextIsolation: true,
+				enableWebSQL: false,
 				enableRemoteModule: false,
+				spellcheck: false,
+				devTools: false,
 				v8CacheOptions: 'bypassHeatCheck'
 			}
 		};
--- a/src/vs/code/electron-main/sharedProcess.ts
+++ b/src/vs/code/electron-main/sharedProcess.ts
@@ -43,12 +43,13 @@ export class SharedProcess implements ISharedProcess {
 			backgroundColor: this.themeMainService.getBackgroundColor(),
 			webPreferences: {
 				preload: URI.parse(require.toUrl('vs/base/parts/sandbox/electron-browser/preload.js')).fsPath,
-				images: false,
 				nodeIntegration: true,
-				webgl: false,
 				enableWebSQL: false,
 				enableRemoteModule: false,
+				spellcheck: false,
 				nativeWindowOpen: true,
+				images: false,
+				webgl: false,
 				disableBlinkFeatures: 'Auxclick' // do NOT change, allows us to identify this window as shared-process in the process explorer
 			}
 		});
--- a/src/vs/code/electron-main/window.ts
+++ b/src/vs/code/electron-main/window.ts
@@ -168,10 +168,11 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 				webPreferences: {
 					preload: URI.parse(this.doGetPreloadUrl()).fsPath,
 					nodeIntegration: true,
-					webviewTag: true,
 					enableWebSQL: false,
 					enableRemoteModule: false,
+					spellcheck: false,
 					nativeWindowOpen: true,
+					webviewTag: true,
 					zoomFactor: zoomLevelToZoomFactor(windowConfig?.zoomLevel)
 				}
 			};
--- a/src/vs/code/electron-sandbox/processExplorer/media/collapsed.svg
+++ b/src/vs/code/electron-sandbox/processExplorer/media/collapsed.svg
--- a/src/vs/code/electron-sandbox/processExplorer/media/expanded.svg
+++ b/src/vs/code/electron-sandbox/processExplorer/media/expanded.svg
--- a/src/vs/code/electron-sandbox/processExplorer/media/processExplorer.css
+++ b/src/vs/code/electron-sandbox/processExplorer/media/processExplorer.css
--- a/src/vs/code/electron-sandbox/processExplorer/processExplorer.html
+++ b/src/vs/code/electron-sandbox/processExplorer/processExplorer.html
--- a/src/vs/code/electron-sandbox/processExplorer/processExplorer.js
+++ b/src/vs/code/electron-sandbox/processExplorer/processExplorer.js
@@ -14,6 +14,6 @@ const bootstrapWindow = (() => {
 	return window.MonacoBootstrapWindow;
 })();

-bootstrapWindow.load(['vs/code/electron-browser/processExplorer/processExplorerMain'], function (processExplorer, configuration) {
-	processExplorer.startup(configuration.data);
+bootstrapWindow.load(['vs/code/electron-sandbox/processExplorer/processExplorerMain'], function (processExplorer, configuration) {
+	processExplorer.startup(configuration.windowId, configuration.data);
 }, { forceEnableDeveloperKeybindings: true });
--- a/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts
+++ b/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts
@@ -4,20 +4,18 @@
 *--------------------------------------------------------------------------------------------*/

 import 'vs/css!./media/processExplorer';
-import { clipboard } from 'electron';
-import { totalmem } from 'os';
+import { ElectronService, IElectronService } from 'vs/platform/electron/electron-sandbox/electron';
 import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
-import product from 'vs/platform/product/common/product';
 import { localize } from 'vs/nls';
 import { ProcessExplorerStyles, ProcessExplorerData } from 'vs/platform/issue/common/issue';
 import { applyZoom, zoomIn, zoomOut } from 'vs/platform/windows/electron-sandbox/window';
-import * as platform from 'vs/base/common/platform';
 import { IContextMenuItem } from 'vs/base/parts/contextmenu/common/contextmenu';
 import { popup } from 'vs/base/parts/contextmenu/electron-sandbox/contextmenu';
 import { ProcessItem } from 'vs/base/common/processes';
 import { addDisposableListener, addClass } from 'vs/base/browser/dom';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { isRemoteDiagnosticError, IRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnostics';
+import { MainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';

 const DEBUG_FLAGS_PATTERN = /\s--(inspect|debug)(-brk|port)?=(\d+)?/;
 const DEBUG_PORT_PATTERN = /\s--(inspect|debug)-port=(\d+)/;
@@ -40,7 +38,12 @@ class ProcessExplorer {

 	private listeners = new DisposableStore();

-	constructor(data: ProcessExplorerData) {
+	private electronService: IElectronService;
+
+	constructor(windowId: number, private data: ProcessExplorerData) {
+		const mainProcessService = new MainProcessService(windowId);
+		this.electronService = new ElectronService(windowId, mainProcessService) as IElectronService;
+
 		this.applyStyles(data.styles);

 		// Map window process pids to titles, annotate process names with this when rendering to distinguish between them
@@ -59,24 +62,24 @@ class ProcessExplorer {
 		ipcRenderer.send('vscode:listProcesses');
 	}

-	private getProcessList(rootProcess: ProcessItem, isLocal: boolean): FormattedProcessItem[] {
+	private getProcessList(rootProcess: ProcessItem, isLocal: boolean, totalMem: number): FormattedProcessItem[] {
 		const processes: FormattedProcessItem[] = [];

 		if (rootProcess) {
-			this.getProcessItem(processes, rootProcess, 0, isLocal);
+			this.getProcessItem(processes, rootProcess, 0, isLocal, totalMem);
 		}

 		return processes;
 	}

-	private getProcessItem(processes: FormattedProcessItem[], item: ProcessItem, indent: number, isLocal: boolean): void {
+	private getProcessItem(processes: FormattedProcessItem[], item: ProcessItem, indent: number, isLocal: boolean, totalMem: number): void {
 		const isRoot = (indent === 0);

 		const MB = 1024 * 1024;

 		let name = item.name;
 		if (isRoot) {
-			name = isLocal ? `${product.applicationName} main` : 'remote agent';
+			name = isLocal ? `${this.data.applicationName} main` : 'remote agent';
 		}

 		if (name === 'window') {
@@ -86,7 +89,7 @@ class ProcessExplorer {

 		// Format name with indent
 		const formattedName = isRoot ? name : `${'    '.repeat(indent)} ${name}`;
-		const memory = process.platform === 'win32' ? item.mem : (totalmem() * (item.mem / 100));
+		const memory = this.data.platform === 'win32' ? item.mem : (totalMem * (item.mem / 100));
 		processes.push({
 			cpu: item.load,
 			memory: (memory / MB),
@@ -100,7 +103,7 @@ class ProcessExplorer {
 		if (Array.isArray(item.children)) {
 			item.children.forEach(child => {
 				if (child) {
-					this.getProcessItem(processes, child, indent + 1, isLocal);
+					this.getProcessItem(processes, child, indent + 1, isLocal, totalMem);
 				}
 			});
 		}
@@ -258,7 +261,7 @@ class ProcessExplorer {
 		container.appendChild(body);
 	}

-	private updateProcessInfo(processLists: [{ name: string, rootProcess: ProcessItem | IRemoteDiagnosticError }]): void {
+	private async updateProcessInfo(processLists: [{ name: string, rootProcess: ProcessItem | IRemoteDiagnosticError }]): Promise<void> {
 		const container = document.getElementById('process-list');
 		if (!container) {
 			return;
@@ -271,19 +274,20 @@ class ProcessExplorer {
 		tableHead.innerHTML = `<tr>
 			<th scope="col" class="cpu">${localize('cpu', "CPU %")}</th>
 			<th scope="col" class="memory">${localize('memory', "Memory (MB)")}</th>
-			<th scope="col" class="pid">${localize('pid', "pid")}</th>
+			<th scope="col" class="pid">${localize('pid', "PID")}</th>
 			<th scope="col" class="nameLabel">${localize('name', "Name")}</th>
 		</tr>`;

 		container.append(tableHead);

 		const hasMultipleMachines = Object.keys(processLists).length > 1;
+		const totalMem = await this.electronService.getTotalMem();
 		processLists.forEach((remote, i) => {
 			const isLocal = i === 0;
 			if (isRemoteDiagnosticError(remote.rootProcess)) {
 				this.renderProcessFetchError(remote.name, remote.rootProcess.errorMessage);
 			} else {
-				this.renderTableSection(remote.name, this.getProcessList(remote.rootProcess, isLocal), hasMultipleMachines, isLocal);
+				this.renderTableSection(remote.name, this.getProcessList(remote.rootProcess, isLocal, totalMem), hasMultipleMachines, isLocal);
 			}
 		});
 	}
@@ -322,15 +326,15 @@ class ProcessExplorer {
 		if (isLocal) {
 			items.push({
 				label: localize('killProcess', "Kill Process"),
-				click() {
-					process.kill(pid, 'SIGTERM');
+				click: () => {
+					this.electronService.killProcess(pid, 'SIGTERM');
 				}
 			});

 			items.push({
 				label: localize('forceKillProcess', "Force Kill Process"),
-				click() {
-					process.kill(pid, 'SIGKILL');
+				click: () => {
+					this.electronService.killProcess(pid, 'SIGKILL');
 				}
 			});

@@ -341,20 +345,20 @@ class ProcessExplorer {

 		items.push({
 			label: localize('copy', "Copy"),
-			click() {
+			click: () => {
 				const row = document.getElementById(pid.toString());
 				if (row) {
-					clipboard.writeText(row.innerText);
+					this.electronService.writeClipboardText(row.innerText);
 				}
 			}
 		});

 		items.push({
 			label: localize('copyAll', "Copy All"),
-			click() {
+			click: () => {
 				const processList = document.getElementById('process-list');
 				if (processList) {
-					clipboard.writeText(processList.innerText);
+					this.electronService.writeClipboardText(processList.innerText);
 				}
 			}
 		});
@@ -398,15 +402,15 @@ class ProcessExplorer {



-export function startup(data: ProcessExplorerData): void {
-	const platformClass = platform.isWindows ? 'windows' : platform.isLinux ? 'linux' : 'mac';
+export function startup(windowId: number, data: ProcessExplorerData): void {
+	const platformClass = data.platform === 'win32' ? 'windows' : data.platform === 'linux' ? 'linux' : 'mac';
 	addClass(document.body, platformClass); // used by our fonts
 	applyZoom(data.zoomLevel);

-	const processExplorer = new ProcessExplorer(data);
+	const processExplorer = new ProcessExplorer(windowId, data);

 	document.onkeydown = (e: KeyboardEvent) => {
-		const cmdOrCtrlKey = platform.isMacintosh ? e.metaKey : e.ctrlKey;
+		const cmdOrCtrlKey = data.platform === 'darwin' ? e.metaKey : e.ctrlKey;

 		// Cmd/Ctrl + zooms in
 		if (cmdOrCtrlKey && e.keyCode === 187) {
@@ -421,7 +425,7 @@ export function startup(data: ProcessExplorerData): void {

 	// Cmd/Ctrl + w closes process explorer
 	window.addEventListener('keydown', e => {
-		const cmdOrCtrlKey = platform.isMacintosh ? e.metaKey : e.ctrlKey;
+		const cmdOrCtrlKey = data.platform === 'darwin' ? e.metaKey : e.ctrlKey;
 		if (cmdOrCtrlKey && e.keyCode === 87) {
 			processExplorer.dispose();
 			ipcRenderer.send('vscode:closeProcessExplorer');
--- a/src/vs/editor/browser/editorExtensions.ts
+++ b/src/vs/editor/browser/editorExtensions.ts
@@ -419,7 +419,7 @@ export function registerModelAndPositionCommand(id: string, handler: (model: ITe
 		const model = accessor.get(IModelService).getModel(resource);
 		if (model) {
 			const editorPosition = Position.lift(position);
-			return handler(model, editorPosition, args.slice(2));
+			return handler(model, editorPosition, ...args.slice(2));
 		}

 		return accessor.get(ITextModelService).createModelReference(resource).then(reference => {
--- a/src/vs/editor/common/config/commonEditorConfig.ts
+++ b/src/vs/editor/common/config/commonEditorConfig.ts
@@ -381,7 +381,7 @@ export abstract class CommonEditorConfiguration extends Disposable implements IC
 					}
 					continue;
 				}
-				if (typeof baseValue === 'object' && typeof subsetValue === 'object') {
+				if (baseValue && typeof baseValue === 'object' && subsetValue && typeof subsetValue === 'object') {
 					if (!this._subsetEquals(baseValue, subsetValue)) {
 						return false;
 					}
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -2576,9 +2576,9 @@ class EditorPixelRatio extends ComputedEditorOption<EditorOption.pixelRatio, num
 * Configuration options for quick suggestions
 */
 export interface IQuickSuggestionsOptions {
-	other: boolean;
-	comments: boolean;
-	strings: boolean;
+	other?: boolean;
+	comments?: boolean;
+	strings?: boolean;
 }

 export type ValidQuickSuggestionsOptions = boolean | Readonly<Required<IQuickSuggestionsOptions>>;
--- a/src/vs/editor/common/services/languagesRegistry.ts
+++ b/src/vs/editor/common/services/languagesRegistry.ts
@@ -153,9 +153,14 @@ export class LanguagesRegistry extends Disposable {
 		}

 		if (Array.isArray(lang.extensions)) {
+			if (lang.configuration) {
+				// insert first as this appears to be the 'primary' language definition
+				resolvedLanguage.extensions = lang.extensions.concat(resolvedLanguage.extensions);
+			} else {
+				resolvedLanguage.extensions = resolvedLanguage.extensions.concat(lang.extensions);
+			}
 			for (let extension of lang.extensions) {
 				mime.registerTextMime({ id: langId, mime: primaryMime, extension: extension }, this._warnOnOverwrite);
-				resolvedLanguage.extensions.push(extension);
 			}
 		}

--- a/src/vs/editor/contrib/hover/hover.ts
+++ b/src/vs/editor/contrib/hover/hover.ts
@@ -101,6 +101,7 @@ export class ModesHoverController implements IEditorContribution {
 			this._toUnhook.add(this._editor.onDidChangeModelDecorations(() => this._onModelDecorationsChanged()));
 		} else {
 			this._toUnhook.add(this._editor.onMouseMove(hideWidgetsEventHandler));
+			this._toUnhook.add(this._editor.onKeyDown((e: IKeyboardEvent) => this._onKeyDown(e)));
 		}

 		this._toUnhook.add(this._editor.onMouseLeave(hideWidgetsEventHandler));
--- a/src/vs/editor/contrib/rename/media/onTypeRename.css
+++ b/src/vs/editor/contrib/rename/media/onTypeRename.css
@@ -4,8 +4,7 @@
 *--------------------------------------------------------------------------------------------*/

 .monaco-editor .on-type-rename-decoration {
-	background: rgba(255, 0, 0, 0.3);
-	border-left: 1px solid rgba(255, 0, 0, 0.3);
+	border-left: 1px solid transparent;
 	/* So border can be transparent */
 	background-clip: padding-box;
 }
--- a/src/vs/editor/contrib/rename/onTypeRename.ts
+++ b/src/vs/editor/contrib/rename/onTypeRename.ts
@@ -26,6 +26,9 @@ import { URI } from 'vs/base/common/uri';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { onUnexpectedError, onUnexpectedExternalError } from 'vs/base/common/errors';
 import * as strings from 'vs/base/common/strings';
+import { registerColor } from 'vs/platform/theme/common/colorRegistry';
+import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
+import { Color } from 'vs/base/common/color';

 export const CONTEXT_ONTYPE_RENAME_INPUT_VISIBLE = new RawContextKey<boolean>('onTypeRenameInputVisible', false);

@@ -360,6 +363,13 @@ export function getOnTypeRenameRanges(model: ITextModel, position: Position, tok
 	}), result => !!result && arrays.isNonEmptyArray(result?.ranges));
 }

+export const editorOnTypeRenameBackground = registerColor('editor.onTypeRenameBackground', { dark: Color.fromHex('#f00').transparent(0.3), light: Color.fromHex('#f00').transparent(0.3), hc: Color.fromHex('#f00').transparent(0.3) }, nls.localize('editorOnTypeRenameBackground', 'Background color when the editor auto renames on type.'));
+registerThemingParticipant((theme, collector) => {
+	const editorOnTypeRenameBackgroundColor = theme.getColor(editorOnTypeRenameBackground);
+	if (editorOnTypeRenameBackgroundColor) {
+		collector.addRule(`.monaco-editor .on-type-rename-decoration { background: ${editorOnTypeRenameBackgroundColor}; border-left-color: ${editorOnTypeRenameBackgroundColor}; }`);
+	}
+});

 registerModelAndPositionCommand('_executeRenameOnTypeProvider', (model, position) => getOnTypeRenameRanges(model, position, CancellationToken.None));

--- a/src/vs/editor/contrib/rename/rename.ts
+++ b/src/vs/editor/contrib/rename/rename.ts
@@ -4,11 +4,11 @@
 *--------------------------------------------------------------------------------------------*/

 import * as nls from 'vs/nls';
-import { illegalArgument, onUnexpectedError } from 'vs/base/common/errors';
+import { onUnexpectedError } from 'vs/base/common/errors';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { IEditorProgressService } from 'vs/platform/progress/common/progress';
-import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction, EditorCommand, registerEditorCommand, registerDefaultLanguageCommand } from 'vs/editor/browser/editorExtensions';
+import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction, EditorCommand, registerEditorCommand, registerModelAndPositionCommand } from 'vs/editor/browser/editorExtensions';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { ITextModel } from 'vs/editor/common/model';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
@@ -33,6 +33,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IConfigurationRegistry, ConfigurationScope, Extensions } from 'vs/platform/configuration/common/configurationRegistry';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfigurationService';
+import { assertType } from 'vs/base/common/types';

 class RenameSkeleton {

@@ -350,11 +351,9 @@ registerEditorCommand(new RenameCommand({

 // ---- api bridge command

-registerDefaultLanguageCommand('_executeDocumentRenameProvider', function (model, position, args) {
-	let { newName } = args;
-	if (typeof newName !== 'string') {
-		throw illegalArgument('newName');
-	}
+registerModelAndPositionCommand('_executeDocumentRenameProvider', function (model, position, ...args) {
+	const [newName] = args;
+	assertType(typeof newName === 'string');
 	return rename(model, position, newName);
 });

--- a/src/vs/editor/test/common/config/commonEditorConfig.test.ts
+++ b/src/vs/editor/test/common/config/commonEditorConfig.test.ts
@@ -211,4 +211,15 @@ suite('Common Editor Config', () => {
 			strings: false
 		});
 	});
+
+	test('issue #102920: Can\'t snap or split view with JSON files', () => {
+		const config = new TestConfiguration({ quickSuggestions: null! });
+		config.updateOptions({ quickSuggestions: { strings: true } });
+		const actual = <Readonly<Required<IQuickSuggestionsOptions>>>config.options.get(EditorOption.quickSuggestions);
+		assert.deepEqual(actual, {
+			other: true,
+			comments: false,
+			strings: true
+		});
+	});
 });
--- a/src/vs/editor/test/common/services/languagesRegistry.test.ts
+++ b/src/vs/editor/test/common/services/languagesRegistry.test.ts
@@ -221,6 +221,32 @@ suite('LanguagesRegistry', () => {
 		assert.deepEqual(registry.getExtensions('aName'), ['aExt', 'aExt2']);
 	});

+	test('extensions of primary language registration come first', () => {
+		let registry = new LanguagesRegistry(false);
+
+		registry._registerLanguages([{
+			id: 'a',
+			extensions: ['aExt3']
+		}]);
+
+		assert.deepEqual(registry.getExtensions('a')[0], 'aExt3');
+
+		registry._registerLanguages([{
+			id: 'a',
+			configuration: URI.file('conf.json'),
+			extensions: ['aExt']
+		}]);
+
+		assert.deepEqual(registry.getExtensions('a')[0], 'aExt');
+
+		registry._registerLanguages([{
+			id: 'a',
+			extensions: ['aExt2']
+		}]);
+
+		assert.deepEqual(registry.getExtensions('a')[0], 'aExt');
+	});
+
 	test('filenames', () => {
 		let registry = new LanguagesRegistry(false);

--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -3561,9 +3561,9 @@ declare namespace monaco.editor {
 	 * Configuration options for quick suggestions
 	 */
 	export interface IQuickSuggestionsOptions {
-		other: boolean;
-		comments: boolean;
-		strings: boolean;
+		other?: boolean;
+		comments?: boolean;
+		strings?: boolean;
 	}

 	export type ValidQuickSuggestionsOptions = boolean | Readonly<Required<IQuickSuggestionsOptions>>;
--- a/src/vs/platform/configuration/common/configuration.ts
+++ b/src/vs/platform/configuration/common/configuration.ts
@@ -10,7 +10,7 @@ import { Event } from 'vs/base/common/event';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IConfigurationRegistry, Extensions, OVERRIDE_PROPERTY_PATTERN } from 'vs/platform/configuration/common/configurationRegistry';
+import { IConfigurationRegistry, Extensions, OVERRIDE_PROPERTY_PATTERN, overrideIdentifierFromKey } from 'vs/platform/configuration/common/configurationRegistry';
 import { IStringDictionary } from 'vs/base/common/collections';

 export const IConfigurationService = createDecorator<IConfigurationService>('configurationService');
@@ -354,10 +354,6 @@ export function getDefaultValues(): any {
 	return valueTreeRoot;
 }

-export function overrideIdentifierFromKey(key: string): string {
-	return key.substring(1, key.length - 1);
-}
-
 export function keyFromOverrideIdentifier(overrideIdentifier: string): string {
 	return `[${overrideIdentifier}]`;
 }
--- a/src/vs/platform/configuration/common/configurationModels.ts
+++ b/src/vs/platform/configuration/common/configurationModels.ts
@@ -9,8 +9,8 @@ import * as arrays from 'vs/base/common/arrays';
 import * as types from 'vs/base/common/types';
 import * as objects from 'vs/base/common/objects';
 import { URI, UriComponents } from 'vs/base/common/uri';
-import { OVERRIDE_PROPERTY_PATTERN, ConfigurationScope, IConfigurationRegistry, Extensions, IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
-import { IOverrides, overrideIdentifierFromKey, addToValueTree, toValuesTree, IConfigurationModel, getConfigurationValue, IConfigurationOverrides, IConfigurationData, getDefaultValues, getConfigurationKeys, removeFromValueTree, toOverrides, IConfigurationValue, ConfigurationTarget, compare, IConfigurationChangeEvent, IConfigurationChange } from 'vs/platform/configuration/common/configuration';
+import { OVERRIDE_PROPERTY_PATTERN, ConfigurationScope, IConfigurationRegistry, Extensions, IConfigurationPropertySchema, overrideIdentifierFromKey } from 'vs/platform/configuration/common/configurationRegistry';
+import { IOverrides, addToValueTree, toValuesTree, IConfigurationModel, getConfigurationValue, IConfigurationOverrides, IConfigurationData, getDefaultValues, getConfigurationKeys, removeFromValueTree, toOverrides, IConfigurationValue, ConfigurationTarget, compare, IConfigurationChangeEvent, IConfigurationChange } from 'vs/platform/configuration/common/configuration';
 import { Workspace } from 'vs/platform/workspace/common/workspace';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Disposable } from 'vs/base/common/lifecycle';
--- a/src/vs/platform/configuration/common/configurationRegistry.ts
+++ b/src/vs/platform/configuration/common/configurationRegistry.ts
@@ -9,7 +9,7 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { Registry } from 'vs/platform/registry/common/platform';
 import * as types from 'vs/base/common/types';
 import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
+import { IStringDictionary } from 'vs/base/common/collections';

 export const Extensions = {
 	Configuration: 'base.contributions.configuration'
@@ -35,12 +35,12 @@ export interface IConfigurationRegistry {
 	/**
 	 * Register multiple default configurations to the registry.
 	 */
-	registerDefaultConfigurations(defaultConfigurations: IDefaultConfigurationExtension[]): void;
+	registerDefaultConfigurations(defaultConfigurations: IStringDictionary<any>[]): void;

 	/**
 	 * Deregister multiple default configurations from the registry.
 	 */
-	deregisterDefaultConfigurations(defaultConfigurations: IDefaultConfigurationExtension[]): void;
+	deregisterDefaultConfigurations(defaultConfigurations: IStringDictionary<any>[]): void;

 	/**
 	 * Signal that the schema of a configuration setting has changes. It is currently only supported to change enumeration values.
@@ -131,12 +131,6 @@ export interface IConfigurationNode {
 	extensionInfo?: IConfigurationExtensionInfo;
 }

-export interface IDefaultConfigurationExtension {
-	id: ExtensionIdentifier;
-	name: string;
-	defaults: { [key: string]: {} };
-}
-
 type SettingProperties = { [key: string]: any };

 export const allSettings: { properties: SettingProperties, patternProperties: SettingProperties } = { properties: {}, patternProperties: {} };
@@ -152,7 +146,8 @@ const contributionRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensio

 class ConfigurationRegistry implements IConfigurationRegistry {

-	private readonly defaultOverridesConfigurationNode: IConfigurationNode;
+	private readonly defaultValues: IStringDictionary<any>;
+	private readonly defaultLanguageConfigurationOverridesNode: IConfigurationNode;
 	private readonly configurationContributors: IConfigurationNode[];
 	private readonly configurationProperties: { [qualifiedKey: string]: IJSONSchema };
 	private readonly excludedConfigurationProperties: { [qualifiedKey: string]: IJSONSchema };
@@ -166,12 +161,13 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 	readonly onDidUpdateConfiguration: Event<string[]> = this._onDidUpdateConfiguration.event;

 	constructor() {
-		this.defaultOverridesConfigurationNode = {
+		this.defaultValues = {};
+		this.defaultLanguageConfigurationOverridesNode = {
 			id: 'defaultOverrides',
-			title: nls.localize('defaultConfigurations.title', "Default Configuration Overrides"),
+			title: nls.localize('defaultLanguageConfigurationOverrides.title', "Default Language Configuration Overrides"),
 			properties: {}
 		};
-		this.configurationContributors = [this.defaultOverridesConfigurationNode];
+		this.configurationContributors = [this.defaultLanguageConfigurationOverridesNode];
 		this.resourceLanguageSettingsSchema = { properties: {}, patternProperties: {}, additionalProperties: false, errorMessage: 'Unknown editor configuration setting', allowTrailingCommas: true, allowComments: true };
 		this.configurationProperties = {};
 		this.excludedConfigurationProperties = {};
@@ -202,29 +198,8 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 			if (configuration.properties) {
 				for (const key in configuration.properties) {
 					properties.push(key);
-
 					delete this.configurationProperties[key];
-
-					// Delete from schema
-					delete allSettings.properties[key];
-					switch (configuration.properties[key].scope) {
-						case ConfigurationScope.APPLICATION:
-							delete applicationSettings.properties[key];
-							break;
-						case ConfigurationScope.MACHINE:
-							delete machineSettings.properties[key];
-							break;
-						case ConfigurationScope.MACHINE_OVERRIDABLE:
-							delete machineOverridableSettings.properties[key];
-							break;
-						case ConfigurationScope.WINDOW:
-							delete windowSettings.properties[key];
-							break;
-						case ConfigurationScope.RESOURCE:
-						case ConfigurationScope.LANGUAGE_OVERRIDABLE:
-							delete resourceSettings.properties[key];
-							break;
-					}
+					this.removeFromSchema(key, configuration.properties[key]);
 				}
 			}
 			if (configuration.allOf) {
@@ -244,41 +219,60 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 		this._onDidUpdateConfiguration.fire(properties);
 	}

-	public registerDefaultConfigurations(defaultConfigurations: IDefaultConfigurationExtension[]): void {
+	public registerDefaultConfigurations(defaultConfigurations: IStringDictionary<any>[]): void {
 		const properties: string[] = [];
+		const overrideIdentifiers: string[] = [];

 		for (const defaultConfiguration of defaultConfigurations) {
-			for (const key in defaultConfiguration.defaults) {
-				const defaultValue = defaultConfiguration.defaults[key];
-				if (OVERRIDE_PROPERTY_PATTERN.test(key) && typeof defaultValue === 'object') {
-					const propertySchema: IConfigurationPropertySchema = {
+			for (const key in defaultConfiguration) {
+				properties.push(key);
+				this.defaultValues[key] = defaultConfiguration[key];
+
+				if (OVERRIDE_PROPERTY_PATTERN.test(key)) {
+					const property: IConfigurationPropertySchema = {
 						type: 'object',
-						default: defaultValue,
-						description: nls.localize('overrideSettings.description', "Configure editor settings to be overridden for {0} language.", key),
+						default: this.defaultValues[key],
+						description: nls.localize('defaultLanguageConfiguration.description', "Configure settings to be overridden for {0} language.", key),
 						$ref: resourceLanguageSettingsSchemaId
 					};
-					allSettings.properties[key] = propertySchema;
-					this.defaultOverridesConfigurationNode.properties![key] = propertySchema;
-					this.configurationProperties[key] = propertySchema;
-					properties.push(key);
+					overrideIdentifiers.push(overrideIdentifierFromKey(key));
+					this.configurationProperties[key] = property;
+					this.defaultLanguageConfigurationOverridesNode.properties![key] = property;
+				} else {
+					const property = this.configurationProperties[key];
+					if (property) {
+						this.updatePropertyDefaultValue(key, property);
+						this.updateSchema(key, property);
+					}
 				}
 			}
 		}

+		this.registerOverrideIdentifiers(overrideIdentifiers);
 		this._onDidSchemaChange.fire();
 		this._onDidUpdateConfiguration.fire(properties);
 	}

-	public deregisterDefaultConfigurations(defaultConfigurations: IDefaultConfigurationExtension[]): void {
+	public deregisterDefaultConfigurations(defaultConfigurations: IStringDictionary<any>[]): void {
 		const properties: string[] = [];
 		for (const defaultConfiguration of defaultConfigurations) {
-			for (const key in defaultConfiguration.defaults) {
+			for (const key in defaultConfiguration) {
 				properties.push(key);
-				delete allSettings.properties[key];
-				delete this.defaultOverridesConfigurationNode.properties![key];
-				delete this.configurationProperties[key];
+				delete this.defaultValues[key];
+				if (OVERRIDE_PROPERTY_PATTERN.test(key)) {
+					delete this.configurationProperties[key];
+					delete this.defaultLanguageConfigurationOverridesNode.properties![key];
+				} else {
+					const property = this.configurationProperties[key];
+					if (property) {
+						this.updatePropertyDefaultValue(key, property);
+						this.updateSchema(key, property);
+					}
+				}
 			}
 		}
+
+		this.updateOverridePropertyPatternKey();
 		this._onDidSchemaChange.fire();
 		this._onDidUpdateConfiguration.fire(properties);
 	}
@@ -291,7 +285,6 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 		for (const overrideIdentifier of overrideIdentifiers) {
 			this.overrideIdentifiers.add(overrideIdentifier);
 		}
-
 		this.updateOverridePropertyPatternKey();
 	}

@@ -305,12 +298,13 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 					delete properties[key];
 					continue;
 				}
-				// fill in default values
-				let property = properties[key];
-				let defaultValue = property.default;
-				if (types.isUndefined(defaultValue)) {
-					property.default = getDefaultValue(property.type);
-				}
+
+				const property = properties[key];
+
+				// update default value
+				this.updatePropertyDefaultValue(key, property);
+
+				// update scope
 				if (OVERRIDE_PROPERTY_PATTERN.test(key)) {
 					property.scope = undefined; // No scope for overridable properties `[${identifier}]`
 				} else {
@@ -361,28 +355,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 			let properties = configuration.properties;
 			if (properties) {
 				for (const key in properties) {
-					allSettings.properties[key] = properties[key];
-					switch (properties[key].scope) {
-						case ConfigurationScope.APPLICATION:
-							applicationSettings.properties[key] = properties[key];
-							break;
-						case ConfigurationScope.MACHINE:
-							machineSettings.properties[key] = properties[key];
-							break;
-						case ConfigurationScope.MACHINE_OVERRIDABLE:
-							machineOverridableSettings.properties[key] = properties[key];
-							break;
-						case ConfigurationScope.WINDOW:
-							windowSettings.properties[key] = properties[key];
-							break;
-						case ConfigurationScope.RESOURCE:
-							resourceSettings.properties[key] = properties[key];
-							break;
-						case ConfigurationScope.LANGUAGE_OVERRIDABLE:
-							resourceSettings.properties[key] = properties[key];
-							this.resourceLanguageSettingsSchema.properties![key] = properties[key];
-							break;
-					}
+					this.updateSchema(key, properties[key]);
 				}
 			}
 			let subNodes = configuration.allOf;
@@ -393,6 +366,53 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 		register(configuration);
 	}

+	private updateSchema(key: string, property: IConfigurationPropertySchema): void {
+		allSettings.properties[key] = property;
+		switch (property.scope) {
+			case ConfigurationScope.APPLICATION:
+				applicationSettings.properties[key] = property;
+				break;
+			case ConfigurationScope.MACHINE:
+				machineSettings.properties[key] = property;
+				break;
+			case ConfigurationScope.MACHINE_OVERRIDABLE:
+				machineOverridableSettings.properties[key] = property;
+				break;
+			case ConfigurationScope.WINDOW:
+				windowSettings.properties[key] = property;
+				break;
+			case ConfigurationScope.RESOURCE:
+				resourceSettings.properties[key] = property;
+				break;
+			case ConfigurationScope.LANGUAGE_OVERRIDABLE:
+				resourceSettings.properties[key] = property;
+				this.resourceLanguageSettingsSchema.properties![key] = property;
+				break;
+		}
+	}
+
+	private removeFromSchema(key: string, property: IConfigurationPropertySchema): void {
+		delete allSettings.properties[key];
+		switch (property.scope) {
+			case ConfigurationScope.APPLICATION:
+				delete applicationSettings.properties[key];
+				break;
+			case ConfigurationScope.MACHINE:
+				delete machineSettings.properties[key];
+				break;
+			case ConfigurationScope.MACHINE_OVERRIDABLE:
+				delete machineOverridableSettings.properties[key];
+				break;
+			case ConfigurationScope.WINDOW:
+				delete windowSettings.properties[key];
+				break;
+			case ConfigurationScope.RESOURCE:
+			case ConfigurationScope.LANGUAGE_OVERRIDABLE:
+				delete resourceSettings.properties[key];
+				break;
+		}
+	}
+
 	private updateOverridePropertyPatternKey(): void {
 		for (const overrideIdentifier of this.overrideIdentifiers.values()) {
 			const overrideIdentifierProperty = `[${overrideIdentifier}]`;
@@ -401,8 +421,8 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 				description: nls.localize('overrideSettings.defaultDescription', "Configure editor settings to be overridden for a language."),
 				errorMessage: nls.localize('overrideSettings.errorMessage', "This setting does not support per-language configuration."),
 				$ref: resourceLanguageSettingsSchemaId,
-				default: this.defaultOverridesConfigurationNode.properties![overrideIdentifierProperty]?.default
 			};
+			this.updatePropertyDefaultValue(overrideIdentifierProperty, resourceLanguagePropertiesSchema);
 			allSettings.properties[overrideIdentifierProperty] = resourceLanguagePropertiesSchema;
 			applicationSettings.properties[overrideIdentifierProperty] = resourceLanguagePropertiesSchema;
 			machineSettings.properties[overrideIdentifierProperty] = resourceLanguagePropertiesSchema;
@@ -412,11 +432,26 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 		}
 		this._onDidSchemaChange.fire();
 	}
+
+	private updatePropertyDefaultValue(key: string, property: IConfigurationPropertySchema): void {
+		let defaultValue = this.defaultValues[key];
+		if (types.isUndefined(defaultValue)) {
+			defaultValue = property.default;
+		}
+		if (types.isUndefined(defaultValue)) {
+			defaultValue = getDefaultValue(property.type);
+		}
+		property.default = defaultValue;
+	}
 }

 const OVERRIDE_PROPERTY = '\\[.*\\]$';
 export const OVERRIDE_PROPERTY_PATTERN = new RegExp(OVERRIDE_PROPERTY);

+export function overrideIdentifierFromKey(key: string): string {
+	return key.substring(1, key.length - 1);
+}
+
 export function getDefaultValue(type: string | string[] | undefined): any {
 	const t = Array.isArray(type) ? (<string[]>type)[0] : <string>type;
 	switch (t) {
--- a/src/vs/platform/electron/common/electron.ts
+++ b/src/vs/platform/electron/common/electron.ts
@@ -4,7 +4,7 @@
 *--------------------------------------------------------------------------------------------*/

 import { Event } from 'vs/base/common/event';
-import { MessageBoxOptions, MessageBoxReturnValue, OpenDevToolsOptions, SaveDialogOptions, OpenDialogOptions, OpenDialogReturnValue, SaveDialogReturnValue, CrashReporterStartOptions, MouseInputEvent } from 'vs/base/parts/sandbox/common/electronTypes';
+import { MessageBoxOptions, MessageBoxReturnValue, OpenDevToolsOptions, SaveDialogOptions, OpenDialogOptions, OpenDialogReturnValue, SaveDialogReturnValue, MouseInputEvent } from 'vs/base/parts/sandbox/common/electronTypes';
 import { IOpenedWindow, IWindowOpenable, IOpenEmptyWindowOptions, IOpenWindowOptions } from 'vs/platform/windows/common/windows';
 import { INativeOpenDialogOptions } from 'vs/platform/dialogs/common/dialogs';
 import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
@@ -64,6 +64,10 @@ export interface ICommonElectronService {
 	updateTouchBar(items: ISerializableCommandAction[][]): Promise<void>;
 	moveItemToTrash(fullPath: string, deleteOnFail?: boolean): Promise<boolean>;
 	isAdmin(): Promise<boolean>;
+	getTotalMem(): Promise<number>;
+
+	// Process
+	killProcess(pid: number, code: string): Promise<void>;

 	// clipboard
 	readClipboardText(type?: 'selection' | 'clipboard'): Promise<string>;
@@ -94,7 +98,6 @@ export interface ICommonElectronService {
 	// Development
 	openDevTools(options?: OpenDevToolsOptions): Promise<void>;
 	toggleDevTools(): Promise<void>;
-	startCrashReporter(options: CrashReporterStartOptions): Promise<void>;
 	sendInputEvent(event: MouseInputEvent): Promise<void>;

 	// Connectivity
--- a/src/vs/platform/electron/electron-main/electronMainService.ts
+++ b/src/vs/platform/electron/electron-main/electronMainService.ts
@@ -5,7 +5,7 @@

 import { Event } from 'vs/base/common/event';
 import { IWindowsMainService, ICodeWindow } from 'vs/platform/windows/electron-main/windows';
-import { MessageBoxOptions, MessageBoxReturnValue, shell, OpenDevToolsOptions, SaveDialogOptions, SaveDialogReturnValue, OpenDialogOptions, OpenDialogReturnValue, CrashReporterStartOptions, crashReporter, Menu, BrowserWindow, app, clipboard, powerMonitor } from 'electron';
+import { MessageBoxOptions, MessageBoxReturnValue, shell, OpenDevToolsOptions, SaveDialogOptions, SaveDialogReturnValue, OpenDialogOptions, OpenDialogReturnValue, Menu, BrowserWindow, app, clipboard, powerMonitor } from 'electron';
 import { OpenContext } from 'vs/platform/windows/node/window';
 import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
 import { IOpenedWindow, IOpenWindowOptions, IWindowOpenable, IOpenEmptyWindowOptions } from 'vs/platform/windows/common/windows';
@@ -20,9 +20,9 @@ import { dirExists } from 'vs/base/node/pfs';
 import { URI } from 'vs/base/common/uri';
 import { ITelemetryData, ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
 import { INativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
 import { MouseInputEvent } from 'vs/base/parts/sandbox/common/electronTypes';
+import { totalmem } from 'os';

 export interface IElectronMainService extends AddFirstParameterToFunctions<ICommonElectronService, Promise<unknown> /* only methods, not events */, number | undefined /* window ID */> { }

@@ -37,8 +37,7 @@ export class ElectronMainService implements IElectronMainService {
 		@IDialogMainService private readonly dialogMainService: IDialogMainService,
 		@ILifecycleMainService private readonly lifecycleMainService: ILifecycleMainService,
 		@IEnvironmentService private readonly environmentService: INativeEnvironmentService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@ILogService private readonly logService: ILogService
+		@ITelemetryService private readonly telemetryService: ITelemetryService
 	) {
 	}

@@ -313,6 +312,19 @@ export class ElectronMainService implements IElectronMainService {
 		return isAdmin;
 	}

+	async getTotalMem(): Promise<number> {
+		return totalmem();
+	}
+
+	//#endregion
+
+
+	//#region Process
+
+	async killProcess(windowId: number | undefined, pid: number, code: string): Promise<void> {
+		process.kill(pid, code);
+	}
+
 	//#endregion


@@ -465,12 +477,6 @@ export class ElectronMainService implements IElectronMainService {
 		}
 	}

-	async startCrashReporter(windowId: number | undefined, options: CrashReporterStartOptions): Promise<void> {
-		this.logService.trace('ElectronMainService#crashReporter', JSON.stringify(options));
-
-		crashReporter.start(options);
-	}
-
 	async sendInputEvent(windowId: number | undefined, event: MouseInputEvent): Promise<void> {
 		const window = this.windowById(windowId);
 		if (window && (event.type === 'mouseDown' || event.type === 'mouseUp')) {
--- a/src/vs/platform/environment/node/argv.ts
+++ b/src/vs/platform/environment/node/argv.ts
@@ -64,18 +64,20 @@ export interface ParsedArgs {
 	'disable-updates'?: boolean;
 	'disable-crash-reporter'?: boolean;
 	'crash-reporter-directory'?: string;
+	'crash-reporter-id'?: string;
 	'skip-add-to-recently-opened'?: boolean;
 	'max-memory'?: string;
 	'file-write'?: boolean;
 	'file-chmod'?: boolean;
 	'driver'?: string;
 	'driver-verbose'?: boolean;
-	remote?: string;
+	'remote'?: string;
 	'disable-user-env-probe'?: boolean;
 	'force'?: boolean;
 	'do-not-sync'?: boolean;
 	'force-user-env'?: boolean;
 	'sync'?: 'on' | 'off';
+	'__sandbox'?: boolean;

 	// {{SQL CARBON EDIT}} Start
 	aad?: boolean;
@@ -190,6 +192,7 @@ export const OPTIONS: OptionDescriptions<Required<ParsedArgs>> = {
 	'disable-updates': { type: 'boolean' },
 	'disable-crash-reporter': { type: 'boolean' },
 	'crash-reporter-directory': { type: 'string' },
+	'crash-reporter-id': { type: 'string' },
 	'disable-user-env-probe': { type: 'boolean' },
 	'skip-add-to-recently-opened': { type: 'boolean' },
 	'unity-launch': { type: 'boolean' },
@@ -204,6 +207,7 @@ export const OPTIONS: OptionDescriptions<Required<ParsedArgs>> = {
 	'trace-options': { type: 'string' },
 	'force-user-env': { type: 'boolean' },
 	'open-devtools': { type: 'boolean' },
+	'__sandbox': { type: 'boolean' },

 	// {{SQL CARBON EDIT}} Start
 	'command': { type: 'string', alias: 'c', cat: 'o', args: 'command-name', description: localize('commandParameter', 'Name of command to run') },
--- a/src/vs/platform/environment/node/environmentService.ts
+++ b/src/vs/platform/environment/node/environmentService.ts
@@ -43,6 +43,8 @@ export interface INativeEnvironmentService extends IEnvironmentService {
 	driverVerbose: boolean;

 	disableUpdates: boolean;
+
+	sandbox: boolean;
 }

 export class EnvironmentService implements INativeEnvironmentService {
@@ -254,7 +256,7 @@ export class EnvironmentService implements INativeEnvironmentService {
 	get serviceMachineIdResource(): URI { return resources.joinPath(URI.file(this.userDataPath), 'machineid'); }

 	get disableUpdates(): boolean { return !!this._args['disable-updates']; }
-	get disableCrashReporter(): boolean { return !!this._args['disable-crash-reporter']; }
+	get crashReporterId(): string | undefined { return this._args['crash-reporter-id']; }
 	get crashReporterDirectory(): string | undefined { return this._args['crash-reporter-directory']; }

 	get driverHandle(): string | undefined { return this._args['driver']; }
@@ -262,6 +264,8 @@ export class EnvironmentService implements INativeEnvironmentService {

 	get disableTelemetry(): boolean { return !!this._args['disable-telemetry']; }

+	get sandbox(): boolean { return !!this._args['__sandbox']; }
+
 	constructor(private _args: ParsedArgs, private _execPath: string) {
 		if (!process.env['VSCODE_LOGS']) {
 			const key = toLocalISOString(new Date()).replace(/-|:|\.\d+Z$/g, '');
--- a/src/vs/platform/extensionManagement/node/extensionLifecycle.ts
+++ b/src/vs/platform/extensionManagement/node/extensionLifecycle.ts
@@ -14,14 +14,15 @@ import { Event } from 'vs/base/common/event';
 import { Schemas } from 'vs/base/common/network';
 import { INativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
 import { rimraf } from 'vs/base/node/pfs';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';

 export class ExtensionsLifecycle extends Disposable {

 	private processesLimiter: Limiter<void> = new Limiter(5); // Run max 5 processes in parallel

 	constructor(
-		private environmentService: INativeEnvironmentService,
-		private logService: ILogService
+		@IEnvironmentService private environmentService: INativeEnvironmentService,
+		@ILogService private readonly logService: ILogService
 	) {
 		super();
 	}
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -92,7 +92,8 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		@IInstantiationService instantiationService: IInstantiationService,
 	) {
 		super();
-		this.extensionsScanner = this._register(instantiationService.createInstance(ExtensionsScanner));
+		const extensionLifecycle = this._register(instantiationService.createInstance(ExtensionsLifecycle));
+		this.extensionsScanner = this._register(instantiationService.createInstance(ExtensionsScanner, extension => extensionLifecycle.postUninstall(extension)));
 		this.manifestCache = this._register(new ExtensionsManifestCache(environmentService, this));
 		this.extensionsDownloader = this._register(instantiationService.createInstance(ExtensionsDownloader));

@@ -102,9 +103,6 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			this.installingExtensions.clear();
 			this.uninstallingExtensions.clear();
 		}));
-
-		const extensionLifecycle = this._register(new ExtensionsLifecycle(environmentService, this.logService));
-		this._register(this.extensionsScanner.onDidRemoveExtension(extension => extensionLifecycle.postUninstall(extension)));
 	}

 	zip(extension: ILocalExtension): Promise<URI> {
--- a/src/vs/platform/extensionManagement/node/extensionsScanner.ts
+++ b/src/vs/platform/extensionManagement/node/extensionsScanner.ts
@@ -23,7 +23,6 @@ import { CancellationToken } from 'vscode';
 import { extract, ExtractError } from 'vs/base/node/zip';
 import { isWindows } from 'vs/base/common/platform';
 import { flatten } from 'vs/base/common/arrays';
-import { Emitter } from 'vs/base/common/event';
 import { assign } from 'vs/base/common/objects';

 const ERROR_SCANNING_SYS_EXTENSIONS = 'scanningSystem';
@@ -41,10 +40,8 @@ export class ExtensionsScanner extends Disposable {
 	private readonly uninstalledPath: string;
 	private readonly uninstalledFileLimiter: Queue<any>;

-	private _onDidRemoveExtension = new Emitter<ILocalExtension>();
-	readonly onDidRemoveExtension = this._onDidRemoveExtension.event;
-
 	constructor(
+		private readonly beforeRemovingExtension: (e: ILocalExtension) => Promise<void>,
 		@ILogService private readonly logService: ILogService,
 		@IEnvironmentService private readonly environmentService: INativeEnvironmentService,
 		@IProductService private readonly productService: IProductService,
@@ -280,7 +277,7 @@ export class ExtensionsScanner extends Disposable {
 		await Promise.all(byExtension.map(async e => {
 			const latest = e.sort((a, b) => semver.rcompare(a.manifest.version, b.manifest.version))[0];
 			if (!installed.has(latest.identifier.id.toLowerCase())) {
-				this._onDidRemoveExtension.fire(latest);
+				await this.beforeRemovingExtension(latest);
 			}
 		}));
 		const toRemove: ILocalExtension[] = extensions.filter(e => uninstalled[new ExtensionIdentifierWithVersion(e.identifier, e.manifest.version).key()]);
--- a/src/vs/platform/issue/common/issue.ts
+++ b/src/vs/platform/issue/common/issue.ts
@@ -85,6 +85,8 @@ export interface ProcessExplorerStyles extends WindowStyles {
 export interface ProcessExplorerData extends WindowData {
 	pid: number;
 	styles: ProcessExplorerStyles;
+	platform: string;
+	applicationName: string;
 }

 export interface ICommonIssueService {
--- a/src/vs/platform/issue/electron-main/issueMainService.ts
+++ b/src/vs/platform/issue/electron-main/issueMainService.ts
@@ -199,6 +199,7 @@ export class IssueMainService implements ICommonIssueService {
 							nodeIntegration: true,
 							enableWebSQL: false,
 							enableRemoteModule: false,
+							spellcheck: false,
 							nativeWindowOpen: true,
 							zoomFactor: zoomLevelToZoomFactor(data.zoomLevel)
 						}
@@ -250,11 +251,23 @@ export class IssueMainService implements ICommonIssueService {
 						title: localize('processExplorer', "Process Explorer"),
 						webPreferences: {
 							preload: URI.parse(require.toUrl('vs/base/parts/sandbox/electron-browser/preload.js')).fsPath,
-							nodeIntegration: true,
 							enableWebSQL: false,
 							enableRemoteModule: false,
+							spellcheck: false,
 							nativeWindowOpen: true,
-							zoomFactor: zoomLevelToZoomFactor(data.zoomLevel)
+							zoomFactor: zoomLevelToZoomFactor(data.zoomLevel),
+							...this.environmentService.sandbox ?
+
+								// Sandbox
+								{
+									sandbox: true,
+									contextIsolation: true
+								} :
+
+								// No Sandbox
+								{
+									nodeIntegration: true
+								}
 						}
 					});

@@ -270,7 +283,7 @@ export class IssueMainService implements ICommonIssueService {
 					};

 					this._processExplorerWindow.loadURL(
-						toLauchUrl('vs/code/electron-browser/processExplorer/processExplorer.html', windowConfiguration));
+						toLauchUrl('vs/code/electron-sandbox/processExplorer/processExplorer.html', windowConfiguration));

 					this._processExplorerWindow.on('close', () => this._processExplorerWindow = null);

--- a/src/vs/platform/launch/electron-main/launchMainService.ts
+++ b/src/vs/platform/launch/electron-main/launchMainService.ts
@@ -70,14 +70,18 @@ export class LaunchMainService implements ILaunchMainService {
 		@IConfigurationService private readonly configurationService: IConfigurationService
 	) { }

-	start(args: ParsedArgs, userEnv: IProcessEnvironment): Promise<void> {
+	async start(args: ParsedArgs, userEnv: IProcessEnvironment): Promise<void> {
 		this.logService.trace('Received data from other instance: ', args, userEnv);

-		const urlsToOpen = parseOpenUrl(args);
+		// Since we now start to open a window, make sure the app has focus.
+		// Focussing a window will not ensure that the application itself
+		// has focus, so we use the `steal: true` hint to force focus.
+		app.focus({ steal: true });

 		// Check early for open-url which is handled in URL service
+		const urlsToOpen = parseOpenUrl(args);
 		if (urlsToOpen.length) {
-			let whenWindowReady: Promise<any> = Promise.resolve<any>(null);
+			let whenWindowReady: Promise<unknown> = Promise.resolve();

 			// Create a window if there is none
 			if (this.windowsMainService.getWindowCount() === 0) {
@@ -91,12 +95,12 @@ export class LaunchMainService implements ILaunchMainService {
 					this.urlService.open(url);
 				}
 			});
-
-			return Promise.resolve(undefined);
 		}

 		// Otherwise handle in windows service
-		return this.startOpenWindow(args, userEnv);
+		else {
+			return this.startOpenWindow(args, userEnv);
+		}
 	}

 	private startOpenWindow(args: ParsedArgs, userEnv: IProcessEnvironment): Promise<void> {
@@ -156,8 +160,6 @@ export class LaunchMainService implements ILaunchMainService {
 			else {
 				const lastActive = this.windowsMainService.getLastActiveWindow();
 				if (lastActive) {
-					// Force focus the app before requesting window focus
-					app.focus({ steal: true });
 					lastActive.focus();

 					usedWindows = [lastActive];
--- a/Show More
+++ b/Show More