Merge branch 'master' into pr/pfitzseb/115309

2021-02-08 14:48:21 +01:00 · 2021-02-08 14:48:21 +01:00 · 124cd2155a
parent b0ac7e40bb 75f4a581b7
commit 124cd2155a
842 changed files with 19191 additions and 15155 deletions
--- a/.github/actions/build-chat/.gitignore
+++ b/.github/actions/build-chat/.gitignore
@ -1,2 +0,0 @@
-dist
-node_modules
--- a/.github/actions/build-chat/action.yml
+++ b/.github/actions/build-chat/action.yml
@ -1,10 +0,0 @@
-name: 'Build Chat'
-description: 'Notify in chat about build results.'
-author: 'Christof Marti'
-inputs:
-  workflow_run_url:
-    description: 'Workflow run URL of the completed build.'
-    required: true
-runs:
-  using: 'node12'
-  main: 'dist/main.js'
--- a/.github/actions/build-chat/package.json
+++ b/.github/actions/build-chat/package.json
@ -1,23 +0,0 @@
-{
-  "name": "build-chat",
-  "version": "0.0.0",
-  "author": "Microsoft Corporation",
-  "license": "MIT",
-  "description": "A GitHub action to create a Windows Package Manager manifest file.",
-  "main": "dist/main.js",
-  "scripts": {
-    "build": "tsc"
-  },
-  "dependencies": {
-    "@actions/core": "^1.2.6",
-    "@octokit/rest": "^18.0.12",
-    "@slack/web-api": "^6.0.0",
-    "azure-storage": "^2.10.3",
-    "stream-buffers": "^3.0.2"
-  },
-  "devDependencies": {
-    "@types/node": "^14.14.22",
-    "@types/stream-buffers": "^3.0.3",
-    "typescript": "^4.1.3"
-  }
-}
--- a/.github/actions/build-chat/src/main.ts
+++ b/.github/actions/build-chat/src/main.ts
@ -1,217 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as core from '@actions/core';
-import { Octokit, RestEndpointMethodTypes } from '@octokit/rest';
-import { WebClient } from '@slack/web-api';
-import * as storage from 'azure-storage';
-import { WritableStreamBuffer } from 'stream-buffers';
-
-(async () => {
-	const actionUrl = core.getInput('workflow_run_url');
-	const url = actionUrl || 'https://api.github.com/repos/microsoft/vscode/actions/runs/503514090';
-	console.log(url);
-	const parts = url.split('/');
-	const owner = parts[parts.length - 5];
-	const repo = parts[parts.length - 4];
-	const runId = parseInt(parts[parts.length - 1], 10);
-	if (actionUrl) {
-		await handleNotification(owner, repo, runId);
-	} else {
-		const results = await buildComplete(owner, repo, runId);
-		for (const message of [...results.logMessages, ...results.messages]) {
-			console.log(message);
-		}
-	}
-})()
-	.then(null, console.error);
-
-const testChannels = ['bot-log', 'bot-test-log'];
-
-async function handleNotification(owner: string, repo: string, runId: number) {
-
-	const results = await buildComplete(owner, repo, runId);
-	if (results.logMessages.length || results.messages.length) {
-
-		const web = new WebClient(process.env.SLACK_TOKEN);
-		const memberships = await listAllMemberships(web);
-		const memberTestChannels = memberships.filter(m => testChannels.indexOf(m.name) !== -1);
-
-		for (const message of results.logMessages) {
-			for (const testChannel of memberTestChannels) {
-				await web.chat.postMessage({
-					text: message,
-					link_names: true,
-					channel: testChannel.id,
-				});
-			}
-		}
-		for (const message of results.messages) {
-			for (const channel of memberships) {
-				await web.chat.postMessage({
-					text: message,
-					link_names: true,
-					channel: channel.id,
-				});
-			}
-		}
-	}
-}
-
-async function buildComplete(owner: string, repo: string, runId: number) {
-	console.log(`buildComplete: https://github.com/${owner}/${repo}/actions/runs/${runId}`);
-	const auth = `token ${process.env.GITHUB_TOKEN}`;
-	const octokit = new Octokit({ auth });
-	const buildResult = (await octokit.actions.getWorkflowRun({
-		owner,
-		repo,
-		run_id: runId,
-	})).data;
-	if (buildResult.head_branch !== 'master' && !buildResult.head_branch?.startsWith('release/')) {
-		console.error('Private branch. Terminating.')
-		return { logMessages: [], messages: [] };
-	}
-
-	// const buildQuery = `${buildsApiUrl}?$top=10&maxTime=${buildResult.finishTime}&definitions=${buildResult.definition.id}&branchName=${buildResult.sourceBranch}&resultFilter=${results.join(',')}&api-version=5.0-preview.4`;
-
-	const buildResults = (await octokit.actions.listWorkflowRuns({
-		owner,
-		repo,
-		workflow_id: buildResult.workflow_id,
-		branch: buildResult.head_branch || undefined,
-		per_page: 5, // More returns 502s.
-	})).data.workflow_runs
-		.filter(run => run.status === 'completed');
-
-	const currentBuildIndex = buildResults.findIndex(build => build.id === buildResult.id);
-	if (currentBuildIndex === -1) {
-		console.error('Build not on first page. Terminating.')
-		console.error(buildResults.map(({ id, status, conclusion }) => ({ id, status, conclusion })));
-		return { logMessages: [], messages: [] };
-	}
-	const slicedResults = buildResults.slice(currentBuildIndex, currentBuildIndex + 2);
-	const builds = slicedResults
-		.map<Build>((build, i, array) => ({
-			data: build,
-			previousSourceVersion: i < array.length - 1 ? array[i + 1].head_sha : undefined,
-			authors: [],
-			buildHtmlUrl: build.html_url,
-			changesHtmlUrl: '',
-		}));
-	const logMessages = builds.slice(0, 1)
-		.map(build => `Id: ${build.data.id} | Branch: ${build.data.head_branch} | Conclusion: ${build.data.conclusion} | Created: ${build.data.created_at} | Updated: ${build.data.updated_at}`);
-	const transitionedBuilds = builds.filter((build, i, array) => i < array.length - 1 && transitioned(build, array[i + 1]));
-	await Promise.all(transitionedBuilds
-		.map(async build => {
-			if (build.previousSourceVersion) {
-				const cmp = await compareCommits(octokit, owner, repo, build.previousSourceVersion, build.data.head_sha);
-				const commits = cmp.data.commits;
-				const authors = new Set<string>([
-					...commits.map((c: any) => c.author.login),
-					...commits.map((c: any) => c.committer.login),
-				]);
-				authors.delete('web-flow'); // GitHub Web UI committer
-				build.authors = [...authors];
-				build.changesHtmlUrl = `https://github.com/${owner}/${repo}/compare/${build.previousSourceVersion.substr(0, 7)}...${build.data.head_sha.substr(0, 7)}`; // Shorter than: cmp.data.html_url
-			}
-		}));
-	const vscode = repo === 'vscode';
-	const name = vscode ? `VS Code ${buildResult.name} Build` : buildResult.name;
-	// TBD: `Requester: ${vstsToSlackUser(build.requester, build.degraded)}${pingBenForSmokeTests && releaseBuild && build.result === 'partiallySucceeded' ? ' | Ping: @bpasero' : ''}`
-	const accounts = await readAccounts();
-	const githubAccountMap = githubToAccounts(accounts);
-	const messages = transitionedBuilds.map(build => `${name}
-Result: ${build.data.conclusion} | Branch: ${build.data.head_branch} | Authors: ${githubToSlackUsers(githubAccountMap, build.authors, build.degraded).sort().join(', ') || `None (rebuild)`}
-Build: ${build.buildHtmlUrl}
-Changes: ${build.changesHtmlUrl}`);
-	return { logMessages, messages };
-}
-
-const conclusions = ['success', 'failure']
-
-function transitioned(newer: Build, older: Build) {
-	const newerResult = newer.data.conclusion || 'success';
-	const olderResult = older.data.conclusion || 'success';
-	if (newerResult === olderResult) {
-		return false;
-	}
-	if (conclusions.indexOf(newerResult) > conclusions.indexOf(olderResult)) {
-		newer.degraded = true;
-	}
-	return true;
-}
-
-async function compareCommits(octokit: Octokit, owner: string, repo: string, base: string, head: string) {
-	return octokit.repos.compareCommits({ owner, repo, base, head });
-}
-
-function githubToSlackUsers(githubToAccounts: Record<string, Accounts>, githubUsers: string[], at?: boolean) {
-	return githubUsers.map(g => githubToAccounts[g] ? `${at ? '@' : ''}${githubToAccounts[g].slack}` : g);
-}
-
-interface Accounts {
-	github: string;
-	slack: string;
-	vsts: string;
-}
-
-function githubToAccounts(accounts: Accounts[]) {
-	return accounts.reduce((m, e) => {
-		m[e.github] = e;
-		return m;
-	}, <Record<string, Accounts>>{});
-}
-
-async function readAccounts() {
-	const connectionString = process.env.BUILD_CHAT_STORAGE_CONNECTION_STRING;
-	if (!connectionString) {
-		console.error('Connection string missing.');
-		return [];
-	}
-	const buf = await readFile(connectionString, 'config', '/', 'accounts.json');
-	return JSON.parse(buf.toString()) as Accounts[];
-}
-
-async function readFile(connectionString: string, share: string, directory: string, filename: string) {
-	return new Promise<Buffer>((resolve, reject) => {
-		const stream = new WritableStreamBuffer()
-		const fileService = storage.createFileService(connectionString);
-		fileService.getFileToStream(share, directory, filename, stream, err => {
-			if (err) {
-				reject(err);
-			} else {
-				const contents = stream.getContents();
-				if (contents) {
-					resolve(contents);
-				} else {
-					reject(new Error('No content'));
-				}
-			}
-		});
-	});
-}
-
-interface AllChannels {
-	channels: {
-		id: string;
-		name: string;
-		is_member: boolean;
-	}[];
-}
-
-async function listAllMemberships(web: WebClient) {
-	const groups = await web.conversations.list({ types: 'public_channel,private_channel' }) as unknown as AllChannels;
-	return groups.channels
-		.filter(c => c.is_member);
-}
-
-interface Build {
-	data: RestEndpointMethodTypes['actions']['getWorkflowRun']['response']['data'];
-	previousSourceVersion: string | undefined;
-	authors: string[];
-	buildHtmlUrl: string;
-	changesHtmlUrl: string;
-	degraded?: boolean;
-}
--- a/.github/actions/build-chat/tsconfig.json
+++ b/.github/actions/build-chat/tsconfig.json
@ -1,18 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es2017",
-        "strict": true,
-        "noUnusedLocals": true,
-        "resolveJsonModule": true,
-        "lib": [
-            "es2017"
-        ],
-        "sourceMap": true,
-        "outDir": "./dist",
-        "rootDir": "./src",
-    },
-    "exclude": [
-        "node_modules"
-    ]
-}
--- a/.github/actions/build-chat/yarn.lock
+++ b/.github/actions/build-chat/yarn.lock
@ -1,728 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@actions/core@^1.2.6":
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.2.6.tgz#a78d49f41a4def18e88ce47c2cac615d5694bf09"
-  integrity sha512-ZQYitnqiyBc3D+k7LsgSBmMDVkOVidaagDG7j3fOym77jNunWRuYx7VSHa9GNfFZh+zh61xsCjRj4JxMZlDqTA==
-
-"@octokit/auth-token@^2.4.4":
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.4.tgz#ee31c69b01d0378c12fd3ffe406030f3d94d3b56"
-  integrity sha512-LNfGu3Ro9uFAYh10MUZVaT7X2CnNm2C8IDQmabx+3DygYIQjs9FwzFAHN/0t6mu5HEPhxcb1XOuxdpY82vCg2Q==
-  dependencies:
-    "@octokit/types" "^6.0.0"
-
-"@octokit/core@^3.2.3":
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.2.4.tgz#5791256057a962eca972e31818f02454897fd106"
-  integrity sha512-d9dTsqdePBqOn7aGkyRFe7pQpCXdibSJ5SFnrTr0axevObZrpz3qkWm7t/NjYv5a66z6vhfteriaq4FRz3e0Qg==
-  dependencies:
-    "@octokit/auth-token" "^2.4.4"
-    "@octokit/graphql" "^4.5.8"
-    "@octokit/request" "^5.4.12"
-    "@octokit/types" "^6.0.3"
-    before-after-hook "^2.1.0"
-    universal-user-agent "^6.0.0"
-
-"@octokit/endpoint@^6.0.1":
-  version "6.0.10"
-  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.10.tgz#741ce1fa2f4fb77ce8ebe0c6eaf5ce63f565f8e8"
-  integrity sha512-9+Xef8nT7OKZglfkOMm7IL6VwxXUQyR7DUSU0LH/F7VNqs8vyd7es5pTfz9E7DwUIx7R3pGscxu1EBhYljyu7Q==
-  dependencies:
-    "@octokit/types" "^6.0.0"
-    is-plain-object "^5.0.0"
-    universal-user-agent "^6.0.0"
-
-"@octokit/graphql@^4.5.8":
-  version "4.5.8"
-  resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.5.8.tgz#d42373633c3015d0eafce64a8ce196be167fdd9b"
-  integrity sha512-WnCtNXWOrupfPJgXe+vSmprZJUr0VIu14G58PMlkWGj3cH+KLZEfKMmbUQ6C3Wwx6fdhzVW1CD5RTnBdUHxhhA==
-  dependencies:
-    "@octokit/request" "^5.3.0"
-    "@octokit/types" "^6.0.0"
-    universal-user-agent "^6.0.0"
-
-"@octokit/openapi-types@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-3.0.0.tgz#f73d48af2d21bf4f97fbf38fae43b54699e0dbba"
-  integrity sha512-jOp1CVRw+OBJaZtG9QzZggvJXvyzgDXuW948SWsDiwmyDuCjeYCiF3TDD/qvhpF580RfP7iBIos4AVU6yhgMlA==
-
-"@octokit/plugin-paginate-rest@^2.6.2":
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.8.0.tgz#2b41e12b494e895bf5fb5b12565d2c80a0ecc6ae"
-  integrity sha512-HtuEQ2AYE4YFEBQN0iHmMsIvVucd5RsnwJmRKIsfAg1/ZeoMaU+jXMnTAZqIUEmcVJA27LjHUm3f1hxf8Fpdxw==
-  dependencies:
-    "@octokit/types" "^6.4.0"
-
-"@octokit/plugin-request-log@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.2.tgz#394d59ec734cd2f122431fbaf05099861ece3c44"
-  integrity sha512-oTJSNAmBqyDR41uSMunLQKMX0jmEXbwD1fpz8FG27lScV3RhtGfBa1/BBLym+PxcC16IBlF7KH9vP1BUYxA+Eg==
-
-"@octokit/plugin-rest-endpoint-methods@4.4.1":
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.4.1.tgz#105cf93255432155de078c9efc33bd4e14d1cd63"
-  integrity sha512-+v5PcvrUcDeFXf8hv1gnNvNLdm4C0+2EiuWt9EatjjUmfriM1pTMM+r4j1lLHxeBQ9bVDmbywb11e3KjuavieA==
-  dependencies:
-    "@octokit/types" "^6.1.0"
-    deprecation "^2.3.1"
-
-"@octokit/request-error@^2.0.0":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.4.tgz#07dd5c0521d2ee975201274c472a127917741262"
-  integrity sha512-LjkSiTbsxIErBiRh5wSZvpZqT4t0/c9+4dOe0PII+6jXR+oj/h66s7E4a/MghV7iT8W9ffoQ5Skoxzs96+gBPA==
-  dependencies:
-    "@octokit/types" "^6.0.0"
-    deprecation "^2.0.0"
-    once "^1.4.0"
-
-"@octokit/request@^5.3.0", "@octokit/request@^5.4.12":
-  version "5.4.12"
-  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.12.tgz#b04826fa934670c56b135a81447be2c1723a2ffc"
-  integrity sha512-MvWYdxengUWTGFpfpefBBpVmmEYfkwMoxonIB3sUGp5rhdgwjXL1ejo6JbgzG/QD9B/NYt/9cJX1pxXeSIUCkg==
-  dependencies:
-    "@octokit/endpoint" "^6.0.1"
-    "@octokit/request-error" "^2.0.0"
-    "@octokit/types" "^6.0.3"
-    deprecation "^2.0.0"
-    is-plain-object "^5.0.0"
-    node-fetch "^2.6.1"
-    once "^1.4.0"
-    universal-user-agent "^6.0.0"
-
-"@octokit/rest@^18.0.12":
-  version "18.0.12"
-  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.0.12.tgz#278bd41358c56d87c201e787e8adc0cac132503a"
-  integrity sha512-hNRCZfKPpeaIjOVuNJzkEL6zacfZlBPV8vw8ReNeyUkVvbuCvvrrx8K8Gw2eyHHsmd4dPlAxIXIZ9oHhJfkJpw==
-  dependencies:
-    "@octokit/core" "^3.2.3"
-    "@octokit/plugin-paginate-rest" "^2.6.2"
-    "@octokit/plugin-request-log" "^1.0.2"
-    "@octokit/plugin-rest-endpoint-methods" "4.4.1"
-
-"@octokit/types@^6.0.0", "@octokit/types@^6.0.3", "@octokit/types@^6.1.0", "@octokit/types@^6.4.0":
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.4.0.tgz#f3f47be70bcdb3c26f2c2619f3dd0ced466a265c"
-  integrity sha512-1FEmuVppZE2zG0rBdQlviRz5cp0udyI63zyhBVPrm0FRNAsQkAXU7IYWQg1XvhChFut8YbFYN1usQpk54D6/4w==
-  dependencies:
-    "@octokit/openapi-types" "^3.0.0"
-    "@types/node" ">= 8"
-
-"@slack/logger@>=1.0.0 <3.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@slack/logger/-/logger-2.0.0.tgz#6a4e1c755849bc0f66dac08a8be54ce790ec0e6b"
-  integrity sha512-OkIJpiU2fz6HOJujhlhfIGrc8hB4ibqtf7nnbJQDerG0BqwZCfmgtK5sWzZ0TkXVRBKD5MpLrTmCYyMxoMCgPw==
-  dependencies:
-    "@types/node" ">=8.9.0"
-
-"@slack/types@^1.7.0":
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/@slack/types/-/types-1.10.0.tgz#cbf7d83e1027f4cbfd13d6b429f120c7fb09127a"
-  integrity sha512-tA7GG7Tj479vojfV3AoxbckalA48aK6giGjNtgH6ihpLwTyHE3fIgRrvt8TWfLwW8X8dyu7vgmAsGLRG7hWWOg==
-
-"@slack/web-api@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@slack/web-api/-/web-api-6.0.0.tgz#14c65ed73c66a187e5f20e12c3898dfd8d5cbf7c"
-  integrity sha512-YD1wqWuzrYPf4RQyD7OnYS5lImUmNWn+G5V6Qt0N97fPYxqhT72YJtRdSnsTc3VkH5R5imKOhYxb+wqI9hiHnA==
-  dependencies:
-    "@slack/logger" ">=1.0.0 <3.0.0"
-    "@slack/types" "^1.7.0"
-    "@types/is-stream" "^1.1.0"
-    "@types/node" ">=12.0.0"
-    axios "^0.21.1"
-    eventemitter3 "^3.1.0"
-    form-data "^2.5.0"
-    is-stream "^1.1.0"
-    p-queue "^6.6.1"
-    p-retry "^4.0.0"
-
-"@types/is-stream@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@types/is-stream/-/is-stream-1.1.0.tgz#b84d7bb207a210f2af9bed431dc0fbe9c4143be1"
-  integrity sha512-jkZatu4QVbR60mpIzjINmtS1ZF4a/FqdTUTBeQDVOQ2PYyidtwFKr0B5G6ERukKwliq+7mIXvxyppwzG5EgRYg==
-  dependencies:
-    "@types/node" "*"
-
-"@types/node@*", "@types/node@>= 8", "@types/node@>=12.0.0", "@types/node@>=8.9.0", "@types/node@^14.14.22":
-  version "14.14.22"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.22.tgz#0d29f382472c4ccf3bd96ff0ce47daf5b7b84b18"
-  integrity sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==
-
-"@types/retry@^0.12.0":
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
-  integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
-
-"@types/stream-buffers@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/stream-buffers/-/stream-buffers-3.0.3.tgz#34e565bf64e3e4bdeee23fd4aa58d4636014a02b"
-  integrity sha512-NeFeX7YfFZDYsCfbuaOmFQ0OjSmHreKBpp7MQ4alWQBHeh2USLsj7qyMyn9t82kjqIX516CR/5SRHnARduRtbQ==
-  dependencies:
-    "@types/node" "*"
-
-ajv@^6.12.3:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-asn1@~0.2.3:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-
-aws4@^1.8.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
-  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
-
-axios@^0.21.1:
-  version "0.21.1"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
-  integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
-  dependencies:
-    follow-redirects "^1.10.0"
-
-azure-storage@^2.10.3:
-  version "2.10.3"
-  resolved "https://registry.yarnpkg.com/azure-storage/-/azure-storage-2.10.3.tgz#c5966bf929d87587d78f6847040ea9a4b1d4a50a"
-  integrity sha512-IGLs5Xj6kO8Ii90KerQrrwuJKexLgSwYC4oLWmc11mzKe7Jt2E5IVg+ZQ8K53YWZACtVTMBNO3iGuA+4ipjJxQ==
-  dependencies:
-    browserify-mime "~1.2.9"
-    extend "^3.0.2"
-    json-edm-parser "0.1.2"
-    md5.js "1.3.4"
-    readable-stream "~2.0.0"
-    request "^2.86.0"
-    underscore "~1.8.3"
-    uuid "^3.0.0"
-    validator "~9.4.1"
-    xml2js "0.2.8"
-    xmlbuilder "^9.0.7"
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
-  dependencies:
-    tweetnacl "^0.14.3"
-
-before-after-hook@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.1.0.tgz#b6c03487f44e24200dd30ca5e6a1979c5d2fb635"
-  integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A==
-
-browserify-mime@~1.2.9:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/browserify-mime/-/browserify-mime-1.2.9.tgz#aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"
-  integrity sha1-rrGvKN5sDXpqLOQK22j/GEIq8x8=
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-
-combined-stream@^1.0.6, combined-stream@~1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-core-util-is@1.0.2, core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
-  dependencies:
-    assert-plus "^1.0.0"
-
-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=
-
-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==
-
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
-eventemitter3@^3.1.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
-  integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
-
-eventemitter3@^4.0.4:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
-  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
-
-extend@^3.0.2, extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
-
-fast-deep-equal@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-follow-redirects@^1.10.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7"
-  integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
-form-data@^2.5.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
-  integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-  dependencies:
-    assert-plus "^1.0.0"
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
-hash-base@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
-  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
-  dependencies:
-    inherits "^2.0.4"
-    readable-stream "^3.6.0"
-    safe-buffer "^5.2.0"
-
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-is-plain-object@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
-  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
-
-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=
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
-json-edm-parser@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/json-edm-parser/-/json-edm-parser-0.1.2.tgz#1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"
-  integrity sha1-HmCw/vG8CvZ7wNFG393lSGzWFbQ=
-  dependencies:
-    jsonparse "~1.2.0"
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
-jsonparse@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.2.0.tgz#5c0c5685107160e72fe7489bddea0b44c2bc67bd"
-  integrity sha1-XAxWhRBxYOcv50ib3eoLRMK8Z70=
-
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
-md5.js@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
-  integrity sha1-6b296UogpawYsENA/Fdk1bCdkB0=
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-
-mime-db@1.45.0:
-  version "1.45.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
-  integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==
-
-mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.28"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd"
-  integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==
-  dependencies:
-    mime-db "1.45.0"
-
-node-fetch@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
-  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
-
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
-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"
-
-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=
-
-p-queue@^6.6.1:
-  version "6.6.2"
-  resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-6.6.2.tgz#2068a9dcf8e67dd0ec3e7a2bcb76810faa85e426"
-  integrity sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==
-  dependencies:
-    eventemitter3 "^4.0.4"
-    p-timeout "^3.2.0"
-
-p-retry@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.2.0.tgz#ea9066c6b44f23cab4cd42f6147cdbbc6604da5d"
-  integrity sha512-jPH38/MRh263KKcq0wBNOGFJbm+U6784RilTmHjB/HM9kH9V8WlCpVUcdOmip9cjXOh6MxZ5yk1z2SjDUJfWmA==
-  dependencies:
-    "@types/retry" "^0.12.0"
-    retry "^0.12.0"
-
-p-timeout@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
-  integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
-  dependencies:
-    p-finally "^1.0.0"
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
-process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
-
-psl@^1.1.28:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
-
-punycode@^2.1.0, punycode@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
-
-readable-stream@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readable-stream@~2.0.0:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
-  integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
-    util-deprecate "~1.0.1"
-
-request@^2.86.0:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
-retry@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.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==
-
-safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-sax@0.5.x:
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
-  integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=
-
-sshpk@^1.7.0:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
-  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
-stream-buffers@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-3.0.2.tgz#5249005a8d5c2d00b3a32e6e0a6ea209dc4f3521"
-  integrity sha512-DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ==
-
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
-
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
-typescript@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
-  integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
-
-underscore@~1.8.3:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
-  integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=
-
-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==
-
-uri-js@^4.2.2:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
-  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
-  dependencies:
-    punycode "^2.1.0"
-
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-uuid@^3.0.0, uuid@^3.3.2:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
-validator@~9.4.1:
-  version "9.4.1"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-9.4.1.tgz#abf466d398b561cd243050112c6ff1de6cc12663"
-  integrity sha512-YV5KjzvRmSyJ1ee/Dm5UED0G+1L4GZnLN3w6/T+zZm8scVua4sOhYKWTUrKa0H/tMiJyO9QLHMPN+9mB/aMunA==
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-xml2js@0.2.8:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.2.8.tgz#9b81690931631ff09d1957549faf54f4f980b3c2"
-  integrity sha1-m4FpCTFjH/CdGVdUn69U9PmAs8I=
-  dependencies:
-    sax "0.5.x"
-
-xmlbuilder@^9.0.7:
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
-  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
--- a/.github/workflows/author-verified.yml
+++ b/.github/workflows/author-verified.yml
@ -1,9 +1,5 @@
 name: Author Verified
 on:
