Adding the mirrored parallelism icon (#19391) (#19428)

Co-authored-by: Aasim Khan <aaskhan@microsoft.com>

.devcontainer/cache/before-cache.sh

@@ -1,11 +1,11 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
-# This file establishes a basline for the repository before any steps in the "prepare.sh"
+# This file establishes a basline for the reposuitory before any steps in the "prepare.sh"
 # are run. Its just a find command that filters out a few things we don't need to watch.
 
 set -e
 
-SCRIPT_PATH="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
+SCRIPT_PATH="$(cd "$(dirname $0)" && pwd)"
 SOURCE_FOLDER="${1:-"."}"
 
 cd "${SOURCE_FOLDER}"

.devcontainer/cache/build-cache-image.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-# This file simply wraps the docker build command to build an image that includes
-# a cache.tar file with the result of "prepare.sh" inside of it. See cache.Dockerfile
-# for the steps that are actually taken to do this.
+# This file simply wraps the dockeer build command used to build the image with the
+# cached result of the commands from "prepare.sh" and pushes it to the specified
+# container image registry.
 
 set -e
 
-SCRIPT_PATH="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
+SCRIPT_PATH="$(cd "$(dirname $0)" && pwd)"
 CONTAINER_IMAGE_REPOSITORY="$1"
 BRANCH="${2:-"main"}"
 

.devcontainer/cache/cache-diff.sh

@@ -1,11 +1,12 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 # This file is used to archive off a copy of any differences in the source tree into another location
-# in the image. Once the codespace / container is up, this will be restored into its proper location.
+# in the image. Once the codespace is up, this will be restored into its proper location (which is
+# quick and happens parallel to other startup activities)
 
 set -e
 
-SCRIPT_PATH="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
+SCRIPT_PATH="$(cd "$(dirname $0)" && pwd)"
 SOURCE_FOLDER="${1:-"."}"
 CACHE_FOLDER="${2:-"/usr/local/etc/devcontainer-cache"}"
 

.devcontainer/cache/cache.Dockerfile

@@ -1,8 +1,7 @@
-# This dockerfile is used to build up from a base image to create an image a cache.tar file containing the results of running "prepare.sh".
+# This dockerfile is used to build up from a base image to create an image with cached results of running "prepare.sh".
 # Other image contents: https://github.com/microsoft/vscode-dev-containers/blob/master/repository-containers/images/github.com/microsoft/vscode/.devcontainer/base.Dockerfile
+FROM mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:dev
 
-# This first stage generates cache.tar
-FROM mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:dev as cache
 ARG USERNAME=node
 COPY --chown=${USERNAME}:${USERNAME} . /repo-source-tmp/
 RUN mkdir /usr/local/etc/devcontainer-cache \
@@ -11,12 +10,5 @@ RUN mkdir /usr/local/etc/devcontainer-cache \
 		cd /repo-source-tmp \
 		&& .devcontainer/cache/before-cache.sh \
 		&& .devcontainer/prepare.sh \
-		&& .devcontainer/cache/cache-diff.sh"
-
-# This second stage starts fresh and just copies in cache.tar from the previous stage. The related
-# devcontainer.json file is then setup to have postCreateCommand fire restore-diff.sh to expand it.
-FROM mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:dev as dev-container
-ARG USERNAME=node
-ARG CACHE_FOLDER="/usr/local/etc/devcontainer-cache"
-RUN mkdir -p "${CACHE_FOLDER}" && chown "${USERNAME}:${USERNAME}" "${CACHE_FOLDER}"
-COPY --from=cache ${CACHE_FOLDER}/cache.tar ${CACHE_FOLDER}/
+		&& .devcontainer/cache/cache-diff.sh" \
+	&& rm -rf /repo-source-tmp

.devcontainer/cache/restore-diff.sh

@@ -1,8 +1,9 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
-# This file expands the cache.tar file in the image that contains the results of "prepare.sh"
-# on top of the source tree. It runs as a postCreateCommand which runs after the container/codespace
-# is already up where you would typically run a command like "yarn install".
+# This file restores the results of the "prepare.sh" into their proper locations
+# once the container has been created. It runs as a postCreateCommand which
+# in GitHub Codespaces occurs parallel to other startup activities and does not
+# really add to the overal startup time given how quick the operation ends up being.
 
 set -e
 

.devcontainer/prepare.sh

@@ -1,9 +1,10 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
-# This file contains the steps that should be run when building a "cache" image with contents that should be
-# layered directly **on top of the source tree** once a dev container is created. This avoids having to run long
-# running commands like "yarn install" from the ground up. Developers (and should) still run these commands
-# after the actual dev container is created, but only differences will be processed.
+# This file contains the steps that should be run when creating the intermediary image that contains
+# contents for that should be in the image by default. It will be used to build up from the base image
+# to create an image that speeds up first time use of the dev container by "caching" the results
+# of these commands. Developers can still run these commands without an issue once the container is
+# up, but only differences will be processed which also speeds up the first time these operations occur.
 
 yarn install
 yarn electron

.eslintignore

@@ -3,23 +3,23 @@
 **/vs/css.build.js
 **/vs/css.js
 **/vs/loader.js
-**/dompurify/**
+**/insane/**
 **/marked/**
 **/semver/**
 **/test/**/*.js
 **/node_modules/**
-/extensions/**/out/**
-/extensions/**/build/**
-/extensions/big-data-cluster/src/bigDataCluster/controller/apiGenerated.ts
-/extensions/big-data-cluster/src/bigDataCluster/controller/clusterApiGenerated2.ts
-/extensions/markdown-language-features/media/**
-/extensions/markdown-language-features/notebook-out/**
-/extensions/typescript-basics/test/colorize-fixtures/**
-/extensions/**/dist/**
-/extensions/types
-/extensions/typescript-language-features/test-workspace/**
-/test/automation/out
+**/vscode-api-tests/testWorkspace/**
+**/vscode-api-tests/testWorkspace2/**
+**/extensions/**/out/**
+**/extensions/**/build/**
+**/big-data-cluster/src/bigDataCluster/controller/apiGenerated.ts
+**/big-data-cluster/src/bigDataCluster/controller/clusterApiGenerated2.ts
+**/extensions/markdown-language-features/media/**
+**/extensions/markdown-language-features/notebook-out/**
+**/extensions/typescript-basics/test/colorize-fixtures/**
+**/extensions/**/dist/**
+**/extensions/typescript-language-features/test-workspace/**
 
 # These files are not linted by `yarn eslint`, so we exclude them from being linted in the editor.
-# This ensures that if we add new rules and they pass CI, there are also no errors in the editor.
+# This ensures that if we add new rules and they pass CI, the are also no errors in the editor.
 /resources/web/code-web.js

.eslintrc.json

@@ -20,7 +20,6 @@
 		"no-duplicate-case": "warn",
 		"no-duplicate-imports": "warn",
 		"no-eval": "warn",
-		"no-async-promise-executor": "off",
 		"no-extra-semi": "warn",
 		"no-new-wrappers": "warn",
 		"no-redeclare": "off",
@@ -135,7 +134,7 @@
 				"restrictions": [
 					"vs/nls",
 					"**/{vs,sql}/base/{common,node}/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
@@ -177,7 +176,7 @@
 					"vs/nls",
 					"**/{vs,sql}/base/{common,node}/**",
 					"**/{vs,sql}/base/parts/*/{common,node}/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
@@ -196,7 +195,7 @@
 					"vs/css!./**/*",
 					"**/{vs,sql}/base/{common,browser,node,electron-sandbox,electron-browser}/**",
 					"**/{vs,sql}/base/parts/*/{common,browser,node,electron-sandbox,electron-browser}/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
@@ -205,7 +204,7 @@
 					"vs/nls",
 					"**/{vs,sql}/base/{common,node,electron-main}/**",
 					"**/{vs,sql}/base/parts/*/{common,node,electron-main}/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
@@ -213,7 +212,6 @@
 				"restrictions": [
 					"vs/nls",
 					"azdata",
-					"mssql",
 					"azurecore",
 					"**/{vs,sql}/base/common/**",
 					"**/{vs,sql}/base/parts/*/common/**",
@@ -255,7 +253,7 @@
 					"**/{vs,sql}/base/{common,node}/**",
 					"**/{vs,sql}/base/parts/*/{common,node}/**",
 					"**/{vs,sql}/platform/*/{common,node}/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
@@ -277,7 +275,7 @@
 					"**/{vs,sql}/base/{common,browser,node,electron-sandbox,electron-browser}/**",
 					"**/{vs,sql}/base/parts/*/{common,browser,node,electron-sandbox,electron-browser}/**",
 					"**/{vs,sql}/platform/*/{common,browser,node,electron-sandbox,electron-browser}/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
@@ -288,7 +286,7 @@
 					"**/{vs,sql}/base/{common,node,electron-main}/**",
 					"**/{vs,sql}/base/parts/*/{common,node,electron-main}/**",
 					"**/{vs,sql}/platform/*/{common,node,electron-main}/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
@@ -475,7 +473,6 @@
 				"restrictions": [
 					"vscode",
 					"azdata",
-					"mssql",
 					"azurecore",
 					"vs/nls",
 					"**/{vs,sql}/base/common/**",
@@ -525,7 +522,7 @@
 					"**/{vs,sql}/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
 					"**/{vs,sql}/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
 					"**/{vs,sql}/workbench/services/*/{common,browser,node,electron-sandbox,electron-browser}/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
@@ -540,7 +537,7 @@
 					"vs/workbench/contrib/files/browser/editors/fileEditorInput",
 					"**/{vs,sql}/workbench/services/**",
 					"**/{vs,sql}/workbench/test/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
@@ -555,7 +552,6 @@
 					"**/{vs,sql}/workbench/common/**",
 					"**/{vs,sql}/workbench/services/**/common/**",
 					"**/{vs,sql}/workbench/api/**/common/**",
-					"**/{vs,sql}/workbench/contrib/**/common/**",
 					"vs/workbench/contrib/files/common/editors/fileEditorInput", // this should be fine, it only accesses constants from contrib
 					"vscode-textmate",
 					"vscode-oniguruma",
@@ -583,7 +579,6 @@
 					"vs/nls",
 					"vs/css!./**/*",
 					"azdata",
-					"mssql",
 					"azurecore",
 					"vscode",
 					"**/{vs,sql}/base/**/{common,browser,worker}/**",
@@ -593,7 +588,6 @@
 					"**/{vs,sql}/workbench/{common,browser}/**",
 					"**/{vs,sql}/workbench/api/{common,browser}/**",
 					"**/{vs,sql}/workbench/services/**/{common,browser}/**",
-					"**/{vs,sql}/workbench/contrib/**/common/**",
 					"vscode-textmate",
 					"vscode-oniguruma",
 					"iconv-lite-umd",
@@ -616,7 +610,7 @@
 					"**/{vs,sql}/workbench/{common,node}/**",
 					"**/{vs,sql}/workbench/api/{common,node}/**",
 					"**/{vs,sql}/workbench/services/**/{common,node}/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
@@ -647,7 +641,7 @@
 					"**/{vs,sql}/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
 					"**/{vs,sql}/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
 					"**/{vs,sql}/workbench/services/**/{common,browser,node,electron-sandbox,electron-browser}/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
@@ -786,7 +780,7 @@
 					"**/{vs,sql}/workbench/api/{common,node}/**",
 					"**/{vs,sql}/workbench/services/**/{common,node}/**",
 					"**/{vs,sql}/workbench/contrib/**/{common,node}/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
@@ -819,7 +813,7 @@
 					"**/{vs,sql}/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
 					"**/{vs,sql}/workbench/services/**/{common,browser,node,electron-sandbox,electron-browser}/**",
 					"**/{vs,sql}/workbench/contrib/**/{common,browser,node,electron-sandbox,electron-browser}/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
@@ -842,7 +836,7 @@
 					"**/{vs,sql}/base/parts/**/{common,node}/**",
 					"**/{vs,sql}/platform/**/{common,node}/**",
 					"**/{vs,sql}/code/**/{common,node}/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
@@ -854,7 +848,7 @@
 					"**/{vs,sql}/base/parts/**/{common,browser,node,electron-sandbox,electron-browser}/**",
 					"**/{vs,sql}/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
 					"**/{vs,sql}/code/**/{common,browser,node,electron-sandbox,electron-browser}/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
@@ -865,7 +859,7 @@
 					"**/{vs,sql}/base/parts/**/{common,node,electron-main}/**",
 					"**/{vs,sql}/platform/**/{common,node,electron-main}/**",
 					"**/{vs,sql}/code/**/{common,node,electron-main}/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
@@ -877,7 +871,7 @@
 					"**/{vs,sql}/platform/**/{common,node}/**",
 					"**/{vs,sql}/workbench/**/{common,node}/**",
 					"**/{vs,sql}/server/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
@@ -948,28 +942,28 @@
 				"target": "**/test/smoke/**",
 				"restrictions": [
 					"**/test/smoke/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
 				"target": "**/test/automation/**",
 				"restrictions": [
 					"**/test/automation/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
 				"target": "**/test/integration/**",
 				"restrictions": [
 					"**/test/integration/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
 				"target": "**/test/monaco/**",
 				"restrictions": [
 					"**/test/monaco/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
@@ -989,7 +983,7 @@
 				"target": "**/{node,electron-browser,electron-main}/**/*.test.ts",
 				"restrictions": [
 					"**/{vs,sql}/**",
-					"@vscode/*", "@parcel/*", "*", // node modules
+					"@vscode/*", "*", // node modules
 					"@angular/*" // {{SQL CARBON EDIT}}
 				]
 			},
@@ -997,14 +991,14 @@
 				"target": "**/{node,electron-browser,electron-main}/**/test/**",
 				"restrictions": [
 					"**/{vs,sql}/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
 				"target": "**/test/{node,electron-browser,electron-main}/**",
 				"restrictions": [
 					"**/{vs,sql}/**",
-					"@vscode/*", "@parcel/*", "*" // node modules
+					"@vscode/*", "*" // node modules
 				]
 			},
 			{
@@ -1152,7 +1146,6 @@
 				"src/sql/base/browser/ui/table/plugins/checkboxSelectColumn.plugin.ts",
 				"src/sql/base/browser/ui/table/plugins/headerFilter.plugin.ts",
 				"src/sql/base/browser/ui/table/plugins/rowDetailView.ts",
-				"src/sql/base/browser/ui/table/plugins/rowMoveManager.plugin.ts",
 				"src/sql/base/browser/ui/table/plugins/rowSelectionModel.plugin.ts",
 				"src/sql/workbench/services/notebook/browser/outputs/factories.ts",
 				"src/sql/workbench/services/notebook/browser/outputs/mimemodel.ts",

.gitattributes

@@ -8,4 +8,4 @@ ThirdPartyNotices.txt eol=crlf
 *.ps1 eol=lf
 *.sh eol=lf
 *.rtf -text
-**/*.json linguist-language=jsonc
+*.json linguist-language=jsonc

.github/label-actions.yml

@@ -2,9 +2,8 @@
 Needs Logs:
   comment: "We need more info to debug your particular issue. If you could attach your logs to the issue (ensure no private data is in them), it would help us fix the issue much faster.
 
-First open the Settings page, find the `Mssql: Tracing Level` setting and change that to `All` then restart ADS and repro your issue.
 
-Next there are two types of logs to collect:
+There are two types of logs to collect:
 
 
 **Console Logs**

.github/port-labeler.yml

@@ -1,3 +0,0 @@
-# Add 'repo' label to any root file changes
-Port Request:
-- '**/*'

.github/subscribers.json

@@ -6,6 +6,7 @@
 		"donjayamanne",
 		"jilljac",
 		"IanMatthewHuff",
+		"tanhakabir",
 		"dynamicwebpaige"
 	]
 }

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: 16
+          node-version: 14
 
       - uses: actions/setup-python@v2
         with:
@@ -101,7 +101,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: 16
+          node-version: 14
       # {{SQL CARBON EDIT}} Skip caching for now
       # - name: Compute node modules cache key
       #   id: nodeModulesCacheKey
@@ -133,7 +133,7 @@ jobs:
 
       # Don't inline source maps so that we generate code coverage for ts files
       - name: Compile and Download
-        run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" # {{SQL CARBON EDIT}} Remove unused options playwright-install download-builtin-extensions
+        run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
         env:
           SQL_NO_INLINE_SOURCEMAP: 1
 
@@ -173,7 +173,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: 16
+          node-version: 14
 
       # {{SQL CARBON EDIT}} Skip caching for now
       # - name: Compute node modules cache key
@@ -205,7 +205,7 @@ jobs:
         run: yarn --frozen-lockfile --network-timeout 180000
 
       - name: Compile and Download
-        run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" # {{SQL CARBON EDIT}} Remove unused options playwright-install download-builtin-extensions
+        run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
 
       # This is required for keytar unittests, otherwise we hit
       # https://github.com/atom/node-keytar/issues/76
@@ -235,7 +235,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: 16
+          node-version: 14
 
       - name: Compute node modules cache key
         id: nodeModulesCacheKey

.gitignore

@@ -7,6 +7,8 @@ node_modules/
 extensions/**/dist/
 /out*/
 /extensions/**/out/
+src/vs/server
+resources/server
 build/node_modules
 coverage/
 test_data/
@@ -16,4 +18,3 @@ yarn-error.log
 vscode.lsif
 vscode.db
 /.profile-oss
-*.orig

.vscode/extensions.json

@@ -3,7 +3,6 @@
 	// for the documentation about the extensions.json format
 	"recommendations": [
 		"dbaeumer.vscode-eslint",
-		"EditorConfig.EditorConfig",
-		"redhat.vscode-yaml"
+		"EditorConfig.EditorConfig"
 	]
 }

.vscode/notebooks/api.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"October 2021\""
+    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"August 2021\""
   },
   {
     "kind": 1,
@@ -27,6 +27,6 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repo $milestone is:open label:api-proposal sort:created-asc"
+    "value": "$repo $milestone is:open label:api-proposal "
   }
 ]

.vscode/notebooks/endgame.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev 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 repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-unpkg\n\n$MILESTONE=milestone:\"October 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 repo:microsoft/vscode-remotehub\n\n$MILESTONE=milestone:\"July 2021\""
   },
   {
     "kind": 1,
@@ -24,26 +24,6 @@
     "language": "github-issues",
     "value": "$REPOS $MILESTONE is:pr is:open"
   },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Unverified Older Insiders-Released Issues"
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS -$MILESTONE is:issue is:closed label:bug label:insiders-released -label:verified -label:*duplicate -label:*as-designed -label:z-author-verified -label:on-testplan"
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Unverified Older Insiders-Released Feature Requests"
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS -$MILESTONE is:issue is:closed label:feature-request label:insiders-released -label:on-testplan -label:verified -label:*duplicate"
-  },
   {
     "kind": 1,
     "language": "markdown",
@@ -77,7 +57,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS is:issue is:open label:testplan-item"
+    "value": "$REPOS $MILESTONE is:issue is:open label:testplan-item"
   },
   {
     "kind": 1,
@@ -87,7 +67,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE is:issue is:closed label:verification-needed -label:verified"
+    "value": "$REPOS $MILESTONE is:issue is:closed label:feature-request label:verification-needed -label:verified"
   },
   {
     "kind": 1,

.vscode/notebooks/grooming-delta.github-issues

@@ -2,666 +2,769 @@
   {
     "kind": 1,
     "language": "markdown",
-    "value": "## Config"
+    "value": "## Config",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$since=2021-10-01"
+    "value": "$since=2020-10-01",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode\n\nQuery exceeds the maximum result. Run the query manually: `is:issue is:open closed:>2021-10-01`"
+    "value": "# vscode\n\nQuery exceeds the maximum result. Run the query manually: `is:issue is:open closed:>2020-10-01`",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "//repo:microsoft/vscode is:issue closed:>$since"
+    "value": "//repo:microsoft/vscode is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "//repo:microsoft/vscode is:issue created:>$since"
+    "value": "//repo:microsoft/vscode is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-remote-release"
+    "value": "# vscode-remote-release",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-remote-release is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-remote-release is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-remote-release is:issue created:>$since"
+    "value": "repo:microsoft/vscode-remote-release is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# monaco-editor"
+    "value": "# monaco-editor",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/monaco-editor is:issue closed:>$since"
+    "value": "repo:microsoft/monaco-editor is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/monaco-editor is:issue created:>$since"
+    "value": "repo:microsoft/monaco-editor is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-docs"
+    "value": "# vscode-docs",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-docs is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-docs is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-docs is:issue created:>$since"
+    "value": "repo:microsoft/vscode-docs is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-js-debug"
+    "value": "# vscode-js-debug",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-js-debug is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-js-debug is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-js-debug is:issue created:>$since"
+    "value": "repo:microsoft/vscode-js-debug is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# language-server-protocol"
+    "value": "# language-server-protocol",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/language-server-protocol is:issue closed:>$since"
+    "value": "repo:microsoft/language-server-protocol is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/language-server-protocol is:issue created:>$since"
+    "value": "repo:microsoft/language-server-protocol is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-eslint"
+    "value": "# vscode-eslint",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-eslint is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-eslint is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-eslint is:issue created:>$since"
+    "value": "repo:microsoft/vscode-eslint is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-css-languageservice"
+    "value": "# vscode-css-languageservice",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-css-languageservice is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-css-languageservice is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-css-languageservice is:issue created:>$since"
+    "value": "repo:microsoft/vscode-css-languageservice is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-test"
+    "value": "# vscode-test",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-test is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-test 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,
     "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,
     "language": "markdown",
-    "value": "# vscode-chrome-debug-core"
+    "value": "# vscode-chrome-debug (deprecated)",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-chrome-debug-core is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-chrome-debug is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-chrome-debug-core is:issue created:>$since"
+    "value": "repo:microsoft/vscode-chrome-debug is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-debugadapter-node"
+    "value": "# vscode-chrome-debug-core",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-debugadapter-node is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-chrome-debug-core is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-debugadapter-node is:issue created:>$since"
+    "value": "repo:microsoft/vscode-chrome-debug-core is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-emmet-helper"
+    "value": "# vscode-debugadapter-node",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-emmet-helper is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-debugadapter-node is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-emmet-helper is:issue created:>$since"
+    "value": "repo:microsoft/vscode-debugadapter-node is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-extension-vscode\n\nDeprecated"
+    "value": "# vscode-emmet-helper",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-extension-vscode is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-emmet-helper is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-extension-vscode is:issue created:>$since"
+    "value": "repo:microsoft/vscode-emmet-helper is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-extension-samples"
+    "value": "# vscode-extension-vscode\n\nDeprecated",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-extension-samples is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-extension-vscode is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-extension-samples is:issue created:>$since"
+    "value": "repo:microsoft/vscode-extension-vscode is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-filewatcher-windows"
+    "value": "# vscode-extension-samples",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-filewatcher-windows is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-extension-samples is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-filewatcher-windows is:issue created:>$since"
+    "value": "repo:microsoft/vscode-extension-samples is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-generator-code"
+    "value": "# vscode-filewatcher-windows",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-generator-code is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-filewatcher-windows is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-generator-code is:issue created:>$since"
+    "value": "repo:microsoft/vscode-filewatcher-windows is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-html-languageservice"
+    "value": "# vscode-generator-code",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-html-languageservice is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-generator-code is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-html-languageservice is:issue created:>$since"
+    "value": "repo:microsoft/vscode-generator-code is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-json-languageservice"
+    "value": "# vscode-html-languageservice",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-json-languageservice is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-html-languageservice is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-json-languageservice is:issue created:>$since"
+    "value": "repo:microsoft/vscode-html-languageservice is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-languageserver-node"
+    "value": "# vscode-jshint",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-languageserver-node is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-jshint is:issue closed:>$since",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "repo:microsoft/vscode-jshint is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": ""
+    "value": "# vscode-json-languageservice",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-languageserver-node is:issue created:>$since"
+    "value": "repo:microsoft/vscode-json-languageservice is:issue closed:>$since",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "repo:microsoft/vscode-json-languageservice is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-loader"
+    "value": "# vscode-languageserver-node",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-loader is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-languageserver-node is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-loader is:issue created:>$since"
+    "value": "repo:microsoft/vscode-languageserver-node is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-mono-debug"
+    "value": "# vscode-loader",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-mono-debug is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-loader is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-mono-debug is:issue created:>$since"
+    "value": "repo:microsoft/vscode-loader is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-node-debug"
+    "value": "# vscode-mono-debug",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-node-debug is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-mono-debug is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-node-debug is:issue created:>$since"
+    "value": "repo:microsoft/vscode-mono-debug is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-node-debug2"
+    "value": "# vscode-node-debug",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-node-debug2 is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-node-debug is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-node-debug2 is:issue created:>$since"
+    "value": "repo:microsoft/vscode-node-debug is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-recipes"
+    "value": "# vscode-node-debug2",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-recipes is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-node-debug2 is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-recipes is:issue created:>$since"
+    "value": "repo:microsoft/vscode-node-debug2 is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-textmate"
+    "value": "# vscode-recipes",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-textmate is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-recipes is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-textmate is:issue created:>$since"
+    "value": "repo:microsoft/vscode-recipes is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-themes"
+    "value": "# vscode-textmate",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-themes is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-textmate is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-themes is:issue created:>$since"
+    "value": "repo:microsoft/vscode-textmate is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-vsce"
+    "value": "# vscode-themes",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-vsce is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-themes is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-vsce is:issue created:>$since"
+    "value": "repo:microsoft/vscode-themes is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-website"
+    "value": "# vscode-vsce",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-website is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-vsce is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-website is:issue created:>$since"
+    "value": "repo:microsoft/vscode-vsce is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-windows-process-tree"
+    "value": "# vscode-website",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-windows-process-tree is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-website is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-windows-process-tree is:issue created:>$since"
+    "value": "repo:microsoft/vscode-website is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# debug-adapter-protocol"
+    "value": "# vscode-windows-process-tree",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/debug-adapter-protocol is:issue closed:>$since"
+    "value": "repo:microsoft/vscode-windows-process-tree is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/debug-adapter-protocol is:issue created:>$since"
+    "value": "repo:microsoft/vscode-windows-process-tree is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# inno-updater"
+    "value": "# debug-adapter-protocol",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/inno-updater is:issue closed:>$since"
+    "value": "repo:microsoft/debug-adapter-protocol is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/inno-updater is:issue created:>$since"
+    "value": "repo:microsoft/debug-adapter-protocol is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# monaco-languages"
+    "value": "# inno-updater",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/monaco-languages is:issue closed:>$since"
+    "value": "repo:microsoft/inno-updater is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/monaco-languages is:issue created:>$since"
+    "value": "repo:microsoft/inno-updater is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# monaco-typescript"
+    "value": "# language-server-protocol-inspector",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/monaco-typescript is:issue closed:>$since"
+    "value": "repo:microsoft/language-server-protocol-inspector is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/monaco-typescript is:issue created:>$since"
+    "value": "repo:microsoft/language-server-protocol-inspector is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# monaco-css"
+    "value": "# monaco-languages",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/monaco-css is:issue closed:>$since"
+    "value": "repo:microsoft/monaco-languages is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/monaco-css is:issue created:>$since"
+    "value": "repo:microsoft/monaco-languages is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# monaco-json"
+    "value": "# monaco-typescript",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/monaco-json is:issue closed:>$since"
+    "value": "repo:microsoft/monaco-typescript is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/monaco-json is:issue created:>$since"
+    "value": "repo:microsoft/monaco-typescript is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# monaco-html"
+    "value": "# monaco-css",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/monaco-html is:issue closed:>$since"
+    "value": "repo:microsoft/monaco-css is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/monaco-html is:issue created:>$since"
+    "value": "repo:microsoft/monaco-css is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# monaco-editor-webpack-plugin"
+    "value": "# monaco-json",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/monaco-editor-webpack-plugin is:issue closed:>$since"
+    "value": "repo:microsoft/monaco-json is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/monaco-editor-webpack-plugin is:issue created:>$since"
+    "value": "repo:microsoft/monaco-json is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# node-jsonc-parser"
+    "value": "# monaco-html",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/node-jsonc-parser is:issue closed:>$since"
+    "value": "repo:microsoft/monaco-html is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/node-jsonc-parser is:issue created:>$since"
+    "value": "repo:microsoft/monaco-html is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-jupyter"
+    "value": "# monaco-editor-webpack-plugin",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-jupyter is:issue closed:>$since"
+    "value": "repo:microsoft/monaco-editor-webpack-plugin is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-jupyter is:issue created:>$since"
+    "value": "repo:microsoft/monaco-editor-webpack-plugin is:issue created:>$since",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# vscode-python"
+    "value": "# node-jsonc-parser",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-python is:issue closed:>$since"
+    "value": "repo:microsoft/node-jsonc-parser is:issue closed:>$since",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-python is:issue created:>$since"
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# vscode-livepreview"
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/vscode-livepreview is:issue closed:>$since"
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/vscode-livepreview is:issue created:>$since"
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": ""
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# vscode-test"
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/vscode-test is:issue closed:>$since"
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/vscode-test is:issue created:>$since"
+    "value": "repo:microsoft/node-jsonc-parser is:issue created:>$since",
+    "editable": true
   }
 ]