-  repository_dispatch:
-    types: [trigger-author-verified]
-  schedule:
-    - cron: 20 14 * * * # 4:20pm Zurich
  issues:
    types: [closed]

@ -13,28 +9,22 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Actions
-        if: github.event_name != 'issues' || contains(github.event.issue.labels.*.name, 'author-verification-requested')
+        if: contains(github.event.issue.labels.*.name, 'author-verification-requested') && contains(github.event.issue.labels.*.name, 'insiders-released')
        uses: actions/checkout@v2
        with:
          repository: "microsoft/vscode-github-triage-actions"
-          ref: v42
+          ref: stable
          path: ./actions
      - name: Install Actions
-        if: github.event_name != 'issues' || contains(github.event.issue.labels.*.name, 'author-verification-requested')
+        if: contains(github.event.issue.labels.*.name, 'author-verification-requested') && contains(github.event.issue.labels.*.name, 'insiders-released')
        run: npm install --production --prefix ./actions
-      - name: Checkout Repo
-        if: github.event_name != 'issues' || contains(github.event.issue.labels.*.name, 'author-verification-requested')
-        uses: actions/checkout@v2
-        with:
-          path: ./repo
-          fetch-depth: 0
      - name: Run Author Verified
-        if: github.event_name != 'issues' || contains(github.event.issue.labels.*.name, 'author-verification-requested')
+        if: contains(github.event.issue.labels.*.name, 'author-verification-requested') && contains(github.event.issue.labels.*.name, 'insiders-released')
        uses: ./actions/author-verified
        with:
          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          requestVerificationComment: "This bug has been fixed in to the latest release of [VS Code Insiders](https://code.visualstudio.com/insiders/)!\n\n@${author}, you can help us out by commenting `/verified` if things are now working as expected.\n\nIf things still don't seem right, please ensure you're on version ${commit} of Insiders (today's or later - you can use `Help: About` in the command palette to check), and leave a comment letting us know what isn't working as expected.\n\nHappy Coding!"
-          pendingReleaseLabel: awaiting-insiders-release
+          requestVerificationComment: "This bug has been fixed in the latest release of [VS Code Insiders](https://code.visualstudio.com/insiders/)!\n\n@${author}, you can help us out by commenting `/verified` if things are now working as expected.\n\nIf things still don't seem right, please ensure you're on version ${commit} of Insiders (today's or later - you can use `Help: About` in the command palette to check), and leave a comment letting us know what isn't working as expected.\n\nHappy Coding!"
+          releasedLabel: insiders-released
          verifiedLabel: verified
          authorVerificationRequestedLabel: author-verification-requested
--- a/.github/workflows/build-chat.yml
+++ b/.github/workflows/build-chat.yml
@ -14,23 +14,22 @@ jobs:
  main:
    runs-on: ubuntu-latest
    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Setup Node.js 12.x
-      uses: actions/setup-node@v1.4.4
-      with:
-          node-version: "12.x"
-
-    - name: Build
-      run: yarn install && yarn run build
-      working-directory: .github/actions/build-chat
-
-    - name: Build Chat
-      uses: ./.github/actions/build-chat
-      with:
-        workflow_run_url: ${{ github.event.workflow_run.url }}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        SLACK_TOKEN: ${{ secrets.SLACK_TOKEN }}
-        BUILD_CHAT_STORAGE_CONNECTION_STRING: ${{ secrets.BUILD_CHAT_STORAGE_CONNECTION_STRING }}
+      - name: Checkout Actions
+        uses: actions/checkout@v2
+        with:
+          repository: "microsoft/vscode-github-triage-actions"
+          path: ./actions
+      - name: Install Actions
+        run: npm install --production --prefix ./actions
+      - name: Install Additional Dependencies
+        # Pulls in a bunch of other packages that arent needed for the rest of the actions
+        run: npm install @azure/storage-blob@12.1.1
+      - name: Build Chat
+        uses: ./actions/build-chat
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          slack_token: ${{ secrets.SLACK_TOKEN }}
+          storage_connection_string: ${{ secrets.BUILD_CHAT_STORAGE_CONNECTION_STRING }}
+          workflow_run_url: ${{ github.event.workflow_run.url }}
+          notification_channel: build
+          log_channel: bot-log
--- a/.github/workflows/deep-classifier-monitor.yml
+++ b/.github/workflows/deep-classifier-monitor.yml
@ -11,7 +11,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: "microsoft/vscode-github-triage-actions"
-          ref: v42
+          ref: stable
          path: ./actions
      - name: Install Actions
        run: npm install --production --prefix ./actions
--- a/.github/workflows/deep-classifier-runner.yml
+++ b/.github/workflows/deep-classifier-runner.yml
@ -13,7 +13,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: "microsoft/vscode-github-triage-actions"
-          ref: v42
+          ref: stable
          path: ./actions
      - name: Install Actions
        run: npm install --production --prefix ./actions
--- a/.github/workflows/deep-classifier-scraper.yml
+++ b/.github/workflows/deep-classifier-scraper.yml
@ -11,7 +11,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: "microsoft/vscode-github-triage-actions"
-          ref: v42
+          ref: stable
          path: ./actions
      - name: Install Actions
        run: npm install --production --prefix ./actions
--- a/.github/workflows/english-please.yml
+++ b/.github/workflows/english-please.yml
@ -13,7 +13,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: "microsoft/vscode-github-triage-actions"
-          ref: v42
+          ref: stable
          path: ./actions
      - name: Install Actions
        if: contains(github.event.issue.labels.*.name, '*english-please')
--- a/.github/workflows/feature-request.yml
+++ b/.github/workflows/feature-request.yml
@ -18,7 +18,7 @@ jobs:
        with:
          repository: "microsoft/vscode-github-triage-actions"
          path: ./actions
-          ref: v42
+          ref: stable
      - name: Install Actions
        if: github.event_name != 'issues' || contains(github.event.issue.labels.*.name, 'feature-request')
        run: npm install --production --prefix ./actions
--- a/.github/workflows/latest-release-monitor.yml
+++ b/.github/workflows/latest-release-monitor.yml
@ -14,7 +14,7 @@ jobs:
        with:
          repository: "microsoft/vscode-github-triage-actions"
          path: ./actions
-          ref: v42
+          ref: stable
      - name: Install Actions
        run: npm install --production --prefix ./actions
      - name: Install Storage Module
--- a/.github/workflows/locker.yml
+++ b/.github/workflows/locker.yml
@ -14,7 +14,7 @@ jobs:
        with:
          repository: "microsoft/vscode-github-triage-actions"
          path: ./actions
-          ref: v42
+          ref: stable
      - name: Install Actions
        run: npm install --production --prefix ./actions
      - name: Run Locker
--- a/.github/workflows/needs-more-info-closer.yml
+++ b/.github/workflows/needs-more-info-closer.yml
@ -14,7 +14,7 @@ jobs:
        with:
          repository: "microsoft/vscode-github-triage-actions"
          path: ./actions
-          ref: v42
+          ref: stable
      - name: Install Actions
        run: npm install --production --prefix ./actions
      - name: Run Needs More Info Closer
--- a/.github/workflows/no-yarn-lock-changes.yml
+++ b/.github/workflows/no-yarn-lock-changes.yml
@ -0,0 +1,14 @@
+name: Prevent yarn.lock changes in PRs
+on: [pull_request]
+
+jobs:
+  main:
+    name: Prevent yarn.lock changes in PRs
+    runs-on: ubuntu-latest
+    steps:
+      - id: file_changes
+        uses: trilom/file-changes-action@v1.2.4
+      - name: Check for yarn.lock changes
+        run: |
+          cat $HOME/files.json | jq -e '.[] | test("yarn\\.lock$") | not' \
+            || (echo "Changes to yarn.lock files aren't allowed in PRs." && exit 1)
--- a/.github/workflows/on-comment.yml
+++ b/.github/workflows/on-comment.yml
@ -1,4 +1,4 @@
-name: Commands
+name: On Comment
 on:
  issue_comment:
    types: [created]
@ -13,7 +13,7 @@ jobs:
        with:
          repository: "microsoft/vscode-github-triage-actions"
          path: ./actions
-          ref: v42
+          ref: stable
      - name: Install Actions
        run: npm install --production --prefix ./actions
      - name: Run Commands
@ -22,3 +22,10 @@ jobs:
          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
          config-path: commands
+      - name: "Run Release Pipeline Labeler"
+        uses: ./actions/release-pipeline
+        with:
+          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
+          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
+          notYetReleasedLabel: unreleased
+          insidersReleasedLabel: insiders-released
--- a/.github/workflows/on-label.yml
+++ b/.github/workflows/on-label.yml
@ -11,29 +11,25 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: "microsoft/vscode-github-triage-actions"
-          ref: v42
+          ref: stable
          path: ./actions
      - name: Install Actions
        run: npm install --production --prefix ./actions

      # source of truth in ./author-verified.yml
-      - name: Checkout Repo
-        if: contains(github.event.issue.labels.*.name, 'author-verification-requested')
-        uses: actions/checkout@v2
-        with:
-          path: ./repo
-          fetch-depth: 0
      - name: Run Author Verified
-        if: contains(github.event.issue.labels.*.name, 'author-verification-requested')
+        if: contains(github.event.issue.labels.*.name, 'author-verification-requested') && contains(github.event.issue.labels.*.name, 'insiders-released')
        uses: ./actions/author-verified
        with:
          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          requestVerificationComment: "This bug has been fixed in to the latest release of [VS Code Insiders](https://code.visualstudio.com/insiders/)!\n\n@${author}, you can help us out by confirming things are working as expected in the latest Insiders release. If things look good, please leave a comment with the text `/verified` to let us know. If not, please ensure you're on version ${commit} of Insiders (today's or later - you can use `Help: About` in the command palette to check), and leave a comment letting us know what isn't working as expected.\n\nHappy Coding!"
-          pendingReleaseLabel: awaiting-insiders-release
+          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
+          requestVerificationComment: "This bug has been fixed in the latest release of [VS Code Insiders](https://code.visualstudio.com/insiders/)!\n\n@${author}, you can help us out by commenting `/verified` if things are now working as expected.\n\nIf things still don't seem right, please ensure you're on version ${commit} of Insiders (today's or later - you can use `Help: About` in the command palette to check), and leave a comment letting us know what isn't working as expected.\n\nHappy Coding!"
+          releasedLabel: insiders-released
          verifiedLabel: verified
          authorVerificationRequestedLabel: author-verification-requested

-      # source of truth in ./commands.yml
+
+      # also make changes in ./on-comment.yml
      - name: Run Commands
        uses: ./actions/commands
        with:
--- a/.github/workflows/on-open.yml
+++ b/.github/workflows/on-open.yml
@ -11,7 +11,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: "microsoft/vscode-github-triage-actions"
-          ref: v42
+          ref: stable
          path: ./actions
      - name: Install Actions
        run: npm install --production --prefix ./actions
--- a/.github/workflows/release-pipeline-labeler.yml
+++ b/.github/workflows/release-pipeline-labeler.yml
@ -13,7 +13,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: "microsoft/vscode-github-triage-actions"
-          ref: v42
+          ref: stable
          path: ./actions
      - name: Checkout Repo
        if: github.event_name != 'issues'
--- a/.github/workflows/test-plan-item-validator.yml
+++ b/.github/workflows/test-plan-item-validator.yml
@ -14,7 +14,7 @@ jobs:
        with:
          repository: "microsoft/vscode-github-triage-actions"
          path: ./actions
-          ref: v42
+          ref: stable
      - name: Install Actions
        if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item')
        run: npm install --production --prefix ./actions
--- a/.mailmap
+++ b/.mailmap
@ -1,2 +1,5 @@
 Eric Amodio <eamodio@microsoft.com> Eric Amodio <eamodio@gmail.com>
 Daniel Imms <daimms@microsoft.com> Daniel Imms <tyriar@tyriar.com>
+Tanha Kabir <tanha.kabir@microsoft.com> Tanha Kabir <tanhakabir.ca@gmail.com>
+Raymond Zhao <raymondzhao@microsoft.com>
+Tyler Leonhardt <tyleonha@microsoft.com> Tyler Leonhardt <me@tylerleonhardt.com>
--- a/.vscode/notebooks/api.github-issues
+++ b/.vscode/notebooks/api.github-issues
@ -8,7 +8,7 @@
  {
    "kind": 2,
    "language": "github-issues",
-    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"January 2021\"",
+    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"February 2021\"",
    "editable": true
  },
  {
--- a/.vscode/notebooks/endgame.github-issues
+++ b/.vscode/notebooks/endgame.github-issues
@ -8,7 +8,7 @@
  {
    "kind": 2,
    "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server\n\n$MILESTONE=milestone:\"January 2021\"",
+    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-emmet-helper\n\n$MILESTONE=milestone:\"January 2021\"",
    "editable": true
  },
  {
@ -89,10 +89,28 @@
    "value": "# Verification",
    "editable": true
  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Verifiable Fixes",
+    "editable": true
+  },
  {
    "kind": 2,
    "language": "github-issues",
-    "value": "$REPOS $MILESTONE is:issue is:closed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found",
+    "value": "$REPOS $MILESTONE is:issue is:closed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -label:z-author-verified -label:unreleased",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Unreleased Fixes",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE is:issue is:closed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -label:z-author-verified label:unreleased",
    "editable": true
  },
  {
--- a/.vscode/notebooks/grooming-delta.github-issues
+++ b/.vscode/notebooks/grooming-delta.github-issues
@ -176,17 +176,20 @@
  {
    "kind": 1,
    "language": "markdown",
-    "value": "# vscode-pull-request-github"
+    "value": "# vscode-pull-request-github",
+    "editable": true
  },
  {
    "kind": 2,
    "language": "github-issues",
-    "value": "repo:microsoft/vscode-pull-request-github is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-pull-request-github is:issue closed:>$since",
+    "editable": true
  },
  {
    "kind": 2,
    "language": "github-issues",
-    "value": "repo:microsoft/vscode-test is:issue created:>$since"
+    "value": "repo:microsoft/vscode-test is:issue created:>$since",
+    "editable": true
  },
  {
    "kind": 1,
--- a/.vscode/notebooks/my-endgame.github-issues
+++ b/.vscode/notebooks/my-endgame.github-issues
@ -152,7 +152,7 @@
  {
    "kind": 2,
    "language": "github-issues",
-    "value": "$REPOS $MILESTONE $MINE is:issue is:open label:bug label:verification-steps-needed",
+    "value": "$REPOS $MILESTONE $MINE is:issue label:bug label:verification-steps-needed",
    "editable": true
  },
  {
@ -164,7 +164,7 @@
  {
    "kind": 2,
    "language": "github-issues",
-    "value": "$REPOS $MILESTONE $MINE is:issue is:open label:bug label:verification-found",
+    "value": "$REPOS $MILESTONE $MINE is:issue label:bug label:verification-found",
    "editable": true
  },
  {
@ -176,7 +176,7 @@
  {
    "kind": 2,
    "language": "github-issues",
-    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed author:@me sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found",
+    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed author:@me sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found",
    "editable": true
  },
  {
@ -188,7 +188,7 @@
  {
    "kind": 2,
    "language": "github-issues",
-    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:bamurtaugh -author:bpasero -author:btholt -author:chrisdias -author:chrmarti -author:Chuxel -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:eamodio -author:egamma -author:fiveisprime -author:gregvanl -author:isidorn -author:ItalyPaleAle -author:JacksonKearl -author:joaomoreno -author:jrieken -author:kieferrm -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:ornellaalt -author:orta -author:rebornix -author:RMacfarlane -author:roblourens -author:rzhao271 -author:sana-ajani -author:sandy081 -author:sbatten -author:stevencl -author:Tyriar -author:weinand -author:TylerLeonhardt -author:lramos15",
+    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:bamurtaugh -author:bpasero -author:btholt -author:chrisdias -author:chrmarti -author:Chuxel -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:eamodio -author:egamma -author:fiveisprime -author:gregvanl -author:isidorn -author:ItalyPaleAle -author:JacksonKearl -author:joaomoreno -author:jrieken -author:kieferrm -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:ornellaalt -author:orta -author:rebornix -author:RMacfarlane -author:roblourens -author:rzhao271 -author:sana-ajani -author:sandy081 -author:sbatten -author:stevencl -author:Tyriar -author:weinand -author:TylerLeonhardt -author:lramos15",
    "editable": true
  },
  {
@ -200,7 +200,7 @@
  {
    "kind": 2,
    "language": "github-issues",
-    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed -author:@me sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found",
+    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed -author:@me sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found",
    "editable": true
  },
  {
--- a/.vscode/notebooks/my-work.github-issues
+++ b/.vscode/notebooks/my-work.github-issues
@ -8,7 +8,7 @@
  {
    "kind": 2,
    "language": "github-issues",
-    "value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog\n\n// current milestone name\n$milestone=milestone:\"January 2021\"",
+    "value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog\n\n// current milestone name\n$milestone=milestone:\"February 2021\"",
    "editable": true
  },
  {
--- a/.vscode/notebooks/notebook-papercuts.github-issues
+++ b/.vscode/notebooks/notebook-papercuts.github-issues
@ -1,14 +0,0 @@
-[
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Native Notebook Paper Cuts\n\nThis notebook serves as an ongoing collection of paper cut issues that we encounter while dogfooding native notebooks. With that in mind only promote issues that really turn you off when using notebooks, e.g issues that make you wanna stop using native notebooks. To mark an issue (bug, feature-request, etc) as paper cut add the labels: `notebook` _and_ `papercut :drop_of_blood:`",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/vscode is:open label:notebook label:\"papercut :drop_of_blood:\"",
-    "editable": true
-  }
-]
--- a/.vscode/notebooks/papercuts.github-issues
+++ b/.vscode/notebooks/papercuts.github-issues
@ -0,0 +1,44 @@
+[
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Papercuts\n\nThis notebook serves as an ongoing collection of papercut issues that we encounter while dogfooding. With that in mind only promote issues that really turn you off, e.g. issues that make you want to stop using VS Code or its extensions. To mark an issue (bug, feature-request, etc.) as papercut add the labels: `papercut :drop_of_blood:`",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## All Papercuts\n\nThese are all papercut issues that we encounter while dogfooding vscode or extensions that we author.",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "repo:microsoft/vscode is:open -label:notebook label:\"papercut :drop_of_blood:\"",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Native Notebook",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "repo:microsoft/vscode is:open label:notebook label:\"papercut :drop_of_blood:\"",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "### My Papercuts",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "repo:microsoft/vscode is:open assignee:@me label:\"papercut :drop_of_blood:\"",
+    "editable": true
+  }
+]
--- a/.vscode/notebooks/verification.github-issues
+++ b/.vscode/notebooks/verification.github-issues
@ -14,7 +14,7 @@
  {
    "kind": 2,
    "language": "github-issues",
-    "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks \n$milestone=milestone:\"November 2020\"",
+    "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks \n$milestone=milestone:\"January 2021\"",
    "editable": true
  },
  {
--- a/.yarnrc
+++ b/.yarnrc
@ -1,3 +1,3 @@
 disturl "https://electronjs.org/headers"
-target "11.2.1"
+target "11.2.2"
 runtime "electron"
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@ -207,7 +207,7 @@ steps:
      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin" \
      ./scripts/test-integration.sh --build --tfs "Integration Tests"
    displayName: Run integration tests (Electron)
-    timeoutInMinutes: 5
+    timeoutInMinutes: 10
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

  - script: |
@ -244,6 +244,16 @@ steps:
    displayName: Run smoke tests (Electron)
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

+  - script: |
+      set -e
+      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      APP_NAME="`ls $APP_ROOT | head -n 1`"
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin" \
+      yarn smoketest-no-compile --build "$APP_ROOT/$APP_NAME" --remote
+    timeoutInMinutes: 5
+    displayName: Run smoke tests (Remote)
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
  - script: |
      set -e
      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@ -172,7 +172,7 @@ steps:
      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
      DISPLAY=:10 ./scripts/test-integration.sh --build --tfs "Integration Tests"
    displayName: Run integration tests (Electron)
-    timeoutInMinutes: 5
+    timeoutInMinutes: 10
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

  - script: |
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@ -84,6 +84,8 @@ parameters:
 variables:
  - name: ENABLE_TERRAPIN
    value: ${{ eq(parameters.ENABLE_TERRAPIN, true) }}
+  - name: VSCODE_QUALITY
+    value: ${{ parameters.VSCODE_QUALITY }}
  - name: VSCODE_BUILD_STAGE_WINDOWS
    value: ${{ or(eq(parameters.VSCODE_BUILD_WIN32, true), eq(parameters.VSCODE_BUILD_WIN32_32BIT, true), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}
  - name: VSCODE_BUILD_STAGE_LINUX
@ -194,7 +196,8 @@ stages:
            steps:
              - template: linux/product-build-linux.yml

-        - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true)) }}:
+        # TODO@joaomoreno: We don't ship ARM snaps for now
+        - ${{ if and(false, eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true)) }}:
          - job: LinuxSnapArmhf
            dependsOn:
              - LinuxArmhf
@ -213,7 +216,8 @@ stages:
            steps:
              - template: linux/product-build-linux.yml

-        - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true)) }}:
+        # TODO@joaomoreno: We don't ship ARM snaps for now
+        - ${{ if and(false, eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true)) }}:
          - job: LinuxSnapArm64
            dependsOn:
              - LinuxArm64
--- a/build/azure-pipelines/win32/import-esrp-auth-cert.ps1
+++ b/build/azure-pipelines/win32/import-esrp-auth-cert.ps1
@ -3,7 +3,7 @@ $ErrorActionPreference = "Stop"

 $CertBytes = [System.Convert]::FromBase64String($CertBase64)
 $CertCollection = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2Collection
-$CertCollection.Import($CertBytes, $null, [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::Exportable)
+$CertCollection.Import($CertBytes, $null, [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::Exportable -bxor [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::PersistKeySet)

 $CertStore = New-Object System.Security.Cryptography.X509Certificates.X509Store("My","LocalMachine")
 $CertStore.Open("ReadWrite")
--- a/build/ext.js
+++ b/build/ext.js
@ -1,207 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-const fs = require('fs').promises;
-const path = require('path');
-const cp = require('child_process');
-const os = require('os');
-const mkdirp = require('mkdirp');
-const product = require('../product.json');
-const root = path.resolve(path.join(__dirname, '..', '..'));
-const exists = (path) => fs.stat(path).then(() => true, () => false);
-
-const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
-
-async function readControlFile() {
-	try {
-		return JSON.parse(await fs.readFile(controlFilePath, 'utf8'));
-	} catch (err) {
-		return {};
-	}
-}
-
-async function writeControlFile(control) {
-	await mkdirp(path.dirname(controlFilePath));
-	await fs.writeFile(controlFilePath, JSON.stringify(control, null, '  '));
-}
-
-async function exec(cmd, args, opts = {}) {
-	return new Promise((c, e) => {
-		const child = cp.spawn(cmd, args, { stdio: 'inherit', env: process.env, ...opts });
-		child.on('close', code => code === 0 ? c() : e(`Returned ${code}`));
-	});
-}
-
-function getFolderPath(extDesc) {
-	const folder = extDesc.repo.replace(/.*\//, '');
-	return folderPath = path.join(root, folder);
-}
-
-async function getExtensionType(folderPath) {
-	const pkg = JSON.parse(await fs.readFile(path.join(folderPath, 'package.json'), 'utf8'));
-
-	if (pkg['contributes']['themes'] || pkg['contributes']['iconThemes']) {
-		return 'theme';
-	} else if (pkg['contributes']['grammars']) {
-		return 'grammar';
-	} else {
-		return 'misc';
-	}
-}
-
-async function initExtension(extDesc) {
-	const folderPath = getFolderPath(extDesc);
-
-	if (!await exists(folderPath)) {
-		console.log(`⏳ git clone: ${extDesc.name}`);
-		await exec('git', ['clone', `${extDesc.repo}.git`], { cwd: root });
-	}
-
-	const type = await getExtensionType(folderPath);
-	return { path: folderPath, type, ...extDesc };
-}
-
-async function createWorkspace(type, extensions) {
-	const workspaceName = `vscode-${type}-extensions.code-workspace`;
-	const workspacePath = path.join(root, workspaceName);
-	const workspace = { folders: extensions.map(ext => ({ path: path.basename(ext.path) })) };
-
-	if (!await exists(workspacePath)) {
-		console.log(`✅ create workspace: ${workspaceName}`);
-	}
-
-	await fs.writeFile(workspacePath, JSON.stringify(workspace, undefined, '  '));
-}
-
-async function init() {
-	const extensions = [];
-
-	for (const extDesc of product.builtInExtensions) {
-		extensions.push(await initExtension(extDesc));
-	}
-
-	await createWorkspace('all', extensions);
-
-	const byType = extensions
-		.reduce((m, e) => m.set(e.type, [...(m.get(e.type) || []), e]), new Map());
-
-	for (const [type, extensions] of byType) {
-		await createWorkspace(type, extensions);
-	}
-
-	return byType;
-}
-
-async function status() {
-	const byType = await init();
-	const control = await readControlFile();
-
-	for (const [type, extensions] of byType) {
-		console.log(`${type} (${extensions.length} extensions):`);
-
-		const maxWidth = Math.max(...extensions.map(e => e.name.length));
-		for (const ext of extensions) {
-			console.log(`  ${ext.name.padEnd(maxWidth, ' ')} ➡  ${control[ext.name]}`);
-		}
-	}
-
-	console.log(`total: ${product.builtInExtensions.length} extensions`);
-}
-
-async function each([cmd, ...args], opts) {
-	await init();
-
-	for (const extDesc of product.builtInExtensions) {
-		const folderPath = getFolderPath(extDesc);
-
-		if (opts.type) {
-			const type = await getExtensionType(folderPath);
-
-			if (type !== opts.type) {
-				continue;
-			}
-		}
-
-		console.log(`👉 ${extDesc.name}`);
-		await exec(cmd, args, { cwd: folderPath });
-	}
-}
-
-async function _link(extensions, opts, fn) {
-	await init();
-
-	const control = await readControlFile();
-
-	for (const extDesc of product.builtInExtensions) {
-		if (extensions.length > 0 && extensions.indexOf(extDesc.name) === -1) {
-			continue;
-		}
-
-		if (opts.type) {
-			const folderPath = getFolderPath(extDesc);
-			const type = await getExtensionType(folderPath);
-
-			if (type !== opts.type) {
-				continue;
-			}
-		}
-
-		await fn(control, extDesc);
-	}
-
-	await writeControlFile(control);
-}
-
-async function link(extensions, opts) {
-	await _link(extensions, opts, async (control, extDesc) => {
-		const ext = await initExtension(extDesc);
-		control[extDesc.name] = ext.path;
-		console.log(`👉 link: ${extDesc.name} ➡ ${ext.path}`);
-	});
-}
-
-async function unlink(extensions, opts) {
-	await _link(extensions, opts, async (control, extDesc) => {
-		control[extDesc.name] = 'marketplace';
-		console.log(`👉 unlink: ${extDesc.name}`);
-	});
-}
-
-if (require.main === module) {
-	const { program } = require('commander');
-
-	program.version('0.0.1');
-
-	program
-		.command('init')
-		.description('Initialize workspace with built-in extensions')
-		.action(init);
-
-	program
-		.command('status')
-		.description('Print extension status')
-		.action(status);
-
-	program
-		.command('each <command...>')
-		.option('-t, --type <type>', 'Specific type only')
-		.description('Run a command in each extension repository')
-		.allowUnknownOption()
-		.action(each);
-
-	program
-		.command('link [extensions...]')
-		.option('-t, --type <type>', 'Specific type only')
-		.description('Link with code-oss')
-		.action(link);
-
-	program
-		.command('unlink [extensions...]')
-		.option('-t, --type <type>', 'Specific type only')
-		.description('Unlink from code-oss')
-		.action(unlink);
-
-	program.parseAsync(process.argv);
-}
--- a/build/filters.js
+++ b/build/filters.js
@ -44,6 +44,7 @@ module.exports.indentationFilter = [
 	'!src/vs/base/node/cpuUsage.sh',
 	'!test/unit/assert.js',
 	'!resources/linux/snap/electron-launch',
+	'!build/ext.js',

 	// except specific folders
 	'!test/automation/out/**',
--- a/build/lib/i18n.resources.json
+++ b/build/lib/i18n.resources.json
@ -218,6 +218,10 @@
 			"name": "vs/workbench/contrib/webviewPanel",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/workspace",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/workspaces",
 			"project": "vscode-workbench"
--- a/build/lib/watch/package.json
+++ b/build/lib/watch/package.json
@ -7,6 +7,6 @@
  "license": "MIT",
  "devDependencies": {},
  "dependencies": {
-    "vscode-gulp-watch": "^5.0.2"
+    "vscode-gulp-watch": "^5.0.3"
  }
 }
--- a/build/lib/watch/yarn.lock
+++ b/build/lib/watch/yarn.lock
@ -2,7 +2,12 @@
 # yarn lockfile v1


-ansi-colors@1.1.0, ansi-colors@^1.0.1:
+ansi-colors@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+
+ansi-colors@^1.0.1:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
  integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==
@ -21,15 +26,7 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=

-anymatch@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
-  integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==
-  dependencies:
-    micromatch "^2.1.5"
-    normalize-path "^2.0.0"
-
-anymatch@~3.1.1:
+anymatch@^3.1.1, anymatch@~3.1.1:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
@ -37,33 +34,16 @@ anymatch@~3.1.1:
    normalize-path "^3.0.0"
    picomatch "^2.0.4"

-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
-  dependencies:
-    arr-flatten "^1.0.1"
-
 arr-diff@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=

-arr-flatten@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
 arr-union@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=

-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
-
 assign-symbols@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
@ -74,15 +54,6 @@ binary-extensions@^2.0.0:
  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
  integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==

-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
 braces@~3.0.2:
  version "3.0.2"
  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
@ -90,10 +61,10 @@ braces@~3.0.2:
  dependencies:
    fill-range "^7.0.1"

-chokidar@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
-  integrity sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==
+chokidar@3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
+  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
  dependencies:
    anymatch "~3.1.1"
    braces "~3.0.2"
@ -101,30 +72,20 @@ chokidar@3.3.0:
    is-binary-path "~2.1.0"
    is-glob "~4.0.1"
    normalize-path "~3.0.0"
-    readdirp "~3.2.0"
+    readdirp "~3.5.0"
  optionalDependencies:
-    fsevents "~2.1.1"
+    fsevents "~2.3.1"

 clone-buffer@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
  integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=

-clone-stats@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
-  integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=
-
 clone-stats@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
  integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=

-clone@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
-
 clone@^2.1.1:
  version "2.1.2"
  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
@ -149,20 +110,6 @@ core-util-is@~1.0.0:
  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=

-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
-  dependencies:
-    fill-range "^2.1.0"
-
 extend-shallow@^3.0.2:
  version "3.0.2"
  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
@ -171,38 +118,16 @@ extend-shallow@^3.0.2:
    assign-symbols "^1.0.0"
    is-extendable "^1.0.1"

-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
-  dependencies:
-    is-extglob "^1.0.0"
-
-fancy-log@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
-  integrity sha1-9BEl49hPLn2JpD0G2VjI94vha+E=
+fancy-log@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
+  integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
  dependencies:
    ansi-gray "^0.1.1"
    color-support "^1.1.3"
+    parse-node-version "^1.0.0"
    time-stamp "^1.0.0"

-filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
-
-fill-range@^2.1.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
-  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^3.0.0"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
 fill-range@^7.0.1:
  version "7.0.1"
  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
@ -217,47 +142,12 @@ first-chunk-stream@^2.0.0:
  dependencies:
    readable-stream "^2.0.2"

-for-in@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+fsevents@~2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f"
+  integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==

-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
-  dependencies:
-    for-in "^1.0.1"
-
-fsevents@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
-  integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==
-
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
-  dependencies:
-    is-glob "^2.0.0"
-
-glob-parent@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-parent@~5.1.0:
+glob-parent@^5.1.1, glob-parent@~5.1.0:
  version "5.1.1"
  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
@ -269,7 +159,7 @@ graceful-fs@^4.1.2:
  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==

-inherits@^2.0.1, 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==
@ -281,28 +171,6 @@ is-binary-path@~2.1.0:
  dependencies:
    binary-extensions "^2.0.0"

-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
-  dependencies:
-    is-primitive "^2.0.0"
-
-is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
 is-extendable@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
@ -310,30 +178,11 @@ is-extendable@^1.0.1:
  dependencies:
    is-plain-object "^2.0.4"

-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
-
-is-extglob@^2.1.0, is-extglob@^2.1.1:
+is-extglob@^2.1.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=

-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
-  dependencies:
-    is-extglob "^1.0.0"
-
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
-  dependencies:
-    is-extglob "^2.1.0"
-
 is-glob@^4.0.1, is-glob@~4.0.1:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
@ -341,18 +190,6 @@ is-glob@^4.0.1, is-glob@~4.0.1:
  dependencies:
    is-extglob "^2.1.1"

-is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-number@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
-
 is-number@^7.0.0:
  version "7.0.0"
  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
@ -365,120 +202,37 @@ is-plain-object@^2.0.4:
  dependencies:
    isobject "^3.0.1"

-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
-
-is-utf8@^0.2.0:
+is-utf8@^0.2.0, is-utf8@^0.2.1:
  version "0.2.1"
  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=

-isarray@1.0.0, isarray@~1.0.0:
+isarray@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=

-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-  dependencies:
-    isarray "1.0.0"
-
 isobject@^3.0.1:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=

-kind-of@^3.0.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^6.0.0:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
-  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-
-math-random@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
-  integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
-
-micromatch@^2.1.5:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
-
-normalize-path@^2.0.0, normalize-path@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
 normalize-path@^3.0.0, normalize-path@~3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==

-object-assign@^4.1.0:
+object-assign@^4.1.1:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=

-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
-path-is-absolute@^1.0.1:
+parse-node-version@^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=
+  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
+  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==

-picomatch@^2.0.4:
+picomatch@^2.0.4, picomatch@^2.2.1:
  version "2.2.2"
  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
@ -488,18 +242,6 @@ pify@^2.3.0:
  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=

-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
 plugin-error@1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
@ -510,26 +252,12 @@ plugin-error@1.0.1:
    arr-union "^3.1.0"
    extend-shallow "^3.0.2"

-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
-
 process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==

-randomatic@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
-  integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==
-  dependencies:
-    is-number "^4.0.0"
-    kind-of "^6.0.0"
-    math-random "^1.0.1"
-
-readable-stream@^2.0.2, readable-stream@^2.2.2, readable-stream@^2.3.5:
+readable-stream@^2.0.2, readable-stream@^2.3.5:
  version "2.3.7"
  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@ -542,40 +270,27 @@ readable-stream@^2.0.2, readable-stream@^2.2.2, readable-stream@^2.3.5:
    string_decoder "~1.1.1"
    util-deprecate "~1.0.1"

-readdirp@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.2.0.tgz#c30c33352b12c96dfb4b895421a49fd5a9593839"
-  integrity sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==
+readable-stream@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
  dependencies:
-    picomatch "^2.0.4"
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"

-regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
+readdirp@~3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
+  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
  dependencies:
-    is-equal-shallow "^0.1.3"
+    picomatch "^2.2.1"

 remove-trailing-separator@^1.0.1:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=

-repeat-element@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
-
-repeat-string@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-
-replace-ext@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
-  integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=
-
 replace-ext@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
@ -586,6 +301,18 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==

+safe-buffer@~5.2.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==
+
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
 string_decoder@~1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@ -593,6 +320,13 @@ string_decoder@~1.1.1:
  dependencies:
    safe-buffer "~5.1.0"

+strip-bom-buf@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz#1cb45aaf57530f4caf86c7f75179d2c9a51dd572"
+  integrity sha1-HLRar1dTD0yvhsf3UXnSyaUd1XI=
+  dependencies:
+    is-utf8 "^0.2.1"
+
 strip-bom-stream@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz#f87db5ef2613f6968aa545abfe1ec728b6a829ca"
@ -620,36 +354,26 @@ to-regex-range@^5.0.1:
  dependencies:
    is-number "^7.0.0"

-util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=

-vinyl-file@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-2.0.0.tgz#a7ebf5ffbefda1b7d18d140fcb07b223efb6751a"
-  integrity sha1-p+v1/779obfRjRQPyweyI++2dRo=
+vinyl-file@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-3.0.0.tgz#b104d9e4409ffa325faadd520642d0a3b488b365"
+  integrity sha1-sQTZ5ECf+jJfqt1SBkLQo7SIs2U=
  dependencies:
    graceful-fs "^4.1.2"
    pify "^2.3.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
+    strip-bom-buf "^1.0.0"
    strip-bom-stream "^2.0.0"
-    vinyl "^1.1.0"
+    vinyl "^2.0.1"

-vinyl@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884"
-  integrity sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86"
-  integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==
+vinyl@^2.0.1, vinyl@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"
+  integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==
  dependencies:
    clone "^2.1.1"
    clone-buffer "^1.0.0"
@ -658,20 +382,19 @@ vinyl@^2.1.0:
    remove-trailing-separator "^1.0.1"
    replace-ext "^1.0.0"

-vscode-gulp-watch@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/vscode-gulp-watch/-/vscode-gulp-watch-5.0.2.tgz#0060ba8d091284a6fbd7e608aa318a9c1d73b840"
-  integrity sha512-l2v+W3iQvxpX2ny2C7eJTd+83rQXiZ85KGY0mub/QRqUxgDc+KH/EYiw4mttzIhPzVBmxrUO4RcLNbPdccg0mQ==
+vscode-gulp-watch@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/vscode-gulp-watch/-/vscode-gulp-watch-5.0.3.tgz#1ca1c03581d43692ecb1fe0b9afd4256faeb701b"
+  integrity sha512-MTUp2yLE9CshhkNSNV58EQNxQSeF8lIj3mkXZX9a1vAk+EQNM2PAYdPUDSd/P/08W3PMHGznEiZyfK7JAjLosg==
  dependencies:
-    ansi-colors "1.1.0"
-    anymatch "^1.3.0"
-    chokidar "3.3.0"
-    fancy-log "1.3.2"
-    glob-parent "^3.0.1"
+    ansi-colors "4.1.1"
+    anymatch "^3.1.1"
+    chokidar "3.5.1"
+    fancy-log "^1.3.3"
+    glob-parent "^5.1.1"
    normalize-path "^3.0.0"
-    object-assign "^4.1.0"
-    path-is-absolute "^1.0.1"
+    object-assign "^4.1.1"
    plugin-error "1.0.1"
-    readable-stream "^2.2.2"
-    vinyl "^2.1.0"
-    vinyl-file "^2.0.0"
+    readable-stream "^3.6.0"
+    vinyl "^2.2.0"
+    vinyl-file "^3.0.0"
--- a/build/monaco/package.json
+++ b/build/monaco/package.json
@ -1,7 +1,7 @@
 {
  "name": "monaco-editor-core",
  "private": true,
-  "version": "0.21.1",
+  "version": "0.22.0",
  "description": "A browser based code editor",
  "author": "Microsoft Corporation",
  "license": "MIT",
--- a/build/npm/update-all-grammars.js
+++ b/build/npm/update-all-grammars.js
@ -7,40 +7,41 @@ const cp = require('child_process');
 const fs = require('fs');
 const path = require('path');

-/**
- * @param {string} location
- */
-function updateGrammar(location) {
-	const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-	const result = cp.spawnSync(npm, ['run', 'update-grammar'], {
-		cwd: location,
-		stdio: 'inherit'
+async function spawn(cmd, args, opts) {
+	return new Promise((c, e) => {
+		const child = cp.spawn(cmd, args, { shell: true, stdio: 'inherit', env: process.env, ...opts });
+		child.on('close', code => code === 0 ? c() : e(`Returned ${code}`));
 	});
+}

-	if (result.error || result.status !== 0) {
+async function main() {
+	await spawn('yarn', [], { cwd: 'extensions' });
+
+	for (const extension of fs.readdirSync('extensions')) {
+		try {
+			let packageJSON = JSON.parse(fs.readFileSync(path.join('extensions', extension, 'package.json')).toString());
+			if (!(packageJSON && packageJSON.scripts && packageJSON.scripts['update-grammar'])) {
+				continue;
+			}
+		} catch {
+			continue;
+		}
+
+		await spawn(`npm`, ['run', 'update-grammar'], { cwd: `extensions/${extension}` });
+	}
+
+	// run integration tests
+
+	if (process.platform === 'win32') {
+		cp.spawn('.\\scripts\\test-integration.bat', [], { env: process.env, stdio: 'inherit' });
+	} else {
+		cp.spawn('/bin/bash', ['./scripts/test-integration.sh'], { env: process.env, stdio: 'inherit' });
+	}
+}
+
+if (require.main === module) {
+	main().catch(err => {
+		console.error(err);
 		process.exit(1);
-	}
+	});
 }
-
-const allExtensionFolders = fs.readdirSync('extensions');
-const extensions = allExtensionFolders.filter(e => {
-	try {
-		let packageJSON = JSON.parse(fs.readFileSync(path.join('extensions', e, 'package.json')).toString());
-		return packageJSON && packageJSON.scripts && packageJSON.scripts['update-grammar'];
-	} catch (e) {
-		return false;
-	}
-});
-
-console.log(`Updating ${extensions.length} grammars...`);
-
-extensions.forEach(extension => updateGrammar(`extensions/${extension}`));
-
-// run integration tests
-
-if (process.platform === 'win32') {
-	cp.spawn('.\\scripts\\test-integration.bat', [], { env: process.env, stdio: 'inherit' });
-} else {
-	cp.spawn('/bin/bash', ['./scripts/test-integration.sh'], { env: process.env, stdio: 'inherit' });
-}
-
--- a/build/npm/update-grammar.js
+++ b/build/npm/update-grammar.js
@ -1,176 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-var path = require('path');
-var fs = require('fs');
-var plist = require('fast-plist');
-var cson = require('cson-parser');
-var https = require('https');
-var url = require('url');
-
-let commitDate = '0000-00-00';
-
-/**
- * @param {string} urlString
- */
-function getOptions(urlString) {
-	var _url = url.parse(urlString);
-	var headers = {
-		'User-Agent': 'VSCode'
-	};
-	var token = process.env['GITHUB_TOKEN'];
-	if (token) {
-		headers['Authorization'] = 'token ' + token;
-	}
-	return {
-		protocol: _url.protocol,
-		host: _url.host,
-		port: _url.port,
-		path: _url.path,
-		headers: headers
-	};
-}
-
-/**
- * @param {string} url
- * @param {number} redirectCount
- */
-function download(url, redirectCount) {
-	return new Promise((c, e) => {
-		var content = '';
-		https.get(getOptions(url), function (response) {
-			response.on('data', function (data) {
-				content += data.toString();
-			}).on('end', function () {
-				if (response.statusCode === 403 && response.headers['x-ratelimit-remaining'] === '0') {
-					e('GitHub API rate exceeded. Set GITHUB_TOKEN environment variable to increase rate limit.');
-					return;
-				}
-				let count = redirectCount || 0;
-				if (count < 5 && response.statusCode >= 300 && response.statusCode <= 303 || response.statusCode === 307) {
-					let location = response.headers['location'];
-					if (location) {
-						console.log("Redirected " + url + " to " + location);
-						download(location, count + 1).then(c, e);
-						return;
-					}
-				}
-				c(content);
-			});
-		}).on('error', function (err) {
-			e(err.message);
-		});
-	});
-}
-
-function getCommitSha(repoId, repoPath) {
-	var commitInfo = 'https://api.github.com/repos/' + repoId + '/commits?path=' + repoPath;
-	return download(commitInfo).then(function (content) {
-		try {
-			let lastCommit = JSON.parse(content)[0];
-			return Promise.resolve({
-				commitSha: lastCommit.sha,
-				commitDate: lastCommit.commit.author.date
-			});
-		} catch (e) {
-			return Promise.reject(new Error("Failed extracting the SHA: " + content));
-		}
-	});
-}
-
-exports.update = function (repoId, repoPath, dest, modifyGrammar, version = 'master', packageJsonPathOverride = '') {
-	var contentPath = 'https://raw.githubusercontent.com/' + repoId + `/${version}/` + repoPath;
-	console.log('Reading from ' + contentPath);
-	return download(contentPath).then(function (content) {
-		var ext = path.extname(repoPath);
-		var grammar;
-		if (ext === '.tmLanguage' || ext === '.plist') {
-			grammar = plist.parse(content);
-		} else if (ext === '.cson') {
-			grammar = cson.parse(content);
-		} else if (ext === '.json' || ext === '.JSON-tmLanguage') {
-			grammar = JSON.parse(content);
-		} else {
-			return Promise.reject(new Error('Unknown file extension: ' + ext));
-		}
-		if (modifyGrammar) {
-			modifyGrammar(grammar);
-		}
-		return getCommitSha(repoId, repoPath).then(function (info) {
-			let result = {
-				information_for_contributors: [
-					'This file has been converted from https://github.com/' + repoId + '/blob/master/' + repoPath,
-					'If you want to provide a fix or improvement, please create a pull request against the original repository.',
-					'Once accepted there, we are happy to receive an update request.'
-				]
-			};
-
-			if (info) {
-				result.version = 'https://github.com/' + repoId + '/commit/' + info.commitSha;
-			}
-
-			let keys = ['name', 'scopeName', 'comment', 'injections', 'patterns', 'repository'];
-			for (let key of keys) {
-				if (grammar.hasOwnProperty(key)) {
-					result[key] = grammar[key];
-				}
-			}
-
-			try {
-				fs.writeFileSync(dest, JSON.stringify(result, null, '\t').replace(/\n/g, '\r\n'));
-				let cgmanifestRead = JSON.parse(fs.readFileSync('./cgmanifest.json').toString());
-				let promises = new Array();
-				const currentCommitDate = info.commitDate.substr(0, 10);
-
-				// Add commit sha to cgmanifest.
-				if (currentCommitDate > commitDate) {
-					let packageJsonPath = 'https://raw.githubusercontent.com/' + repoId + `/${info.commitSha}/`;
-					if (packageJsonPathOverride) {
-						packageJsonPath += packageJsonPathOverride;
-					}
-					packageJsonPath += 'package.json';
-					for (let i = 0; i < cgmanifestRead.registrations.length; i++) {
-						if (cgmanifestRead.registrations[i].component.git.repositoryUrl.substr(cgmanifestRead.registrations[i].component.git.repositoryUrl.length - repoId.length, repoId.length) === repoId) {
-							cgmanifestRead.registrations[i].component.git.commitHash = info.commitSha;
-								commitDate = currentCommitDate;
-								promises.push(download(packageJsonPath).then(function (packageJson) {
-									if (packageJson) {
-										try {
-											cgmanifestRead.registrations[i].version = JSON.parse(packageJson).version;
-										} catch (e) {
-											console.log('Cannot get version. File does not exist at ' + packageJsonPath);
-										}
-									}
-								}));
-							break;
-						}
-					}
-				}
-				Promise.all(promises).then(function (allResult) {
-					fs.writeFileSync('./cgmanifest.json', JSON.stringify(cgmanifestRead, null, '\t').replace(/\n/g, '\r\n'));
-				});
-				if (info) {
-					console.log('Updated ' + path.basename(dest) + ' to ' + repoId + '@' + info.commitSha.substr(0, 7) + ' (' + currentCommitDate + ')');
-				} else {
-					console.log('Updated ' + path.basename(dest));
-				}
-			} catch (e) {
-				return Promise.reject(e);
-			}
-		});
-
-	}, console.error).catch(e => {
-		console.error(e);
-		process.exit(1);
-	});
-};
-
-if (path.basename(process.argv[1]) === 'update-grammar.js') {
-	for (var i = 3; i < process.argv.length; i += 2) {
-		exports.update(process.argv[2], process.argv[i], process.argv[i + 1]);
-	}
-}
--- a/build/package.json
+++ b/build/package.json
@ -4,8 +4,10 @@
  "license": "MIT",
  "devDependencies": {
    "@azure/cosmos": "^3.9.3",
+    "@azure/storage-blob": "^12.4.0",
    "@types/ansi-colors": "^3.2.0",
    "@types/azure": "0.9.19",
+    "@types/byline": "^4.2.32",
    "@types/debounce": "^1.0.0",
    "@types/eslint": "4.16.1",
    "@types/fancy-log": "^1.3.0",
@ -20,8 +22,10 @@
    "@types/mime": "0.0.29",
    "@types/minimatch": "^3.0.3",
    "@types/minimist": "^1.2.1",
+    "@types/mkdirp": "^1.0.1",
    "@types/mocha": "^8.2.0",
    "@types/node": "^12.19.9",
+    "@types/p-limit": "^2.2.0",
    "@types/plist": "^3.0.2",
    "@types/pump": "^1.0.1",
    "@types/request": "^2.47.0",
@ -34,6 +38,8 @@
    "@typescript-eslint/parser": "^3.3.0",
    "applicationinsights": "1.0.8",
    "azure-storage": "^2.1.0",
+    "byline": "^5.0.0",
+    "colors": "^1.4.0",
    "commander": "^7.0.0",
    "electron-osx-sign": "^0.4.16",
    "esbuild": "^0.8.30",
@ -42,6 +48,7 @@
    "jsonc-parser": "^2.3.0",
    "mime": "^1.4.1",
    "mkdirp": "^1.0.4",
+    "p-limit": "^3.1.0",
    "plist": "^3.0.1",
    "source-map": "0.6.1",
    "typescript": "4.2.0-dev.20201207",
--- a/build/yarn.lock
+++ b/build/yarn.lock
@ -2,6 +2,73 @@
 # yarn lockfile v1


+"@azure/abort-controller@^1.0.0":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.0.2.tgz#822405c966b2aec16fb62c1b19d37eaccf231995"
+  integrity sha512-XUyTo+bcyxHEf+jlN2MXA7YU9nxVehaubngHV1MIZZaqYmZqykkoeAz/JMMEeR7t3TcyDwbFa3Zw8BZywmIx4g==
+  dependencies:
+    tslib "^2.0.0"
+
+"@azure/core-asynciterator-polyfill@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@azure/core-asynciterator-polyfill/-/core-asynciterator-polyfill-1.0.0.tgz#dcccebb88406e5c76e0e1d52e8cc4c43a68b3ee7"
+  integrity sha512-kmv8CGrPfN9SwMwrkiBK9VTQYxdFQEGe0BmQk+M8io56P9KNzpAxcWE/1fxJj7uouwN4kXF0BHW8DNlgx+wtCg==
+
+"@azure/core-auth@^1.1.3":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.1.4.tgz#af9a334acf3cb9c49e6013e6caf6dc9d43476030"
+  integrity sha512-+j1embyH1jqf04AIfJPdLafd5SC1y6z1Jz4i+USR1XkTp6KM8P5u4/AjmWMVoEQdM/M29PJcRDZcCEWjK9S1bw==
+  dependencies:
+    "@azure/abort-controller" "^1.0.0"
+    tslib "^2.0.0"
+
+"@azure/core-http@^1.2.0":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@azure/core-http/-/core-http-1.2.2.tgz#a6f7717184fd2657d3acabd1d64dfdc0bd531ce3"
+  integrity sha512-9eu2OcbR7e44gqBy4U1Uv8NTWgLIMwKXMEGgO2MahsJy5rdTiAhs5fJHQffPq8uX2MFh21iBODwO9R/Xlov88A==
+  dependencies:
+    "@azure/abort-controller" "^1.0.0"
+    "@azure/core-auth" "^1.1.3"
+    "@azure/core-tracing" "1.0.0-preview.9"
+    "@azure/logger" "^1.0.0"
+    "@opentelemetry/api" "^0.10.2"
+    "@types/node-fetch" "^2.5.0"
+    "@types/tunnel" "^0.0.1"
+    form-data "^3.0.0"
+    node-fetch "^2.6.0"
+    process "^0.11.10"
+    tough-cookie "^4.0.0"
+    tslib "^2.0.0"
+    tunnel "^0.0.6"
+    uuid "^8.3.0"
+    xml2js "^0.4.19"
+
+"@azure/core-lro@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-1.0.3.tgz#1ddfb4ecdb81ce87b5f5d972ffe2acbbc46e524e"
+  integrity sha512-Py2crJ84qx1rXkzIwfKw5Ni4WJuzVU7KAF6i1yP3ce8fbynUeu8eEWS4JGtSQgU7xv02G55iPDROifmSDbxeHA==
+  dependencies:
+    "@azure/abort-controller" "^1.0.0"
+    "@azure/core-http" "^1.2.0"
+    events "^3.0.0"
+    tslib "^2.0.0"
+
+"@azure/core-paging@^1.1.1":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.1.3.tgz#3587c9898a0530cacb64bab216d7318468aa5efc"
+  integrity sha512-his7Ah40ThEYORSpIAwuh6B8wkGwO/zG7gqVtmSE4WAJ46e36zUDXTKReUCLBDc6HmjjApQQxxcRFy5FruG79A==
+  dependencies:
+    "@azure/core-asynciterator-polyfill" "^1.0.0"
+
+"@azure/core-tracing@1.0.0-preview.9":
+  version "1.0.0-preview.9"
+  resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.0-preview.9.tgz#84f3b85572013f9d9b85e1e5d89787aa180787eb"
+  integrity sha512-zczolCLJ5QG42AEPQ+Qg9SRYNUyB+yZ5dzof4YEc+dyWczO9G2sBqbAjLB7IqrsdHN2apkiB2oXeDKCsq48jug==
+  dependencies:
+    "@opencensus/web-types" "0.0.7"
+    "@opentelemetry/api" "^0.10.2"
+    tslib "^2.0.0"
+
 "@azure/cosmos@^3.9.3":
  version "3.9.3"
  resolved "https://registry.yarnpkg.com/@azure/cosmos/-/cosmos-3.9.3.tgz#7e95ff92e5c3e9da7e8316bc50c9cc928be6c1d6"
@ -19,6 +86,28 @@
    universal-user-agent "^6.0.0"
    uuid "^8.3.0"

+"@azure/logger@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.0.1.tgz#19b333203d1b2931353d8879e814b64a7274837a"
+  integrity sha512-QYQeaJ+A5x6aMNu8BG5qdsVBnYBop9UMwgUvGihSjf1PdZZXB+c/oMdM2ajKwzobLBh9e9QuMQkN9iL+IxLBLA==
+  dependencies:
+    tslib "^2.0.0"
+
+"@azure/storage-blob@^12.4.0":
+  version "12.4.0"
+  resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.4.0.tgz#7127ddd9f413105e2c3688691bc4c6245d0806b3"
+  integrity sha512-OnhVSoKD1HzBB79/rFzPbC4w9TdzFXeoOwkX+aIu3rb8qvN0VaqvUqZXSrBCyG2LcLyVkY4MPCJQBrmEUm9kvw==
+  dependencies:
+    "@azure/abort-controller" "^1.0.0"
+    "@azure/core-http" "^1.2.0"
+    "@azure/core-lro" "^1.0.2"
+    "@azure/core-paging" "^1.1.1"
+    "@azure/core-tracing" "1.0.0-preview.9"
+    "@azure/logger" "^1.0.0"
+    "@opentelemetry/api" "^0.10.2"
+    events "^3.0.0"
+    tslib "^2.0.0"
+
 "@malept/cross-spawn-promise@^1.1.0":
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d"
@ -26,6 +115,23 @@
  dependencies:
    cross-spawn "^7.0.1"

+"@opencensus/web-types@0.0.7":
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/@opencensus/web-types/-/web-types-0.0.7.tgz#4426de1fe5aa8f624db395d2152b902874f0570a"
+  integrity sha512-xB+w7ZDAu3YBzqH44rCmG9/RlrOmFuDPt/bpf17eJr8eZSrLt7nc7LnWdxM9Mmoj/YKMHpxRg28txu3TcpiL+g==
+
+"@opentelemetry/api@^0.10.2":
+  version "0.10.2"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-0.10.2.tgz#9647b881f3e1654089ff7ea59d587b2d35060654"
+  integrity sha512-GtpMGd6vkzDMYcpu2t9LlhEgMy/SzBwRnz48EejlRArYqZzqSzAsKmegUK7zHgl+EOIaK9mKHhnRaQu3qw20cA==
+  dependencies:
+    "@opentelemetry/context-base" "^0.10.2"
+
+"@opentelemetry/context-base@^0.10.2":
+  version "0.10.2"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/context-base/-/context-base-0.10.2.tgz#55bea904b2b91aa8a8675df9eaba5961bddb1def"
+  integrity sha512-hZNKjKOYsckoOEgBziGMnBcX0M7EtstnCmwz5jZUOUYwlZ+/xxX6z3jPu1XVO2Jivk0eLfuP9GP+vFD49CMetw==
+
 "@types/ansi-colors@^3.2.0":
  version "3.2.0"
  resolved "https://registry.yarnpkg.com/@types/ansi-colors/-/ansi-colors-3.2.0.tgz#3e4fe85d9131ce1c6994f3040bd0b25306c16a6e"
@ -38,6 +144,13 @@
  dependencies:
    "@types/node" "*"

+"@types/byline@^4.2.32":
+  version "4.2.32"
+  resolved "https://registry.yarnpkg.com/@types/byline/-/byline-4.2.32.tgz#9d35ec15968056118548412ee24c2c3026c997dc"
+  integrity sha512-qtlm/J6XOO9p+Ep/ZB5+mCFEDhzWDDHWU4a1eReN7lkPZXW9rkloq2jcAhvKKmlO5tL2GSvKROb+PTsNVhBiyQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/caseless@*":
  version "0.12.1"
  resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.1.tgz#9794c69c8385d0192acc471a540d1f8e0d16218a"
@ -199,11 +312,26 @@
  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
  integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==

+"@types/mkdirp@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-1.0.1.tgz#0930b948914a78587de35458b86c907b6e98bbf6"
+  integrity sha512-HkGSK7CGAXncr8Qn/0VqNtExEE+PHMWb+qlR1faHMao7ng6P3tAaoWWBMdva0gL5h4zprjIO89GJOLXsMcDm1Q==
+  dependencies:
+    "@types/node" "*"
+
 "@types/mocha@^8.2.0":
  version "8.2.0"
  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.0.tgz#3eb56d13a1de1d347ecb1957c6860c911704bc44"
  integrity sha512-/Sge3BymXo4lKc31C8OINJgXLaw+7vL1/L1pGiBNpGrBiT8FQiaFpSYV0uhTaG4y78vcMBTMFsWaHDvuD+xGzQ==

+"@types/node-fetch@^2.5.0":
+  version "2.5.8"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.8.tgz#e199c835d234c7eb0846f6618012e558544ee2fb"
+  integrity sha512-fbjI6ja0N5ZA8TV53RUqzsKNkl9fv8Oj3T7zxW7FGv1GSH7gwJaNF8dzCjrqKaxKeUpTz4yT1DaJFq/omNpGfw==
+  dependencies:
+    "@types/node" "*"
+    form-data "^3.0.0"
+
 "@types/node@*":
  version "8.0.51"
  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.51.tgz#b31d716fb8d58eeb95c068a039b9b6292817d5fb"
@ -219,6 +347,13 @@
  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.22.tgz#0d29f382472c4ccf3bd96ff0ce47daf5b7b84b18"
  integrity sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==

+"@types/p-limit@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@types/p-limit/-/p-limit-2.2.0.tgz#94a608e9b258a6c6156a13d1a14fd720dba70b97"
+  integrity sha512-fGFbybl1r0oE9mqgfc2EHHUin9ZL5rbQIexWI6jYRU1ADVn4I3LHzT+g/kpPpZsfp8PB94CQ655pfAjNF8LP6A==
+  dependencies:
+    p-limit "*"
+
 "@types/plist@^3.0.2":
  version "3.0.2"
  resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz#61b3727bba0f5c462fe333542534a0c3e19ccb01"
@ -271,6 +406,13 @@
  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.2.tgz#e0d481d8bb282ad8a8c9e100ceb72c995fb5e709"
  integrity sha512-vOVmaruQG5EatOU/jM6yU2uCp3Lz6mK1P5Ztu4iJjfM4SVHU9XYktPUQtKlIXuahqXHdEyUarMrBEwg5Cwu+bA==

+"@types/tunnel@^0.0.1":
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/@types/tunnel/-/tunnel-0.0.1.tgz#0d72774768b73df26f25df9184273a42da72b19c"
+  integrity sha512-AOqu6bQu5MSWwYvehMXLukFHnupHrpZ8nvgae5Ggie9UwzDR1CCwoXgSSWNZJuyOlCdfdsWMA5F2LlmvyoTv8A==
+  dependencies:
+    "@types/node" "*"
+
 "@types/underscore@^1.8.9":
  version "1.8.9"
  resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.8.9.tgz#fef41f800cd23db1b4f262ddefe49cd952d82323"
@ -536,6 +678,11 @@ buffer-fill@^1.0.0:
  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=

+byline@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
+  integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE=
+
 caseless@~0.12.0:
  version "0.12.0"
  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@ -563,7 +710,12 @@ colors@1.0.3:
  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
  integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=

-combined-stream@^1.0.6, combined-stream@~1.0.6:
+colors@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
  version "1.0.8"
  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@ -792,6 +944,11 @@ estraverse@^4.1.0, estraverse@^4.1.1:
  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==

+events@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
+  integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==
+
 extend@^3.0.2, extend@~3.0.2:
  version "3.0.2"
  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
@ -829,6 +986,15 @@ forever-agent@~0.6.1:
  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=

+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"
+
 form-data@~2.3.2:
  version "2.3.3"
  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@ -1214,6 +1380,13 @@ osenv@^0.1.3:
    os-homedir "^1.0.0"
    os-tmpdir "^1.0.0"

+p-limit@*, p-limit@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
 parse-semver@^1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/parse-semver/-/parse-semver-1.1.1.tgz#9a4afd6df063dc4826f93fba4a99cf223f666cb8"
@ -1267,7 +1440,12 @@ process-nextick-args@~1.0.6:
  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=

-psl@^1.1.28:
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
+
+psl@^1.1.28, psl@^1.1.33:
  version "1.8.0"
  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
@ -1370,6 +1548,11 @@ sax@0.5.x:
  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
  integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=

+sax@>=0.6.0:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
 semaphore@^1.0.5:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/semaphore/-/semaphore-1.1.0.tgz#aaad8b86b20fe8e9b32b16dc2ee682a8cd26a8aa"
@ -1448,6 +1631,15 @@ tmp@0.0.29:
  dependencies:
    os-tmpdir "~1.0.1"

+tough-cookie@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
+  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
+  dependencies:
+    psl "^1.1.33"
+    punycode "^2.1.1"
+    universalify "^0.1.2"
+
 tough-cookie@~2.5.0:
  version "2.5.0"
  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
@ -1485,6 +1677,11 @@ tunnel@0.0.4:
  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.4.tgz#2d3785a158c174c9a16dc2c046ec5fc5f1742213"
  integrity sha1-LTeFoVjBdMmhbcLARuxfxfF0IhM=

+tunnel@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
+  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
+
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
  version "0.14.5"
  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
@ -1528,6 +1725,11 @@ universal-user-agent@^6.0.0:
  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
  integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==

+universalify@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
 universalify@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
@ -1640,6 +1842,14 @@ xml2js@0.2.8:
  dependencies:
    sax "0.5.x"

+xml2js@^0.4.19:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
+  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~11.0.0"
+
 xmlbuilder@>=11.0.1:
  version "15.1.1"
  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"
@ -1650,6 +1860,11 @@ xmlbuilder@^9.0.7:
  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=

+xmlbuilder@~11.0.0:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
+  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
+
 xmldom@0.1.x:
  version "0.1.31"
  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
@ -1675,6 +1890,11 @@ yazl@^2.2.2:
  dependencies:
    buffer-crc32 "~0.2.3"

+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
 zone.js@0.7.6:
  version "0.7.6"
  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"
--- a/cgmanifest.json
+++ b/cgmanifest.json
@ -60,12 +60,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "8805b996e0d8cfb6e3921f9b586366bafb125b59"
+					"commitHash": "805e442ff873e10735a1ea18021f491597afa885"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "11.2.1"
+			"version": "11.2.2"
 		},
 		{
 			"component": {
--- a/extensions/bat/package.json
+++ b/extensions/bat/package.json
@ -1,29 +1,47 @@
 {
-	"name": "bat",
-	"displayName": "%displayName%",
-	"description": "%description%",
-	"version": "1.0.0",
-	"publisher": "vscode",
-	"license": "MIT",
-	"engines": { "vscode": "*" },
-	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js mmims/language-batchfile grammars/batchfile.cson ./syntaxes/batchfile.tmLanguage.json"
-	},
-	"contributes": {
-		"languages": [{
-			"id": "bat",
-			"extensions": [ ".bat", ".cmd"],
-			"aliases": [ "Batch", "bat" ],
-			"configuration": "./language-configuration.json"
-		}],
-		"grammars": [{
-			"language": "bat",
-			"scopeName": "source.batchfile",
-			"path": "./syntaxes/batchfile.tmLanguage.json"
-		}],
-		"snippets": [{
-			"language": "bat",
-			"path": "./snippets/batchfile.code-snippets"
-		}]
-	}
+  "name": "bat",
+  "displayName": "%displayName%",
+  "description": "%description%",
+  "version": "1.0.0",
+  "publisher": "vscode",
+  "license": "MIT",
+  "engines": {
+    "vscode": "^1.52.0"
+  },
+  "scripts": {
+    "update-grammar": "node ../node_modules/.bin/vscode-grammar-updater mmims/language-batchfile grammars/batchfile.cson ./syntaxes/batchfile.tmLanguage.json"
+  },
+  "contributes": {
+    "languages": [
+      {
+        "id": "bat",
+        "extensions": [
+          ".bat",
+          ".cmd"
+        ],
+        "aliases": [
+          "Batch",
+          "bat"
+        ],
+        "configuration": "./language-configuration.json"
+      }
+    ],
+    "grammars": [
+      {
+        "language": "bat",
+        "scopeName": "source.batchfile",
+        "path": "./syntaxes/batchfile.tmLanguage.json"
+      }
+    ],
+    "snippets": [
+      {
+        "language": "bat",
+        "path": "./snippets/batchfile.code-snippets"
+      }
+    ]
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
+  }
 }
--- a/extensions/bat/package.nls.json
+++ b/extensions/bat/package.nls.json
@ -1,4 +1,4 @@
 {
 	"displayName": "Windows Bat Language Basics",
 	"description": "Provides snippets, syntax highlighting, bracket matching and folding in Windows batch files."
-}
+}
--- a/extensions/bat/yarn.lock
+++ b/extensions/bat/yarn.lock
@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
--- a/extensions/clojure/package.json
+++ b/extensions/clojure/package.json
@ -1,25 +1,45 @@
 {
-	"name": "clojure",
-	"displayName": "%displayName%",
-	"description": "%description%",
-	"version": "1.0.0",
-	"publisher": "vscode",
-	"license": "MIT",
-	"engines": { "vscode": "*" },
-	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js atom/language-clojure grammars/clojure.cson ./syntaxes/clojure.tmLanguage.json"
-	},
-	"contributes": {
-		"languages": [{
-			"id": "clojure",
-			"aliases": ["Clojure", "clojure"],
-			"extensions": [".clj", ".cljs", ".cljc", ".cljx", ".clojure", ".edn"],
-			"configuration": "./language-configuration.json"
-		}],
-		"grammars": [{
-			"language": "clojure",
-			"scopeName": "source.clojure",
-			"path": "./syntaxes/clojure.tmLanguage.json"
-		}]
-	}
-}
+  "name": "clojure",
+  "displayName": "%displayName%",
+  "description": "%description%",
+  "version": "1.0.0",
+  "publisher": "vscode",
+  "license": "MIT",
+  "engines": {
+    "vscode": "*"
+  },
+  "scripts": {
+    "update-grammar": "node ../node_modules/.bin/vscode-grammar-updater atom/language-clojure grammars/clojure.cson ./syntaxes/clojure.tmLanguage.json"
+  },
+  "contributes": {
+    "languages": [
+      {
+        "id": "clojure",
+        "aliases": [
+          "Clojure",
+          "clojure"
+        ],
+        "extensions": [
+          ".clj",
+          ".cljs",
+          ".cljc",
+          ".cljx",
+          ".clojure",
+          ".edn"
+        ],
+        "configuration": "./language-configuration.json"
+      }
+    ],
+    "grammars": [
+      {
+        "language": "clojure",
+        "scopeName": "source.clojure",
+        "path": "./syntaxes/clojure.tmLanguage.json"
+      }
+    ]
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
+  }
+}
--- a/extensions/clojure/package.nls.json
+++ b/extensions/clojure/package.nls.json
@ -1,4 +1,4 @@
 {
 	"displayName": "Clojure Language Basics",
 	"description": "Provides syntax highlighting and bracket matching in Clojure files."
-}
+}
--- a/extensions/clojure/yarn.lock
+++ b/extensions/clojure/yarn.lock
@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
--- a/extensions/coffeescript/package.json
+++ b/extensions/coffeescript/package.json
@ -1,34 +1,54 @@
 {
-	"name": "coffeescript",
-	"displayName": "%displayName%",
-	"description": "%description%",
-	"version": "1.0.0",
-	"publisher": "vscode",
-	"license": "MIT",
-	"engines": { "vscode": "*" },
-	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js atom/language-coffee-script grammars/coffeescript.cson ./syntaxes/coffeescript.tmLanguage.json"
-	},
-	"contributes": {
-		"languages": [{
-			"id": "coffeescript",
-			"extensions": [ ".coffee", ".cson", ".iced" ],
-			"aliases": [ "CoffeeScript", "coffeescript", "coffee" ],
-			"configuration": "./language-configuration.json"
-		}],
-		"grammars": [{
-			"language": "coffeescript",
-			"scopeName": "source.coffee",
-			"path": "./syntaxes/coffeescript.tmLanguage.json"
-		}],
-		"breakpoints": [
-			{
-				"language": "coffeescript"
-			}
-		],
-		"snippets": [{
-			"language": "coffeescript",
-			"path": "./snippets/coffeescript.code-snippets"
-		}]
-	}
+  "name": "coffeescript",
+  "displayName": "%displayName%",
+  "description": "%description%",
+  "version": "1.0.0",
+  "publisher": "vscode",
+  "license": "MIT",
+  "engines": {
+    "vscode": "*"
+  },
+  "scripts": {
+    "update-grammar": "node ../node_modules/.bin/vscode-grammar-updater atom/language-coffee-script grammars/coffeescript.cson ./syntaxes/coffeescript.tmLanguage.json"
+  },
+  "contributes": {
+    "languages": [
+      {
+        "id": "coffeescript",
+        "extensions": [
+          ".coffee",
+          ".cson",
+          ".iced"
+        ],
+        "aliases": [
+          "CoffeeScript",
+          "coffeescript",
+          "coffee"
+        ],
+        "configuration": "./language-configuration.json"
+      }
+    ],
+    "grammars": [
+      {
+        "language": "coffeescript",
+        "scopeName": "source.coffee",
+        "path": "./syntaxes/coffeescript.tmLanguage.json"
+      }
+    ],
+    "breakpoints": [
+      {
+        "language": "coffeescript"
+      }
+    ],
+    "snippets": [
+      {
+        "language": "coffeescript",
+        "path": "./snippets/coffeescript.code-snippets"
+      }
+    ]
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
+  }
 }
--- a/extensions/coffeescript/yarn.lock
+++ b/extensions/coffeescript/yarn.lock
@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
--- a/extensions/configuration-editing/package.json
+++ b/extensions/configuration-editing/package.json
@ -129,5 +129,9 @@
  },
  "devDependencies": {
    "@types/node": "^12.19.9"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
  }
 }
--- a/extensions/configuration-editing/package.nls.json
+++ b/extensions/configuration-editing/package.nls.json
@ -1,4 +1,4 @@
 {
 	"displayName": "Configuration Editing",
 	"description": "Provides capabilities (advanced IntelliSense, auto-fixing) in configuration files like settings, launch, and extension recommendation files."
-}
+}
--- a/extensions/cpp/build/update-grammars.js
+++ b/extensions/cpp/build/update-grammars.js
@ -4,7 +4,7 @@
 *--------------------------------------------------------------------------------------------*/
 'use strict';

-var updateGrammar = require('../../../build/npm/update-grammar');
+var updateGrammar = require('vscode-grammar-updater');

 updateGrammar.update('jeff-hykin/cpp-textmate-grammar', 'syntaxes/c.tmLanguage.json', './syntaxes/c.tmLanguage.json', undefined, 'master', 'source/languages/cpp/');
 updateGrammar.update('jeff-hykin/cpp-textmate-grammar', 'syntaxes/cpp.tmLanguage.json', './syntaxes/cpp.tmLanguage.json', undefined, 'master', 'source/languages/cpp/');
--- a/extensions/cpp/package.json
+++ b/extensions/cpp/package.json
@ -1,87 +1,91 @@
 {
-	"name": "cpp",
-	"displayName": "%displayName%",
-	"description": "%description%",
-	"version": "1.0.0",
-	"publisher": "vscode",
-	"license": "MIT",
-	"engines": {
-		"vscode": "*"
-	},
-	"scripts": {
-		"update-grammar": "node ./build/update-grammars.js"
-	},
-	"contributes": {
-		"languages": [
-			{
-				"id": "c",
-				"extensions": [
-					".c",
-					".i"
-				],
-				"aliases": [
-					"C",
-					"c"
-				],
-				"configuration": "./language-configuration.json"
-			},
-			{
-				"id": "cpp",
-				"extensions": [
-					".cpp",
-					".cc",
-					".cxx",
-					".c++",
-					".hpp",
-					".hh",
+  "name": "cpp",
+  "displayName": "%displayName%",
+  "description": "%description%",
+  "version": "1.0.0",
+  "publisher": "vscode",
+  "license": "MIT",
+  "engines": {
+    "vscode": "*"
+  },
+  "scripts": {
+    "update-grammar": "node ./build/update-grammars.js"
+  },
+  "contributes": {
+    "languages": [
+      {
+        "id": "c",
+        "extensions": [
+          ".c",
+          ".i"
+        ],
+        "aliases": [
+          "C",
+          "c"
+        ],
+        "configuration": "./language-configuration.json"
+      },
+      {
+        "id": "cpp",
+        "extensions": [
+          ".cpp",
+          ".cc",
+          ".cxx",
+          ".c++",
+          ".hpp",
+          ".hh",
          ".hxx",
          ".h++",
-					".h",
-					".ii",
-					".ino",
-					".inl",
-					".ipp",
-					".hpp.in",
-					".h.in"
-				],
-				"aliases": [
-					"C++",
-					"Cpp",
-					"cpp"
-				],
-				"configuration": "./language-configuration.json"
-			}
-		],
-		"grammars": [
-			{
-				"language": "c",
-				"scopeName": "source.c",
-				"path": "./syntaxes/c.tmLanguage.json"
-			},
-			{
-				"language": "cpp",
-				"scopeName": "source.cpp.embedded.macro",
-				"path": "./syntaxes/cpp.embedded.macro.tmLanguage.json"
-			},
-			{
-				"language": "cpp",
-				"scopeName": "source.cpp",
-				"path": "./syntaxes/cpp.tmLanguage.json"
-			},
-			{
-				"scopeName": "source.c.platform",
-				"path": "./syntaxes/platform.tmLanguage.json"
-			}
-		],
-		"snippets": [
-			{
-				"language": "c",
-				"path": "./snippets/c.code-snippets"
-			},
-			{
-				"language": "cpp",
-				"path": "./snippets/cpp.code-snippets"
-			}
-		]
-	}
+          ".h",
+          ".ii",
+          ".ino",
+          ".inl",
+          ".ipp",
+          ".hpp.in",
+          ".h.in"
+        ],
+        "aliases": [
+          "C++",
+          "Cpp",
+          "cpp"
+        ],
+        "configuration": "./language-configuration.json"
+      }
+    ],
+    "grammars": [
+      {
+        "language": "c",
+        "scopeName": "source.c",
+        "path": "./syntaxes/c.tmLanguage.json"
+      },
+      {
+        "language": "cpp",
+        "scopeName": "source.cpp.embedded.macro",
+        "path": "./syntaxes/cpp.embedded.macro.tmLanguage.json"
+      },
+      {
+        "language": "cpp",
+        "scopeName": "source.cpp",
+        "path": "./syntaxes/cpp.tmLanguage.json"
+      },
+      {
+        "scopeName": "source.c.platform",
+        "path": "./syntaxes/platform.tmLanguage.json"
+      }
+    ],
+    "snippets": [
+      {
+        "language": "c",
+        "path": "./snippets/c.code-snippets"
+      },
+      {
+        "language": "cpp",
+        "path": "./snippets/cpp.code-snippets"
+      }
+    ]
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
+  }
 }
--- a/extensions/cpp/package.nls.json
+++ b/extensions/cpp/package.nls.json
@ -1,4 +1,4 @@
 {
 	"displayName": "C/C++ Language Basics",
 	"description": "Provides snippets, syntax highlighting, bracket matching and folding in C/C++ files."
-}
+}
--- a/extensions/cpp/yarn.lock
+++ b/extensions/cpp/yarn.lock
@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
--- a/extensions/csharp/package.json
+++ b/extensions/csharp/package.json
@ -1,7 +1,7 @@
 {
  "name": "csharp",
-	"displayName": "%displayName%",
-	"description": "%description%",
+  "displayName": "%displayName%",
+  "description": "%description%",
  "version": "1.0.0",
  "publisher": "vscode",
  "license": "MIT",
@ -9,9 +9,8 @@
    "vscode": "0.10.x"
  },
  "scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js dotnet/csharp-tmLanguage grammars/csharp.tmLanguage ./syntaxes/csharp.tmLanguage.json"