.vscode/notebooks/grooming.github-issues

@@ -0,0 +1,30 @@
+[
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "### Categorizing Issues\n\nEach issue must have a type label. Most type labels are grey, some are yellow. Bugs are grey with a touch of red.",
+    "editable": true,
+    "outputs": []
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "repo:microsoft/vscode is:open is:issue assignee:@me -label:\"needs more info\" -label:bug -label:feature-request -label:under-discussion -label:debt -label:*question -label:upstream -label:electron -label:engineering -label:plan-item ",
+    "editable": true,
+    "outputs": []
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "### Feature Areas\n\nEach issue should be assigned to a feature area",
+    "editable": true,
+    "outputs": []
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "repo:microsoft/vscode is:open is:issue assignee:@me -label:L10N -label:VIM -label:api -label:api-finalization -label:api-proposal -label:authentication -label:breadcrumbs -label:callhierarchy -label:code-lens -label:color-palette -label:comments -label:config -label:context-keys -label:css-less-scss -label:custom-editors -label:debug -label:debug-console -label:dialogs -label:diff-editor -label:dropdown -label:editor -label:editor-RTL -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-scrollbar -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:error-list -label:explorer-custom -label:extension-host -label:extension-recommendations -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-guess-encoding -label:file-io -label:file-watcher -label:font-rendering -label:formatting -label:git -label:github -label:gpu -label:grammar -label:grid-view -label:html -label:i18n -label:icon-brand -label:icons-product -label:install-update -label:integrated-terminal -label:integrated-terminal-conpty -label:integrated-terminal-links -label:integrated-terminal-rendering -label:integrated-terminal-winpty -label:intellisense-config -label:ipc -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:notebook -label:outline -label:output -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-pick -label:references-viewlet -label:release-notes -label:remote -label:remote-explorer -label:rename -label:sandbox -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:settings-editor -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview -label:suggest -label:sync-error-handling -label:tasks -label:telemetry -label:themes -label:timeline -label:timeline-git -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree -label:typescript -label:undo-redo -label:uri -label:ux -label:variable-resolving -label:vscode-build -label:vscode-website -label:web -label:webview -label:workbench-actions -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editors -label:workbench-electron -label:workbench-feedback -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-views -label:workbench-welcome -label:workbench-window -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:zoom",
+    "editable": true,
+    "outputs": []
+  }
+]

.vscode/notebooks/inbox.github-issues

@@ -2,41 +2,49 @@
   {
     "kind": 1,
     "language": "markdown",
-    "value": "## tl;dr: Triage Inbox\n\nAll inbox issues but not those that need more information. These issues need to be triaged, e.g assigned to a user or ask for more information"
+    "value": "## tl;dr: Triage Inbox\n\nAll inbox issues but not those that need more information. These issues need to be triaged, e.g assigned to a user or ask for more information",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$inbox -label:\"needs more info\" sort:created-asc"
+    "value": "$inbox -label:\"needs more info\"",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "##### `Config`: defines the inbox query"
+    "value": "##### `Config`: defines the inbox query",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$inbox=repo:microsoft/vscode is:open no:assignee -label:feature-request -label:testplan-item -label:plan-item "
+    "value": "$inbox=repo:microsoft/vscode is:open no:assignee -label:feature-request -label:testplan-item -label:plan-item ",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "## Inbox tracking and Issue triage"
+    "value": "## Inbox tracking and Issue triage",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "New issues or pull requests submitted by the community are initially triaged by an [automatic classification bot](https://github.com/microsoft/vscode-github-triage-actions/tree/master/classifier-deep). Issues that the bot does not correctly triage are then triaged by a team member. The team rotates the inbox tracker on a weekly basis.\n\nA [mirror](https://github.com/JacksonKearl/testissues/issues) of the VS Code issue stream is available with details about how the bot classifies issues, including feature-area classifications and confidence ratings. Per-category confidence thresholds and feature-area ownership data is maintained in [.github/classifier.json](https://github.com/microsoft/vscode/blob/main/.github/classifier.json). \n\n💡 The bot is being run through a GitHub action that runs every 30 minutes. Give the bot the opportunity to classify an issue before doing it manually.\n\n### Inbox Tracking\n\nThe inbox tracker is responsible for the [global inbox](https://github.com/microsoft/vscode/issues?utf8=%E2%9C%93&q=is%3Aopen+no%3Aassignee+-label%3Afeature-request+-label%3Atestplan-item+-label%3Aplan-item) containing all **open issues and pull requests** that\n- are neither **feature requests** nor **test plan items** nor **plan items** and\n- have **no owner assignment**.\n\nThe **inbox tracker** may perform any step described in our [issue triaging documentation](https://github.com/microsoft/vscode/wiki/Issues-Triaging) but its main responsibility is to route issues to the actual feature area owner.\n\nFeature area owners track the **feature area inbox** containing all **open issues and pull requests** that\n- are personally assigned to them and are not assigned to any milestone\n- are labeled with their feature area label and are not assigned to any milestone.\nThis secondary triage may involve any of the steps described in our [issue triaging documentation](https://github.com/microsoft/vscode/wiki/Issues-Triaging) and results in a fully triaged or closed issue.\n\nThe [github triage extension](https://github.com/microsoft/vscode-github-triage-extension) can be used to assist with triaging — it provides a \"Command Palette\"-style list of triaging actions like assignment, labeling, and triggers for various bot actions."
+    "value": "New issues or pull requests submitted by the community are initially triaged by an [automatic classification bot](https://github.com/microsoft/vscode-github-triage-actions/tree/master/classifier-deep). Issues that the bot does not correctly triage are then triaged by a team member. The team rotates the inbox tracker on a weekly basis.\n\nA [mirror](https://github.com/JacksonKearl/testissues/issues) of the VS Code issue stream is available with details about how the bot classifies issues, including feature-area classifications and confidence ratings. Per-category confidence thresholds and feature-area ownership data is maintained in [.github/classifier.json](https://github.com/microsoft/vscode/blob/main/.github/classifier.json). \n\n💡 The bot is being run through a GitHub action that runs every 30 minutes. Give the bot the opportunity to classify an issue before doing it manually.\n\n### Inbox Tracking\n\nThe inbox tracker is responsible for the [global inbox](https://github.com/microsoft/vscode/issues?utf8=%E2%9C%93&q=is%3Aopen+no%3Aassignee+-label%3Afeature-request+-label%3Atestplan-item+-label%3Aplan-item) containing all **open issues and pull requests** that\n- are neither **feature requests** nor **test plan items** nor **plan items** and\n- have **no owner assignment**.\n\nThe **inbox tracker** may perform any step described in our [issue triaging documentation](https://github.com/microsoft/vscode/wiki/Issues-Triaging) but its main responsibility is to route issues to the actual feature area owner.\n\nFeature area owners track the **feature area inbox** containing all **open issues and pull requests** that\n- are personally assigned to them and are not assigned to any milestone\n- are labeled with their feature area label and are not assigned to any milestone.\nThis secondary triage may involve any of the steps described in our [issue triaging documentation](https://github.com/microsoft/vscode/wiki/Issues-Triaging) and results in a fully triaged or closed issue.\n\nThe [github triage extension](https://github.com/microsoft/vscode-github-triage-extension) can be used to assist with triaging — it provides a \"Command Palette\"-style list of triaging actions like assignment, labeling, and triggers for various bot actions.",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "## All Inbox Items\n\nAll issues that have no assignee and that have neither **feature requests** nor **test plan items** nor **plan items**."
+    "value": "## All Inbox Items\n\nAll issues that have no assignee and that have neither **feature requests** nor **test plan items** nor **plan items**.",
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$inbox"
+    "value": "$inbox",
+    "editable": true
   }
 ]