-	},
-
+    "update-grammar": "node ../node_modules/.bin/vscode-grammar-updater dotnet/csharp-tmLanguage grammars/csharp.tmLanguage ./syntaxes/csharp.tmLanguage.json"
+  },
  "contributes": {
    "languages": [
      {
@ -35,9 +34,15 @@
        "path": "./syntaxes/csharp.tmLanguage.json"
      }
    ],
-		"snippets": [{
-			"language": "csharp",
-			"path": "./snippets/csharp.code-snippets"
-		}]
+    "snippets": [
+      {
+        "language": "csharp",
+        "path": "./snippets/csharp.code-snippets"
+      }
+    ]
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
  }
 }
--- a/extensions/csharp/package.nls.json
+++ b/extensions/csharp/package.nls.json
@ -1,4 +1,4 @@
 {
 	"displayName": "C# Language Basics",
 	"description": "Provides snippets, syntax highlighting, bracket matching and folding in C# files."
-}
+}
--- a/extensions/csharp/yarn.lock
+++ b/extensions/csharp/yarn.lock
@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
--- a/extensions/css-language-features/package.json
+++ b/extensions/css-language-features/package.json
@ -61,6 +61,18 @@
            "default": true,
            "description": "%css.validate.desc%"
          },
+          "css.hover.documentation": {
+            "type": "boolean",
+            "scope": "resource",
+            "default": true,
+            "description": "%css.hover.documentation%"
+          },
+          "css.hover.references": {
+            "type": "boolean",
+            "scope": "resource",
+            "default": true,
+            "description": "%css.hover.references%"
+          },
          "css.lint.compatibleVendorPrefixes": {
            "type": "string",
            "scope": "resource",
@ -316,6 +328,18 @@
            "default": true,
            "description": "%scss.validate.desc%"
          },
+          "scss.hover.documentation": {
+            "type": "boolean",
+            "scope": "resource",
+            "default": true,
+            "description": "%scss.hover.documentation%"
+          },
+          "scss.hover.references": {
+            "type": "boolean",
+            "scope": "resource",
+            "default": true,
+            "description": "%scss.hover.references%"
+          },
          "scss.lint.compatibleVendorPrefixes": {
            "type": "string",
            "scope": "resource",
@ -561,6 +585,18 @@
            "default": true,
            "description": "%less.validate.desc%"
          },
+          "less.hover.documentation": {
+            "type": "boolean",
+            "scope": "resource",
+            "default": true,
+            "description": "%less.hover.documentation%"
+          },
+          "less.hover.references": {
+            "type": "boolean",
+            "scope": "resource",
+            "default": true,
+            "description": "%less.hover.references%"
+          },
          "less.lint.compatibleVendorPrefixes": {
            "type": "string",
            "scope": "resource",
@ -812,5 +848,9 @@
  },
  "devDependencies": {
    "@types/node": "^12.19.9"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
  }
 }
--- a/extensions/css-language-features/package.nls.json
+++ b/extensions/css-language-features/package.nls.json
@ -28,6 +28,8 @@
 	"css.trace.server.desc": "Traces the communication between VS Code and the CSS language server.",
 	"css.validate.title": "Controls CSS validation and problem severities.",
 	"css.validate.desc": "Enables or disables all validations.",
+	"css.hover.documentation": "Show tag and attribute documentation in CSS hovers.",
+	"css.hover.references": "Show references to MDN in CSS hovers.",
 	"less.title": "LESS",
 	"less.completion.triggerPropertyValueCompletion.desc": "By default, VS Code triggers property value completion after selecting a CSS property. Use this setting to disable this behavior.",
 	"less.completion.completePropertyWithSemicolon.desc": "Insert semicolon at end of line when completing CSS properties",
@ -53,6 +55,8 @@
 	"less.lint.zeroUnits.desc": "No unit for zero needed.",
 	"less.validate.title": "Controls LESS validation and problem severities.",
 	"less.validate.desc": "Enables or disables all validations.",
+	"less.hover.documentation": "Show tag and attribute documentation in LESS hovers.",
+	"less.hover.references": "Show references to MDN in LESS hovers.",
 	"scss.title": "SCSS (Sass)",
 	"scss.completion.triggerPropertyValueCompletion.desc": "By default, VS Code triggers property value completion after selecting a CSS property. Use this setting to disable this behavior.",
 	"scss.completion.completePropertyWithSemicolon.desc": "Insert semicolon at end of line when completing CSS properties",
@ -78,6 +82,8 @@
 	"scss.lint.zeroUnits.desc": "No unit for zero needed.",
 	"scss.validate.title": "Controls SCSS validation and problem severities.",
 	"scss.validate.desc": "Enables or disables all validations.",
+	"scss.hover.documentation": "Show tag and attribute documentation in SCSS hovers.",
+	"scss.hover.references": "Show references to MDN in SCSS hovers.",
 	"css.colorDecorators.enable.deprecationMessage": "The setting `css.colorDecorators.enable` has been deprecated in favor of `editor.colorDecorators`.",
 	"scss.colorDecorators.enable.deprecationMessage": "The setting `scss.colorDecorators.enable` has been deprecated in favor of `editor.colorDecorators`.",
 	"less.colorDecorators.enable.deprecationMessage": "The setting `less.colorDecorators.enable` has been deprecated in favor of `editor.colorDecorators`."
--- a/extensions/css-language-features/server/package.json
+++ b/extensions/css-language-features/server/package.json
@ -10,7 +10,7 @@
  "main": "./out/node/cssServerMain",
  "browser": "./dist/browser/cssServerMain",
  "dependencies": {
-    "vscode-css-languageservice": "^5.0.3",
+    "vscode-css-languageservice": "^5.1.0",
    "vscode-languageserver": "^7.0.0",
    "vscode-uri": "^3.0.2"
  },
--- a/extensions/css-language-features/server/src/cssServer.ts
+++ b/extensions/css-language-features/server/src/cssServer.ts
@ -206,10 +206,10 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 		return runSafeAsync(async () => {
 			const document = documents.get(textDocumentPosition.textDocument.uri);
 			if (document) {
-				await dataProvidersReady;
+				const [settings,] = await Promise.all([getDocumentSettings(document), dataProvidersReady]);
 				const styleSheet = stylesheets.get(document);
 				const documentContext = getDocumentContext(document.uri, workspaceFolders);
-				return getLanguageService(document).doComplete2(document, textDocumentPosition.position, styleSheet, documentContext);
+				return getLanguageService(document).doComplete2(document, textDocumentPosition.position, styleSheet, documentContext, settings?.completion);
 			}
 			return null;
 		}, null, `Error while computing completions for ${textDocumentPosition.textDocument.uri}`, token);
@ -219,9 +219,9 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 		return runSafeAsync(async () => {
 			const document = documents.get(textDocumentPosition.textDocument.uri);
 			if (document) {
-				await dataProvidersReady;
+				const [settings,] = await Promise.all([getDocumentSettings(document), dataProvidersReady]);
 				const styleSheet = stylesheets.get(document);
-				return getLanguageService(document).doHover(document, textDocumentPosition.position, styleSheet);
+				return getLanguageService(document).doHover(document, textDocumentPosition.position, styleSheet, settings?.hover);
 			}
 			return null;
 		}, null, `Error while computing hover for ${textDocumentPosition.textDocument.uri}`, token);
--- a/extensions/css-language-features/server/yarn.lock
+++ b/extensions/css-language-features/server/yarn.lock
@ -12,10 +12,10 @@
  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==

-vscode-css-languageservice@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-5.0.3.tgz#2d400a47e73d0bfc5bc0d3fdf5be487cfdca341b"
-  integrity sha512-KJt4jhCxqrgGrC02UsQsKw90dPkFknMHsH5HTInT7gkDRRfGFwEd+e2O1/E75br3TdFhvRmzjljYz5thZ58L3A==
+vscode-css-languageservice@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-5.1.0.tgz#cd172d13e9e7ae23ba567c73778aee10475ff716"
+  integrity sha512-iLHd/WjRKgaZBXMNeUooHG+r0qlhJBkXa+3MpQQR6Rpm928cis/3OV2Mp1R80yAQevIMeDL32RIJfHoJCT/RRg==
  dependencies:
    vscode-languageserver-textdocument "^1.0.1"
    vscode-languageserver-types "^3.16.0"
--- a/extensions/css/package.json
+++ b/extensions/css/package.json
@ -1,7 +1,7 @@
 {
  "name": "css",
-	"displayName": "%displayName%",
-	"description": "%description%",
+  "displayName": "%displayName%",
+  "description": "%description%",
  "version": "1.0.0",
  "publisher": "vscode",
  "license": "MIT",
@ -9,7 +9,7 @@
    "vscode": "0.10.x"
  },
  "scripts": {
-    "update-grammar": "node ../../build/npm/update-grammar.js octref/language-css grammars/css.cson ./syntaxes/css.tmLanguage.json"
+    "update-grammar": "node ../node_modules/.bin/vscode-grammar-updater octref/language-css grammars/css.cson ./syntaxes/css.tmLanguage.json"
  },
  "contributes": {
    "languages": [
@ -38,5 +38,9 @@
        }
      }
    ]
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
  }
 }
--- a/extensions/css/package.nls.json
+++ b/extensions/css/package.nls.json
@ -1,4 +1,4 @@
 {
 	"displayName": "CSS Language Basics",
 	"description": "Provides syntax highlighting and bracket matching for CSS, LESS and SCSS files."
-}
+}
--- a/extensions/css/yarn.lock
+++ b/extensions/css/yarn.lock
@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
--- a/extensions/debug-auto-launch/package.json
+++ b/extensions/debug-auto-launch/package.json
@ -1,40 +1,44 @@
 {
-	"name": "debug-auto-launch",
-	"displayName": "%displayName%",
-	"description": "%description%",
-	"version": "1.0.0",
-	"publisher": "vscode",
-	"license": "MIT",
-	"engines": {
-		"vscode": "^1.5.0"
-	},
-	"activationEvents": [
-		"*"
-	],
-	"main": "./out/extension",
-	"scripts": {
-		"compile": "gulp compile-extension:debug-auto-launch",
-		"watch": "gulp watch-extension:debug-auto-launch"
-	},
-	"contributes": {
-		"commands": [
-			{
-				"command": "extension.node-debug.toggleAutoAttach",
-				"title": "%toggle.auto.attach%",
-				"category": "Debug"
-			}
-		]
-	},
-	"dependencies": {
-		"vscode-nls": "^4.0.0"
-	},
-	"devDependencies": {
-		"@types/node": "^12.19.9"
-	},
-	"prettier": {
-		"printWidth": 100,
-		"trailingComma": "all",
-		"singleQuote": true,
-		"arrowParens": "avoid"
-	}
+  "name": "debug-auto-launch",
+  "displayName": "%displayName%",
+  "description": "%description%",
+  "version": "1.0.0",
+  "publisher": "vscode",
+  "license": "MIT",
+  "engines": {
+    "vscode": "^1.5.0"
+  },
+  "activationEvents": [
+    "*"
+  ],
+  "main": "./out/extension",
+  "scripts": {
+    "compile": "gulp compile-extension:debug-auto-launch",
+    "watch": "gulp watch-extension:debug-auto-launch"
+  },
+  "contributes": {
+    "commands": [
+      {
+        "command": "extension.node-debug.toggleAutoAttach",
+        "title": "%toggle.auto.attach%",
+        "category": "Debug"
+      }
+    ]
+  },
+  "dependencies": {
+    "vscode-nls": "^4.0.0"
+  },
+  "devDependencies": {
+    "@types/node": "^12.19.9"
+  },
+  "prettier": {
+    "printWidth": 100,
+    "trailingComma": "all",
+    "singleQuote": true,
+    "arrowParens": "avoid"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
+  }
 }