.vscode/notebooks/my-endgame.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev 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-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal\n\n$MILESTONE=milestone:\"October 2021\"\n\n$MINE=assignee:@me"
+    "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-remotehub repo:microsoft/vscode-emmet-helper\n\n$MILESTONE=milestone:\"July 2021\"\n\n$MINE=assignee:@me"
   },
   {
     "kind": 1,
@@ -52,7 +52,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS is:issue is:open author:@me label:testplan-item"
+    "value": "$REPOS $MILESTONE is:issue is:open author:@me label:testplan-item"
   },
   {
     "kind": 1,
@@ -77,7 +77,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MINE is:issue is:open label:testplan-item"
+    "value": "$REPOS $MILESTONE $MINE is:issue is:open label:testplan-item"
   },
   {
     "kind": 1,
@@ -147,7 +147,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed author:@me sort:updated-asc label:bug -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:needs-triage -label:verification-found"
+    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed author:@me sort:updated-asc label:bug -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found"
   },
   {
     "kind": 1,
@@ -157,7 +157,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed sort:updated-asc label:bug -label:verified -label:z-author-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:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:dynamicwebpaige -author:eamodio -author:egamma -author:fiveisprime -author:greazer -author:gregvanl -author:hediet -author:IanMatthewHuff -author:isidorn -author:ItalyPaleAle -author:JacksonKearl -author:joaomoreno -author:joyceerhl -author:jrieken -author:karrtikr-author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:ornellaalt -author:orta -author:rchiodo -author:rebornix -author:RMacfarlane -author:roblourens -author:rzhao271 -author:sana-ajani -author:sandy081 -author:sbatten -author:stevencl -author:TylerLeonhardt -author:Tyriar -author:weinand "
+    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed sort:updated-asc label:bug -label:verified -label:z-author-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 -author:hediet"
   },
   {
     "kind": 1,

.vscode/notebooks/verification.github-issues

@@ -12,7 +12,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev 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-emmet-helper repo:microsoft/vscode-jupyter repo:microsoft/vscode-python\n$milestone=milestone:\"August 2021\""
+    "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 repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-jupyter repo:microsoft/vscode-python\r\n$milestone=milestone:\"July 2021\""
   },
   {
     "kind": 1,

.vscode/settings.json

@@ -8,7 +8,8 @@
 		"**/.DS_Store": true,
 		"build/**/*.js": {
 			"when": "$(basename).ts"
-		}
+		},
+		"src/vs/server": false
 	},
 	"files.associations": {
 		"cglicenses.json": "jsonc"
@@ -26,7 +27,8 @@
 		"test/automation/out/**": true,
 		"test/integration/browser/out/**": true,
 		"src/vs/base/test/node/uri.test.data.txt": true,
-		"src/vs/workbench/test/browser/api/extHostDocumentData.test.perf-data.ts": true
+		"src/vs/workbench/test/browser/api/extHostDocumentData.test.perf-data.ts": true,
+		"src/vs/server": false
 	},
 	"lcov.path": [
 		"./.build/coverage/lcov.info",
@@ -79,8 +81,6 @@
 		"editor.defaultFormatter": "vscode.typescript-language-features"
 	},
 	"typescript.tsc.autoDetect": "off",
+	"notebook.experimental.useMarkdownRenderer": true,
 	"testing.autoRun.mode": "rerun",
-	"yaml.schemas": {
-		"https://raw.githubusercontent.com/microsoft/azure-pipelines-vscode/master/service-schema.json": "build/azure-pipelines/**/*.yml"
-	},
 }

.yarnrc

@@ -1,4 +1,3 @@
 disturl "https://electronjs.org/headers"
 target "13.6.6"
 runtime "electron"
-build_from_source "true"

CHANGELOG.md

@@ -1,28 +1,14 @@
 # Change Log
 
-## Version 1.37.0
-* Release date: June 15, 2022
+## Version 1.36.0
+* Release date: April 20, 2022
 * Release status: General Availability
 ## What's new in this version
-* New Features:
-    *  Backup & Restore - Backup & Restore to URL is now available in preview for Azure SQL Managed Instances.
-    *  Table Designer - Added API to support computed column capabilities on Table Designer.
-    *  Table Designer - Can now specify where to add new columns and columns can now be re-arranged by mouse dragging.
-    *  Table Designer - Table Designer is now supported by SQL Projects to add or modify database schema without need to be connected to a server instance.
-    *  Query Plan Viewer - Smart plan comparison is now available. Can now compare execution plans and view detailed differences between plans in the Properties Table.
-    *  Query Plan Viewer - Added toggle button to switch between estimated and actual execution plans.
-    *  Query Plan Viewer - Query Plan now comes with improved precision to operator costs for larger plans.
-    *  MongoDB Extension for Azure Cosmos DB (Preview) - This extension introduces support for access to Mongo resources for Cosmos DB.
-
-* Bug Fixes:
-    *  Table Designer - Fixed issue that caused app to not prompt user to save before closing.
-    *  Table Designer - Fixed issue that returned empty data set upon attempting to edit the first cell of a new row.
-    *  Table Designer - Improved resize to fit experience when zooming in on user interface as well as tab behavior issues.
-    *  Query Plan Viewer - Fixed bug that caused custom zoom level spinner to allow values outside valid range.
-    *  Schema Compare - Fixed issue with indexes not being added correctly when updating project from database.
-    *  Notebooks - Fixed inconsistencies with notebook cell behavior and toolbars.
-    *  Notebooks - Fixed issues with keyboard navigation.
-
+- General Availability of the Azure SQL Migration Extension for ADS
+- Support for .NET Interactive Notebooks Extension
+- New Table Designer Features including support for System Versioned, Graph and Memory Optomized Tables
+- Query Plan Viewer Updates includign warning and parallelism icons, the option to disable tooltips and support for opening .sqlplan files
+- Improvements in SQL Projects and Schema Compare 
 
 | Platform																|
 | ---------------------------------------	|
@@ -34,38 +20,13 @@
 | [Linux RPM][linux-rpm]									|
 | [Linux DEB][linux-deb]									|
 