--- a/extensions/debug-server-ready/package.json
+++ b/extensions/debug-server-ready/package.json
@ -1,143 +1,149 @@
 {
-	"name": "debug-server-ready",
-	"displayName": "%displayName%",
-	"description": "%description%",
-	"version": "1.0.0",
-	"publisher": "vscode",
-	"license": "MIT",
-	"engines": {
-		"vscode": "^1.32.0"
-	},
-	"activationEvents": [
-		"onDebugResolve"
-	],
-	"enableProposedApi": true,
-	"main": "./out/extension",
-	"scripts": {
-		"compile": "gulp compile-extension:debug-server-ready",
-		"watch": "gulp watch-extension:debug-server-ready"
-	},
-	"contributes": {
-		"debuggers": [
-			{
-				"type": "*",
-				"configurationAttributes": {
-					"launch": {
-						"properties": {
-							"serverReadyAction": {
-								"oneOf": [
-									{
-										"type": "object",
-										"additionalProperties": false,
-										"markdownDescription": "%debug.server.ready.serverReadyAction.description%",
-										"default": {
-											"action": "openExternally"
-										},
-										"properties": {
-											"action": {
-												"type": "string",
-												"enum": [
-													"openExternally"
-												],
-												"enumDescriptions": [
-													"%debug.server.ready.action.openExternally.description%"
-												],
-												"markdownDescription": "%debug.server.ready.action.description%",
-												"default": "openExternally"
-											},
-											"pattern": {
-												"type": "string",
-												"markdownDescription": "%debug.server.ready.pattern.description%",
-												"default": "listening on port ([0-9]+)"
-											},
-											"uriFormat": {
-												"type": "string",
-												"markdownDescription": "%debug.server.ready.uriFormat.description%",
-												"default": "http://localhost:%s"
-											}
-										}
-									},
-									{
-										"type": "object",
-										"additionalProperties": false,
-										"markdownDescription": "%debug.server.ready.serverReadyAction.description%",
-										"default": {
-											"action": "openExternally"
-										},
-										"properties": {
-											"action": {
-												"type": "string",
-												"enum": [
-													"debugWithChrome"
-												],
-												"enumDescriptions": [
-													"%debug.server.ready.action.debugWithChrome.description%"
-												],
-												"markdownDescription": "%debug.server.ready.action.description%",
-												"default": "openExternally"
-											},
-											"pattern": {
-												"type": "string",
-												"markdownDescription": "%debug.server.ready.pattern.description%",
-												"default": "listening on port ([0-9]+)"
-											},
-											"uriFormat": {
-												"type": "string",
-												"markdownDescription": "%debug.server.ready.uriFormat.description%",
-												"default": "http://localhost:%s"
-											},
-											"webRoot": {
-												"type": "string",
-												"markdownDescription": "%debug.server.ready.webRoot.description%",
-												"default": "${workspaceFolder}"
-											}
-										}
-									},
-									{
-										"type": "object",
-										"additionalProperties": false,
-										"markdownDescription": "%debug.server.ready.serverReadyAction.description%",
-										"default": {
+  "name": "debug-server-ready",
+  "displayName": "%displayName%",
+  "description": "%description%",
+  "version": "1.0.0",
+  "publisher": "vscode",
+  "license": "MIT",
+  "engines": {
+    "vscode": "^1.32.0"
+  },
+  "activationEvents": [
+    "onDebugResolve"
+  ],
+  "enableProposedApi": true,
+  "main": "./out/extension",
+  "scripts": {
+    "compile": "gulp compile-extension:debug-server-ready",
+    "watch": "gulp watch-extension:debug-server-ready"
+  },
+  "contributes": {
+    "debuggers": [
+      {
+        "type": "*",
+        "configurationAttributes": {
+          "launch": {
+            "properties": {
+              "serverReadyAction": {
+                "oneOf": [
+                  {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "markdownDescription": "%debug.server.ready.serverReadyAction.description%",
+                    "default": {
+                      "action": "openExternally"
+                    },
+                    "properties": {
+                      "action": {
+                        "type": "string",
+                        "enum": [
+                          "openExternally"
+                        ],
+                        "enumDescriptions": [
+                          "%debug.server.ready.action.openExternally.description%"
+                        ],
+                        "markdownDescription": "%debug.server.ready.action.description%",
+                        "default": "openExternally"
+                      },
+                      "pattern": {
+                        "type": "string",
+                        "markdownDescription": "%debug.server.ready.pattern.description%",
+                        "default": "listening on port ([0-9]+)"
+                      },
+                      "uriFormat": {
+                        "type": "string",
+                        "markdownDescription": "%debug.server.ready.uriFormat.description%",
+                        "default": "http://localhost:%s"
+                      }
+                    }
+                  },
+                  {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "markdownDescription": "%debug.server.ready.serverReadyAction.description%",
+                    "default": {
+                      "action": "openExternally"
+                    },
+                    "properties": {
+                      "action": {
+                        "type": "string",
+                        "enum": [
+                          "debugWithChrome"
+                        ],
+                        "enumDescriptions": [
+                          "%debug.server.ready.action.debugWithChrome.description%"
+                        ],
+                        "markdownDescription": "%debug.server.ready.action.description%",
+                        "default": "openExternally"
+                      },
+                      "pattern": {
+                        "type": "string",
+                        "markdownDescription": "%debug.server.ready.pattern.description%",
+                        "default": "listening on port ([0-9]+)"
+                      },
+                      "uriFormat": {
+                        "type": "string",
+                        "markdownDescription": "%debug.server.ready.uriFormat.description%",
+                        "default": "http://localhost:%s"
+                      },
+                      "webRoot": {
+                        "type": "string",
+                        "markdownDescription": "%debug.server.ready.webRoot.description%",
+                        "default": "${workspaceFolder}"
+                      }
+                    }
+                  },
+                  {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "markdownDescription": "%debug.server.ready.serverReadyAction.description%",
+                    "default": {
                      "action": "startDebugging",
                      "name": "<launch browser config name>"
                    },
-                    "required": ["name"],
-										"properties": {
-											"action": {
-												"type": "string",
-												"enum": [
-													"startDebugging"
-												],
-												"enumDescriptions": [
-													"%debug.server.ready.action.startDebugging.description%"
-												],
-												"markdownDescription": "%debug.server.ready.action.description%",
-												"default": "startDebugging"
-											},
-											"pattern": {
-												"type": "string",
-												"markdownDescription": "%debug.server.ready.pattern.description%",
-												"default": "listening on port ([0-9]+)"
-											},
-											"name": {
-												"type": "string",
-												"markdownDescription": "%debug.server.ready.debugConfigName.description%",
-												"default": "Launch Browser"
-											}
-										}
-									}
-								]
-							}
-						}
-					}
-				}
-			}
-		]
-	},
-	"dependencies": {
-		"vscode-nls": "^4.0.0"
-	},
-	"devDependencies": {
-		"@types/node": "^12.19.9"
-	}
+                    "required": [
+                      "name"
+                    ],
+                    "properties": {
+                      "action": {
+                        "type": "string",
+                        "enum": [
+                          "startDebugging"
+                        ],
+                        "enumDescriptions": [
+                          "%debug.server.ready.action.startDebugging.description%"
+                        ],
+                        "markdownDescription": "%debug.server.ready.action.description%",
+                        "default": "startDebugging"
+                      },
+                      "pattern": {
+                        "type": "string",
+                        "markdownDescription": "%debug.server.ready.pattern.description%",
+                        "default": "listening on port ([0-9]+)"
+                      },
+                      "name": {
+                        "type": "string",
+                        "markdownDescription": "%debug.server.ready.debugConfigName.description%",
+                        "default": "Launch Browser"
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  "dependencies": {
+    "vscode-nls": "^4.0.0"
+  },
+  "devDependencies": {
+    "@types/node": "^12.19.9"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
+  }
 }
--- a/extensions/docker/package.json
+++ b/extensions/docker/package.json
@ -1,34 +1,57 @@
 {
-	"name": "docker",
-	"displayName": "%displayName%",
-	"description": "%description%",
-	"version": "1.0.0",
-	"publisher": "vscode",
-	"license": "MIT",
-	"engines": { "vscode": "*" },
-	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js moby/moby contrib/syntax/textmate/Docker.tmbundle/Syntaxes/Dockerfile.tmLanguage ./syntaxes/docker.tmLanguage.json"
-	},
-	"contributes": {
-		"languages": [{
-			"id": "dockerfile",
-			"extensions": [ ".dockerfile", ".containerfile" ],
-			"filenames": [ "Dockerfile", "Containerfile" ],
-			"filenamePatterns": [ "Dockerfile.*", "Containerfile.*" ],
-			"aliases": [ "Docker", "Dockerfile", "Containerfile" ],
-			"configuration": "./language-configuration.json"
-		}],
-		"grammars": [{
-			"language": "dockerfile",
-			"scopeName": "source.dockerfile",
-			"path": "./syntaxes/docker.tmLanguage.json"
-		}],
-		"configurationDefaults": {
-			"[dockerfile]": {
-				"editor.quickSuggestions": {
-					"strings": true
-				}
-			}
-		}
-	}
+  "name": "docker",
+  "displayName": "%displayName%",
+  "description": "%description%",
+  "version": "1.0.0",
+  "publisher": "vscode",
+  "license": "MIT",
+  "engines": {
+    "vscode": "*"
+  },
+  "scripts": {
+    "update-grammar": "node ../node_modules/.bin/vscode-grammar-updater moby/moby contrib/syntax/textmate/Docker.tmbundle/Syntaxes/Dockerfile.tmLanguage ./syntaxes/docker.tmLanguage.json"
+  },
+  "contributes": {
+    "languages": [
+      {
+        "id": "dockerfile",
+        "extensions": [
+          ".dockerfile",
+          ".containerfile"
+        ],
+        "filenames": [
+          "Dockerfile",
+          "Containerfile"
+        ],
+        "filenamePatterns": [
+          "Dockerfile.*",
+          "Containerfile.*"
+        ],
+        "aliases": [
+          "Docker",
+          "Dockerfile",
+          "Containerfile"
+        ],
+        "configuration": "./language-configuration.json"
+      }
+    ],
+    "grammars": [
+      {
+        "language": "dockerfile",
+        "scopeName": "source.dockerfile",
+        "path": "./syntaxes/docker.tmLanguage.json"
+      }
+    ],
+    "configurationDefaults": {
+      "[dockerfile]": {
+        "editor.quickSuggestions": {
+          "strings": true
+        }
+      }
+    }
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
+  }
 }
--- a/extensions/docker/package.nls.json
+++ b/extensions/docker/package.nls.json
@ -1,4 +1,4 @@
 {
 	"displayName": "Docker Language Basics",
 	"description": "Provides syntax highlighting and bracket matching in Docker files."
-}
+}
--- a/extensions/docker/yarn.lock
+++ b/extensions/docker/yarn.lock
@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@ -1,445 +1,445 @@
 {
-    "name": "emmet",
-    "displayName": "Emmet",
-    "description": "%description%",
-    "version": "1.0.0",
-    "publisher": "vscode",
-    "license": "MIT",
-    "engines": {
-        "vscode": "^1.13.0"
-    },
-    "icon": "images/icon.png",
-    "categories": [
-        "Other"
-    ],
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/microsoft/vscode-emmet"
-    },
-    "activationEvents": [
-        "onStartupFinished",
-        "onCommand:emmet.expandAbbreviation",
-        "onLanguage:html",
-        "onLanguage:css",
-        "onLanguage:scss",
-        "onLanguage:less"
-    ],
-    "main": "./out/node/emmetNodeMain",
-    "browser": "./dist/browser/emmetBrowserMain",
-    "contributes": {
-        "configuration": {
-            "type": "object",
-            "title": "Emmet",
-            "properties": {
-                "emmet.showExpandedAbbreviation": {
-                    "type": [
-                        "string"
-                    ],
-                    "enum": [
-                        "never",
-                        "always",
-                        "inMarkupAndStylesheetFilesOnly"
-                    ],
-                    "default": "always",
-                    "markdownDescription": "%emmetShowExpandedAbbreviation%"
-                },
-                "emmet.showAbbreviationSuggestions": {
-                    "type": "boolean",
-                    "default": true,
-                    "markdownDescription": "%emmetShowAbbreviationSuggestions%"
-                },
-                "emmet.includeLanguages": {
-                    "type": "object",
-                    "additionalProperties": {
-                        "type": "string"
-                    },
-                    "default": {},
-                    "markdownDescription": "%emmetIncludeLanguages%"
-                },
-                "emmet.variables": {
-                    "type": "object",
-                    "properties": {
-                        "lang": {
-                            "type": "string",
-                            "default": "en"
-                        },
-                        "charset": {
-                            "type": "string",
-                            "default": "UTF-8"
-                        }
-                    },
-                    "default": {},
-                    "description": "%emmetVariables%"
-                },
-                "emmet.syntaxProfiles": {
-                    "type": "object",
-                    "default": {},
-                    "description": "%emmetSyntaxProfiles%"
-                },
-                "emmet.excludeLanguages": {
-                    "type": "array",
-                    "default": [
-                        "markdown"
-                    ],
-                    "description": "%emmetExclude%"
-                },
-                "emmet.extensionsPath": {
-                    "type": [
-                        "string",
-                        "null"
-                    ],
-                    "default": null,
-                    "description": "%emmetExtensionsPath%"
-                },
-                "emmet.triggerExpansionOnTab": {
-                    "type": "boolean",
-                    "default": false,
-                    "description": "%emmetTriggerExpansionOnTab%"
-                },
-                "emmet.preferences": {
-                    "type": "object",
-                    "default": {},
-                    "description": "%emmetPreferences%",
-                    "properties": {
-                        "css.intUnit": {
-                            "type": "string",
-                            "default": "px",
-                            "description": "%emmetPreferencesIntUnit%"
-                        },
-                        "css.floatUnit": {
-                            "type": "string",
-                            "default": "em",
-                            "description": "%emmetPreferencesFloatUnit%"
-                        },
-                        "css.propertyEnd": {
-                            "type": "string",
-                            "default": ";",
-                            "description": "%emmetPreferencesCssAfter%"
-                        },
-                        "sass.propertyEnd": {
-                            "type": "string",
-                            "default": "",
-                            "description": "%emmetPreferencesSassAfter%"
-                        },
-                        "stylus.propertyEnd": {
-                            "type": "string",
-                            "default": "",
-                            "description": "%emmetPreferencesStylusAfter%"
-                        },
-                        "css.valueSeparator": {
-                            "type": "string",
-                            "default": ": ",
-                            "description": "%emmetPreferencesCssBetween%"
-                        },
-                        "sass.valueSeparator": {
-                            "type": "string",
-                            "default": ": ",
-                            "description": "%emmetPreferencesSassBetween%"
-                        },
-                        "stylus.valueSeparator": {
-                            "type": "string",
-                            "default": " ",
-                            "description": "%emmetPreferencesStylusBetween%"
-                        },
-                        "bem.elementSeparator": {
-                            "type": "string",
-                            "default": "__",
-                            "description": "%emmetPreferencesBemElementSeparator%"
-                        },
-                        "bem.modifierSeparator": {
-                            "type": "string",
-                            "default": "_",
-                            "description": "%emmetPreferencesBemModifierSeparator%"
-                        },
-                        "filter.commentBefore": {
-                            "type": "string",
-                            "default": "",
-                            "description": "%emmetPreferencesFilterCommentBefore%"
-                        },
-                        "filter.commentAfter": {
-                            "type": "string",
-                            "default": "\n<!-- /[#ID][.CLASS] -->",
-                            "description": "%emmetPreferencesFilterCommentAfter%"
-                        },
-                        "filter.commentTrigger": {
-                            "type": "array",
-                            "default": [
-                                "id",
-                                "class"
-                            ],
-                            "description": "%emmetPreferencesFilterCommentTrigger%"
-                        },
-                        "format.noIndentTags": {
-                            "type": "array",
-                            "default": [
-                                "html"
-                            ],
-                            "description": "%emmetPreferencesFormatNoIndentTags%"
-                        },
-                        "format.forceIndentationForTags": {
-                            "type": "array",
-                            "default": [
-                                "body"
-                            ],
-                            "description": "%emmetPreferencesFormatForceIndentTags%"
-                        },
-                        "profile.allowCompactBoolean": {
-                            "type": "boolean",
-                            "default": false,
-                            "description": "%emmetPreferencesAllowCompactBoolean%"
-                        },
-                        "css.webkitProperties": {
-                            "type": "string",
-                            "default": null,
-                            "markdownDescription": "%emmetPreferencesCssWebkitProperties%"
-                        },
-                        "css.mozProperties": {
-                            "type": "string",
-                            "default": null,
-                            "markdownDescription": "%emmetPreferencesCssMozProperties%"
-                        },
-                        "css.oProperties": {
-                            "type": "string",
-                            "default": null,
-                            "markdownDescription": "%emmetPreferencesCssOProperties%"
-                        },
-                        "css.msProperties": {
-                            "type": "string",
-                            "default": null,
-                            "markdownDescription": "%emmetPreferencesCssMsProperties%"
-                        },
-                        "css.fuzzySearchMinScore": {
-                            "type": "number",
-                            "default": 0.3,
-                            "description": "%emmetPreferencesCssFuzzySearchMinScore%"
-                        }
-                    }
-                },
-                "emmet.showSuggestionsAsSnippets": {
-                    "type": "boolean",
-                    "default": false,
-                    "markdownDescription": "%emmetShowSuggestionsAsSnippets%"
-                },
-                "emmet.optimizeStylesheetParsing": {
-                    "type": "boolean",
-                    "default": true,
-                    "markdownDescription": "%emmetOptimizeStylesheetParsing%"
-                }
-            }
+  "name": "emmet",
+  "displayName": "Emmet",
+  "description": "%description%",
+  "version": "1.0.0",
+  "publisher": "vscode",
+  "license": "MIT",
+  "engines": {
+    "vscode": "^1.13.0"
+  },
+  "icon": "images/icon.png",
+  "categories": [
+    "Other"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
+  },
+  "activationEvents": [
+    "onStartupFinished",
+    "onCommand:emmet.expandAbbreviation",
+    "onLanguage:html",
+    "onLanguage:css",
+    "onLanguage:scss",
+    "onLanguage:less"
+  ],
+  "main": "./out/node/emmetNodeMain",
+  "browser": "./dist/browser/emmetBrowserMain",
+  "contributes": {
+    "configuration": {
+      "type": "object",
+      "title": "Emmet",
+      "properties": {
+        "emmet.showExpandedAbbreviation": {
+          "type": [
+            "string"
+          ],
+          "enum": [
+            "never",
+            "always",
+            "inMarkupAndStylesheetFilesOnly"
+          ],
+          "default": "always",
+          "markdownDescription": "%emmetShowExpandedAbbreviation%"
        },
-        "commands": [
-            {
-                "command": "editor.emmet.action.wrapIndividualLinesWithAbbreviation",
-                "title": "%command.wrapIndividualLinesWithAbbreviation%",
-                "category": "Emmet"
+        "emmet.showAbbreviationSuggestions": {
+          "type": "boolean",
+          "default": true,
+          "markdownDescription": "%emmetShowAbbreviationSuggestions%"
+        },
+        "emmet.includeLanguages": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "default": {},
+          "markdownDescription": "%emmetIncludeLanguages%"
+        },
+        "emmet.variables": {
+          "type": "object",
+          "properties": {
+            "lang": {
+              "type": "string",
+              "default": "en"
            },
-            {
-                "command": "editor.emmet.action.wrapWithAbbreviation",
-                "title": "%command.wrapWithAbbreviation%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.removeTag",
-                "title": "%command.removeTag%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.updateTag",
-                "title": "%command.updateTag%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.matchTag",
-                "title": "%command.matchTag%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.balanceIn",
-                "title": "%command.balanceIn%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.balanceOut",
-                "title": "%command.balanceOut%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.prevEditPoint",
-                "title": "%command.prevEditPoint%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.nextEditPoint",
-                "title": "%command.nextEditPoint%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.mergeLines",
-                "title": "%command.mergeLines%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.selectPrevItem",
-                "title": "%command.selectPrevItem%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.selectNextItem",
-                "title": "%command.selectNextItem%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.splitJoinTag",
-                "title": "%command.splitJoinTag%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.toggleComment",
-                "title": "%command.toggleComment%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.evaluateMathExpression",
-                "title": "%command.evaluateMathExpression%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.updateImageSize",
-                "title": "%command.updateImageSize%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.incrementNumberByOneTenth",
-                "title": "%command.incrementNumberByOneTenth%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.incrementNumberByOne",
-                "title": "%command.incrementNumberByOne%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.incrementNumberByTen",
-                "title": "%command.incrementNumberByTen%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.decrementNumberByOneTenth",
-                "title": "%command.decrementNumberByOneTenth%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.decrementNumberByOne",
-                "title": "%command.decrementNumberByOne%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.decrementNumberByTen",
-                "title": "%command.decrementNumberByTen%",
-                "category": "Emmet"
-            },
-            {
-                "command": "editor.emmet.action.reflectCSSValue",
-                "title": "%command.reflectCSSValue%",
-                "category": "Emmet"
-            },
-            {
-                "command": "workbench.action.showEmmetCommands",
-                "title": "%command.showEmmetCommands%",
-                "category": ""
+            "charset": {
+              "type": "string",
+              "default": "UTF-8"
            }
-        ],
-        "menus": {
-            "commandPalette": [
-                {
-                    "command": "editor.emmet.action.wrapIndividualLinesWithAbbreviation"
-                },
-                {
-                    "command": "editor.emmet.action.wrapWithAbbreviation"
-                },
-                {
-                    "command": "editor.emmet.action.removeTag"
-                },
-                {
-                    "command": "editor.emmet.action.updateTag"
-                },
-                {
-                    "command": "editor.emmet.action.matchTag"
-                },
-                {
-                    "command": "editor.emmet.action.balanceIn"
-                },
-                {
-                    "command": "editor.emmet.action.balanceOut"
-                },
-                {
-                    "command": "editor.emmet.action.prevEditPoint"
-                },
-                {
-                    "command": "editor.emmet.action.nextEditPoint"
-                },
-                {
-                    "command": "editor.emmet.action.mergeLines"
-                },
-                {
-                    "command": "editor.emmet.action.selectPrevItem"
-                },
-                {
-                    "command": "editor.emmet.action.selectNextItem"
-                },
-                {
-                    "command": "editor.emmet.action.splitJoinTag"
-                },
-                {
-                    "command": "editor.emmet.action.toggleComment"
-                },
-                {
-                    "command": "editor.emmet.action.evaluateMathExpression"
-                },
-                {
-                    "command": "editor.emmet.action.updateImageSize",
-                    "when": "resourceScheme =~ /^file$/"
-                },
-                {
-                    "command": "editor.emmet.action.incrementNumberByOneTenth"
-                },
-                {
-                    "command": "editor.emmet.action.incrementNumberByOne"
-                },
-                {
-                    "command": "editor.emmet.action.incrementNumberByTen"
-                },
-                {
-                    "command": "editor.emmet.action.decrementNumberByOneTenth"
-                },
-                {
-                    "command": "editor.emmet.action.decrementNumberByOne"
-                },
-                {
-                    "command": "editor.emmet.action.decrementNumberByTen"
-                },
-                {
-                    "command": "editor.emmet.action.reflectCSSValue"
-                }
-            ]
+          },
+          "default": {},
+          "description": "%emmetVariables%"
+        },
+        "emmet.syntaxProfiles": {
+          "type": "object",
+          "default": {},
+          "description": "%emmetSyntaxProfiles%"
+        },
+        "emmet.excludeLanguages": {
+          "type": "array",
+          "default": [
+            "markdown"
+          ],
+          "description": "%emmetExclude%"
+        },
+        "emmet.extensionsPath": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "default": null,
+          "description": "%emmetExtensionsPath%"
+        },
+        "emmet.triggerExpansionOnTab": {
+          "type": "boolean",
+          "default": false,
+          "description": "%emmetTriggerExpansionOnTab%"
+        },
+        "emmet.preferences": {
+          "type": "object",
+          "default": {},
+          "description": "%emmetPreferences%",
+          "properties": {
+            "css.intUnit": {
+              "type": "string",
+              "default": "px",
+              "description": "%emmetPreferencesIntUnit%"
+            },
+            "css.floatUnit": {
+              "type": "string",
+              "default": "em",
+              "description": "%emmetPreferencesFloatUnit%"
+            },
+            "css.propertyEnd": {
+              "type": "string",
+              "default": ";",
+              "description": "%emmetPreferencesCssAfter%"
+            },
+            "sass.propertyEnd": {
+              "type": "string",
+              "default": "",
+              "description": "%emmetPreferencesSassAfter%"
+            },
+            "stylus.propertyEnd": {
+              "type": "string",
+              "default": "",
+              "description": "%emmetPreferencesStylusAfter%"
+            },
+            "css.valueSeparator": {
+              "type": "string",
+              "default": ": ",
+              "description": "%emmetPreferencesCssBetween%"
+            },
+            "sass.valueSeparator": {
+              "type": "string",
+              "default": ": ",
+              "description": "%emmetPreferencesSassBetween%"
+            },
+            "stylus.valueSeparator": {
+              "type": "string",
+              "default": " ",
+              "description": "%emmetPreferencesStylusBetween%"
+            },
+            "bem.elementSeparator": {
+              "type": "string",
+              "default": "__",
+              "description": "%emmetPreferencesBemElementSeparator%"
+            },
+            "bem.modifierSeparator": {
+              "type": "string",
+              "default": "_",
+              "description": "%emmetPreferencesBemModifierSeparator%"
+            },
+            "filter.commentBefore": {
+              "type": "string",
+              "default": "",
+              "description": "%emmetPreferencesFilterCommentBefore%"
+            },
+            "filter.commentAfter": {
+              "type": "string",
+              "default": "\n<!-- /[#ID][.CLASS] -->",
+              "description": "%emmetPreferencesFilterCommentAfter%"
+            },
+            "filter.commentTrigger": {
+              "type": "array",
+              "default": [
+                "id",
+                "class"
+              ],
+              "description": "%emmetPreferencesFilterCommentTrigger%"
+            },
+            "format.noIndentTags": {
+              "type": "array",
+              "default": [
+                "html"
+              ],
+              "description": "%emmetPreferencesFormatNoIndentTags%"
+            },
+            "format.forceIndentationForTags": {
+              "type": "array",
+              "default": [
+                "body"
+              ],
+              "description": "%emmetPreferencesFormatForceIndentTags%"
+            },
+            "profile.allowCompactBoolean": {
+              "type": "boolean",
+              "default": false,
+              "description": "%emmetPreferencesAllowCompactBoolean%"
+            },
+            "css.webkitProperties": {
+              "type": "string",
+              "default": null,
+              "markdownDescription": "%emmetPreferencesCssWebkitProperties%"
+            },
+            "css.mozProperties": {
+              "type": "string",
+              "default": null,
+              "markdownDescription": "%emmetPreferencesCssMozProperties%"
+            },
+            "css.oProperties": {
+              "type": "string",
+              "default": null,
+              "markdownDescription": "%emmetPreferencesCssOProperties%"
+            },
+            "css.msProperties": {
+              "type": "string",
+              "default": null,
+              "markdownDescription": "%emmetPreferencesCssMsProperties%"
+            },
+            "css.fuzzySearchMinScore": {
+              "type": "number",
+              "default": 0.3,
+              "description": "%emmetPreferencesCssFuzzySearchMinScore%"
+            }
+          }
+        },
+        "emmet.showSuggestionsAsSnippets": {
+          "type": "boolean",
+          "default": false,
+          "markdownDescription": "%emmetShowSuggestionsAsSnippets%"
+        },
+        "emmet.optimizeStylesheetParsing": {
+          "type": "boolean",
+          "default": true,
+          "markdownDescription": "%emmetOptimizeStylesheetParsing%"
        }
+      }
    },
-    "scripts": {
-        "watch": "gulp watch-extension:emmet",
-        "compile": "gulp compile-extension:emmet",
-        "deps": "yarn add vscode-emmet-helper"
-    },
-    "devDependencies": {
-        "@types/node": "^12.19.9",
-        "emmet": "https://github.com/rzhao271/emmet.git#1b2df677d8925ef5ea6da9df8845968403979a0a"
-    },
-    "dependencies": {
-        "@emmetio/abbreviation": "^2.2.0",
-        "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode",
-        "@emmetio/html-matcher": "^0.3.3",
-        "@emmetio/math-expression": "^1.0.4",
-        "image-size": "^0.5.2",
-        "vscode-emmet-helper": "2.2.4-2",
-        "vscode-languageserver-textdocument": "^1.0.1"
+    "commands": [
+      {
+        "command": "editor.emmet.action.wrapIndividualLinesWithAbbreviation",
+        "title": "%command.wrapIndividualLinesWithAbbreviation%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.wrapWithAbbreviation",
+        "title": "%command.wrapWithAbbreviation%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.removeTag",
+        "title": "%command.removeTag%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.updateTag",
+        "title": "%command.updateTag%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.matchTag",
+        "title": "%command.matchTag%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.balanceIn",
+        "title": "%command.balanceIn%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.balanceOut",
+        "title": "%command.balanceOut%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.prevEditPoint",
+        "title": "%command.prevEditPoint%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.nextEditPoint",
+        "title": "%command.nextEditPoint%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.mergeLines",
+        "title": "%command.mergeLines%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.selectPrevItem",
+        "title": "%command.selectPrevItem%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.selectNextItem",
+        "title": "%command.selectNextItem%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.splitJoinTag",
+        "title": "%command.splitJoinTag%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.toggleComment",
+        "title": "%command.toggleComment%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.evaluateMathExpression",
+        "title": "%command.evaluateMathExpression%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.updateImageSize",
+        "title": "%command.updateImageSize%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.incrementNumberByOneTenth",
+        "title": "%command.incrementNumberByOneTenth%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.incrementNumberByOne",
+        "title": "%command.incrementNumberByOne%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.incrementNumberByTen",
+        "title": "%command.incrementNumberByTen%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.decrementNumberByOneTenth",
+        "title": "%command.decrementNumberByOneTenth%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.decrementNumberByOne",
+        "title": "%command.decrementNumberByOne%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.decrementNumberByTen",
+        "title": "%command.decrementNumberByTen%",
+        "category": "Emmet"
+      },
+      {
+        "command": "editor.emmet.action.reflectCSSValue",
+        "title": "%command.reflectCSSValue%",
+        "category": "Emmet"
+      },
+      {
+        "command": "workbench.action.showEmmetCommands",
+        "title": "%command.showEmmetCommands%",
+        "category": ""
+      }
+    ],
+    "menus": {
+      "commandPalette": [
+        {
+          "command": "editor.emmet.action.wrapIndividualLinesWithAbbreviation"
+        },
+        {
+          "command": "editor.emmet.action.wrapWithAbbreviation"
+        },
+        {
+          "command": "editor.emmet.action.removeTag"
+        },
+        {
+          "command": "editor.emmet.action.updateTag"
+        },
+        {
+          "command": "editor.emmet.action.matchTag"
+        },
+        {
+          "command": "editor.emmet.action.balanceIn"
+        },
+        {
+          "command": "editor.emmet.action.balanceOut"
+        },
+        {
+          "command": "editor.emmet.action.prevEditPoint"
+        },
+        {
+          "command": "editor.emmet.action.nextEditPoint"
+        },
+        {
+          "command": "editor.emmet.action.mergeLines"
+        },
+        {
+          "command": "editor.emmet.action.selectPrevItem"
+        },
+        {
+          "command": "editor.emmet.action.selectNextItem"
+        },
+        {
+          "command": "editor.emmet.action.splitJoinTag"
+        },
+        {
+          "command": "editor.emmet.action.toggleComment"
+        },
+        {
+          "command": "editor.emmet.action.evaluateMathExpression"
+        },
+        {
+          "command": "editor.emmet.action.updateImageSize",
+          "when": "resourceScheme =~ /^file$/"
+        },
+        {
+          "command": "editor.emmet.action.incrementNumberByOneTenth"
+        },
+        {
+          "command": "editor.emmet.action.incrementNumberByOne"
+        },
+        {
+          "command": "editor.emmet.action.incrementNumberByTen"
+        },
+        {
+          "command": "editor.emmet.action.decrementNumberByOneTenth"
+        },
+        {
+          "command": "editor.emmet.action.decrementNumberByOne"
+        },
+        {
+          "command": "editor.emmet.action.decrementNumberByTen"
+        },
+        {
+          "command": "editor.emmet.action.reflectCSSValue"
+        }
+      ]
    }
+  },
+  "scripts": {
+    "watch": "gulp watch-extension:emmet",
+    "compile": "gulp compile-extension:emmet",
+    "deps": "yarn add vscode-emmet-helper"
+  },
+  "devDependencies": {
+    "@types/node": "^12.19.9",
+    "emmet": "https://github.com/rzhao271/emmet.git#1b2df677d8925ef5ea6da9df8845968403979a0a"
+  },
+  "dependencies": {
+    "@emmetio/abbreviation": "^2.2.0",
+    "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode",
+    "@emmetio/html-matcher": "^0.3.3",
+    "@emmetio/math-expression": "^1.0.4",
+    "image-size": "^0.5.2",
+    "vscode-emmet-helper": "2.2.4",
+    "vscode-languageserver-textdocument": "^1.0.1"
+  }
 }
--- a/extensions/emmet/src/test/test-fixtures/.vscode/settings.json
+++ b/extensions/emmet/src/test/test-fixtures/.vscode/settings.json
@ -0,0 +1,3 @@
+{
+	"editor.minimap.enabled": false // see https://github.com/microsoft/vscode/issues/115747
+}
--- a/extensions/emmet/yarn.lock
+++ b/extensions/emmet/yarn.lock
@ -54,9 +54,9 @@
  integrity sha1-Rs/+oRmgoAMxKiHC2bVijLX81EI=

 "@types/node@^12.19.9":
-  version "12.19.12"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.12.tgz#04793c2afa4ce833a9972e4c476432e30f9df47b"
-  integrity sha512-UwfL2uIU9arX/+/PRcIkT08/iBadGN2z6ExOROA2Dh5mAuWTBj6iJbQX4nekiV5H8cTrEG569LeX+HRco9Cbxw==
+  version "12.19.15"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.15.tgz#0de7e978fb43db62da369db18ea088a63673c182"
+  integrity sha512-lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw==

 "emmet@https://github.com/rzhao271/emmet.git#1b2df677d8925ef5ea6da9df8845968403979a0a":
  version "2.3.0"
@ -75,10 +75,10 @@ jsonc-parser@^2.3.0:
  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.3.1.tgz#59549150b133f2efacca48fe9ce1ec0659af2342"
  integrity sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==

-vscode-emmet-helper@2.2.4-2:
-  version "2.2.4-2"
-  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-2.2.4-2.tgz#8019188077a91dbe9a8d8c10c0b79369bb5c24d6"
-  integrity sha512-7UTZXwt9M1xwaV72o2YgSBVoghtDtscTgYTOl1kiPkXN9OKiM4N52hcHFA1LlRtdTvIQd4PEkgaz57F9ZT/4kg==
+vscode-emmet-helper@2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-2.2.4.tgz#8ab86d2b7fe9e6270b4c77c9fd8d1eb8f3f4c401"
+  integrity sha512-1N6bMzP1ZzkDGzamvsKxQ/lOmBc4+OQdj0dA2C9A5PSeYV9gh5xbJ061sm+VyFHOGZE+VyUQq5m/WFmFsLbKnA==
  dependencies:
    emmet "https://github.com/rzhao271/emmet.git#1b2df677d8925ef5ea6da9df8845968403979a0a"
    jsonc-parser "^2.3.0"
--- a/extensions/extension-editing/package.json
+++ b/extensions/extension-editing/package.json
@ -1,64 +1,71 @@
 {
-	"name": "extension-editing",
-	"displayName": "%displayName%",
-	"description": "%description%",
-	"version": "1.0.0",
-	"publisher": "vscode",
-	"license": "MIT",
-	"engines": {
-		"vscode": "^1.4.0"
-	},
-	"activationEvents": [
-		"onLanguage:json",
-		"onLanguage:markdown",
-		"onLanguage:typescript"
-	],
-	"main": "./out/extensionEditingMain",
-	"browser": "./dist/browser/extensionEditingBrowserMain",
-	"scripts": {
-		"compile": "gulp compile-extension:extension-editing",
-		"watch": "gulp watch-extension:extension-editing"
-	},
-	"dependencies": {
-		"jsonc-parser": "^2.2.1",
-		"markdown-it": "^8.3.1",
-		"parse5": "^3.0.2",
-		"vscode-nls": "^4.1.1"
-	},
-	"contributes": {
-		"jsonValidation": [
-			{
-				"fileMatch": "package.json",
-				"url": "vscode://schemas/vscode-extensions"
-			},
-			{
-				"fileMatch": "*language-configuration.json",
-				"url": "vscode://schemas/language-configuration"
-			},
-			{
-				"fileMatch": ["*icon-theme.json", "!*product-icon-theme.json"],
-				"url": "vscode://schemas/icon-theme"
-			},
-			{
-				"fileMatch": "*product-icon-theme.json",
-				"url": "vscode://schemas/product-icon-theme"
-			},
-			{
-				"fileMatch": "*color-theme.json",
-				"url": "vscode://schemas/color-theme"
-			}
-		],
-		"languages": [
-			{
-				"id": "ignore",
-				"filenames": [
-					".vscodeignore"
-				]
-			}
-		]
-	},
-	"devDependencies": {
-		"@types/markdown-it": "0.0.2",
-		"@types/node": "^12.19.9"
-	}
+  "name": "extension-editing",
+  "displayName": "%displayName%",
+  "description": "%description%",
+  "version": "1.0.0",
+  "publisher": "vscode",
+  "license": "MIT",
+  "engines": {
+    "vscode": "^1.4.0"
+  },
+  "activationEvents": [
+    "onLanguage:json",
+    "onLanguage:markdown",
+    "onLanguage:typescript"
+  ],
+  "main": "./out/extensionEditingMain",
+  "browser": "./dist/browser/extensionEditingBrowserMain",
+  "scripts": {
+    "compile": "gulp compile-extension:extension-editing",
+    "watch": "gulp watch-extension:extension-editing"
+  },
+  "dependencies": {
+    "jsonc-parser": "^2.2.1",
+    "markdown-it": "^8.3.1",
+    "parse5": "^3.0.2",
+    "vscode-nls": "^4.1.1"
+  },
+  "contributes": {
+    "jsonValidation": [
+      {
+        "fileMatch": "package.json",
+        "url": "vscode://schemas/vscode-extensions"
+      },
+      {
+        "fileMatch": "*language-configuration.json",
+        "url": "vscode://schemas/language-configuration"
+      },
+      {
+        "fileMatch": [
+          "*icon-theme.json",
+          "!*product-icon-theme.json"
+        ],
+        "url": "vscode://schemas/icon-theme"
+      },
+      {
+        "fileMatch": "*product-icon-theme.json",
+        "url": "vscode://schemas/product-icon-theme"
+      },
+      {
+        "fileMatch": "*color-theme.json",
+        "url": "vscode://schemas/color-theme"
+      }
+    ],
+    "languages": [
+      {
+        "id": "ignore",
+        "filenames": [
+          ".vscodeignore"
+        ]
+      }
+    ]
+  },
+  "devDependencies": {
+    "@types/markdown-it": "0.0.2",
+    "@types/node": "^12.19.9"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
+  }
 }
--- a/extensions/extension-editing/package.nls.json
+++ b/extensions/extension-editing/package.nls.json
@ -1,4 +1,4 @@
 {
 	"displayName": "Extension Authoring",
 	"description": "Provides linting capabilities for authoring extensions."
-}
+}
--- a/extensions/fsharp/package.json
+++ b/extensions/fsharp/package.json
@ -1,29 +1,50 @@
 {
-	"name": "fsharp",
-	"displayName": "%displayName%",
-	"description": "%description%",
-	"version": "1.0.0",
-	"publisher": "vscode",
-	"license": "MIT",
-	"engines": { "vscode": "*" },
-	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js ionide/ionide-fsgrammar grammars/fsharp.json ./syntaxes/fsharp.tmLanguage.json"
-	},
-	"contributes": {
-		"languages": [{
-			"id": "fsharp",
-			"extensions": [ ".fs", ".fsi", ".fsx", ".fsscript" ],
-			"aliases": [ "F#", "FSharp", "fsharp" ],
-			"configuration": "./language-configuration.json"
-		}],
-		"grammars": [{
-			"language": "fsharp",
-			"scopeName": "source.fsharp",
-			"path": "./syntaxes/fsharp.tmLanguage.json"
-		}],
-		"snippets": [{
-			"language": "fsharp",
-			"path": "./snippets/fsharp.code-snippets"
-		}]
-	}
+  "name": "fsharp",
+  "displayName": "%displayName%",
+  "description": "%description%",
+  "version": "1.0.0",
+  "publisher": "vscode",
+  "license": "MIT",
+  "engines": {
+    "vscode": "*"
+  },
+  "scripts": {
+    "update-grammar": "node ../node_modules/.bin/vscode-grammar-updater ionide/ionide-fsgrammar grammars/fsharp.json ./syntaxes/fsharp.tmLanguage.json"
+  },
+  "contributes": {
+    "languages": [
+      {
+        "id": "fsharp",
+        "extensions": [
+          ".fs",
+          ".fsi",
+          ".fsx",
+          ".fsscript"
+        ],
+        "aliases": [
+          "F#",
+          "FSharp",
+          "fsharp"
+        ],
+        "configuration": "./language-configuration.json"
+      }
+    ],
+    "grammars": [
+      {
+        "language": "fsharp",
+        "scopeName": "source.fsharp",
+        "path": "./syntaxes/fsharp.tmLanguage.json"
+      }
+    ],
+    "snippets": [
+      {
+        "language": "fsharp",
+        "path": "./snippets/fsharp.code-snippets"
+      }
+    ]
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
+  }
 }
--- a/extensions/fsharp/package.nls.json
+++ b/extensions/fsharp/package.nls.json
@ -1,4 +1,4 @@
 {
 	"displayName": "F# Language Basics",
 	"description": "Provides snippets, syntax highlighting, bracket matching and folding in F# files."
-}
+}
--- a/extensions/fsharp/yarn.lock
+++ b/extensions/fsharp/yarn.lock
@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
--- a/extensions/git-ui/package.json
+++ b/extensions/git-ui/package.json
@ -27,5 +27,9 @@
  },
  "devDependencies": {
    "@types/node": "^12.19.9"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
  }
 }
--- a/extensions/git-ui/package.nls.json
+++ b/extensions/git-ui/package.nls.json
@ -1,4 +1,4 @@
 {
 	"displayName": "Git UI",
 	"description": "Git SCM UI Integration"
-}
+}
--- a/extensions/git/build/update-grammars.js
+++ b/extensions/git/build/update-grammars.js
@ -4,7 +4,7 @@
 *--------------------------------------------------------------------------------------------*/
 'use strict';

-var updateGrammar = require('../../../build/npm/update-grammar');
+var updateGrammar = require('vscode-grammar-updater');

 updateGrammar.update('textmate/git.tmbundle', 'Syntaxes/Git%20Commit%20Message.tmLanguage', './syntaxes/git-commit.tmLanguage.json');
 updateGrammar.update('textmate/git.tmbundle', 'Syntaxes/Git%20Rebase%20Message.tmLanguage', './syntaxes/git-rebase.tmLanguage.json');
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@ -2140,6 +2140,15 @@
          "highContrast": "#c74e39"
        }
      },
+      {
+        "id": "gitDecoration.renamedResourceForeground",
+        "description": "%colors.renamed%",
+        "defaults": {
+          "light": "#007100",
+          "dark": "#73C991",
+          "highContrast": "#73C991"
+        }
+      },
      {
        "id": "gitDecoration.untrackedResourceForeground",
        "description": "%colors.untracked%",
@ -2180,9 +2189,9 @@
        "id": "gitDecoration.conflictingResourceForeground",
        "description": "%colors.conflict%",
        "defaults": {
-          "light": "#6c6cc4",
-          "dark": "#6c6cc4",
-          "highContrast": "#6c6cc4"
+          "light": "#ad0707",
+          "dark": "#e4676b",
+          "highContrast": "#c74e39"
        }
      },
      {
@ -2342,5 +2351,9 @@
    "@types/mocha": "^8.2.0",
    "@types/node": "^12.19.9",
    "@types/which": "^1.0.28"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
  }
 }
--- a/extensions/git/package.nls.json
+++ b/extensions/git/package.nls.json
@ -198,6 +198,7 @@
 	"colors.stageModified": "Color for modified resources which have been staged.",
 	"colors.stageDeleted": "Color for deleted resources which have been staged.",
 	"colors.deleted": "Color for deleted resources.",
+	"colors.renamed": "Color for renamed or copied resources.",
 	"colors.untracked": "Color for untracked resources.",
 	"colors.ignored": "Color for ignored resources.",
 	"colors.conflict": "Color for resources with conflicts.",
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@ -5,7 +5,7 @@

 import * as os from 'os';
 import * as path from 'path';
-import { commands, Disposable, LineChange, MessageOptions, OutputChannel, Position, ProgressLocation, QuickPickItem, Range, SourceControlResourceState, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceEdit, WorkspaceFolder, TimelineItem, env, Selection, TextDocumentContentProvider } from 'vscode';
+import { Command, commands, Disposable, LineChange, MessageOptions, OutputChannel, Position, ProgressLocation, QuickPickItem, Range, SourceControlResourceState, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceEdit, WorkspaceFolder, TimelineItem, env, Selection, TextDocumentContentProvider } from 'vscode';
 import TelemetryReporter from 'vscode-extension-telemetry';
 import * as nls from 'vscode-nls';
 import { Branch, ForcePushMode, GitErrorCodes, Ref, RefType, Status, CommitOptions, RemoteSourceProvider } from './api/git';
@ -153,21 +153,21 @@ class AddRemoteItem implements QuickPickItem {
 	}
 }

-interface CommandOptions {
+interface ScmCommandOptions {
 	repository?: boolean;
 	diff?: boolean;
 }

-interface Command {
+interface ScmCommand {
 	commandId: string;
 	key: string;
 	method: Function;
-	options: CommandOptions;
+	options: ScmCommandOptions;
 }

-const Commands: Command[] = [];
+const Commands: ScmCommand[] = [];

-function command(commandId: string, options: CommandOptions = {}): Function {
+function command(commandId: string, options: ScmCommandOptions = {}): Function {
 	return (_target: any, key: string, descriptor: any) => {
 		if (!(typeof descriptor.value === 'function')) {
 			throw new Error('not supported');
@ -374,16 +374,20 @@ export class CommandCenter {

 	@command('git.openAllChanges', { repository: true })
 	async openChanges(repository: Repository): Promise<void> {
-		[
-			...repository.workingTreeGroup.resourceStates,
-			...repository.untrackedGroup.resourceStates,
-		].forEach(resource => {
-			commands.executeCommand(
+		for (const resource of [...repository.workingTreeGroup.resourceStates, ...repository.untrackedGroup.resourceStates]) {
+			if (
+				resource.type === Status.DELETED || resource.type === Status.DELETED_BY_THEM ||
+				resource.type === Status.DELETED_BY_US || resource.type === Status.BOTH_DELETED
+			) {
+				continue;
+			}
+
+			void commands.executeCommand(
 				'vscode.open',
 				resource.resourceUri,
-				{ preview: false, }
+				{ background: true, preview: false, }
 			);
-		});
+		}
 	}

 	async cloneRepository(url?: string, parentPath?: string, options: { recursive?: boolean } = {}): Promise<void> {
@ -2608,6 +2612,22 @@ export class CommandCenter {

 	@command('git.timeline.openDiff', { repository: false })
 	async timelineOpenDiff(item: TimelineItem, uri: Uri | undefined, _source: string) {
+		const cmd = this.resolveTimelineOpenDiffCommand(
+			item, uri,
+			{
+				preserveFocus: true,
+				preview: true,
+				viewColumn: ViewColumn.Active
+			},
+		);
+		if (cmd === undefined) {
+			return undefined;
+		}
+
+		return commands.executeCommand(cmd.command, ...(cmd.arguments ?? []));
+	}
+
+	resolveTimelineOpenDiffCommand(item: TimelineItem, uri: Uri | undefined, options?: TextDocumentShowOptions): Command | undefined {
 		if (uri === undefined || uri === null || !GitTimelineItem.is(item)) {
 			return undefined;
 		}
@ -2624,13 +2644,11 @@ export class CommandCenter {
 			title = localize('git.title.diffRefs', '{0} ({1}) ⟷ {0} ({2})', basename, item.shortPreviousRef, item.shortRef);
 		}

-		const options: TextDocumentShowOptions = {
-			preserveFocus: true,
-			preview: true,
-			viewColumn: ViewColumn.Active
+		return {
+			command: 'vscode.diff',
+			title: 'Open Comparison',
+			arguments: [toGitUri(uri, item.previousRef), item.ref === '' ? uri : toGitUri(uri, item.ref), title, options]
 		};
-
-		return commands.executeCommand('vscode.diff', toGitUri(uri, item.previousRef), item.ref === '' ? uri : toGitUri(uri, item.ref), title, options);
 	}

 	@command('git.timeline.copyCommitId', { repository: false })
@ -2660,7 +2678,7 @@ export class CommandCenter {
 		}
 	}

-	private createCommand(id: string, key: string, method: Function, options: CommandOptions): (...args: any[]) => any {
+	private createCommand(id: string, key: string, method: Function, options: ScmCommandOptions): (...args: any[]) => any {
 		const result = (...args: any[]) => {
 			let result: Promise<any>;

--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@ -823,8 +823,7 @@ export class Repository {
 		return this.repositoryRoot;
 	}

-	// TODO@Joao: rename to exec
-	async run(args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
+	async exec(args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
 		return await this.git.exec(this.repositoryRoot, args, options);
 	}

@ -849,7 +848,7 @@ export class Repository {
 			args.push(value);
 		}

-		const result = await this.run(args, options);
+		const result = await this.exec(args, options);
 		return result.stdout.trim();
 	}

@ -862,7 +861,7 @@ export class Repository {

 		args.push('-l');

-		const result = await this.run(args);
+		const result = await this.exec(args);
 		const lines = result.stdout.trim().split(/\r|\r\n|\n/);

 		return lines.map(entry => {
@ -878,7 +877,7 @@ export class Repository {
 			args.push(options.path);
 		}

-		const result = await this.run(args);
+		const result = await this.exec(args);
 		if (result.exitCode) {
 			// An empty repo
 			return [];
@ -909,7 +908,7 @@ export class Repository {

 		args.push('--', uri.fsPath);

-		const result = await this.run(args);
+		const result = await this.exec(args);
 		if (result.exitCode) {
 			// No file history, e.g. a new file or untracked
 			return [];
@ -964,7 +963,7 @@ export class Repository {
 			}

 			const { mode, object } = elements[0];
-			const catFile = await this.run(['cat-file', '-s', object]);
+			const catFile = await this.exec(['cat-file', '-s', object]);
 			const size = parseInt(catFile.stdout);

 			return { mode, object, size };
@ -981,12 +980,12 @@ export class Repository {
 	}

 	async lstree(treeish: string, path: string): Promise<LsTreeElement[]> {
-		const { stdout } = await this.run(['ls-tree', '-l', treeish, '--', sanitizePath(path)]);
+		const { stdout } = await this.exec(['ls-tree', '-l', treeish, '--', sanitizePath(path)]);
 		return parseLsTree(stdout);
 	}

 	async lsfiles(path: string): Promise<LsFilesElement[]> {
-		const { stdout } = await this.run(['ls-files', '--stage', '--', sanitizePath(path)]);
+		const { stdout } = await this.exec(['ls-files', '--stage', '--', sanitizePath(path)]);
 		return parseLsFiles(stdout);
 	}

@ -1051,7 +1050,7 @@ export class Repository {
 		}

 		try {
-			await this.run(args);
+			await this.exec(args);
 		} catch (err) {
 			if (/patch does not apply/.test(err.stderr)) {
 				err.gitErrorCode = GitErrorCodes.PatchDoesNotApply;
@ -1068,7 +1067,7 @@ export class Repository {
 			args.push('--cached');
 		}

-		const result = await this.run(args);
+		const result = await this.exec(args);
 		return result.stdout;
 	}

@ -1081,7 +1080,7 @@ export class Repository {
 		}

 		const args = ['diff', '--', sanitizePath(path)];
-		const result = await this.run(args);
+		const result = await this.exec(args);
 		return result.stdout;
 	}

@ -1094,7 +1093,7 @@ export class Repository {
 		}

 		const args = ['diff', ref, '--', sanitizePath(path)];
-		const result = await this.run(args);
+		const result = await this.exec(args);
 		return result.stdout;
 	}

@ -1107,7 +1106,7 @@ export class Repository {
 		}

 		const args = ['diff', '--cached', '--', sanitizePath(path)];
-		const result = await this.run(args);
+		const result = await this.exec(args);
 		return result.stdout;
 	}

@ -1120,13 +1119,13 @@ export class Repository {
 		}

 		const args = ['diff', '--cached', ref, '--', sanitizePath(path)];
-		const result = await this.run(args);
+		const result = await this.exec(args);
 		return result.stdout;
 	}

 	async diffBlobs(object1: string, object2: string): Promise<string> {
 		const args = ['diff', object1, object2];
-		const result = await this.run(args);
+		const result = await this.exec(args);
 		return result.stdout;
 	}

@ -1140,7 +1139,7 @@ export class Repository {
 		}

 		const args = ['diff', range, '--', sanitizePath(path)];
-		const result = await this.run(args);
+		const result = await this.exec(args);

 		return result.stdout.trim();
 	}
@ -1155,7 +1154,7 @@ export class Repository {
 			args.push(ref);
 		}

-		const gitResult = await this.run(args);
+		const gitResult = await this.exec(args);
 		if (gitResult.exitCode) {
 			return [];
 		}
@ -1228,14 +1227,14 @@ export class Repository {

 	async getMergeBase(ref1: string, ref2: string): Promise<string> {
 		const args = ['merge-base', ref1, ref2];
-		const result = await this.run(args);
+		const result = await this.exec(args);

 		return result.stdout.trim();
 	}

 	async hashObject(data: string): Promise<string> {
 		const args = ['hash-object', '-w', '--stdin'];
-		const result = await this.run(args, { input: data });
+		const result = await this.exec(args, { input: data });

 		return result.stdout.trim();
 	}
@ -1251,10 +1250,10 @@ export class Repository {

 		if (paths && paths.length) {
 			for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
-				await this.run([...args, '--', ...chunk]);
+				await this.exec([...args, '--', ...chunk]);
 			}
 		} else {
-			await this.run([...args, '--', '.']);
+			await this.exec([...args, '--', '.']);
 		}
 	}

@ -1267,7 +1266,7 @@ export class Repository {

 		args.push(...paths.map(sanitizePath));

-		await this.run(args);
+		await this.exec(args);
 	}

 	async stage(path: string, data: string): Promise<void> {
@ -1300,7 +1299,7 @@ export class Repository {
 			add = '--add';
 		}

-		await this.run(['update-index', add, '--cacheinfo', mode, hash, path]);
+		await this.exec(['update-index', add, '--cacheinfo', mode, hash, path]);
 	}

 	async checkout(treeish: string, paths: string[], opts: { track?: boolean, detached?: boolean } = Object.create(null)): Promise<void> {
@ -1321,10 +1320,10 @@ export class Repository {
 		try {
 			if (paths && paths.length > 0) {
 				for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
-					await this.run([...args, '--', ...chunk]);
+					await this.exec([...args, '--', ...chunk]);
 				}
 			} else {
-				await this.run(args);
+				await this.exec(args);
 			}
 		} catch (err) {
 			if (/Please,? commit your changes or stash them/.test(err.stderr || '')) {
@ -1375,21 +1374,21 @@ export class Repository {
 		}

 		try {
-			await this.run(args, !opts.amend || message ? { input: message || '' } : {});
+			await this.exec(args, !opts.amend || message ? { input: message || '' } : {});
 		} catch (commitErr) {
 			await this.handleCommitError(commitErr);
 		}
 	}

 	async rebaseAbort(): Promise<void> {
-		await this.run(['rebase', '--abort']);
+		await this.exec(['rebase', '--abort']);
 	}

 	async rebaseContinue(): Promise<void> {
 		const args = ['rebase', '--continue'];

 		try {
-			await this.run(args);
+			await this.exec(args);
 		} catch (commitErr) {
 			await this.handleCommitError(commitErr);
 		}
@ -1402,14 +1401,14 @@ export class Repository {
 		}

 		try {
-			await this.run(['config', '--get-all', 'user.name']);
+			await this.exec(['config', '--get-all', 'user.name']);
 		} catch (err) {
 			err.gitErrorCode = GitErrorCodes.NoUserNameConfigured;
 			throw err;
 		}

 		try {
-			await this.run(['config', '--get-all', 'user.email']);
+			await this.exec(['config', '--get-all', 'user.email']);
 		} catch (err) {
 			err.gitErrorCode = GitErrorCodes.NoUserEmailConfigured;
 			throw err;
@ -1425,39 +1424,39 @@ export class Repository {
 			args.push(ref);
 		}

-		await this.run(args);
+		await this.exec(args);
 	}

 	async deleteBranch(name: string, force?: boolean): Promise<void> {
 		const args = ['branch', force ? '-D' : '-d', name];
-		await this.run(args);
+		await this.exec(args);
 	}

 	async renameBranch(name: string): Promise<void> {
 		const args = ['branch', '-m', name];
-		await this.run(args);
+		await this.exec(args);
 	}

 	async move(from: string, to: string): Promise<void> {
 		const args = ['mv', from, to];
-		await this.run(args);
+		await this.exec(args);
 	}

 	async setBranchUpstream(name: string, upstream: string): Promise<void> {
 		const args = ['branch', '--set-upstream-to', upstream, name];
-		await this.run(args);
+		await this.exec(args);
 	}

 	async deleteRef(ref: string): Promise<void> {
 		const args = ['update-ref', '-d', ref];
-		await this.run(args);
+		await this.exec(args);
 	}

 	async merge(ref: string): Promise<void> {
 		const args = ['merge', ref];

 		try {
-			await this.run(args);
+			await this.exec(args);
 		} catch (err) {
 			if (/^CONFLICT /m.test(err.stdout || '')) {
 				err.gitErrorCode = GitErrorCodes.Conflict;
@ -1476,12 +1475,12 @@ export class Repository {
 			args = [...args, name];
 		}

-		await this.run(args);
+		await this.exec(args);
 	}

 	async deleteTag(name: string): Promise<void> {
 		let args = ['tag', '-d', name];
-		await this.run(args);
+		await this.exec(args);
 	}

 	async clean(paths: string[]): Promise<void> {
@ -1494,7 +1493,7 @@ export class Repository {

 		for (const paths of groups) {
 			for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
-				promises.push(limiter.queue(() => this.run([...args, '--', ...chunk])));
+				promises.push(limiter.queue(() => this.exec([...args, '--', ...chunk])));
 			}
 		}

@ -1502,10 +1501,10 @@ export class Repository {
 	}

 	async undo(): Promise<void> {
-		await this.run(['clean', '-fd']);
+		await this.exec(['clean', '-fd']);

 		try {
-			await this.run(['checkout', '--', '.']);
+			await this.exec(['checkout', '--', '.']);
 		} catch (err) {
 			if (/did not match any file\(s\) known to git\./.test(err.stderr || '')) {
 				return;
@ -1517,11 +1516,11 @@ export class Repository {

 	async reset(treeish: string, hard: boolean = false): Promise<void> {
 		const args = ['reset', hard ? '--hard' : '--soft', treeish];
-		await this.run(args);
+		await this.exec(args);
 	}

 	async revert(treeish: string, paths: string[]): Promise<void> {
-		const result = await this.run(['branch']);
+		const result = await this.exec(['branch']);
 		let args: string[];

 		// In case there are no branches, we must use rm --cached
@ -1534,10 +1533,10 @@ export class Repository {
 		try {
 			if (paths && paths.length > 0) {
 				for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
-					await this.run([...args, '--', ...chunk]);
+					await this.exec([...args, '--', ...chunk]);
 				}
 			} else {
-				await this.run([...args, '--', '.']);
+				await this.exec([...args, '--', '.']);
 			}
 		} catch (err) {
 			// In case there are merge conflicts to be resolved, git reset will output
@ -1552,17 +1551,17 @@ export class Repository {

 	async addRemote(name: string, url: string): Promise<void> {
 		const args = ['remote', 'add', name, url];
-		await this.run(args);
+		await this.exec(args);
 	}

 	async removeRemote(name: string): Promise<void> {
 		const args = ['remote', 'remove', name];
-		await this.run(args);
+		await this.exec(args);
 	}

 	async renameRemote(name: string, newName: string): Promise<void> {
 		const args = ['remote', 'rename', name, newName];
-		await this.run(args);
+		await this.exec(args);
 	}

 	async fetch(options: { remote?: string, ref?: string, all?: boolean, prune?: boolean, depth?: number, silent?: boolean, readonly cancellationToken?: CancellationToken } = {}): Promise<void> {
@ -1595,7 +1594,7 @@ export class Repository {
 		}

 		try {
-			await this.run(args, spawnOptions);
+			await this.exec(args, spawnOptions);
 		} catch (err) {
 			if (/No remote repository specified\./.test(err.stderr || '')) {
 				err.gitErrorCode = GitErrorCodes.NoRemoteRepositorySpecified;
@ -1628,7 +1627,7 @@ export class Repository {
 		}

 		try {
-			await this.run(args, {
+			await this.exec(args, {
 				cancellationToken: options.cancellationToken,
 				env: { 'GIT_HTTP_USER_AGENT': this.git.userAgent }
 			});
@ -1658,7 +1657,7 @@ export class Repository {
 		args.push(branch);

 		try {
-			await this.run(args, options);
+			await this.exec(args, options);
 		} catch (err) {
 			if (/^CONFLICT \([^)]+\): \b/m.test(err.stdout || '')) {
 				err.gitErrorCode = GitErrorCodes.Conflict;
@ -1700,7 +1699,7 @@ export class Repository {
 		}

 		try {
-			await this.run(args, { env: { 'GIT_HTTP_USER_AGENT': this.git.userAgent } });
+			await this.exec(args, { env: { 'GIT_HTTP_USER_AGENT': this.git.userAgent } });
 		} catch (err) {
 			if (/^error: failed to push some refs to\b/m.test(err.stderr || '')) {
 				err.gitErrorCode = GitErrorCodes.PushRejected;
@ -1718,13 +1717,13 @@ export class Repository {

 	async cherryPick(commitHash: string): Promise<void> {
 		const args = ['cherry-pick', commitHash];
-		await this.run(args);
+		await this.exec(args);
 	}

 	async blame(path: string): Promise<string> {
 		try {
 			const args = ['blame', sanitizePath(path)];
-			const result = await this.run(args);
+			const result = await this.exec(args);
 			return result.stdout.trim();
 		} catch (err) {
 			if (/^fatal: no such path/.test(err.stderr || '')) {
@ -1747,7 +1746,7 @@ export class Repository {
 				args.push('-m', message);
 			}

-			await this.run(args);
+			await this.exec(args);
 		} catch (err) {
 			if (/No local changes to save/.test(err.stderr || '')) {
 				err.gitErrorCode = GitErrorCodes.NoLocalChanges;
@ -1773,7 +1772,7 @@ export class Repository {
 				args.push(`stash@{${index}}`);
 			}

-			await this.run(args);
+			await this.exec(args);
 		} catch (err) {
 			if (/No stash found/.test(err.stderr || '')) {
 				err.gitErrorCode = GitErrorCodes.NoStashFound;
@ -1795,7 +1794,7 @@ export class Repository {
 		}

 		try {
-			await this.run(args);
+			await this.exec(args);
 		} catch (err) {
 			if (/No stash found/.test(err.stderr || '')) {
 				err.gitErrorCode = GitErrorCodes.NoStashFound;
@ -1860,7 +1859,7 @@ export class Repository {

 	async getHEAD(): Promise<Ref> {
 		try {
-			const result = await this.run(['symbolic-ref', '--short', 'HEAD']);
+			const result = await this.exec(['symbolic-ref', '--short', 'HEAD']);

 			if (!result.stdout) {
 				throw new Error('Not in a branch');
@ -1868,7 +1867,7 @@ export class Repository {

 			return { name: result.stdout.trim(), commit: undefined, type: RefType.Head };
 		} catch (err) {
-			const result = await this.run(['rev-parse', 'HEAD']);
+			const result = await this.exec(['rev-parse', 'HEAD']);

 			if (!result.stdout) {
 				throw new Error('Error parsing HEAD');
@ -1879,7 +1878,7 @@ export class Repository {
 	}

 	async findTrackingBranches(upstreamBranch: string): Promise<Branch[]> {
-		const result = await this.run(['for-each-ref', '--format', '%(refname:short)%00%(upstream:short)', 'refs/heads']);
+		const result = await this.exec(['for-each-ref', '--format', '%(refname:short)%00%(upstream:short)', 'refs/heads']);
 		return result.stdout.trim().split('\n')
 			.map(line => line.trim().split('\0'))
 			.filter(([_, upstream]) => upstream === upstreamBranch)
@ -1907,7 +1906,7 @@ export class Repository {
 			args.push('--contains', opts.contains);
 		}

-		const result = await this.run(args);
+		const result = await this.exec(args);

 		const fn = (line: string): Ref | null => {
 			let match: RegExpExecArray | null;
@ -1930,7 +1929,7 @@ export class Repository {
 	}

 	async getStashes(): Promise<Stash[]> {
-		const result = await this.run(['stash', 'list']);
+		const result = await this.exec(['stash', 'list']);
 		const regex = /^stash@{(\d+)}:(.+)$/;
 		const rawStashes = result.stdout.trim().split('\n')
 			.filter(b => !!b)
@ -1942,7 +1941,7 @@ export class Repository {
 	}

 	async getRemotes(): Promise<Remote[]> {
-		const result = await this.run(['remote', '--verbose']);
+		const result = await this.exec(['remote', '--verbose']);
 		const lines = result.stdout.trim().split('\n').filter(l => !!l);
 		const remotes: MutableRemote[] = [];

@ -1985,7 +1984,7 @@ export class Repository {
 			args.push(`refs/heads/${name}`, `refs/remotes/${name}`);
 		}

-		const result = await this.run(args);
+		const result = await this.exec(args);
 		const branches: Branch[] = result.stdout.trim().split('\n').map<Branch | undefined>(line => {
 			let [branchName, upstream, status, ref] = line.trim().split('\0');

@ -2067,7 +2066,7 @@ export class Repository {

 	async getCommitTemplate(): Promise<string> {
 		try {
-			const result = await this.run(['config', '--get', 'commit.template']);
+			const result = await this.exec(['config', '--get', 'commit.template']);

 			if (!result.stdout) {
 				return '';
@ -2090,7 +2089,7 @@ export class Repository {
 	}

 	async getCommit(ref: string): Promise<Commit> {
-		const result = await this.run(['show', '-s', `--format=${COMMIT_FORMAT}`, '-z', ref]);
+		const result = await this.exec(['show', '-s', `--format=${COMMIT_FORMAT}`, '-z', ref]);
 		const commits = parseGitCommits(result.stdout);
 		if (commits.length === 0) {
 			return Promise.reject<Commit>('bad commit format');
@ -2102,7 +2101,7 @@ export class Repository {
 		const args = ['submodule', 'update'];

 		for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
-			await this.run([...args, '--', ...chunk]);
+			await this.exec([...args, '--', ...chunk]);
 		}
 	}

--- a/extensions/git/src/main.ts
+++ b/extensions/git/src/main.ts
@ -73,12 +73,13 @@ async function createModel(context: ExtensionContext, outputChannel: OutputChann
 	git.onOutput.addListener('log', onOutput);
 	disposables.push(toDisposable(() => git.onOutput.removeListener('log', onOutput)));

+	const cc = new CommandCenter(git, model, outputChannel, telemetryReporter);
 	disposables.push(
-		new CommandCenter(git, model, outputChannel, telemetryReporter),
+		cc,
 		new GitFileSystemProvider(model),
 		new GitDecorations(model),
 		new GitProtocolHandler(),
-		new GitTimelineProvider(model)
+		new GitTimelineProvider(model, cc)
 	);

 	checkGitVersion(info);
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@ -55,13 +55,13 @@ export class Resource implements SourceControlResourceState {
 			case Status.UNTRACKED: return localize('untracked', "Untracked");
 			case Status.IGNORED: return localize('ignored', "Ignored");
 			case Status.INTENT_TO_ADD: return localize('intent to add', "Intent to Add");
-			case Status.BOTH_DELETED: return localize('both deleted', "Both Deleted");
-			case Status.ADDED_BY_US: return localize('added by us', "Added By Us");
-			case Status.DELETED_BY_THEM: return localize('deleted by them', "Deleted By Them");
-			case Status.ADDED_BY_THEM: return localize('added by them', "Added By Them");
-			case Status.DELETED_BY_US: return localize('deleted by us', "Deleted By Us");
-			case Status.BOTH_ADDED: return localize('both added', "Both Added");
-			case Status.BOTH_MODIFIED: return localize('both modified', "Both Modified");
+			case Status.BOTH_DELETED: return localize('both deleted', "Conflict: Both Deleted");
+			case Status.ADDED_BY_US: return localize('added by us', "Conflict: Added By Us");
+			case Status.DELETED_BY_THEM: return localize('deleted by them', "Conflict: Deleted By Them");
+			case Status.ADDED_BY_THEM: return localize('added by them', "Conflict: Added By Them");
+			case Status.DELETED_BY_US: return localize('deleted by us', "Conflict: Deleted By Us");
+			case Status.BOTH_ADDED: return localize('both added', "Conflict: Both Added");
+			case Status.BOTH_MODIFIED: return localize('both modified', "Conflict: Both Modified");
 			default: return '';
 		}
 	}
@ -199,12 +199,13 @@ export class Resource implements SourceControlResourceState {
 			case Status.DELETED_BY_US:
 				return 'D';
 			case Status.INDEX_COPIED:
+				return 'C';
 			case Status.BOTH_DELETED:
 			case Status.ADDED_BY_US:
 			case Status.ADDED_BY_THEM:
 			case Status.BOTH_ADDED:
 			case Status.BOTH_MODIFIED:
-				return 'C';
+				return '!'; // Using ! instead of ⚠, because the latter looks really bad on windows
 			default:
 				throw new Error('Unknown git status: ' + this.type);
 		}
@ -223,12 +224,13 @@ export class Resource implements SourceControlResourceState {
 			case Status.INDEX_ADDED:
 			case Status.INTENT_TO_ADD:
 				return new ThemeColor('gitDecoration.addedResourceForeground');
+			case Status.INDEX_COPIED:
 			case Status.INDEX_RENAMED:
+				return new ThemeColor('gitDecoration.renamedResourceForeground');
 			case Status.UNTRACKED:
 				return new ThemeColor('gitDecoration.untrackedResourceForeground');
 			case Status.IGNORED:
 				return new ThemeColor('gitDecoration.ignoredResourceForeground');
-			case Status.INDEX_COPIED:
 			case Status.BOTH_DELETED:
 			case Status.ADDED_BY_US:
 			case Status.DELETED_BY_THEM:
@ -246,10 +248,10 @@ export class Resource implements SourceControlResourceState {
 		switch (this.type) {
 			case Status.INDEX_MODIFIED:
 			case Status.MODIFIED:
+			case Status.INDEX_COPIED:
 				return 2;
 			case Status.IGNORED:
 				return 3;
-			case Status.INDEX_COPIED:
 			case Status.BOTH_DELETED:
 			case Status.ADDED_BY_US:
 			case Status.DELETED_BY_THEM:
@ -1482,7 +1484,7 @@ export class Repository implements Disposable {

 		const maybeRebased = await this.run(Operation.Log, async () => {
 			try {
-				const result = await this.repository.run(['log', '--oneline', '--cherry', `${currentBranch ?? ''}...${currentBranch ?? ''}@{upstream}`, '--']);
+				const result = await this.repository.exec(['log', '--oneline', '--cherry', `${currentBranch ?? ''}...${currentBranch ?? ''}@{upstream}`, '--']);
 				if (result.exitCode) {
 					return false;
 				}
--- a/extensions/git/src/timelineProvider.ts
+++ b/extensions/git/src/timelineProvider.ts
@ -9,6 +9,7 @@ import { Model } from './model';
 import { Repository, Resource } from './repository';
 import { debounce } from './decorators';
 import { emojify, ensureEmojis } from './emoji';
+import { CommandCenter } from './commands';

 const localize = nls.loadMessageBundle();

@ -73,7 +74,7 @@ export class GitTimelineProvider implements TimelineProvider {
 	private repoDisposable: Disposable | undefined;
 	private repoStatusDate: Date | undefined;

-	constructor(private readonly model: Model) {
+	constructor(private readonly model: Model, private commands: CommandCenter) {
 		this.disposable = Disposable.from(
 			model.onDidOpenRepository(this.onRepositoriesChanged, this),
 			workspace.onDidChangeConfiguration(this.onConfigurationChanged, this)
@ -161,16 +162,20 @@ export class GitTimelineProvider implements TimelineProvider {
 			const message = emojify(c.message);

 			const item = new GitTimelineItem(c.hash, commits[i + 1]?.hash ?? `${c.hash}^`, message, date?.getTime() ?? 0, c.hash, 'git:file:commit');
-			item.iconPath = new (ThemeIcon as any)('git-commit');
+			item.iconPath = new ThemeIcon('git-commit');
 			if (showAuthor) {
 				item.description = c.authorName;
 			}
 			item.detail = `${c.authorName} (${c.authorEmail}) — ${c.hash.substr(0, 8)}\n${dateFormatter.format(date)}\n\n${message}`;
-			item.command = {
-				title: 'Open Comparison',
-				command: 'git.timeline.openDiff',
-				arguments: [item, uri, this.id]
-			};
+
+			const cmd = this.commands.resolveTimelineOpenDiffCommand(item, uri);
+			if (cmd) {
+				item.command = {
+					title: 'Open Comparison',
+					command: cmd.command,
+					arguments: cmd.arguments,
+				};
+			}

 			return item;
 		});
@ -184,14 +189,18 @@ export class GitTimelineProvider implements TimelineProvider {

 				const item = new GitTimelineItem('~', 'HEAD', localize('git.timeline.stagedChanges', 'Staged Changes'), date.getTime(), 'index', 'git:file:index');
 				// TODO@eamodio: Replace with a better icon -- reflecting its status maybe?
-				item.iconPath = new (ThemeIcon as any)('git-commit');
+				item.iconPath = new ThemeIcon('git-commit');
 				item.description = '';
 				item.detail = localize('git.timeline.detail', '{0}  — {1}\n{2}\n\n{3}', you, localize('git.index', 'Index'), dateFormatter.format(date), Resource.getStatusText(index.type));
-				item.command = {
-					title: 'Open Comparison',
-					command: 'git.timeline.openDiff',
-					arguments: [item, uri, this.id]
-				};
+
+				const cmd = this.commands.resolveTimelineOpenDiffCommand(item, uri);
+				if (cmd) {
+					item.command = {
+						title: 'Open Comparison',
+						command: cmd.command,
+						arguments: cmd.arguments,
+					};
+				}

 				items.splice(0, 0, item);
 			}
@ -202,14 +211,18 @@ export class GitTimelineProvider implements TimelineProvider {

 				const item = new GitTimelineItem('', index ? '~' : 'HEAD', localize('git.timeline.uncommitedChanges', 'Uncommitted Changes'), date.getTime(), 'working', 'git:file:working');
 				// TODO@eamodio: Replace with a better icon -- reflecting its status maybe?
-				item.iconPath = new (ThemeIcon as any)('git-commit');
+				item.iconPath = new ThemeIcon('git-commit');
 				item.description = '';
 				item.detail = localize('git.timeline.detail', '{0}  — {1}\n{2}\n\n{3}', you, localize('git.workingTree', 'Working Tree'), dateFormatter.format(date), Resource.getStatusText(working.type));
-				item.command = {
-					title: 'Open Comparison',
-					command: 'git.timeline.openDiff',
-					arguments: [item, uri, this.id]
-				};
+
+				const cmd = this.commands.resolveTimelineOpenDiffCommand(item, uri);
+				if (cmd) {
+					item.command = {
+						title: 'Open Comparison',
+						command: cmd.command,
+						arguments: cmd.arguments,
+					};
+				}

 				items.splice(0, 0, item);
 			}
--- a/extensions/github-authentication/package.json
+++ b/extensions/github-authentication/package.json
@ -62,5 +62,9 @@
    "@types/node": "^12.19.9",
    "@types/node-fetch": "^2.5.7",
    "@types/uuid": "8.0.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
  }
 }
--- a/extensions/github/package.json
+++ b/extensions/github/package.json
@ -64,5 +64,9 @@
  },
  "devDependencies": {
    "@types/node": "^12.19.9"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
  }
 }
--- a/extensions/go/package.json
+++ b/extensions/go/package.json
@ -1,40 +1,44 @@
 {
-	"name": "go",
-	"displayName": "%displayName%",
-	"description": "%description%",
-	"version": "1.0.0",
-	"publisher": "vscode",
-	"license": "MIT",
-	"engines": {
-		"vscode": "*"
-	},
-	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js jeff-hykin/better-go-syntax export/generated.tmLanguage.json ./syntaxes/go.tmLanguage.json"
-	},
-	"contributes": {
-		"languages": [
-			{
-				"id": "go",
-				"extensions": [
-					".go"
-				],
-				"aliases": [
-					"Go"
-				],
-				"configuration": "./language-configuration.json"
-			}
-		],
-		"grammars": [
-			{
-				"language": "go",
-				"scopeName": "source.go",
-				"path": "./syntaxes/go.tmLanguage.json"
-			}
-		],
-		"configurationDefaults": {
-			"[go]": {
-				"editor.insertSpaces": false
-			}
-		}
-	}
+  "name": "go",
+  "displayName": "%displayName%",
+  "description": "%description%",
+  "version": "1.0.0",
+  "publisher": "vscode",
+  "license": "MIT",
+  "engines": {
+    "vscode": "*"
+  },
+  "scripts": {
+    "update-grammar": "node ../node_modules/.bin/vscode-grammar-updater jeff-hykin/better-go-syntax export/generated.tmLanguage.json ./syntaxes/go.tmLanguage.json"
+  },
+  "contributes": {
+    "languages": [
+      {
+        "id": "go",
+        "extensions": [
+          ".go"
+        ],
+        "aliases": [
+          "Go"
+        ],
+        "configuration": "./language-configuration.json"
+      }
+    ],
+    "grammars": [
+      {
+        "language": "go",
+        "scopeName": "source.go",
+        "path": "./syntaxes/go.tmLanguage.json"
+      }
+    ],
+    "configurationDefaults": {
+      "[go]": {
+        "editor.insertSpaces": false
+      }
+    }
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
+  }
 }
--- a/extensions/go/package.nls.json
+++ b/extensions/go/package.nls.json
@ -1,4 +1,4 @@
 {
 	"displayName": "Go Language Basics",
 	"description": "Provides syntax highlighting and bracket matching in Go files."
-}
+}
--- a/extensions/go/yarn.lock
+++ b/extensions/go/yarn.lock
@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
--- a/Show more
+++ b/Show more