-[win-user]: https://go.microsoft.com/fwlink/?linkid=2198663
-[win-system]: https://go.microsoft.com/fwlink/?linkid=2198878
-[win-zip]: https://go.microsoft.com/fwlink/?linkid=2198664
-[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2198762
-[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2198879
-[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2198880
-[linux-deb]: https://go.microsoft.com/fwlink/?linkid=2198763
-
-## Version 1.36.2
-* Release date: May 20, 2022
-* Release status: General Availability
-## What's new in this version
-- Fix connectivity issue with PBI data source
-- Fix query plan zoom and icon issues
-- Issues fixed in this release https://github.com/microsoft/azuredatastudio/milestone/89?closed=1
-
-## Version 1.36.1
-* Release date: April 22, 2022
-* Release status: General Availability
-## What's new in this version
-* April Hotfix addressing these issues https://github.com/microsoft/azuredatastudio/milestone/88?closed=1.
-* Hotfix RCA - https://github.com/microsoft/azuredatastudio/wiki/ADS-April-2022-Hotfix-RCA
-
-## Version 1.36.0
-* Release date: April 20, 2022
-* Release status: General Availability
-## What's new in this version
-- General Availability of the Azure SQL Migration Extension for ADS
-- Support for .NET Interactive Notebooks Extension
-- New Table Designer Features including support for System Versioned, Graph and Memory Optomized Tables
-- Query Plan Viewer Updates includign warning and parallelism icons, the option to disable tooltips and support for opening .sqlplan files
-- Improvements in SQL Projects and Schema Compare
+[win-user]: https://go.microsoft.com/fwlink/?linkid=2193235
+[win-system]: https://go.microsoft.com/fwlink/?linkid=2193326
+[win-zip]: https://go.microsoft.com/fwlink/?linkid=2193236
+[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2192971
+[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2193237
+[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2193238
+[linux-deb]: https://go.microsoft.com/fwlink/?linkid=2193327
 
 ## Version 1.35.1
 * Release date: March 17, 2022
@@ -79,12 +40,12 @@
 * Release status: General Availability
 ## What's new in this version
 * New Features:
-    *  Table Designer - Added functionality for creation and management of tables for SQL Servers. Built using DacFx framework
-    *  Query Plan Viewer - Added functionality for users to view a graphic view of estimated and actual query plans without need for an extension
+    *  Table Designer - Added functionality for creation and management of tables for SQL Servers. Built using DacFx framework 
+    *  Query Plan Viewer - Added functionality for users to view a graphic view of estimated and actual query plans without need for an extension 
     *  Azure Arc Extension - Updated the Data Controller deployment wizard and the SQL Managed Instance - Azure Arc deployment wizard to reflect the deployment experience in Azure Portal
 
 * Bug Fixes:
-    *  Azure Arc Extension - SQL Managed Instance-Azure Arc is now fixed for both indirect connectivity mode and direct connectivity mode
+    *  Azure Arc Extension - SQL Managed Instance-Azure Arc is now fixed for both indirect connectivity mode and direct connectivity mode 
     *  Notebooks - Support for keyboard navigation between cells to minimize mouse clicking
 
  ## Version 1.34.0
@@ -97,9 +58,9 @@
     *  Support for project build with .NET 6 in SQL Database Projects extension
     *  Publish to container in SQL Database Projects extension
     *  Undo and redo support for notebook cell-level operations
-
+    
 * Extension Updates:
-    *  Azure SQL Migration
+    *  Azure SQL Migration 
     *  Langpacks
     *  SQL Database Projects
 
@@ -109,7 +70,7 @@
     *  Fix to pre-populate target database names in the migration wizard in Azure SQL Migration extension
     *  Fix to column sorting in grids where the presence of null values could lead to unexpected results
     *  Fix for Python upgrades when two or more notebooks were open
-
+ 
 ## Version 1.33.1
 * Release date: Nov 4, 2021
 * Release status: General Availability
@@ -123,18 +84,18 @@
 * Release status: General Availability
 ## What's new in this version
 * New Notebook Features:
-    *  Notebook Views
-    *  Split cell support
-    *  Keyboard shortcuts for Markdown Toolbar Cells
+    *  Notebook Views 
+    *  Split cell support 
+    *  Keyboard shortcuts for Markdown Toolbar Cells 
        * Ctrl/Cmd + B = Bold Text
        * Ctrl/Cmd + I = Italicize Text
        * Ctrl/Cmd + U = Underline Text
        * Ctrl/Cmd + Shift + K = Add Code Block
        * Ctrl/Cmd + Shift + H = Highlight Text
-    *  Book improvements
+    *  Book improvements 
        * Add a new section
        * Drag and Drop
-
+  
 * Extension Updates:
     * Import
     * Langpacks
@@ -150,8 +111,8 @@
 * Release date: August 18, 2021
 * Release status: General Availability
 * Extension Updates:
-    * Arc/Az CLI extensions - Azure Arc extension now uses Azure CLI instead of Azure Data CLI for deploying and interacting with Azure Arc
-       instances
+    * Arc/Az CLI extensions - Azure Arc extension now uses Azure CLI instead of Azure Data CLI for deploying and interacting with Azure Arc 
+       instances    
     *  Langpacks
     *  SQL Database Projects
     *  Azure Monitor

README.md

@@ -131,10 +131,10 @@ Copyright (c) Microsoft Corporation. All rights reserved.
 
 Licensed under the [Source EULA](LICENSE.txt).
 
-[win-user]: https://go.microsoft.com/fwlink/?linkid=2198663
-[win-system]: https://go.microsoft.com/fwlink/?linkid=2198878
-[win-zip]: https://go.microsoft.com/fwlink/?linkid=2198664
-[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2198762
-[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2198879
-[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2198880
-[linux-deb]: https://go.microsoft.com/fwlink/?linkid=2198763
+[win-user]: https://go.microsoft.com/fwlink/?linkid=2193235
+[win-system]: https://go.microsoft.com/fwlink/?linkid=2193326
+[win-zip]: https://go.microsoft.com/fwlink/?linkid=2193236
+[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2192971
+[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2193237
+[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2193238
+[linux-deb]: https://go.microsoft.com/fwlink/?linkid=2193327

build/.moduleignore

@@ -110,18 +110,6 @@ nsfw/src/**
 nsfw/includes/**
 !nsfw/build/Release/*.node
 
-vscode-nsfw/binding.gyp
-vscode-nsfw/build/**
-vscode-nsfw/src/**
-vscode-nsfw/includes/**
-!vscode-nsfw/build/Release/*.node
-
-@parcel/watcher/binding.gyp
-@parcel/watcher/build/**
-@parcel/watcher/prebuilds/**
-@parcel/watcher/src/**
-!@parcel/watcher/build/Release/*.node
-
 vsda/build/**
 vsda/ci/**
 vsda/src/**

build/azure-pipelines/common/computeNodeModulesCacheKey.js

@@ -13,17 +13,8 @@ const shasum = crypto.createHash('sha1');
 shasum.update(fs.readFileSync(path.join(ROOT, 'build/.cachesalt')));
 shasum.update(fs.readFileSync(path.join(ROOT, '.yarnrc')));
 shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc')));
-// Add `package.json` and `yarn.lock` files
+// Add `yarn.lock` files
 for (let dir of dirs) {
-    const packageJsonPath = path.join(ROOT, dir, 'package.json');
-    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath).toString());
-    const relevantPackageJsonSections = {
-        dependencies: packageJson.dependencies,
-        devDependencies: packageJson.devDependencies,
-        optionalDependencies: packageJson.optionalDependencies,
-        resolutions: packageJson.resolutions
-    };
-    shasum.update(JSON.stringify(relevantPackageJsonSections));
     const yarnLockPath = path.join(ROOT, dir, 'yarn.lock');
     shasum.update(fs.readFileSync(yarnLockPath));
 }

build/azure-pipelines/common/computeNodeModulesCacheKey.ts

@@ -18,18 +18,8 @@ shasum.update(fs.readFileSync(path.join(ROOT, 'build/.cachesalt')));
 shasum.update(fs.readFileSync(path.join(ROOT, '.yarnrc')));
 shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc')));
 
-// Add `package.json` and `yarn.lock` files
+// Add `yarn.lock` files
 for (let dir of dirs) {
-	const packageJsonPath = path.join(ROOT, dir, 'package.json');
-	const packageJson = JSON.parse(fs.readFileSync(packageJsonPath).toString());
-	const relevantPackageJsonSections = {
-		dependencies: packageJson.dependencies,
-		devDependencies: packageJson.devDependencies,
-		optionalDependencies: packageJson.optionalDependencies,
-		resolutions: packageJson.resolutions
-	};
-	shasum.update(JSON.stringify(relevantPackageJsonSections));
-
 	const yarnLockPath = path.join(ROOT, dir, 'yarn.lock');
 	shasum.update(fs.readFileSync(yarnLockPath));
 }

build/azure-pipelines/common/createAsset.js

@@ -30,29 +30,20 @@ function getPlatform(product, os, arch, type) {
                         case 'user-setup':
                             return `${asset}-user`;
                         default:
-                            throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
+                            throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
                     }
                 case 'server':
                     if (arch === 'arm64') {
-                        throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
+                        throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
                     }
                     return arch === 'ia32' ? 'server-win32' : `server-win32-${arch}`;
                 case 'web':
                     if (arch === 'arm64') {
-                        throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
+                        throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
                     }
                     return arch === 'ia32' ? 'server-win32-web' : `server-win32-${arch}-web`;
                 default:
-                    throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
-            }
-        case 'alpine':
-            switch (product) {
-                case 'server':
-                    return `server-alpine-${arch}`;
-                case 'web':
-                    return `server-alpine-${arch}-web`;
-                default:
-                    throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
+                    throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
             }
         case 'linux':
             switch (type) {
@@ -67,14 +58,14 @@ function getPlatform(product, os, arch, type) {
                         case 'web':
                             return arch === 'standalone' ? 'web-standalone' : `server-linux-${arch}-web`;
                         default:
-                            throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
+                            throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
                     }
                 case 'deb-package':
                     return `linux-deb-${arch}`;
                 case 'rpm-package':
                     return `linux-rpm-${arch}`;
                 default:
-                    throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
+                    throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
             }
         case 'darwin':
             switch (product) {
@@ -87,14 +78,14 @@ function getPlatform(product, os, arch, type) {
                     return 'server-darwin';
                 case 'web':
                     if (arch !== 'x64') {
-                        throw new Error(`What should the platform be?: ${product} ${os} ${arch} ${type}`);
+                        throw `What should the platform be?: ${product} ${os} ${arch} ${type}`;
                     }
                     return 'server-darwin-web';
                 default:
-                    throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
+                    throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
             }
         default:
-            throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
+            throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
     }
 }
 // Contains all of the logic for mapping types to our actual types in CosmosDB

build/azure-pipelines/common/createAsset.ts

@@ -45,29 +45,20 @@ function getPlatform(product: string, os: string, arch: string, type: string): s
 						case 'user-setup':
 							return `${asset}-user`;
 						default:
-							throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
+							throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
 					}
 				case 'server':
 					if (arch === 'arm64') {
-						throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
+						throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
 					}
 					return arch === 'ia32' ? 'server-win32' : `server-win32-${arch}`;
 				case 'web':
 					if (arch === 'arm64') {
-						throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
+						throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
 					}
 					return arch === 'ia32' ? 'server-win32-web' : `server-win32-${arch}-web`;
 				default:
-					throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
-			}
-		case 'alpine':
-			switch (product) {
-				case 'server':
-					return `server-alpine-${arch}`;
-				case 'web':
-					return `server-alpine-${arch}-web`;
-				default:
-					throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
+					throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
 			}
 		case 'linux':
 			switch (type) {
@@ -82,14 +73,14 @@ function getPlatform(product: string, os: string, arch: string, type: string): s
 						case 'web':
 							return arch === 'standalone' ? 'web-standalone' : `server-linux-${arch}-web`;
 						default:
-							throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
+							throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
 					}
 				case 'deb-package':
 					return `linux-deb-${arch}`;
 				case 'rpm-package':
 					return `linux-rpm-${arch}`;
 				default:
-					throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
+					throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
 			}
 		case 'darwin':
 			switch (product) {
@@ -102,14 +93,14 @@ function getPlatform(product: string, os: string, arch: string, type: string): s
 					return 'server-darwin';
 				case 'web':
 					if (arch !== 'x64') {
-						throw new Error(`What should the platform be?: ${product} ${os} ${arch} ${type}`);
+						throw `What should the platform be?: ${product} ${os} ${arch} ${type}`;
 					}
 					return 'server-darwin-web';
 				default:
-					throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
+					throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
 			}
 		default:
-			throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
+			throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
 	}
 }
 

build/azure-pipelines/common/installPlaywright.js

@@ -5,7 +5,7 @@
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
 const retry_1 = require("./retry");
-const { installDefaultBrowsersForNpmInstall } = require('playwright/lib/utils/registry');
+const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/utils/registry');
 async function install() {
     await (0, retry_1.retry)(() => installDefaultBrowsersForNpmInstall());
 }

build/azure-pipelines/common/installPlaywright.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { retry } from './retry';
-const { installDefaultBrowsersForNpmInstall } = require('playwright/lib/utils/registry');
+const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/utils/registry');
 
 async function install() {
 	await retry(() => installDefaultBrowsersForNpmInstall());

build/azure-pipelines/common/sign.js

@@ -69,17 +69,9 @@ function main([esrpCliPath, type, cert, username, password, folderPath, pattern]
         '-r', 'true',
         '-e', keyFile,
     ];
-    try {
-        cp.execFileSync('dotnet', args, { stdio: 'inherit' });
-    }
-    catch (err) {
-        console.error('ESRP failed');
-        console.error(err);
-        process.exit(1);
-    }
+    cp.spawnSync('dotnet', args, { stdio: 'inherit' });
 }
 exports.main = main;
 if (require.main === module) {
     main(process.argv.slice(2));
-    process.exit(0);
 }

build/azure-pipelines/common/sign.ts

@@ -76,16 +76,9 @@ export function main([esrpCliPath, type, cert, username, password, folderPath, p
 		'-e', keyFile,
 	];
 
-	try {
-		cp.execFileSync('dotnet', args, { stdio: 'inherit' });
-	} catch (err) {
-		console.error('ESRP failed');
-		console.error(err);
-		process.exit(1);
-	}
+	cp.spawnSync('dotnet', args, { stdio: 'inherit' });
 }
 
 if (require.main === module) {
 	main(process.argv.slice(2));
-	process.exit(0);
 }

build/azure-pipelines/darwin/product-build-darwin.yml

@@ -84,6 +84,7 @@ steps:
       set -e
       export npm_config_arch=$(VSCODE_ARCH)
       export npm_config_node_gyp=$(which node-gyp)
+      export npm_config_build_from_source=true
       export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
 
       for i in {1..3}; do # try 3 times, for Terrapin
@@ -223,7 +224,7 @@ steps:
       set -e
       APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
       APP_NAME="`ls $APP_ROOT | head -n 1`"
-      yarn smoketest-no-compile --build "$APP_ROOT/$APP_NAME" --screenshots $(Build.SourcesDirectory)/.build/logs/smoke-tests
+      yarn smoketest-no-compile --build "$APP_ROOT/$APP_NAME" --screenshots .build/logs/smoke-tests
     timeoutInMinutes: 5
     displayName: Run smoke tests (Electron)
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
@@ -233,7 +234,7 @@ steps:
       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 --screenshots $(Build.SourcesDirectory)/.build/logs/smoke-tests
+      yarn smoketest-no-compile --build "$APP_ROOT/$APP_NAME" --remote --screenshots .build/logs/smoke-tests
     timeoutInMinutes: 5
     displayName: Run smoke tests (Remote)
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

build/azure-pipelines/darwin/sql-product-build-darwin.yml

@@ -17,7 +17,7 @@ steps:
 
   - task: NodeTool@0
     inputs:
-      versionSpec: "16.x"
+      versionSpec: "14.x"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
     inputs:
@@ -137,7 +137,7 @@ steps:
       yarn smoketest --build "$APP_ROOT/$APP_NAME" --screenshots "$(build.artifactstagingdirectory)/smokeshots" --log "$(build.artifactstagingdirectory)/logs/darwin/smoke.log" --extensionsDir "$(build.sourcesdirectory)/extensions"
     displayName: Run smoke tests (Electron) (Continue on Error)
     continueOnError: true
-    condition: and(succeeded(), and(or(eq(variables['RUN_TESTS'], 'true'), eq(variables['RUN_SMOKE_TESTS'], 'true')), ne(variables['SMOKE_FAIL_ON_ERROR'], 'true')))
+    condition: and(succeeded(), and(eq(variables['RUN_TESTS'], 'true'), ne(variables['SMOKE_FAIL_ON_ERROR'], 'true')))
 
   - script: |
       set -e
@@ -145,7 +145,7 @@ steps:
       APP_NAME="`ls $APP_ROOT | head -n 1`"
       yarn smoketest --build "$APP_ROOT/$APP_NAME" --screenshots "$(build.artifactstagingdirectory)/smokeshots" --log "$(build.artifactstagingdirectory)/logs/darwin/smoke.log" --extensionsDir "$(build.sourcesdirectory)/extensions"
     displayName: Run smoke tests (Electron) (Fail on Error)
-    condition: and(succeeded(), and(or(eq(variables['RUN_TESTS'], 'true'), eq(variables['RUN_SMOKE_TESTS'], 'true')), eq(variables['SMOKE_FAIL_ON_ERROR'], 'true')))
+    condition: and(succeeded(), and(eq(variables['RUN_TESTS'], 'true'), eq(variables['SMOKE_FAIL_ON_ERROR'], 'true')))
 
   # - script: |
   #     set -e
@@ -213,12 +213,12 @@ steps:
     condition: always()
 
   - task: PublishTestResults@2
-    displayName: 'Publish Test Results'
+    displayName: 'Publish Test Results test-results.xml'
     inputs:
-      testResultsFiles: "*-results.xml"
-      searchFolder: "$(Build.ArtifactStagingDirectory)/test-results"
+      testResultsFiles: 'test-results.xml'
+      searchFolder: '$(Build.SourcesDirectory)'
     continueOnError: true
-    condition: and(succeededOrFailed(), or(eq(variables['RUN_TESTS'], 'true'), eq(variables['RUN_SMOKE_TESTS'], 'true')))
+    condition: and(succeededOrFailed(), eq(variables['RUN_TESTS'], 'true'))
 
   - task: PublishCodeCoverageResults@1
     displayName: 'Publish code coverage from $(Build.SourcesDirectory)/.build/coverage/cobertura-coverage.xml'

build/azure-pipelines/distro-build.yml

@@ -11,7 +11,7 @@ pr:
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "16.x"
+      versionSpec: "14.x"
 
   - task: AzureKeyVault@1
     displayName: "Azure Key Vault: Get Secrets"

build/azure-pipelines/docker/Dockerfile

@@ -1,5 +1,5 @@
-#Download base image ubuntu 22.04
-FROM mcr.microsoft.com/mirror/docker/library/ubuntu:22.04
+#Download base image ubuntu 21.04
+FROM ubuntu:21.04
 ENV TZ=America/Los_Angeles
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 

build/azure-pipelines/docker/sql-product-build-docker.yml

@@ -1,7 +1,7 @@
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "16.x"
+      versionSpec: "14.x"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
     inputs:

build/azure-pipelines/linux/Dockerfile

@@ -1,5 +1,5 @@
 #Download base image ubuntu 18.04
-FROM mcr.microsoft.com/mirror/docker/library/ubuntu:18.04
+FROM ubuntu:18.04
 
 #Adding apt repos for g++-4.9
 RUN echo "deb http://dk.archive.ubuntu.com/ubuntu/ xenial main" >> /etc/apt/sources.list

build/azure-pipelines/linux/continuous-build-linux.yml

@@ -10,7 +10,7 @@ steps:
 
   - task: NodeTool@0
     inputs:
-      versionSpec: "16.x"
+      versionSpec: "14.x"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
     inputs:

build/azure-pipelines/linux/product-build-alpine.yml

@@ -31,7 +31,7 @@ steps:
       azureSubscriptionEndpoint: "vscode-builds-subscription"
       azureContainerRegistry: vscodehub.azurecr.io
       command: "Run an image"
-      imageName: "vscode-linux-build-agent:alpine-$(VSCODE_ARCH)"
+      imageName: "vscode-linux-build-agent:alpine"
       containerCommand: uname
 
   - script: |
@@ -106,31 +106,15 @@ steps:
       node build/azure-pipelines/mixin
     displayName: Mix in quality
 
-  - script: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-    displayName: 'Register Docker QEMU'
-    condition: eq(variables['VSCODE_ARCH'], 'arm64')
-
   - script: |
       set -e
-      docker run -e VSCODE_QUALITY -v $(pwd):/root/vscode -v ~/.netrc:/root/.netrc vscodehub.azurecr.io/vscode-linux-build-agent:alpine-$(VSCODE_ARCH) /root/vscode/build/azure-pipelines/linux/alpine/install-dependencies.sh
+      docker run -e VSCODE_QUALITY -v $(pwd):/root/vscode -v ~/.netrc:/root/.netrc vscodehub.azurecr.io/vscode-linux-build-agent:alpine /root/vscode/build/azure-pipelines/linux/alpine/install-dependencies.sh
     displayName: Prebuild
 
   - script: |
       set -e
-
-      case $VSCODE_ARCH in
-        x64)
-          reh='vscode-reh-linux-alpine-min-ci'
-          rehweb='vscode-reh-web-linux-alpine-min-ci'
-          ;;
-        arm64)
-          reh='vscode-reh-alpine-arm64-min-ci'
-          rehweb='vscode-reh-web-alpine-arm64-min-ci'
-          ;;
-      esac
-
-      yarn gulp $reh
-      yarn gulp $rehweb
+      yarn gulp vscode-reh-linux-alpine-min-ci
+      yarn gulp vscode-reh-web-linux-alpine-min-ci
     displayName: Build
 
   - script: |
@@ -138,14 +122,7 @@ steps:
       REPO="$(pwd)"
       ROOT="$REPO/.."
 
-      case $VSCODE_ARCH in
-        x64)
-          PLATFORM_LINUX='linux-alpine'
-          ;;
-        arm64)
-          PLATFORM_LINUX='alpine-arm64'
-          ;;
-      esac
+      PLATFORM_LINUX="linux-alpine"
 
       # Publish Remote Extension Host
       LEGACY_SERVER_BUILD_NAME="vscode-reh-$PLATFORM_LINUX"
@@ -167,23 +144,12 @@ steps:
     displayName: Prepare for publish
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
-  - publish: $(Agent.BuildDirectory)/vscode-server-alpine-$(VSCODE_ARCH).tar.gz
-    artifact: vscode_server_alpine_$(VSCODE_ARCH)_archive-unsigned
-    displayName: Publish server archive
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'x64'))
-
-  - publish: $(Agent.BuildDirectory)/vscode-server-alpine-$(VSCODE_ARCH)-web.tar.gz
-    artifact: vscode_web_alpine_$(VSCODE_ARCH)_archive-unsigned
-    displayName: Publish web server archive
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'x64'))
-
-  # Legacy x64 artifact name
   - publish: $(Agent.BuildDirectory)/vscode-server-linux-alpine.tar.gz
     artifact: vscode_server_linux_alpine_archive-unsigned
-    displayName: Publish x64 server archive
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), eq(variables['VSCODE_ARCH'], 'x64'))
+    displayName: Publish server archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(Agent.BuildDirectory)/vscode-server-linux-alpine-web.tar.gz
     artifact: vscode_web_linux_alpine_archive-unsigned
-    displayName: Publish x64 web server archive
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), eq(variables['VSCODE_ARCH'], 'x64'))
+    displayName: Publish web server archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))

build/azure-pipelines/linux/product-build-linux.yml

@@ -76,6 +76,7 @@ steps:
   - script: |
       set -e
       export npm_config_arch=$(NPM_ARCH)
+      export npm_config_build_from_source=true
 
       if [ -z "$CC" ] || [ -z "$CXX" ]; then
         # Download clang based on chromium revision used by vscode
@@ -90,7 +91,7 @@ steps:
         # Set compiler toolchain
         export CC=$PWD/.build/CR_Clang/bin/clang
         export CXX=$PWD/.build/CR_Clang/bin/clang++
-        export CXXFLAGS="-nostdinc++ -D_LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS -D__NO_INLINE__ -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit"
+        export CXXFLAGS="-nostdinc++ -D_LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit"
         export LDFLAGS="-stdlib=libc++ -fuse-ld=lld -flto=thin -fsplit-lto-unit -L$PWD/.build/libcxx-objects -lc++abi"
       fi
 
@@ -211,7 +212,7 @@ steps:
   - script: |
       set -e
       APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
-      yarn smoketest-no-compile --build "$APP_PATH" --electronArgs="--disable-dev-shm-usage --use-gl=swiftshader" --screenshots $(Build.SourcesDirectory)/.build/logs/smoke-tests
+      yarn smoketest-no-compile --build "$APP_PATH" --electronArgs="--disable-dev-shm-usage --use-gl=swiftshader" --screenshots .build/logs/smoke-tests
     timeoutInMinutes: 5
     displayName: Run smoke tests (Electron)
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
@@ -220,7 +221,7 @@ steps:
       set -e
       APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
       VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
-      yarn smoketest-no-compile --build "$APP_PATH" --remote --electronArgs="--disable-dev-shm-usage --use-gl=swiftshader" --screenshots $(Build.SourcesDirectory)/.build/logs/smoke-tests
+      yarn smoketest-no-compile --build "$APP_PATH" --remote --electronArgs="--disable-dev-shm-usage --use-gl=swiftshader" --screenshots .build/logs/smoke-tests
     timeoutInMinutes: 5
     displayName: Run smoke tests (Remote)
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

build/azure-pipelines/linux/sql-product-build-linux.yml

@@ -4,7 +4,7 @@ parameters:
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "16.x"
+      versionSpec: "14.x"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
     inputs:

build/azure-pipelines/product-build.yml

@@ -6,7 +6,6 @@ schedules:
     branches:
       include:
         - main
-        - joao/web
 
 parameters:
   - name: VSCODE_QUALITY
@@ -46,11 +45,7 @@ parameters:
     type: boolean
     default: true
   - name: VSCODE_BUILD_LINUX_ALPINE
-    displayName: "🎯 Alpine Linux x64"
-    type: boolean
-    default: true
-  - name: VSCODE_BUILD_LINUX_ALPINE_ARM64
-    displayName: "🎯 Alpine Linux arm64"
+    displayName: "🎯 Alpine Linux"
     type: boolean
     default: true
   - name: VSCODE_BUILD_MACOS
@@ -96,7 +91,7 @@ variables:
   - 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
-    value: ${{ or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true), eq(parameters.VSCODE_BUILD_WEB, true)) }}
+    value: ${{ or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true), eq(parameters.VSCODE_BUILD_WEB, true)) }}
   - name: VSCODE_BUILD_STAGE_MACOS
     value: ${{ or(eq(parameters.VSCODE_BUILD_MACOS, true), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}
   - name: VSCODE_CIBUILD
@@ -253,15 +248,6 @@ stages:
 
         - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true)) }}:
           - job: LinuxAlpine
-            variables:
-              VSCODE_ARCH: x64
-            steps:
-              - template: linux/product-build-alpine.yml
-
-        - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true)) }}:
-          - job: LinuxAlpineArm64
-            variables:
-              VSCODE_ARCH: arm64
             steps:
               - template: linux/product-build-alpine.yml
 

build/azure-pipelines/publish-types/publish-types.yml

@@ -55,13 +55,13 @@ steps:
       git reset --hard upstream/master
       git push --force
 
-      # Update and format the typings file
+      # Update the type
       cd ..
       node build/azure-pipelines/publish-types/update-types.js
+
+      cd DefinitelyTyped
       TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
 
-      # Create and push the branch
-      cd DefinitelyTyped
       git diff --color | cat
       git add -A
       git status

build/azure-pipelines/sdl-scan.yml

@@ -58,7 +58,7 @@ stages:
         inputs:
           azureSubscription: "vscode-builds-subscription"
           KeyVaultName: vscode
-          SecretsFilter: "github-distro-mixin-password"
+          SecretsFilter: "github-distro-mixin-password,ESRP-SSL-AADAuth,vscode-storage-key,builds-docdb-key-readwrite"
 
       - powershell: |
           . build/azure-pipelines/win32/exec.ps1
@@ -94,6 +94,7 @@ stages:
           addProjectDirToScanningExclusionList: true
         env:
           npm_config_arch: "$(NPM_ARCH)"
+          npm_config_build_from_source: true
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
           GITHUB_TOKEN: "$(github-distro-mixin-password)"
         displayName: CodeQL
@@ -105,6 +106,7 @@ stages:
           retry { exec { yarn --frozen-lockfile } }
         env:
           npm_config_arch: "$(NPM_ARCH)"
+          npm_config_build_from_source: true
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
           GITHUB_TOKEN: "$(github-distro-mixin-password)"
           CHILD_CONCURRENCY: 1
@@ -153,7 +155,7 @@ stages:
         inputs:
           azureSubscription: "vscode-builds-subscription"
           KeyVaultName: vscode
-          SecretsFilter: "github-distro-mixin-password"
+          SecretsFilter: "github-distro-mixin-password,ESRP-SSL-AADAuth,vscode-storage-key,builds-docdb-key-readwrite"
 
       - script: |
           set -e
@@ -188,6 +190,7 @@ stages:
       - script: |
           set -e
           export npm_config_arch=$(NPM_ARCH)
+          export npm_config_build_from_source=true
 
           if [ -z "$CC" ] || [ -z "$CXX" ]; then
             # Download clang based on chromium revision used by vscode

build/azure-pipelines/sql-product-compile.yml

@@ -1,7 +1,7 @@
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "16.x"
+    versionSpec: "14.x"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
   inputs:
@@ -77,11 +77,9 @@ steps:
     node build/azure-pipelines/mixin
   displayName: Mix in quality
 
-# Run these separately to avoid OOM errors on pipeline machines
 - script: |
     set -e
-    yarn npm-run-all -lp core-ci extensions-ci
-    yarn npm-run-all -lp hygiene eslint valid-layers-check
+    yarn npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check
   displayName: Compile & Hygiene
 
 - script: |

build/azure-pipelines/upload-nlsmetadata.js

@@ -1,88 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
-const es = require("event-stream");
-const vfs = require("vinyl-fs");
-const util = require("../lib/util");
-const merge = require("gulp-merge-json");
-const gzip = require("gulp-gzip");
-const azure = require('gulp-azure-storage');
-const root = path.dirname(path.dirname(__dirname));
-const commit = util.getVersion(root);
-function main() {
-    return es.merge(vfs.src('out-vscode-web-min/nls.metadata.json', { base: 'out-vscode-web-min' }), vfs.src('.build/extensions/**/nls.metadata.json', { base: '.build/extensions' }), vfs.src('.build/extensions/**/nls.metadata.header.json', { base: '.build/extensions' }), vfs.src('.build/extensions/**/package.nls.json', { base: '.build/extensions' }))
-        .pipe(merge({
-        fileName: 'combined.nls.metadata.json',
-        jsonSpace: '',
-        edit: (parsedJson, file) => {
-            let key;
-            if (file.base === 'out-vscode-web-min') {
-                return { vscode: parsedJson };
-            }
-            // Handle extensions and follow the same structure as the Core nls file.
-            switch (file.basename) {
-                case 'package.nls.json':
-                    // put package.nls.json content in Core NlsMetadata format
-                    // language packs use the key "package" to specify that
-                    // translations are for the package.json file
-                    parsedJson = {
-                        messages: {
-                            package: Object.values(parsedJson)
-                        },
-                        keys: {
-                            package: Object.keys(parsedJson)
-                        },
-                        bundles: {
-                            main: ['package']
-                        }
-                    };
-                    break;
-                case 'nls.metadata.header.json':
-                    parsedJson = { header: parsedJson };
-                    break;
-                case 'nls.metadata.json':
-                    // put nls.metadata.json content in Core NlsMetadata format
-                    const modules = Object.keys(parsedJson);
-                    const json = {
-                        keys: {},
-                        messages: {},
-                        bundles: {
-                            main: []
-                        }
-                    };
-                    for (const module of modules) {
-                        json.messages[module] = parsedJson[module].messages;
-                        json.keys[module] = parsedJson[module].keys;
-                        json.bundles.main.push(module);
-                    }
-                    parsedJson = json;
-                    break;
-            }
-            key = 'vscode.' + file.relative.split('/')[0];
-            return { [key]: parsedJson };
-        },
-    }))
-        .pipe(gzip({ append: false }))
-        .pipe(vfs.dest('./nlsMetadata'))
-        .pipe(es.through(function (data) {
-        console.log(`Uploading ${data.path}`);
-        // trigger artifact upload
-        console.log(`##vso[artifact.upload containerfolder=nlsmetadata;artifactname=combined.nls.metadata.json]${data.path}`);
-        this.emit('data', data);
-    }))
-        .pipe(azure.upload({
-        account: process.env.AZURE_STORAGE_ACCOUNT,
-        key: process.env.AZURE_STORAGE_ACCESS_KEY,
-        container: 'nlsmetadata',
-        prefix: commit + '/',
-        contentSettings: {
-            contentEncoding: 'gzip',
-            cacheControl: 'max-age=31536000, public'
-        }
-    }));
-}
-main();

build/azure-pipelines/upload-nlsmetadata.ts

@@ -1,107 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as path from 'path';
-import * as es from 'event-stream';
-import * as Vinyl from 'vinyl';
-import * as vfs from 'vinyl-fs';
-import * as util from '../lib/util';
-import * as merge from 'gulp-merge-json';
-import * as gzip from 'gulp-gzip';
-const azure = require('gulp-azure-storage');
-
-const root = path.dirname(path.dirname(__dirname));
-const commit = util.getVersion(root);
-
-interface NlsMetadata {
-	keys: { [module: string]: string },
-	messages: { [module: string]: string },
-	bundles: { [bundle: string]: string[] },
-}
-
-function main() {
-	return es.merge(
-		vfs.src('out-vscode-web-min/nls.metadata.json', { base: 'out-vscode-web-min' }),
-		vfs.src('.build/extensions/**/nls.metadata.json', { base: '.build/extensions' }),
-		vfs.src('.build/extensions/**/nls.metadata.header.json', { base: '.build/extensions' }),
-		vfs.src('.build/extensions/**/package.nls.json', { base: '.build/extensions' }))
-		.pipe(merge({
-			fileName: 'combined.nls.metadata.json',
-			jsonSpace: '',
-			edit: (parsedJson, file) => {
-				let key;
-				if (file.base === 'out-vscode-web-min') {
-					return { vscode: parsedJson };
-				}
-
-				// Handle extensions and follow the same structure as the Core nls file.
-				switch (file.basename) {
-					case 'package.nls.json':
-						// put package.nls.json content in Core NlsMetadata format
-						// language packs use the key "package" to specify that
-						// translations are for the package.json file
-						parsedJson = {
-							messages: {
-								package: Object.values(parsedJson)
-							},
-							keys: {
-								package: Object.keys(parsedJson)
-							},
-							bundles: {
-								main: ['package']
-							}
-						};
-						break;
-
-					case 'nls.metadata.header.json':
-						parsedJson = { header: parsedJson };
-						break;
-
-					case 'nls.metadata.json':
-						// put nls.metadata.json content in Core NlsMetadata format
-						const modules = Object.keys(parsedJson);
-
-						const json: NlsMetadata = {
-							keys: {},
-							messages: {},
-							bundles: {
-								main: []
-							}
-						};
-						for (const module of modules) {
-							json.messages[module] = parsedJson[module].messages;
-							json.keys[module] = parsedJson[module].keys;
-							json.bundles.main.push(module);
-						}
-						parsedJson = json;
-						break;
-				}
-				key = 'vscode.' + file.relative.split('/')[0];
-				return { [key]: parsedJson };
-			},
-		}))
-		.pipe(gzip({ append: false }))
-		.pipe(vfs.dest('./nlsMetadata'))
-		.pipe(es.through(function (data: Vinyl) {
-			console.log(`Uploading ${data.path}`);
-			// trigger artifact upload
-			console.log(`##vso[artifact.upload containerfolder=nlsmetadata;artifactname=combined.nls.metadata.json]${data.path}`);
-			this.emit('data', data);
-		}))
-		.pipe(azure.upload({
-			account: process.env.AZURE_STORAGE_ACCOUNT,
-			key: process.env.AZURE_STORAGE_ACCESS_KEY,
-			container: 'nlsmetadata',
-			prefix: commit + '/',
-			contentSettings: {
-				contentEncoding: 'gzip',
-				cacheControl: 'max-age=31536000, public'
-			}
-		}));
-}
-
-main();

build/azure-pipelines/web/build/Dockerfile

@@ -1,5 +1,5 @@
-#Download base image ubuntu 22.04
-FROM mcr.microsoft.com/mirror/docker/library/ubuntu:22.04
+#Download base image ubuntu 21.04
+FROM ubuntu:21.04
 ENV TZ=America/Los_Angeles
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 

build/azure-pipelines/web/product-build-web.yml

@@ -119,13 +119,6 @@ steps:
         node build/azure-pipelines/upload-sourcemaps out-vscode-web-min out-vscode-web-min/vs/workbench/workbench.web.api.js.map
     displayName: Upload sourcemaps (Web)
 
-  - script: |
-      set -e
-      AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
-        node build/azure-pipelines/upload-nlsmetadata
-    displayName: Upload NLS Metadata
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
   - script: |
       set -e
       REPO="$(pwd)"

build/azure-pipelines/web/sql-product-build-web.yml

@@ -1,7 +1,7 @@
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "16.x"
+    versionSpec: "14.x"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
   inputs:

build/azure-pipelines/win32/product-build-win32.yml

@@ -79,6 +79,7 @@ steps:
       . build/azure-pipelines/win32/retry.ps1
       $ErrorActionPreference = "Stop"
       $env:npm_config_arch="$(VSCODE_ARCH)"
+      $env:npm_config_build_from_source="true"
       $env:CHILD_CONCURRENCY="1"
       retry { exec { yarn --frozen-lockfile } }
     env:
@@ -103,14 +104,6 @@ steps:
       exec { node build/azure-pipelines/mixin }
     displayName: Mix in quality
 
-  - powershell: |
-      . build/azure-pipelines/win32/exec.ps1
-      $ErrorActionPreference = "Stop"
-      $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
-      exec { yarn npm-run-all -lp "electron $(VSCODE_ARCH)" }
-    displayName: Download Electron
-    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
@@ -123,6 +116,7 @@ steps:
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
       $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
+      exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-code-helper" }
       exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-inno-updater" }
     displayName: Prepare Package
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
@@ -141,8 +135,8 @@ steps:
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
       $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
-      exec { yarn npm-run-all -lp "playwright-install" }
-    displayName: Download Playwright
+      exec { yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install" }
+    displayName: Download Electron and Playwright
     condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
   - powershell: |
@@ -206,20 +200,20 @@ steps:
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
       $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
-      exec { yarn smoketest-no-compile --build "$AppRoot" --screenshots $(Build.SourcesDirectory)\.build\logs\smoke-tests }
+      exec { yarn smoketest-no-compile --build "$AppRoot"  --screenshots .build\logs\smoke-tests }
     displayName: Run smoke tests (Electron)
     timeoutInMinutes: 5
     condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
-  - powershell: |
-      . build/azure-pipelines/win32/exec.ps1
-      $ErrorActionPreference = "Stop"
-      $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
-      $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"
-      exec { yarn smoketest-no-compile --build "$AppRoot" --remote }
-    displayName: Run smoke tests (Remote)
-    timeoutInMinutes: 5
-    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
+  # - powershell: |
+  #     . build/azure-pipelines/win32/exec.ps1
+  #     $ErrorActionPreference = "Stop"
+  #     $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
+  #     $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"
+  #     exec { yarn smoketest-no-compile --build "$AppRoot" --remote }
+  #   displayName: Run smoke tests (Remote)
+  #   timeoutInMinutes: 5
+  #   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
@@ -255,7 +249,7 @@ steps:
 
   - task: UseDotNet@2
     inputs:
-      version: 3.x
+      version: 2.x
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - task: EsrpClientTool@1

build/azure-pipelines/win32/sql-product-build-win32.yml

@@ -1,7 +1,7 @@
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "16.x"
+      versionSpec: "14.x"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
     inputs:
@@ -103,6 +103,7 @@ steps:
       $ErrorActionPreference = "Stop"
       exec { yarn gulp "package-rebuild-extensions" }
       exec { yarn gulp "vscode-win32-x64-min-ci" }
+      exec { yarn gulp "vscode-win32-x64-code-helper" }
       exec { yarn gulp "vscode-win32-x64-inno-updater" }
     displayName: Build
     env:

build/azure-pipelines/win32/sql-product-test-win32.yml

@@ -1,7 +1,7 @@
 steps:
 - task: NodeTool@0
   inputs:
-   versionSpec: "16.x"
+    versionSpec: "14.x"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
   inputs:

build/filters.js

@@ -41,7 +41,7 @@ module.exports.indentationFilter = [
 	'!src/vs/css.js',
 	'!src/vs/css.build.js',
 	'!src/vs/loader.js',
-	'!src/vs/base/browser/dompurify/*',
+	'!src/vs/base/common/insane/insane.js',
 	'!src/vs/base/common/marked/marked.js',
 	'!src/vs/base/common/semver/semver.js',
 	'!src/vs/base/node/terminateProcess.sh',
@@ -122,8 +122,7 @@ module.exports.indentationFilter = [
 	'!extensions/simple-browser/media/*.js',
 	'!resources/xlf/LocProject.json',
 	'!build/**/*',
-	'!test/coverage/**',
-	'!extensions/**/coverage/**'
+	'!test/coverage/**'
 ];
 
 module.exports.copyrightFilter = [
@@ -183,7 +182,6 @@ module.exports.copyrightFilter = [
 	'!src/sql/base/browser/ui/table/plugins/checkboxSelectColumn.plugin.ts',
 	'!src/sql/base/browser/ui/table/plugins/cellSelectionModel.plugin.ts',
 	'!src/sql/base/browser/ui/table/plugins/autoSizeColumns.plugin.ts',
-	'!src/sql/base/browser/ui/table/plugins/rowMoveManager.plugin.ts',
 	'!src/sql/workbench/services/notebook/browser/outputs/sanitizer.ts',
 	'!src/sql/workbench/contrib/notebook/browser/outputs/renderers.ts',
 	'!src/sql/workbench/services/notebook/browser/outputs/tableRenderers.ts',
@@ -209,7 +207,7 @@ module.exports.jsHygieneFilter = [
 	'!src/vs/nls.js',
 	'!src/vs/css.build.js',
 	'!src/vs/nls.build.js',
-	'!src/**/dompurify.js',
+	'!src/**/insane.js',
 	'!src/**/marked.js',
 	'!src/**/semver.js',
 	'!**/test/**',

build/gulpfile.editor.js

@@ -191,7 +191,7 @@ const compileEditorESMTask = task.define('compile-editor-esm', () => {
 				}
 			}
 
-			console.log(`Open in VS Code the folder at '${destPath}' and you can analyze the compilation error`);
+			console.log(`Open in VS Code the folder at '${destPath}' and you can alayze the compilation error`);
 			throw new Error('Standalone Editor compilation failed. If this is the build machine, simply launch `yarn run gulp editor-distro` on your machine to further analyze the compilation problem.');
 		});
 	}
@@ -231,10 +231,7 @@ function toExternalDTS(contents) {
 
 		if (line.indexOf('declare let MonacoEnvironment') === 0) {
 			lines[i] = `declare global {\n    let MonacoEnvironment: Environment | undefined;\n}`;
-		}
-
-		if (line.indexOf('\tMonacoEnvironment?') === 0) {
-			lines[i] = `    MonacoEnvironment?: Environment | undefined;`;
+			// lines[i] = line.replace('declare namespace monaco.', 'export namespace ');
 		}
 	}
 	return lines.join('\n').replace(/\n\n\n+/g, '\n\n');

build/gulpfile.extensions.js

@@ -240,7 +240,7 @@ exports.compileExtensionsBuildTask = compileExtensionsBuildTask;
 //Get every extension in 'extensions' to create XLF files.
 const exportCompilations = glob.sync('**/package.json', {
 	cwd: extensionsPath,
-	ignore: ['**/out/**', '**/node_modules/**', '**/sqltoolsservice/**',  'package.json']
+	ignore: ['**/out/**', '**/node_modules/**', 'package.json']
 });
 
 //Run the localization packaging task on all extensions in ADS.

build/gulpfile.hygiene.js

@@ -14,10 +14,6 @@ function checkPackageJSON(actualPath) {
 	const rootPackageJSON = require('../package.json');
 	const checkIncluded = (set1, set2) => {
 		for (let depName in set1) {
-			if (depName === 'typescript') {
-				continue;
-			}
-
 			const depVersion = set1[depName];
 			const rootDepVersion = set2[depName];
 			if (!rootDepVersion) {

build/gulpfile.reh.js

@@ -38,17 +38,14 @@ const REMOTE_FOLDER = path.join(REPO_ROOT, 'remote');
 // Targets
 
 const BUILD_TARGETS = [
-	{ platform: 'win32', arch: 'ia32' },
-	{ platform: 'win32', arch: 'x64' },
-	{ platform: 'darwin', arch: null },
-	{ platform: 'linux', arch: 'ia32' },
-	{ platform: 'linux', arch: 'x64' },
-	{ platform: 'linux', arch: 'armhf' },
-	{ platform: 'linux', arch: 'arm64' },
-	{ platform: 'alpine', arch: 'arm64' },
-	// legacy: we use to ship only one alpine so it was put in the arch, but now we ship
-	// multiple alpine images and moved to a better model (alpine as the platform)
-	{ platform: 'linux', arch: 'alpine' },
+	{ platform: 'win32', arch: 'ia32', pkgTarget: 'node8-win-x86' },
+	{ platform: 'win32', arch: 'x64', pkgTarget: 'node8-win-x64' },
+	{ platform: 'darwin', arch: null, pkgTarget: 'node8-macos-x64' },
+	{ platform: 'linux', arch: 'ia32', pkgTarget: 'node8-linux-x86' },
+	{ platform: 'linux', arch: 'x64', pkgTarget: 'node8-linux-x64' },
+	{ platform: 'linux', arch: 'armhf', pkgTarget: 'node8-linux-armv7' },
+	{ platform: 'linux', arch: 'arm64', pkgTarget: 'node8-linux-arm64' },
+	{ platform: 'linux', arch: 'alpine', pkgTarget: 'node8-linux-alpine' },
 ];
 
 const serverResources = [
@@ -111,6 +108,10 @@ const serverEntryPoints = [
 		name: 'vs/server/remoteExtensionHostProcess',
 		exclude: ['vs/css', 'vs/nls']
 	},
+	{
+		name: 'vs/platform/files/node/watcher/unix/watcherApp',
+		exclude: ['vs/css', 'vs/nls']
+	},
 	{
 		name: 'vs/platform/files/node/watcher/nsfw/watcherApp',
 		exclude: ['vs/css', 'vs/nls']
@@ -185,9 +186,8 @@ function nodejs(platform, arch) {
 			.pipe(rename('node.exe'));
 	}
 
-	if (arch === 'alpine' || platform === 'alpine') {
-		const imageName = arch === 'arm64' ? 'arm64v8/node' : 'node';
-		const contents = cp.execSync(`docker run --rm ${imageName}:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' });
+	if (arch === 'alpine') {
+		const contents = cp.execSync(`docker run --rm node:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' });
 		return es.readArray([new File({ path: 'node', contents, stat: { mode: parseInt('755', 8) } })]);
 	}
 
@@ -508,198 +508,32 @@ function packagePkgTask(platform, arch, pkgTarget) {
 	});
 });
 
-function packageTask(type, platform, arch, sourceFolderName, destinationFolderName) {
-	const destination = path.join(BUILD_ROOT, destinationFolderName);
-
-	return () => {
-		const json = require('gulp-json-editor');
-
-		const src = gulp.src(sourceFolderName + '/**', { base: '.' })
-			.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + sourceFolderName), 'out'); }))
-			.pipe(util.setExecutableBit(['**/*.sh']))
-			.pipe(filter(['**', '!**/*.js.map']));
-
-		const workspaceExtensionPoints = ['debuggers', 'jsonValidation'];
-		const isUIExtension = (manifest) => {
-			switch (manifest.extensionKind) {
-				case 'ui': return true;
-				case 'workspace': return false;
-				default: {
-					if (manifest.main) {
-						return false;
-					}
-					if (manifest.contributes && Object.keys(manifest.contributes).some(key => workspaceExtensionPoints.indexOf(key) !== -1)) {
-						return false;
-					}
-					// Default is UI Extension
-					return true;
-				}
+function mixinServer(watch) {
+	const packageJSONPath = path.join(path.dirname(__dirname), 'package.json');
+	function exec(cmdLine) {
+		console.log(cmdLine);
+		cp.execSync(cmdLine, { stdio: 'inherit' });
+	}
+	function checkout() {
+		const packageJSON = JSON.parse(fs.readFileSync(packageJSONPath).toString());
+		exec('git fetch distro');
+		exec(`git checkout ${packageJSON['distro']} -- src/vs/server resources/server`);
+		exec('git reset HEAD src/vs/server resources/server');
+	}
+	checkout();
+	if (watch) {
+		console.log('Enter watch mode (observing package.json)');
+		const watcher = fs.watch(packageJSONPath);
+		watcher.addListener('change', () => {
+			try {
+				checkout();
+			} catch (e) {
+				console.log(e);
 			}
-		};
-		const localWorkspaceExtensions = glob.sync('extensions/*/package.json')
-			.filter((extensionPath) => {
-				if (type === 'reh-web') {
-					return true; // web: ship all extensions for now
-				}
-
-				const manifest = JSON.parse(fs.readFileSync(path.join(REPO_ROOT, extensionPath)).toString());
-				return !isUIExtension(manifest);
-			}).map((extensionPath) => path.basename(path.dirname(extensionPath)))
-			.filter(name => name !== 'vscode-api-tests' && name !== 'vscode-test-resolver'); // Do not ship the test extensions
-		const marketplaceExtensions = JSON.parse(fs.readFileSync(path.join(REPO_ROOT, 'product.json'), 'utf8')).builtInExtensions
-			.filter(entry => !entry.platforms || new Set(entry.platforms).has(platform))
-			.filter(entry => !entry.clientOnly)
-			.map(entry => entry.name);
-		const extensionPaths = [...localWorkspaceExtensions, ...marketplaceExtensions]
-			.map(name => `.build/extensions/${name}/**`);
-
-		const extensions = gulp.src(extensionPaths, { base: '.build', dot: true });
-		const extensionsCommonDependencies = gulp.src('.build/extensions/node_modules/**', { base: '.build', dot: true });
-		const sources = es.merge(src, extensions, extensionsCommonDependencies)
-			.pipe(filter(['**', '!**/*.js.map'], { dot: true }));
-
-		let version = packageJson.version;
-		const quality = product.quality;
-
-		if (quality && quality !== 'stable') {
-			version += '-' + quality;
-		}
-
-		const name = product.nameShort;
-		const packageJsonStream = gulp.src(['remote/package.json'], { base: 'remote' })
-			.pipe(json({ name, version }));
-
-		const date = new Date().toISOString();
-
-		const productJsonStream = gulp.src(['product.json'], { base: '.' })
-			.pipe(json({ commit, date }));
-
-		const license = gulp.src(['remote/LICENSE'], { base: 'remote', allowEmpty: true });
-
-		const jsFilter = util.filter(data => !data.isDirectory() && /\.js$/.test(data.path));
-
-		const productionDependencies = getProductionDependencies(REMOTE_FOLDER);
-		const dependenciesSrc = _.flatten(productionDependencies.map(d => path.relative(REPO_ROOT, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!${d}/.bin/**`]));
-		const deps = gulp.src(dependenciesSrc, { base: 'remote', dot: true })
-			// filter out unnecessary files, no source maps in server build
-			.pipe(filter(['**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.js.map']))
-			.pipe(util.cleanNodeModules(path.join(__dirname, '.moduleignore')))
-			.pipe(jsFilter)
-			.pipe(util.stripSourceMappingURL())
-			.pipe(jsFilter.restore);
-
-		const nodePath = `.build/node/v${nodeVersion}/${platform}-${platform === 'darwin' ? 'x64' : arch}`;
-		const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true });
-
-		let web = [];
-		if (type === 'reh-web') {
-			web = [
-				'resources/server/favicon.ico',
-				'resources/server/code-192.png',
-				'resources/server/code-512.png',
-				'resources/server/manifest.json'
-			].map(resource => gulp.src(resource, { base: '.' }).pipe(rename(resource)));
-		}
-
-		let all = es.merge(
-			packageJsonStream,
-			productJsonStream,
-			license,
-			sources,
-			deps,
-			node,
-			...web
-		);
-
-		let result = all
-			.pipe(util.skipDirectories())
-			.pipe(util.fixWin32DirectoryPermissions());
-
-		if (platform === 'win32') {
-			result = es.merge(result,
-				gulp.src('resources/server/bin/code.cmd', { base: '.' })
-					.pipe(replace('@@VERSION@@', version))
-					.pipe(replace('@@COMMIT@@', commit))
-					.pipe(replace('@@APPNAME@@', product.applicationName))
-					.pipe(rename(`bin/${product.applicationName}.cmd`)),
-				gulp.src('resources/server/bin/helpers/browser.cmd', { base: '.' })
-					.pipe(replace('@@VERSION@@', version))
-					.pipe(replace('@@COMMIT@@', commit))
-					.pipe(replace('@@APPNAME@@', product.applicationName))
-					.pipe(rename(`bin/helpers/browser.cmd`)),
-				gulp.src('resources/server/bin/server.cmd', { base: '.' })
-					.pipe(rename(`server.cmd`))
-			);
-		} else if (platform === 'linux' || platform === 'alpine' || platform === 'darwin') {
-			result = es.merge(result,
-				gulp.src('resources/server/bin/code.sh', { base: '.' })
-					.pipe(replace('@@VERSION@@', version))
-					.pipe(replace('@@COMMIT@@', commit))
-					.pipe(replace('@@APPNAME@@', product.applicationName))
-					.pipe(rename(`bin/${product.applicationName}`))
-					.pipe(util.setExecutableBit()),
-				gulp.src('resources/server/bin/helpers/browser.sh', { base: '.' })
-					.pipe(replace('@@VERSION@@', version))
-					.pipe(replace('@@COMMIT@@', commit))
-					.pipe(replace('@@APPNAME@@', product.applicationName))
-					.pipe(rename(`bin/helpers/browser.sh`))
-					.pipe(util.setExecutableBit()),
-				gulp.src('resources/server/bin/server.sh', { base: '.' })
-					.pipe(rename(`server.sh`))
-					.pipe(util.setExecutableBit())
-			);
-		}
-
-		return result.pipe(vfs.dest(destination));
-	};
+		});
+	}
+	return Promise.resolve();
 }
 
-['reh', 'reh-web'].forEach(type => {
-	const optimizeTask = task.define(`optimize-vscode-${type}`, task.series(
-		util.rimraf(`out-vscode-${type}`),
-		common.optimizeTask({
-			src: 'out-build',
-			entryPoints: _.flatten(type === 'reh' ? serverEntryPoints : serverWithWebEntryPoints),
-			otherSources: [],
-			resources: type === 'reh' ? serverResources : serverWithWebResources,
-			loaderConfig: common.loaderConfig(),
-			out: `out-vscode-${type}`,
-			inlineAmdImages: true,
-			bundleInfo: undefined,
-			fileContentMapper: createVSCodeWebFileContentMapper('.build/extensions')
-		})
-	));
-
-	const minifyTask = task.define(`minify-vscode-${type}`, task.series(
-		optimizeTask,
-		util.rimraf(`out-vscode-${type}-min`),
-		common.minifyTask(`out-vscode-${type}`, `https://ticino.blob.core.windows.net/sourcemaps/${commit}/core`)
-	));
-	gulp.task(minifyTask);
-
-	BUILD_TARGETS.forEach(buildTarget => {
-		const dashed = (str) => (str ? `-${str}` : ``);
-		const platform = buildTarget.platform;
-		const arch = buildTarget.arch;
-
-		['', 'min'].forEach(minified => {
-			const sourceFolderName = `out-vscode-${type}${dashed(minified)}`;
-			const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`;
-
-			const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series(
-				gulp.task(`node-${platform}-${platform === 'darwin' ? 'x64' : arch}`),
-				util.rimraf(path.join(BUILD_ROOT, destinationFolderName)),
-				packageTask(type, platform, arch, sourceFolderName, destinationFolderName)
-			));
-			gulp.task(serverTaskCI);
-
-			const serverTask = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}`, task.series(
-				compileBuildTask,
-				compileExtensionsBuildTask,
-				minified ? minifyTask : optimizeTask,
-				serverTaskCI
-			));
-			gulp.task(serverTask);
-		});
-	});
-});
+gulp.task(task.define('mixin-server', () => mixinServer(false)));
+gulp.task(task.define('mixin-server-watch', () => mixinServer(true)));

build/gulpfile.vscode.js

@@ -39,8 +39,6 @@ const vscodeEntryPoints = _.flatten([
 	buildfile.workerExtensionHost,
 	buildfile.workerNotebook,
 	buildfile.workerLanguageDetection,
-	buildfile.workerSharedProcess,
-	buildfile.workerLocalFileSearch,
 	buildfile.workbenchDesktop,
 	buildfile.code
 ]);

build/gulpfile.vscode.web.js

@@ -6,212 +6,11 @@
 'use strict';
 
 const gulp = require('gulp');
-const path = require('path');
-const es = require('event-stream');
-const util = require('./lib/util');
-const task = require('./lib/task');
-const common = require('./lib/optimize');
-const product = require('../product.json');
-const rename = require('gulp-rename');
-const filter = require('gulp-filter');
-const _ = require('underscore');
-const { getProductionDependencies } = require('./lib/dependencies');
-const vfs = require('vinyl-fs');
-const fs = require('fs');
-const packageJson = require('../package.json');
-const { compileBuildTask } = require('./gulpfile.compile');
-const extensions = require('./lib/extensions');
 
-const REPO_ROOT = path.dirname(__dirname);
-const BUILD_ROOT = path.dirname(REPO_ROOT);
-const WEB_FOLDER = path.join(REPO_ROOT, 'remote', 'web');
+const noop = () => { return Promise.resolve(); };
 
-const commit = util.getVersion(REPO_ROOT);
-const quality = product.quality;
-const version = (quality && quality !== 'stable') ? `${packageJson.version}-${quality}` : packageJson.version;
-
-const vscodeWebResourceIncludes = [
-	// Workbench
-	'out-build/vs/{base,platform,editor,workbench}/**/*.{svg,png,jpg}',
-	'out-build/vs/code/browser/workbench/*.html',
-	'out-build/vs/base/browser/ui/codicons/codicon/**/*.ttf',
-	'out-build/vs/**/markdown.css',
-
-	// Webview
-	'out-build/vs/workbench/contrib/webview/browser/pre/*.js',
-	'out-build/vs/workbench/contrib/webview/browser/pre/*.html',
-
-	// Extension Worker
-	'out-build/vs/workbench/services/extensions/worker/httpsWebWorkerExtensionHostIframe.html',
-	'out-build/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html',
-
-	// Web node paths (needed for integration tests)
-	'out-build/vs/webPackagePaths.js',
-];
-exports.vscodeWebResourceIncludes = vscodeWebResourceIncludes;
-
-const vscodeWebResources = [
-
-	// Includes
-	...vscodeWebResourceIncludes,
-
-	// Excludes
-	'!out-build/vs/**/{node,electron-browser,electron-main}/**',
-	'!out-build/vs/editor/standalone/**',
-	'!out-build/vs/workbench/**/*-tb.png',
-	'!**/test/**'
-];
-
-const buildfile = require('../src/buildfile');
-
-const vscodeWebEntryPoints = _.flatten([
-	buildfile.entrypoint('vs/workbench/workbench.web.api'),
-	buildfile.base,
-	buildfile.workerExtensionHost,
-	buildfile.workerNotebook,
-	buildfile.workerLanguageDetection,
-	buildfile.workerLocalFileSearch,
-	buildfile.keyboardMaps,
-	buildfile.workbenchWeb
-]);
-exports.vscodeWebEntryPoints = vscodeWebEntryPoints;
-
-const buildDate = new Date().toISOString();
-
-/**
- * @param extensionsRoot {string} The location where extension will be read from
- */
-const createVSCodeWebFileContentMapper = (extensionsRoot) => {
-	/**
-	 * @param content {string} The contens of the file
-	 * @param path {string} The absolute file path, always using `/`, even on Windows
-	 */
-	const result = (content, path) => {
-		// (1) Patch product configuration
-		if (path.endsWith('vs/platform/product/common/product.js')) {
-			const productConfiguration = JSON.stringify({
-				...product,
-				extensionAllowedProposedApi: [...product.extensionAllowedProposedApi],
-				version,
-				commit,
-				date: buildDate
-			});
-			return content.replace('/*BUILD->INSERT_PRODUCT_CONFIGURATION*/', productConfiguration.substr(1, productConfiguration.length - 2) /* without { and }*/);
-		}
-
-		// (2) Patch builtin extensions
-		if (path.endsWith('vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.js')) {
-			// Do not inline `vscode-web-playground` even if it has been packed!
-			const builtinExtensions = JSON.stringify(extensions.scanBuiltinExtensions(extensionsRoot, ['vscode-web-playground']));
-			return content.replace('/*BUILD->INSERT_BUILTIN_EXTENSIONS*/', builtinExtensions.substr(1, builtinExtensions.length - 2) /* without [ and ]*/);
-		}
-
-		return content;
-	};
-	return result;
-};
-exports.createVSCodeWebFileContentMapper = createVSCodeWebFileContentMapper;
-
-const optimizeVSCodeWebTask = task.define('optimize-vscode-web', task.series(
-	util.rimraf('out-vscode-web'),
-	common.optimizeTask({
-		src: 'out-build',
-		entryPoints: _.flatten(vscodeWebEntryPoints),
-		otherSources: [],
-		resources: vscodeWebResources,
-		loaderConfig: common.loaderConfig(),
-		externalLoaderInfo: util.createExternalLoaderConfig(product.webEndpointUrl, commit, quality),
-		out: 'out-vscode-web',
-		inlineAmdImages: true,
-		bundleInfo: undefined,
-		fileContentMapper: createVSCodeWebFileContentMapper('.build/web/extensions')
-	})
-));
-
-const minifyVSCodeWebTask = task.define('minify-vscode-web', task.series(
-	optimizeVSCodeWebTask,
-	util.rimraf('out-vscode-web-min'),
-	common.minifyTask('out-vscode-web', `https://ticino.blob.core.windows.net/sourcemaps/${commit}/core`)
-));
-gulp.task(minifyVSCodeWebTask);
-
-function packageTask(sourceFolderName, destinationFolderName) {
-	const destination = path.join(BUILD_ROOT, destinationFolderName);
-
-	return () => {
-		const json = require('gulp-json-editor');
-
-		const src = gulp.src(sourceFolderName + '/**', { base: '.' })
-			.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + sourceFolderName), 'out'); }));
-
-		const extensions = gulp.src('.build/web/extensions/**', { base: '.build/web', dot: true });
-
-		const sources = es.merge(src, extensions)
-			.pipe(filter(['**', '!**/*.js.map'], { dot: true }));
-
-		const name = product.nameShort;
-		const packageJsonStream = gulp.src(['remote/web/package.json'], { base: 'remote/web' })
-			.pipe(json({ name, version }));
-
-		const license = gulp.src(['remote/LICENSE'], { base: 'remote', allowEmpty: true });
-
-		const productionDependencies = getProductionDependencies(WEB_FOLDER);
-		const dependenciesSrc = _.flatten(productionDependencies.map(d => path.relative(REPO_ROOT, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!${d}/.bin/**`]));
-
-		const deps = gulp.src(dependenciesSrc, { base: 'remote/web', dot: true })
-			.pipe(filter(['**', '!**/package-lock.json']))
-			.pipe(util.cleanNodeModules(path.join(__dirname, '.webignore')));
-
-		const favicon = gulp.src('resources/server/favicon.ico', { base: 'resources/server' });
-		const manifest = gulp.src('resources/server/manifest.json', { base: 'resources/server' });
-		const pwaicons = es.merge(
-			gulp.src('resources/server/code-192.png', { base: 'resources/server' }),
-			gulp.src('resources/server/code-512.png', { base: 'resources/server' })
-		);
-
-		let all = es.merge(
-			packageJsonStream,
-			license,
-			sources,
-			deps,
-			favicon,
-			manifest,
-			pwaicons
-		);
-
-		let result = all
-			.pipe(util.skipDirectories())
-			.pipe(util.fixWin32DirectoryPermissions());
-
-		return result.pipe(vfs.dest(destination));
-	};
-}
-
-const compileWebExtensionsBuildTask = task.define('compile-web-extensions-build', task.series(
-	task.define('clean-web-extensions-build', util.rimraf('.build/web/extensions')),
-	task.define('bundle-web-extensions-build', () => extensions.packageLocalExtensionsStream(true).pipe(gulp.dest('.build/web'))),
-	task.define('bundle-marketplace-web-extensions-build', () => extensions.packageMarketplaceExtensionsStream(true).pipe(gulp.dest('.build/web'))),
-	task.define('bundle-web-extension-media-build', () => extensions.buildExtensionMedia(false, '.build/web/extensions')),
-));
-gulp.task(compileWebExtensionsBuildTask);
-
-const dashed = (str) => (str ? `-${str}` : ``);
-
-['', 'min'].forEach(minified => {
-	const sourceFolderName = `out-vscode-web${dashed(minified)}`;
-	const destinationFolderName = `vscode-web`;
-
-	const vscodeWebTaskCI = task.define(`vscode-web${dashed(minified)}-ci`, task.series(
-		compileWebExtensionsBuildTask,
-		minified ? minifyVSCodeWebTask : optimizeVSCodeWebTask,
-		util.rimraf(path.join(BUILD_ROOT, destinationFolderName)),
-		packageTask(sourceFolderName, destinationFolderName)
-	));
-	gulp.task(vscodeWebTaskCI);
-
-	const vscodeWebTask = task.define(`vscode-web${dashed(minified)}`, task.series(
-		compileBuildTask,
-		vscodeWebTaskCI
-	));
-	gulp.task(vscodeWebTask);
-});
+gulp.task('minify-vscode-web', noop);
+gulp.task('vscode-web', noop);
+gulp.task('vscode-web-min', noop);
+gulp.task('vscode-web-ci', noop);
+gulp.task('vscode-web-min-ci', noop);

build/gulpfile.vscode.win32.js

@@ -156,3 +156,9 @@ function updateIcon(executablePath) {
 gulp.task(task.define('vscode-win32-ia32-inno-updater', task.series(copyInnoUpdater('ia32'), updateIcon(path.join(buildPath('ia32'), 'tools', 'inno_updater.exe')))));
 gulp.task(task.define('vscode-win32-x64-inno-updater', task.series(copyInnoUpdater('x64'), updateIcon(path.join(buildPath('x64'), 'tools', 'inno_updater.exe')))));
 gulp.task(task.define('vscode-win32-arm64-inno-updater', task.series(copyInnoUpdater('arm64'), updateIcon(path.join(buildPath('arm64'), 'tools', 'inno_updater.exe')))));
+
+// CodeHelper.exe icon
+
+gulp.task(task.define('vscode-win32-ia32-code-helper', task.series(updateIcon(path.join(buildPath('ia32'), 'resources', 'app', 'out', 'vs', 'platform', 'files', 'node', 'watcher', 'win32', 'CodeHelper.exe')))));
+gulp.task(task.define('vscode-win32-x64-code-helper', task.series(updateIcon(path.join(buildPath('x64'), 'resources', 'app', 'out', 'vs', 'platform', 'files', 'node', 'watcher', 'win32', 'CodeHelper.exe')))));
+gulp.task(task.define('vscode-win32-arm64-code-helper', task.series(updateIcon(path.join(buildPath('arm64'), 'resources', 'app', 'out', 'vs', 'platform', 'files', 'node', 'watcher', 'win32', 'CodeHelper.exe')))));

build/lib/asar.ts

@@ -7,7 +7,7 @@
 
 import * as path from 'path';
 import * as es from 'event-stream';
-const pickle = require('chromium-pickle-js');
+const pickle = require('chromium-pickle-js');
 const Filesystem = <typeof AsarFilesystem>require('asar/lib/filesystem');
 import * as VinylFile from 'vinyl';
 import * as minimatch from 'minimatch';

build/lib/compilation.js

@@ -37,19 +37,9 @@ function createCompile(src, build, emitError) {
     const sourcemaps = require('gulp-sourcemaps');
     const projectPath = path.join(__dirname, '../../', src, 'tsconfig.json');
     const overrideOptions = Object.assign(Object.assign({}, getTypeScriptCompilerOptions(src)), { inlineSources: Boolean(build) });
-    // {{SQL CARBON EDIT}} Add override for not inlining the sourcemap during build so we can get code coverage - it
-    // currently expects a *.map.js file to exist next to the source file for proper source mapping
     if (!build && !process.env['SQL_NO_INLINE_SOURCEMAP']) {
         overrideOptions.inlineSourceMap = true;
     }
-    else if (!build) {
-        console.warn('********************************************************************************************');
-        console.warn('* Inlining of source maps is DISABLED, which will prevent debugging from working properly, *');
-        console.warn('* but is required to generate code coverage reports.                                       *');
-        console.warn('* To re-enable inlining of source maps clear the SQL_NO_INLINE_SOURCEMAP environment var   *');
-        console.warn('* and re-run the build/watch task                                                          *');
-        console.warn('********************************************************************************************');
-    }
     const compilation = tsb.create(projectPath, overrideOptions, false, err => reporter(err));
     function pipeline(token) {
         const bom = require('gulp-bom');

build/lib/compilation.ts

@@ -44,20 +44,10 @@ function createCompile(src: string, build: boolean, emitError?: boolean) {
 
 	const projectPath = path.join(__dirname, '../../', src, 'tsconfig.json');
 	const overrideOptions = { ...getTypeScriptCompilerOptions(src), inlineSources: Boolean(build) };
-	// {{SQL CARBON EDIT}} Add override for not inlining the sourcemap during build so we can get code coverage - it
-	// currently expects a *.map.js file to exist next to the source file for proper source mapping
 	if (!build && !process.env['SQL_NO_INLINE_SOURCEMAP']) {
 		overrideOptions.inlineSourceMap = true;
-	} else if (!build) {
-		console.warn('********************************************************************************************');
-		console.warn('* Inlining of source maps is DISABLED, which will prevent debugging from working properly, *');
-		console.warn('* but is required to generate code coverage reports.                                       *');
-		console.warn('* To re-enable inlining of source maps clear the SQL_NO_INLINE_SOURCEMAP environment var   *');
-		console.warn('* and re-run the build/watch task                                                          *');
-		console.warn('********************************************************************************************');
 	}
 
-
 	const compilation = tsb.create(projectPath, overrideOptions, false, err => reporter(err));
 
 	function pipeline(token?: util.ICancellationToken) {
@@ -97,7 +87,6 @@ function createCompile(src: string, build: boolean, emitError?: boolean) {
 export function compileTask(src: string, out: string, build: boolean): () => NodeJS.ReadWriteStream {
 
 	return function () {
-
 		if (os.totalmem() < 4_000_000_000) {
 			throw new Error('compilation requires 4GB of RAM');
 		}

build/lib/eslint/vscode-dts-literal-or-types.js

@@ -12,13 +12,15 @@ module.exports = new class ApiLiteralOrTypes {
     }
     create(context) {
         return {
-            ['TSTypeAnnotation TSUnionType']: (node) => {
-                if (node.types.every(value => value.type === 'TSLiteralType')) {
-                    context.report({
-                        node: node,
-                        messageId: 'useEnum'
-                    });
+            ['TSTypeAnnotation TSUnionType TSLiteralType']: (node) => {
+                var _a;
+                if (((_a = node.literal) === null || _a === void 0 ? void 0 : _a.type) === 'TSNullKeyword') {
+                    return;
                 }
+                context.report({
+                    node: node,
+                    messageId: 'useEnum'
+                });
             }
         };
     }

build/lib/eslint/vscode-dts-literal-or-types.ts

@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
-import { TSESTree } from '@typescript-eslint/experimental-utils';
 
 export = new class ApiLiteralOrTypes implements eslint.Rule.RuleModule {
 
@@ -15,13 +14,14 @@ export = new class ApiLiteralOrTypes implements eslint.Rule.RuleModule {
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 		return {
-			['TSTypeAnnotation TSUnionType']: (node: any) => {
-				if ((<TSESTree.TSUnionType>node).types.every(value => value.type === 'TSLiteralType')) {
-					context.report({
-						node: node,
-						messageId: 'useEnum'
-					});
+			['TSTypeAnnotation TSUnionType TSLiteralType']: (node: any) => {
+				if (node.literal?.type === 'TSNullKeyword') {
+					return;
 				}
+				context.report({
+					node: node,
+					messageId: 'useEnum'
+				});
 			}
 		};
 	}

build/lib/i18n.resources.json

@@ -102,10 +102,6 @@
 			"name": "vs/workbench/contrib/interactive",
 			"project": "vscode-workbench"
 		},
-		{
-			"name": "vs/workbench/contrib/languageStatus",
-			"project": "vscode-workbench"
-		},
 		{
 			"name": "vs/workbench/contrib/keybindings",
 			"project": "vscode-workbench"

build/lib/layersChecker.js

@@ -49,8 +49,7 @@ const CORE_TYPES = [
     'decode',
     'self',
     'trimLeft',
-    'trimRight',
-    'queueMicrotask'
+    'trimRight'
 ];
 // Types that are defined in a common layer but are known to be only
 // available in native environments should not be allowed in browser

build/lib/layersChecker.ts

@@ -50,8 +50,7 @@ const CORE_TYPES = [
 	'decode',
 	'self',
 	'trimLeft',
-	'trimRight',
-	'queueMicrotask'
+	'trimRight'
 ];
 
 // Types that are defined in a common layer but are known to be only

build/lib/monaco-api.js

@@ -149,6 +149,26 @@ function getMassagedTopLevelDeclarationText(ts, sourceFile, declaration, importN
             }
         });
     }
+    else if (declaration.kind === ts.SyntaxKind.VariableStatement) {
+        const jsDoc = result.substr(0, declaration.getLeadingTriviaWidth(sourceFile));
+        if (jsDoc.indexOf('@monacodtsreplace') >= 0) {
+            const jsDocLines = jsDoc.split(/\r\n|\r|\n/);
+            let directives = [];
+            for (const jsDocLine of jsDocLines) {
+                const m = jsDocLine.match(/^\s*\* \/([^/]+)\/([^/]+)\/$/);
+                if (m) {
+                    directives.push([new RegExp(m[1], 'g'), m[2]]);
+                }
+            }
+            // remove the jsdoc
+            result = result.substr(jsDoc.length);
+            if (directives.length > 0) {
+                // apply replace directives
+                const replacer = createReplacerFromDirectives(directives);
+                result = replacer(result);
+            }
+        }
+    }
     result = result.replace(/export default /g, 'export ');
     result = result.replace(/export declare /g, 'export ');
     result = result.replace(/declare /g, '');
@@ -559,13 +579,6 @@ class TypeScriptLanguageServiceHost {
         this._files = files;
         this._compilerOptions = compilerOptions;
     }
-    // {{SQL CARBON EDIT}} - provide missing methods
-    readFile() {
-        return undefined;
-    }
-    fileExists() {
-        return false;
-    }
     // --- language service host ---------------
     getCompilationSettings() {
         return this._compilerOptions;

build/lib/monaco-api.ts

@@ -178,6 +178,25 @@ function getMassagedTopLevelDeclarationText(ts: typeof import('typescript'), sou
 				// life..
 			}
 		});
+	} else if (declaration.kind === ts.SyntaxKind.VariableStatement) {
+		const jsDoc = result.substr(0, declaration.getLeadingTriviaWidth(sourceFile));
+		if (jsDoc.indexOf('@monacodtsreplace') >= 0) {
+			const jsDocLines = jsDoc.split(/\r\n|\r|\n/);
+			let directives: [RegExp, string][] = [];
+			for (const jsDocLine of jsDocLines) {
+				const m = jsDocLine.match(/^\s*\* \/([^/]+)\/([^/]+)\/$/);
+				if (m) {
+					directives.push([new RegExp(m[1], 'g'), m[2]]);
+				}
+			}
+			// remove the jsdoc
+			result = result.substr(jsDoc.length);
+			if (directives.length > 0) {
+				// apply replace directives
+				const replacer = createReplacerFromDirectives(directives);
+				result = replacer(result);
+			}
+		}
 	}
 	result = result.replace(/export default /g, 'export ');
 	result = result.replace(/export declare /g, 'export ');
@@ -684,14 +703,6 @@ class TypeScriptLanguageServiceHost implements ts.LanguageServiceHost {
 		this._compilerOptions = compilerOptions;
 	}
 
-	// {{SQL CARBON EDIT}} - provide missing methods
-	readFile(): string | undefined {
-		return undefined;
-	}
-	fileExists(): boolean {
-		return false;
-	}
-
 	// --- language service host ---------------
 
 	getCompilationSettings(): ts.CompilerOptions {

build/lib/nls.js

@@ -107,13 +107,6 @@ var _nls;
             this.file = ts.ScriptSnapshot.fromString(contents);
             this.lib = ts.ScriptSnapshot.fromString('');
         }
-        // {{SQL CARBON EDIT}} - provide missing methods
-        readFile() {
-            return undefined;
-        }
-        fileExists() {
-            return false;
-        }
     }
     function isCallExpressionWithinTextSpanCollectStep(ts, textSpan, node) {
         if (!ts.textSpanContainsTextSpan({ start: node.pos, length: node.end - node.pos }, textSpan)) {

build/lib/nls.ts

@@ -155,14 +155,6 @@ module _nls {
 			this.lib = ts.ScriptSnapshot.fromString('');
 		}
 
-		// {{SQL CARBON EDIT}} - provide missing methods
-		readFile(): string | undefined {
-			return undefined;
-		}
-		fileExists(): boolean {
-			return false;
-		}
-
 		getCompilationSettings = () => this.options;
 		getScriptFileNames = () => [this.filename];
 		getScriptVersion = () => '1';

build/lib/optimize.js

@@ -37,7 +37,7 @@ function loaderConfig() {
 }
 exports.loaderConfig = loaderConfig;
 const IS_OUR_COPYRIGHT_REGEXP = /Copyright \(C\) Microsoft Corporation/i;
-function loader(src, bundledFileHeader, bundleLoader, externalLoaderInfo) {
+function loader(src, bundledFileHeader, bundleLoader) {
     let sources = [
         `${src}/vs/loader.js`
     ];
@@ -63,15 +63,6 @@ function loader(src, bundledFileHeader, bundleLoader, externalLoaderInfo) {
         else {
             this.emit('data', data);
         }
-    }, function () {
-        if (externalLoaderInfo !== undefined) {
-            this.emit('data', new VinylFile({
-                path: 'fake2',
-                base: '.',
-                contents: Buffer.from(`require.config(${JSON.stringify(externalLoaderInfo, undefined, 2)});`)
-            }));
-        }
-        this.emit('end');
     }))
         .pipe(concat('vs/loader.js')));
 }
@@ -157,7 +148,7 @@ function optimizeTask(opts) {
             }
             es.readArray(bundleInfoArray).pipe(bundleInfoStream);
         });
-        const result = es.merge(loader(src, bundledFileHeader, bundleLoader, opts.externalLoaderInfo), bundlesStream, resourcesStream, bundleInfoStream);
+        const result = es.merge(loader(src, bundledFileHeader, bundleLoader), bundlesStream, resourcesStream, bundleInfoStream);
         return result
             .pipe(sourcemaps.write('./', {
             sourceRoot: undefined,

build/lib/optimize.ts

@@ -43,7 +43,7 @@ export function loaderConfig() {
 
 const IS_OUR_COPYRIGHT_REGEXP = /Copyright \(C\) Microsoft Corporation/i;
 
-function loader(src: string, bundledFileHeader: string, bundleLoader: boolean, externalLoaderInfo?: any): NodeJS.ReadWriteStream {
+function loader(src: string, bundledFileHeader: string, bundleLoader: boolean): NodeJS.ReadWriteStream {
 	let sources = [
 		`${src}/vs/loader.js`
 	];
@@ -70,15 +70,6 @@ function loader(src: string, bundledFileHeader: string, bundleLoader: boolean, e
 				} else {
 					this.emit('data', data);
 				}
-			}, function () {
-				if (externalLoaderInfo !== undefined) {
-					this.emit('data', new VinylFile({
-						path: 'fake2',
-						base: '.',
-						contents: Buffer.from(`require.config(${JSON.stringify(externalLoaderInfo, undefined, 2)});`)
-					}));
-				}
-				this.emit('end');
 			}))
 			.pipe(concat('vs/loader.js'))
 	);
@@ -144,10 +135,6 @@ export interface IOptimizeTaskOpts {
 	 */
 	resources: string[];
 	loaderConfig: any;
-	/**
-	 * Additional info we append to the end of the loader
-	 */
-	externalLoaderInfo?: any;
 	/**
 	 * (true by default - append css and nls to loader)
 	 */
@@ -226,7 +213,7 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 		});
 
 		const result = es.merge(
-			loader(src, bundledFileHeader, bundleLoader, opts.externalLoaderInfo),
+			loader(src, bundledFileHeader, bundleLoader),
 			bundlesStream,
 			resourcesStream,
 			bundleInfoStream

build/lib/stats.js

@@ -108,7 +108,7 @@ function submitAllStats(productJson, commit) {
                 .setAutoCollectDependencies(false)
                 .setAutoDependencyCorrelation(false)
                 .start();
-            appInsights.defaultClient.config.endpointUrl = 'https://mobile.events.data.microsoft.com/collect/v1';
+            appInsights.defaultClient.config.endpointUrl = 'https://vortex.data.microsoft.com/collect/v1';
             /* __GDPR__
                 "monacoworkbench/packagemetrics" : {
                     "commit" : {"classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },

build/lib/stats.ts

@@ -116,7 +116,7 @@ export function submitAllStats(productJson: any, commit: string): Promise<boolea
 				.setAutoDependencyCorrelation(false)
 				.start();
 
-			appInsights.defaultClient.config.endpointUrl = 'https://mobile.events.data.microsoft.com/collect/v1';
+			appInsights.defaultClient.config.endpointUrl = 'https://vortex.data.microsoft.com/collect/v1';
 
 			/* __GDPR__
 				"monacoworkbench/packagemetrics" : {

build/lib/treeshaking.js

@@ -167,13 +167,6 @@ class TypeScriptLanguageServiceHost {
         this._files = files;
         this._compilerOptions = compilerOptions;
     }
-    // {{SQL CARBON EDIT}} - provide missing methods
-    readFile() {
-        return undefined;
-    }
-    fileExists() {
-        return false;
-    }
     // --- language service host ---------------
     getCompilationSettings() {
         return this._compilerOptions;

build/lib/treeshaking.ts

@@ -245,14 +245,6 @@ class TypeScriptLanguageServiceHost implements ts.LanguageServiceHost {
 		this._compilerOptions = compilerOptions;
 	}
 
-	// {{SQL CARBON EDIT}} - provide missing methods
-	readFile(): string | undefined {
-		return undefined;
-	}
-	fileExists(): boolean {
-		return false;
-	}
-
 	// --- language service host ---------------
 
 	getCompilationSettings(): ts.CompilerOptions {

build/lib/typings/vinyl.d.ts

@@ -47,29 +47,6 @@ declare module "vinyl" {
 		 * Used for relative pathing. Typically where a glob starts.
 		 */
 		public base: string;
-		/**
-		 * Gets and sets the basename of `file.path`.
-		 *
-		 * Throws when `file.path` is not set.
-		 *
-		 * Example:
-		 *
-		 * ```js
-		 * var file = new File({
-		 *   cwd: '/',
-		 *   base: '/test/',
-		 *   path: '/test/file.js'
-		 * });
-		 *
-		 * console.log(file.basename); // file.js
-		 *
-		 * file.basename = 'file.txt';
-		 *
-		 * console.log(file.basename); // file.txt
-		 * console.log(file.path); // /test/file.txt
-		 * ```
-		 */
-		basename: string;
 		/**
 		 * Full path to the file.
 		 */
@@ -128,7 +105,7 @@ declare module "vinyl" {
 	 * This is required as per:
 	 * https://github.com/microsoft/TypeScript/issues/5073
 	 */
-	namespace File { }
+	namespace File {}
 
 	export = File;
 

build/lib/util.js

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildWebNodePaths = exports.createExternalLoaderConfig = exports.acquireWebNodePaths = exports.getElectronVersion = exports.streamToPromise = exports.versionStringToNumber = exports.filter = exports.rebase = exports.getVersion = exports.ensureDir = exports.rreddir = exports.rimraf = exports.rewriteSourceMappingURL = exports.stripSourceMappingURL = exports.loadSourcemaps = exports.cleanNodeModules = exports.skipDirectories = exports.toFileUri = exports.setExecutableBit = exports.fixWin32DirectoryPermissions = exports.incremental = void 0;
+exports.buildWebNodePaths = exports.acquireWebNodePaths = exports.getElectronVersion = exports.streamToPromise = exports.versionStringToNumber = exports.filter = exports.rebase = exports.getVersion = exports.ensureDir = exports.rreddir = exports.rimraf = exports.rewriteSourceMappingURL = exports.stripSourceMappingURL = exports.loadSourcemaps = exports.cleanNodeModules = exports.skipDirectories = exports.toFileUri = exports.setExecutableBit = exports.fixWin32DirectoryPermissions = exports.incremental = void 0;
 const es = require("event-stream");
 const debounce = require("debounce");
 const _filter = require("gulp-filter");
@@ -301,23 +301,6 @@ function acquireWebNodePaths() {
     return nodePaths;
 }
 exports.acquireWebNodePaths = acquireWebNodePaths;
-function createExternalLoaderConfig(webEndpoint, commit, quality) {
-    if (!webEndpoint || !commit || !quality) {
-        return undefined;
-    }
-    webEndpoint = webEndpoint + `/${quality}/${commit}`;
-    let nodePaths = acquireWebNodePaths();
-    Object.keys(nodePaths).map(function (key, _) {
-        nodePaths[key] = `${webEndpoint}/node_modules/${key}/${nodePaths[key]}`;
-    });
-    const externalLoaderConfig = {
-        baseUrl: `${webEndpoint}/out`,
-        recordStats: true,
-        paths: nodePaths
-    };
-    return externalLoaderConfig;
-}
-exports.createExternalLoaderConfig = createExternalLoaderConfig;
 function buildWebNodePaths(outDir) {
     const result = () => new Promise((resolve, _) => {
         const root = path.join(__dirname, '..', '..');

build/lib/util.ts

@@ -345,7 +345,7 @@ export function acquireWebNodePaths() {
 	const root = path.join(__dirname, '..', '..');
 	const webPackageJSON = path.join(root, '/remote/web', 'package.json');
 	const webPackages = JSON.parse(fs.readFileSync(webPackageJSON, 'utf8')).dependencies;
-	const nodePaths: { [key: string]: string } = { };
+	const nodePaths: { [key: string]: string } = {};
 	for (const key of Object.keys(webPackages)) {
 		const packageJSON = path.join(root, 'node_modules', key, 'package.json');
 		const packageData = JSON.parse(fs.readFileSync(packageJSON, 'utf8'));
@@ -366,23 +366,6 @@ export function acquireWebNodePaths() {
 	return nodePaths;
 }
 
-export function createExternalLoaderConfig(webEndpoint?: string, commit?: string, quality?: string) {
-	if (!webEndpoint || !commit || !quality) {
-		return undefined;
-	}
-	webEndpoint = webEndpoint + `/${quality}/${commit}`;
-	let nodePaths = acquireWebNodePaths();
-	Object.keys(nodePaths).map(function (key, _) {
-		nodePaths[key] = `${webEndpoint}/node_modules/${key}/${nodePaths[key]}`;
-	});
-	const externalLoaderConfig = {
-		baseUrl: `${webEndpoint}/out`,
-		recordStats: true,
-		paths: nodePaths
-	};
-	return externalLoaderConfig;
-}
-
 export function buildWebNodePaths(outDir: string) {
 	const result = () => new Promise<void>((resolve, _) => {
 		const root = path.join(__dirname, '..', '..');

build/monaco/ThirdPartyNotices.txt

@@ -35,12 +35,39 @@ END OF nodejs path library NOTICES AND INFORMATION
 
 
 
-%% markedjs NOTICES AND INFORMATION BEGIN HERE
+%% string_scorer version 0.1.20 (https://github.com/joshaven/string_score)
+=========================================
+This software is released under the MIT license:
+
+Copyright (c) Joshaven Potter
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF string_scorer NOTICES AND INFORMATION
+
+
+
+
+%% chjj-marked NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
 
-Copyright (c) 2018+, MarkedJS (https://github.com/markedjs/)
-Copyright (c) 2011-2018, Christopher Jeffrey (https://github.com/chjj/)
+Copyright (c) 2011-2014, Christopher Jeffrey (https://github.com/chjj/)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -60,4 +87,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 =========================================
-END OF markedjs NOTICES AND INFORMATION
+END OF chjj-marked NOTICES AND INFORMATION

build/monaco/api.js

@@ -578,13 +578,6 @@ class TypeScriptLanguageServiceHost {
         this._files = files;
         this._compilerOptions = compilerOptions;
     }
-    // {{SQL CARBON EDIT}} - provide missing methods
-    readFile() {
-        return undefined;
-    }
-    fileExists() {
-        return false;
-    }
     // --- language service host ---------------
     getCompilationSettings() {
         return this._compilerOptions;

build/monaco/api.ts

@@ -699,14 +699,6 @@ class TypeScriptLanguageServiceHost implements ts.LanguageServiceHost {
 		this._compilerOptions = compilerOptions;
 	}
 
-	// {{SQL CARBON EDIT}} - provide missing methods
-	readFile(): string | undefined {
-		return undefined;
-	}
-	fileExists(): boolean {
-		return false;
-	}
-
 	// --- language service host ---------------
 
 	getCompilationSettings(): ts.CompilerOptions {

build/monaco/monaco.d.ts.recipe

@@ -59,7 +59,7 @@ declare namespace monaco.editor {
 #include(vs/editor/standalone/common/standaloneThemeService): BuiltinTheme, IStandaloneThemeData, IColors
 #include(vs/editor/common/modes/supports/tokenization): ITokenThemeRule
 #include(vs/editor/common/services/webWorker): MonacoWebWorker, IWebWorkerOptions
-#include(vs/editor/standalone/browser/standaloneCodeEditor): IActionDescriptor, IGlobalEditorOptions, IStandaloneEditorConstructionOptions, IStandaloneDiffEditorConstructionOptions, IStandaloneCodeEditor, IStandaloneDiffEditor
+#include(vs/editor/standalone/browser/standaloneCodeEditor): IActionDescriptor, IGlobalEditorOptions, IStandaloneEditorConstructionOptions, IDiffEditorConstructionOptions, IStandaloneCodeEditor, IStandaloneDiffEditor
 export interface ICommandHandler {
 	(...args: any[]): void;
 }
@@ -69,7 +69,7 @@ export interface ICommandHandler {
 #include(vs/editor/standalone/browser/colorizer): IColorizerOptions, IColorizerElementOptions
 #include(vs/base/common/scrollable): ScrollbarVisibility
 #include(vs/platform/theme/common/themeService): ThemeColor
-#includeAll(vs/editor/common/model): IScrollEvent
+#includeAll(vs/editor/common/model;LanguageIdentifier=>languages.LanguageIdentifier): IScrollEvent
 #includeAll(vs/editor/common/editorCommon;editorOptions.=>): IScrollEvent
 #includeAll(vs/editor/common/model/textModelEvents):
 #includeAll(vs/editor/common/controller/cursorEvents):

build/monaco/package.json

@@ -1,7 +1,7 @@
 {
   "name": "monaco-editor-core",
   "private": true,
-  "version": "0.29.2",
+  "version": "0.23.0",
   "description": "A browser based code editor",
   "author": "Microsoft Corporation",
   "license": "MIT",

build/npm/preinstall.js

@@ -30,7 +30,7 @@ if (!/yarn[\w-.]*\.js$|yarnpkg$/.test(process.env['npm_execpath'])) {
 
 if (process.platform === 'win32') {
 	if (!hasSupportedVisualStudioVersion()) {
-		console.error('\033[1;31m*** Invalid C/C++ Compiler Toolchain. Please check https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites.\033[0;0m');
+		console.error('\033[1;31m*** Invalid C/C++ Compiler Toolchain. Please check https://github.com/microsoft/vscode/wiki/How-to-Contribute.\033[0;0m');
 		err = true;
 	}
 }

build/package.json

@@ -54,8 +54,7 @@
     "extract-zip": "^2.0.1",
     "fs-extra": "^9.1.0",
     "documentdb": "1.13.0",
-    "got": "11.8.5",
-    "gulp-merge-json": "^2.1.1",
+    "got": "11.8.1",
     "iconv-lite-umd": "0.6.8",
     "jsonc-parser": "^2.3.0",
     "mime": "^1.4.1",
@@ -68,7 +67,7 @@
     "source-map": "0.6.1",
     "tmp": "^0.2.1",
     "typescript": "^4.5.0-dev.20210817",
-    "vsce": "2.8.0",
+    "vsce": "1.48.0",
     "vscode-universal-bundler": "^0.0.2"
   },
   "scripts": {

build/win32/code.iss

@@ -81,9 +81,6 @@ Name: "associatewithfiles"; Description: "{cm:AssociateWithFiles,{#NameLong}}";
 Name: "addtopath"; Description: "{cm:AddToPath}"; GroupDescription: "{cm:Other}"
 Name: "runcode"; Description: "{cm:RunAfter,{#NameShort}}"; GroupDescription: "{cm:Other}"; Check: WizardSilent
 
-[Dirs]
-Name: "{app}"; AfterInstall: DisableAppDirInheritance
-
 [Files]
 Source: "*"; Excludes: "\CodeSignSummary*.md,\tools,\tools\*,\resources\app\product.json"; DestDir: "{code:GetDestDir}"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "tools\*"; DestDir: "{app}\tools"; Flags: ignoreversion
@@ -335,19 +332,3 @@ end;
 #ifdef Debug
   #expr SaveToFile(AddBackslash(SourcePath) + "code-processed.iss")
 #endif
-
-// https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/icacls
-// https://docs.microsoft.com/en-US/windows/security/identity-protection/access-control/security-identifiers
-procedure DisableAppDirInheritance();
-var
-  ResultCode: Integer;
-  Permissions: string;
-begin
-  Permissions := '/grant:r "*S-1-5-18:(OI)(CI)F" /grant:r "*S-1-5-32-544:(OI)(CI)F" /grant:r "*S-1-5-11:(OI)(CI)RX" /grant:r "*S-1-5-32-545:(OI)(CI)RX"';
-
-  #if "user" == InstallTarget
-    Permissions := Permissions + ' /grant:r "*S-1-3-0:(OI)(CI)F"';
-  #endif
-
-  Exec(ExpandConstant('{sys}\icacls.exe'), ExpandConstant('"{app}" /inheritancelevel:r ') + Permissions, '', SW_HIDE, ewWaitUntilTerminated, ResultCode);
-end;

cglicenses.json

@@ -102,6 +102,22 @@
 			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
 		]
 	},
+	{
+		// Reason: Repository lacks license text.
+		// https://github.com/LinusU/load-yaml-file/blob/master/package.json declares MIT.
+		// https://github.com/LinusU/load-yaml-file/issues/2
+		"name": "load-yaml-file",
+		"fullLicenseText": [
+			"MIT License",
+			"Copyright (C) 2012-2018 by various contributors (see AUTHORS)",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
 	{
 		// Reason: Repository lacks license text.
 		// https://github.com/othiym23/emitter-listener/blob/master/package.json declares BSD-2-Clause.

extensions/.eslintrc.json

@@ -1,8 +1,6 @@
 {
 	"rules": {
 		"no-cond-assign": 2,
-		"jsdoc/check-param-names": "error",
-		"@typescript-eslint/explicit-function-return-type": ["error"],
-		"@typescript-eslint/await-thenable": ["error"]
+		"jsdoc/check-param-names": "error"
 	}
 }

extensions/admin-tool-ext-win/package.json

@@ -107,18 +107,18 @@
     ]
   },
   "dependencies": {
-    "@microsoft/ads-extension-telemetry": "^1.2.0",
+    "@microsoft/ads-extension-telemetry": "^1.1.3",
     "@microsoft/ads-service-downloader": "0.2.4",
     "vscode-nls": "^4.1.2"
   },
   "devDependencies": {
-    "@types/mocha": "^7.0.2",
+    "@types/mocha": "^5.2.5",
     "@types/node": "^12.11.7",
-    "mocha": "^7.1.1",
+    "mocha": "^5.2.0",
     "mocha-junit-reporter": "^1.17.0",
     "mocha-multi-reporters": "^1.1.7",
     "should": "^13.2.3",
-    "@microsoft/vscodetestcover": "^1.2.1"
+    "@microsoft/vscodetestcover": "^1.2.0"
   },
   "__metadata": {
     "id": "41",

extensions/admin-tool-ext-win/src/main.ts

@@ -82,7 +82,6 @@ async function handleLaunchSsmsMinGswDialogCommand(connectionContext?: azdata.Ob
 	if (!connectionContext) {
 		TelemetryReporter.sendErrorEvent(TelemetryViews.SsmsMinGsw, 'NoConnectionContext');
 		void vscode.window.showErrorMessage(localize('adminToolExtWin.noConnectionContextForGsw', "No ConnectionContext provided for handleLaunchSsmsMinPropertiesDialogCommand"));
-		return;
 	}
 
 	return launchSsmsDialog(
@@ -102,7 +101,7 @@ async function launchSsmsDialog(action: string, connectionContext: azdata.Object
 		return;
 	}
 
-	let oeNode: azdata.objectexplorer.ObjectExplorerNode | undefined;
+	let oeNode: azdata.objectexplorer.ObjectExplorerNode;
 	// Server node is a Connection node and so doesn't have the NodeInfo
 	if (connectionContext.isConnectionNode) {
 		oeNode = undefined;
@@ -154,11 +153,11 @@ async function launchSsmsDialog(action: string, connectionContext: azdata.Object
 			// Process has exited so remove from map of running processes
 			runningProcesses.delete(proc.pid);
 			const err = stderr.toString();
-			if ((execException?.code !== 0) || err !== '') {
+			if ((execException && execException.code !== 0) || err !== '') {
 				TelemetryReporter.sendErrorEvent(
 					TelemetryViews.SsmsMinDialog,
 					'LaunchSsmsDialogError',
-					execException ? execException?.code?.toString() : '',
+					execException ? execException.code.toString() : '',
 					getTelemetryErrorType(err));
 			}
 
@@ -171,7 +170,7 @@ async function launchSsmsDialog(action: string, connectionContext: azdata.Object
 
 	// If we're not using AAD the tool prompts for a password on stdin
 	if (params.useAad !== true) {
-		proc.stdin!.end(password ? password : '');
+		proc.stdin.end(password ? password : '');
 	}
 
 	// Save the process into our map so we can make sure to stop them if we exit before shutting down