update STS version (#20155)

This reverts commit 70f0e7264b.

.devcontainer/cache/before-cache.sh

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

.devcontainer/cache/cache-diff.sh

@@ -1,12 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env 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 is up, this will be restored into its proper location (which is
+# in the image. Once the codespace / container is up, this will be restored into its proper location.
-# quick and happens parallel to other startup activities)
 
 set -e
 
-SCRIPT_PATH="$(cd "$(dirname $0)" && pwd)"
+SCRIPT_PATH="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
 SOURCE_FOLDER="${1:-"."}"
 CACHE_FOLDER="${2:-"/usr/local/etc/devcontainer-cache"}"
 

.devcontainer/cache/cache.Dockerfile

@@ -1,7 +1,8 @@
-# This dockerfile is used to build up from a base image to create an image with cached results of running "prepare.sh".
+# 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".
 # 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 \
@@ -10,5 +11,12 @@ RUN mkdir /usr/local/etc/devcontainer-cache \
 		cd /repo-source-tmp \
 		&& .devcontainer/cache/before-cache.sh \
 		&& .devcontainer/prepare.sh \
-		&& .devcontainer/cache/cache-diff.sh" \
+		&& .devcontainer/cache/cache-diff.sh"
-	&& rm -rf /repo-source-tmp
+
+# 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/restore-diff.sh

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

.devcontainer/prepare.sh

@@ -1,10 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-# This file contains the steps that should be run when creating the intermediary image that contains
+# This file contains the steps that should be run when building a "cache" image with contents that should be
-# contents for that should be in the image by default. It will be used to build up from the base image
+# layered directly **on top of the source tree** once a dev container is created. This avoids having to run long
-# to create an image that speeds up first time use of the dev container by "caching" the results
+# running commands like "yarn install" from the ground up. Developers (and should) still run these commands
-# of these commands. Developers can still run these commands without an issue once the container is
+# after the actual dev container is created, but only differences will be processed.
-# 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
-**/insane/**
+**/dompurify/**
 **/marked/**
 **/semver/**
 **/test/**/*.js
 **/node_modules/**
-**/vscode-api-tests/testWorkspace/**
+/extensions/**/out/**
-**/vscode-api-tests/testWorkspace2/**
+/extensions/**/build/**
-**/extensions/**/out/**
+/extensions/big-data-cluster/src/bigDataCluster/controller/apiGenerated.ts
-**/extensions/**/build/**
+/extensions/big-data-cluster/src/bigDataCluster/controller/clusterApiGenerated2.ts
-**/big-data-cluster/src/bigDataCluster/controller/apiGenerated.ts
+/extensions/markdown-language-features/media/**
-**/big-data-cluster/src/bigDataCluster/controller/clusterApiGenerated2.ts
+/extensions/markdown-language-features/notebook-out/**
-**/extensions/markdown-language-features/media/**
+/extensions/typescript-basics/test/colorize-fixtures/**
-**/extensions/markdown-language-features/notebook-out/**
+/extensions/**/dist/**
-**/extensions/typescript-basics/test/colorize-fixtures/**
+/extensions/types
-**/extensions/**/dist/**
+/extensions/typescript-language-features/test-workspace/**
-**/extensions/typescript-language-features/test-workspace/**
+/test/automation/out
 
 # 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, the are also no errors in the editor.
+# This ensures that if we add new rules and they pass CI, there are also no errors in the editor.
 /resources/web/code-web.js

.eslintrc.json

@@ -20,6 +20,7 @@
 		"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",
@@ -134,7 +135,7 @@
 				"restrictions": [
 					"vs/nls",
 					"**/{vs,sql}/base/{common,node}/**",
-					"@vscode/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
@@ -176,7 +177,7 @@
 					"vs/nls",
 					"**/{vs,sql}/base/{common,node}/**",
 					"**/{vs,sql}/base/parts/*/{common,node}/**",
-					"@vscode/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
@@ -195,7 +196,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/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
@@ -204,7 +205,7 @@
 					"vs/nls",
 					"**/{vs,sql}/base/{common,node,electron-main}/**",
 					"**/{vs,sql}/base/parts/*/{common,node,electron-main}/**",
-					"@vscode/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
@@ -212,6 +213,8 @@
 				"restrictions": [
 					"vs/nls",
 					"azdata",
+					"mssql",
+					"azurecore",
 					"**/{vs,sql}/base/common/**",
 					"**/{vs,sql}/base/parts/*/common/**",
 					"**/{vs,sql}/platform/*/common/**"
@@ -252,7 +255,7 @@
 					"**/{vs,sql}/base/{common,node}/**",
 					"**/{vs,sql}/base/parts/*/{common,node}/**",
 					"**/{vs,sql}/platform/*/{common,node}/**",
-					"@vscode/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
@@ -274,7 +277,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/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
@@ -285,7 +288,7 @@
 					"**/{vs,sql}/base/{common,node,electron-main}/**",
 					"**/{vs,sql}/base/parts/*/{common,node,electron-main}/**",
 					"**/{vs,sql}/platform/*/{common,node,electron-main}/**",
-					"@vscode/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
@@ -472,6 +475,8 @@
 				"restrictions": [
 					"vscode",
 					"azdata",
+					"mssql",
+					"azurecore",
 					"vs/nls",
 					"**/{vs,sql}/base/common/**",
 					"**/{vs,sql}/platform/*/common/**",
@@ -520,7 +525,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/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
@@ -535,7 +540,7 @@
 					"vs/workbench/contrib/files/browser/editors/fileEditorInput",
 					"**/{vs,sql}/workbench/services/**",
 					"**/{vs,sql}/workbench/test/**",
-					"@vscode/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
@@ -550,6 +555,7 @@
 					"**/{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",
@@ -577,6 +583,8 @@
 					"vs/nls",
 					"vs/css!./**/*",
 					"azdata",
+					"mssql",
+					"azurecore",
 					"vscode",
 					"**/{vs,sql}/base/**/{common,browser,worker}/**",
 					"**/{vs,sql}/platform/**/{common,browser}/**",
@@ -585,6 +593,7 @@
 					"**/{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",
@@ -607,7 +616,7 @@
 					"**/{vs,sql}/workbench/{common,node}/**",
 					"**/{vs,sql}/workbench/api/{common,node}/**",
 					"**/{vs,sql}/workbench/services/**/{common,node}/**",
-					"@vscode/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
@@ -638,7 +647,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/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
@@ -777,7 +786,7 @@
 					"**/{vs,sql}/workbench/api/{common,node}/**",
 					"**/{vs,sql}/workbench/services/**/{common,node}/**",
 					"**/{vs,sql}/workbench/contrib/**/{common,node}/**",
-					"@vscode/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
@@ -810,7 +819,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/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
@@ -833,7 +842,7 @@
 					"**/{vs,sql}/base/parts/**/{common,node}/**",
 					"**/{vs,sql}/platform/**/{common,node}/**",
 					"**/{vs,sql}/code/**/{common,node}/**",
-					"@vscode/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
@@ -845,7 +854,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/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
@@ -856,7 +865,7 @@
 					"**/{vs,sql}/base/parts/**/{common,node,electron-main}/**",
 					"**/{vs,sql}/platform/**/{common,node,electron-main}/**",
 					"**/{vs,sql}/code/**/{common,node,electron-main}/**",
-					"@vscode/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
@@ -868,7 +877,7 @@
 					"**/{vs,sql}/platform/**/{common,node}/**",
 					"**/{vs,sql}/workbench/**/{common,node}/**",
 					"**/{vs,sql}/server/**",
-					"@vscode/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
@@ -939,28 +948,28 @@
 				"target": "**/test/smoke/**",
 				"restrictions": [
 					"**/test/smoke/**",
-					"@vscode/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
 				"target": "**/test/automation/**",
 				"restrictions": [
 					"**/test/automation/**",
-					"@vscode/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
 				"target": "**/test/integration/**",
 				"restrictions": [
 					"**/test/integration/**",
-					"@vscode/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
 				"target": "**/test/monaco/**",
 				"restrictions": [
 					"**/test/monaco/**",
-					"@vscode/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
@@ -980,7 +989,7 @@
 				"target": "**/{node,electron-browser,electron-main}/**/*.test.ts",
 				"restrictions": [
 					"**/{vs,sql}/**",
-					"@vscode/*", "*", // node modules
+					"@vscode/*", "@parcel/*", "*", // node modules
 					"@angular/*" // {{SQL CARBON EDIT}}
 				]
 			},
@@ -988,14 +997,14 @@
 				"target": "**/{node,electron-browser,electron-main}/**/test/**",
 				"restrictions": [
 					"**/{vs,sql}/**",
-					"@vscode/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
 				"target": "**/test/{node,electron-browser,electron-main}/**",
 				"restrictions": [
 					"**/{vs,sql}/**",
-					"@vscode/*", "*" // node modules
+					"@vscode/*", "@parcel/*", "*" // node modules
 				]
 			},
 			{
@@ -1143,6 +1152,7 @@
 				"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/CODEOWNERS

@@ -11,6 +11,7 @@
 /extensions/query-history/ @Charles-Gagnon
 /extensions/resource-deployment/ @Charles-Gagnon
 /extensions/schema-compare/ @kisantia
+/extensions/sql-bindings/ @vasubhog @Charles-Gagnon @lucyzhang929 @chlafreniere @MaddyDev
 /extensions/sql-database-projects/ @Benjin @kisantia
 /extensions/mssql/config.json @Charles-Gagnon @alanrenmsft @kburtram
 

.github/label-actions.yml

@@ -2,8 +2,9 @@
 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.
 
-There are two types of logs to collect:
+Next there are two types of logs to collect:
 
 
 **Console Logs**
@@ -27,6 +28,22 @@ There are two types of logs to collect:
 
 - This will open the log folder locally. Please zip up this folder and attach it to the issue."
 
+# actions for Needs Logs - Azure label
+Needs Logs - Azure:
+  comment: "We need more info to debug your Azure Active Directory 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.
+
+- In the settings menu, find the setting titled `Azure: Logging Level` and select the `Verbose` option
+
+- Run the process that produces your error
+
+- Open command palette (Click **View** -> **Command Palette**)
+
+- Run the command: **`Developer: Open Logs Folder`**
+
+- Follow this path to find the Azure Accounts log file: `[default log folder]/exthost1/output_logging_[earliest timestamp]/#-Azure Acounts.log`
+
+- Please attach the Azure-Accounts.log file to the issue."
+
 # actions for Out of Scope label
 Out of Scope:
   comment: "Thank you for opening this suggestion!  This enhancement is not planned in our

.github/port-labeler.yml

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

.github/subscribers.json

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

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ on:
 jobs:
   windows:
     name: Windows
-    runs-on: windows-latest
+    runs-on: windows-2019
     timeout-minutes: 30
     env:
       CHILD_CONCURRENCY: "1"
@@ -23,7 +23,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
 
       - uses: actions/setup-python@v2
         with:
@@ -101,7 +101,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
       # {{SQL CARBON EDIT}} Skip caching for now
       # - name: Compute node modules cache key
       #   id: nodeModulesCacheKey
@@ -131,12 +131,15 @@ jobs:
           ELECTRON_SKIP_BINARY_DOWNLOAD: 1
         run: yarn --frozen-lockfile --network-timeout 180000
 
+      # 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" playwright-install download-builtin-extensions
+        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
+        env:
+          SQL_NO_INLINE_SOURCEMAP: 1
 
       - name: Run Unit Tests (Electron)
         id: electron-unit-tests
-        run: DISPLAY=:10 ./scripts/test.sh --runGlob "**/sql/**/*.test.js" # {{SQL CARBON EDIT}} Run only our tests with coverage. Disable for now since it's currently broken --coverage
+        run: DISPLAY=:10 ./scripts/test.sh --runGlob "**/sql/**/*.test.js" --coverage
 
       - name: Run Extension Unit Tests (Electron)
         id: electron-extension-unit-tests
@@ -170,7 +173,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
 
       # {{SQL CARBON EDIT}} Skip caching for now
       # - name: Compute node modules cache key
@@ -202,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" playwright-install download-builtin-extensions
+        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
 
       # This is required for keytar unittests, otherwise we hit
       # https://github.com/atom/node-keytar/issues/76
@@ -232,7 +235,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
 
       - name: Compute node modules cache key
         id: nodeModulesCacheKey

.gitignore

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

.vscode/extensions.json

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

.vscode/notebooks/api.github-issues

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

.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-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\""
+    "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\""
   },
   {
     "kind": 1,
@@ -24,6 +24,26 @@
     "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",
@@ -57,7 +77,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE is:issue is:open label:testplan-item"
+    "value": "$REPOS is:issue is:open label:testplan-item"
   },
   {
     "kind": 1,
@@ -67,7 +87,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE is:issue is:closed label:feature-request label:verification-needed -label:verified"
+    "value": "$REPOS $MILESTONE is:issue is:closed label:verification-needed -label:verified"
   },
   {
     "kind": 1,

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

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

.vscode/notebooks/grooming.github-issues

@@ -1,30 +0,0 @@
-[
-  {
-    "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,49 +2,41 @@
   {
     "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\"",
+    "value": "$inbox -label:\"needs more info\" sort:created-asc"
-    "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-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"
+    "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"
   },
   {
     "kind": 1,
@@ -52,7 +52,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE is:issue is:open author:@me label:testplan-item"
+    "value": "$REPOS is:issue is:open author:@me label:testplan-item"
   },
   {
     "kind": 1,
@@ -77,7 +77,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE $MINE is:issue is:open label:testplan-item"
+    "value": "$REPOS $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: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:needs-triage -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: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"
+    "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 "
   },
   {
     "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-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\""
+    "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\""
   },
   {
     "kind": 1,

.vscode/settings.json

@@ -8,8 +8,7 @@
 		"**/.DS_Store": true,
 		"build/**/*.js": {
 			"when": "$(basename).ts"
-		},
+		}
-		"src/vs/server": false
 	},
 	"files.associations": {
 		"cglicenses.json": "jsonc"
@@ -27,8 +26,7 @@
 		"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",
@@ -81,6 +79,8 @@
 		"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,3 +1,4 @@
 disturl "https://electronjs.org/headers"
-target "13.5.0"
+target "13.6.6"
 runtime "electron"
+build_from_source "true"

CHANGELOG.md

@@ -1,37 +1,28 @@
 # Change Log
 
- ## Version 1.34.0
+## Version 1.37.0
-* Release date: December 15, 2021
+* Release date: June 15, 2022
 * Release status: General Availability
 ## What's new in this version
 * New Features:
-    *  Added “Currently restoring backup file” in the migration progress details page of Azure SQL Migration extension when backup files location is Azure Storage blob container
+    *  Backup & Restore - Backup & Restore to URL is now available in preview for Azure SQL Managed Instances.
-    *  Enhancements to diagnostics in Azure SQL Migration extension
+    *  Table Designer - Added API to support computed column capabilities on Table Designer.
-    *  Support for project build with .NET 6 in SQL Database Projects extension
+    *  Table Designer - Can now specify where to add new columns and columns can now be re-arranged by mouse dragging.
-    *  Publish to container in SQL Database Projects extension
+    *  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.
-    *  Undo and redo support for notebook cell-level operations
+    *  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.
-* Extension Updates:
+    *  Query Plan Viewer - Query Plan now comes with improved precision to operator costs for larger plans.
-    *  Azure SQL Migration 
+    *  MongoDB Extension for Azure Cosmos DB (Preview) - This extension introduces support for access to Mongo resources for Cosmos DB.
-    *  Langpacks
-    *  SQL Database Projects
 
 * Bug Fixes:
-    *  Fix for multiple database migrations when using network share as backup files location in Azure SQL Migration extension
+    *  Table Designer - Fixed issue that caused app to not prompt user to save before closing.
-    *  Fix for multiple database migrations when using blob storage containers as backup files location in Azure SQL Migration extension
+    *  Table Designer - Fixed issue that returned empty data set upon attempting to edit the first cell of a new row.
-    *  Fix to pre-populate target database names in the migration wizard in Azure SQL Migration extension
+    *  Table Designer - Improved resize to fit experience when zooming in on user interface as well as tab behavior issues.
-    *  Fix to column sorting in grids where the presence of null values could lead to unexpected results
+    *  Query Plan Viewer - Fixed bug that caused custom zoom level spinner to allow values outside valid range.
-    *  Fix for Python upgrades when two or more notebooks were open
+    *  Schema Compare - Fixed issue with indexes not being added correctly when updating project from database.
- 
+    *  Notebooks - Fixed inconsistencies with notebook cell behavior and toolbars.
-## Version 1.33.1
+    *  Notebooks - Fixed issues with keyboard navigation.
-* Release date: Nov 4, 2021
-* Release status: General Availability
 
-## Hotfix release
-- Fix for [#16535 Unable to See Saved Connections in Restricted Mode](https://github.com/microsoft/azuredatastudio/issues/17535)
-- Fix for [#17579 Can't type in Notebook code cell after editing text cell](https://github.com/microsoft/azuredatastudio/issues/17579)
-
-    
 
 | Platform																|
 | ---------------------------------------	|
@@ -43,31 +34,107 @@
 | [Linux RPM][linux-rpm]									|
 | [Linux DEB][linux-deb]									|
 
-[win-user]: https://go.microsoft.com/fwlink/?linkid=2176805
+[win-user]: https://go.microsoft.com/fwlink/?linkid=2198663
-[win-system]: https://go.microsoft.com/fwlink/?linkid=2175910
+[win-system]: https://go.microsoft.com/fwlink/?linkid=2198878
-[win-zip]: https://go.microsoft.com/fwlink/?linkid=2176806
+[win-zip]: https://go.microsoft.com/fwlink/?linkid=2198664
-[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2176807
+[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2198762
-[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2176505
+[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2198879
-[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2176005
+[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2198880
-[linux-deb]: https://go.microsoft.com/fwlink/?linkid=2176006
+[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
+
+## Version 1.35.1
+* Release date: March 17, 2022
+* Release status: General Availability
+## Hotfix release
+- Fix for [Excel number format #18615](https://github.com/microsoft/azuredatastudio/issues/18615)
+- Fix for [Geometry Data Type Returned as Unknown Charset in Results Grid #18630](https://github.com/microsoft/azuredatastudio/issues/18630)
+
+ ## Version 1.35.0
+* Release date: February 24, 2022
+* 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
+    *  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
+    *  Notebooks - Support for keyboard navigation between cells to minimize mouse clicking
+
+ ## Version 1.34.0
+* Release date: December 15, 2021
+* Release status: General Availability
+## What's new in this version
+* New Features:
+    *  Added “Currently restoring backup file” in the migration progress details page of Azure SQL Migration extension when backup files location is Azure Storage blob container
+    *  Enhancements to diagnostics in Azure SQL Migration extension
+    *  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
+    *  Langpacks
+    *  SQL Database Projects
+
+* Bug Fixes:
+    *  Fix for multiple database migrations when using network share as backup files location in Azure SQL Migration extension
+    *  Fix for multiple database migrations when using blob storage containers as backup files location in Azure SQL Migration extension
+    *  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
+
+## Hotfix release
+- Fix for [#16535 Unable to See Saved Connections in Restricted Mode](https://github.com/microsoft/azuredatastudio/issues/17535)
+- Fix for [#17579 Can't type in Notebook code cell after editing text cell](https://github.com/microsoft/azuredatastudio/issues/17579)
 
 ## Version 1.33.0
 * Release date: October 27, 2021
 * Release status: General Availability
 ## What's new in this version
 * New Notebook Features:
-    *  Notebook Views 
+    *  Notebook Views
-    *  Split cell support 
+    *  Split cell support
-    *  Keyboard shortcuts for Markdown Toolbar Cells 
+    *  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
@@ -83,8 +150,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 
+    * Arc/Az CLI extensions - Azure Arc extension now uses Azure CLI instead of Azure Data CLI for deploying and interacting with Azure Arc
-       instances    
+       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=2183280
+[win-user]: https://go.microsoft.com/fwlink/?linkid=2198663
-[win-system]: https://go.microsoft.com/fwlink/?linkid=2183423
+[win-system]: https://go.microsoft.com/fwlink/?linkid=2198878
-[win-zip]: https://go.microsoft.com/fwlink/?linkid=2183190
+[win-zip]: https://go.microsoft.com/fwlink/?linkid=2198664
-[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2183189
+[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2198762
-[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2183277
+[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2198879
-[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2183342
+[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2198880
-[linux-deb]: https://go.microsoft.com/fwlink/?linkid=2183341
+[linux-deb]: https://go.microsoft.com/fwlink/?linkid=2198763

ThirdPartyNotices.txt

@@ -45,6 +45,7 @@ make-error: https://github.com/JsCommunity/make-error
 mark.js: https://github.com/julmot/mark.js
 minimist: https://github.com/substack/minimist
 moment: https://github.com/moment/moment
+mxgraph: https://github.com/jgraph/mxgraph
 native-keymap: https://github.com/Microsoft/node-native-keymap
 native-watchdog: https://github.com/Microsoft/node-native-watchdog
 ng2-charts: https://github.com/valor-software/ng2-charts
@@ -1538,6 +1539,193 @@ OTHER DEALINGS IN THE SOFTWARE.
 =========================================
 END OF moment NOTICES AND INFORMATION
 
+
+%% mxgraph NOTICES AND INFORMATION BEGIN HERE
+=========================================
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  copyright license to reproduce, prepare Derivative Works of,
+  publicly display, publicly perform, sublicense, and distribute the
+  Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  (except as stated in this section) patent license to make, have made,
+  use, offer to sell, sell, import, and otherwise transfer the Work,
+  where such license applies only to those patent claims licensable
+  by such Contributor that are necessarily infringed by their
+  Contribution(s) alone or by combination of their Contribution(s)
+  with the Work to which such Contribution(s) was submitted. If You
+  institute patent litigation against any entity (including a
+  cross-claim or counterclaim in a lawsuit) alleging that the Work
+  or a Contribution incorporated within the Work constitutes direct
+  or contributory patent infringement, then any patent licenses
+  granted to You under this License for that Work shall terminate
+  as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+  Work or Derivative Works thereof in any medium, with or without
+  modifications, and in Source or Object form, provided that You
+  meet the following conditions:
+
+  (a) You must give any other recipients of the Work or
+      Derivative Works a copy of this License; and
+
+  (b) You must cause any modified files to carry prominent notices
+      stating that You changed the files; and
+
+  (c) You must retain, in the Source form of any Derivative Works
+      that You distribute, all copyright, patent, trademark, and
+      attribution notices from the Source form of the Work,
+      excluding those notices that do not pertain to any part of
+      the Derivative Works; and
+
+  (d) If the Work includes a "NOTICE" text file as part of its
+      distribution, then any Derivative Works that You distribute must
+      include a readable copy of the attribution notices contained
+      within such NOTICE file, excluding those notices that do not
+      pertain to any part of the Derivative Works, in at least one
+      of the following places: within a NOTICE text file distributed
+      as part of the Derivative Works; within the Source form or
+      documentation, if provided along with the Derivative Works; or,
+      within a display generated by the Derivative Works, if and
+      wherever such third-party notices normally appear. The contents
+      of the NOTICE file are for informational purposes only and
+      do not modify the License. You may add Your own attribution
+      notices within Derivative Works that You distribute, alongside
+      or as an addendum to the NOTICE text from the Work, provided
+      that such additional attribution notices cannot be construed
+      as modifying the License.
+
+  (e) Neither the Work nor Derivative Works may be used or form any
+      part of a larger work that integrates or is supposed to be
+      integrated with a product or service owned or marketed by an
+      Atlassian entity, including its successors and assignees in title.
+
+  You may add Your own copyright statement to Your modifications and
+  may provide additional or different license terms and conditions
+  for use, reproduction, or distribution of Your modifications, or
+  for any such Derivative Works as a whole, provided Your use,
+  reproduction, and distribution of the Work otherwise complies with
+  the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+  any Contribution intentionally submitted for inclusion in the Work
+  by You to the Licensor shall be under the terms and conditions of
+  this License, without any additional terms or conditions.
+  Notwithstanding the above, nothing herein shall supersede or modify
+  the terms of any separate license agreement you may have executed
+  with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+  names, trademarks, service marks, or product names of the Licensor,
+  except as required for reasonable and customary use in describing the
+  origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+  agreed to in writing, Licensor provides the Work (and each
+  Contributor provides its Contributions) on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+  implied, including, without limitation, any warranties or conditions
+  of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+  PARTICULAR PURPOSE. You are solely responsible for determining the
+  appropriateness of using or redistributing the Work and assume any
+  risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+  whether in tort (including negligence), contract, or otherwise,
+  unless required by applicable law (such as deliberate and grossly
+  negligent acts) or agreed to in writing, shall any Contributor be
+  liable to You for damages, including any direct, indirect, special,
+  incidental, or consequential damages of any character arising as a
+  result of this License or out of the use or inability to use the
+  Work (including but not limited to damages for loss of goodwill,
+  work stoppage, computer failure or malfunction, or any and all
+  other commercial damages or losses), even if such Contributor
+  has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+  the Work or Derivative Works thereof, You may choose to offer,
+  and charge a fee for, acceptance of support, warranty, indemnity,
+  or other liability obligations and/or rights consistent with this
+  License. However, in accepting such obligations, You may act only
+  on Your own behalf and on Your sole responsibility, not on behalf
+  of any other Contributor, and only if You agree to indemnify,
+  defend, and hold each Contributor harmless for any liability
+  incurred by, or claims asserted against, such Contributor by reason
+  of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+//SEIBERT/MEDIA GmbH, Wiesbaden, Germany is the exclusive licensee of
+JGraph for software products based on this codebase within the Atlassian
+ecosystem of products.
+=========================================
+END OF mxgraph NOTICES AND INFORMATION
+
 %% native-keymap NOTICES AND INFORMATION BEGIN HERE
 =========================================
 Copyright (c) Microsoft Corporation

build/.moduleignore

@@ -110,6 +110,18 @@ 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,8 +13,17 @@ 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 `yarn.lock` files
+// Add `package.json` and `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,8 +18,18 @@ 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 `yarn.lock` files
+// Add `package.json` and `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,20 +30,29 @@ function getPlatform(product, os, arch, type) {
                         case 'user-setup':
                             return `${asset}-user`;
                         default:
-                            throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+                            throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
                     }
                 case 'server':
                     if (arch === 'arm64') {
-                        throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+                        throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
                     }
                     return arch === 'ia32' ? 'server-win32' : `server-win32-${arch}`;
                 case 'web':
                     if (arch === 'arm64') {
-                        throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+                        throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
                     }
                     return arch === 'ia32' ? 'server-win32-web' : `server-win32-${arch}-web`;
                 default:
-                    throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+                    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}`);
             }
         case 'linux':
             switch (type) {
@@ -58,14 +67,14 @@ function getPlatform(product, os, arch, type) {
                         case 'web':
                             return arch === 'standalone' ? 'web-standalone' : `server-linux-${arch}-web`;
                         default:
-                            throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+                            throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
                     }
                 case 'deb-package':
                     return `linux-deb-${arch}`;
                 case 'rpm-package':
                     return `linux-rpm-${arch}`;
                 default:
-                    throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+                    throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
             }
         case 'darwin':
             switch (product) {
@@ -78,14 +87,14 @@ function getPlatform(product, os, arch, type) {
                     return 'server-darwin';
                 case 'web':
                     if (arch !== 'x64') {
-                        throw `What should the platform be?: ${product} ${os} ${arch} ${type}`;
+                        throw new Error(`What should the platform be?: ${product} ${os} ${arch} ${type}`);
                     }
                     return 'server-darwin-web';
                 default:
-                    throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+                    throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
             }
         default:
-            throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+            throw new Error(`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,20 +45,29 @@ function getPlatform(product: string, os: string, arch: string, type: string): s
 						case 'user-setup':
 							return `${asset}-user`;
 						default:
-							throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+							throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
 					}
 				case 'server':
 					if (arch === 'arm64') {
-						throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+						throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
 					}
 					return arch === 'ia32' ? 'server-win32' : `server-win32-${arch}`;
 				case 'web':
 					if (arch === 'arm64') {
-						throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+						throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
 					}
 					return arch === 'ia32' ? 'server-win32-web' : `server-win32-${arch}-web`;
 				default:
-					throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+					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}`);
 			}
 		case 'linux':
 			switch (type) {
@@ -73,14 +82,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 `Unrecognized: ${product} ${os} ${arch} ${type}`;
+							throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
 					}
 				case 'deb-package':
 					return `linux-deb-${arch}`;
 				case 'rpm-package':
 					return `linux-rpm-${arch}`;
 				default:
-					throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+					throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
 			}
 		case 'darwin':
 			switch (product) {
@@ -93,14 +102,14 @@ function getPlatform(product: string, os: string, arch: string, type: string): s
 					return 'server-darwin';
 				case 'web':
 					if (arch !== 'x64') {
-						throw `What should the platform be?: ${product} ${os} ${arch} ${type}`;
+						throw new Error(`What should the platform be?: ${product} ${os} ${arch} ${type}`);
 					}
 					return 'server-darwin-web';
 				default:
-					throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+					throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
 			}
 		default:
-			throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+			throw new Error(`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-core/lib/utils/registry');
+const { installDefaultBrowsersForNpmInstall } = require('playwright/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-core/lib/utils/registry');
+const { installDefaultBrowsersForNpmInstall } = require('playwright/lib/utils/registry');
 
 async function install() {
 	await retry(() => installDefaultBrowsersForNpmInstall());

build/azure-pipelines/common/sign.js

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

build/azure-pipelines/common/sign.ts

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

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

@@ -84,7 +84,6 @@ 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
@@ -224,7 +223,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/logs/smoke-tests
+      yarn smoketest-no-compile --build "$APP_ROOT/$APP_NAME" --screenshots $(Build.SourcesDirectory)/.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'))
@@ -234,7 +233,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/logs/smoke-tests
+      yarn smoketest-no-compile --build "$APP_ROOT/$APP_NAME" --remote --screenshots $(Build.SourcesDirectory)/.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-signing.yml

@@ -17,6 +17,13 @@ steps:
       mv azuredatastudio-darwin-unsigned.zip azuredatastudio-darwin.zip
     displayName: 'Rename the file'
 
+  - task: UseDotNet@2
+    displayName: 'Install .NET Core sdk for signing'
+    inputs:
+      packageType: sdk
+      version: 2.1.x
+      installationPath: $(Agent.ToolsDirectory)/dotnet
+
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
     displayName: 'ESRP CodeSigning'
     inputs:

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

@@ -17,7 +17,7 @@ steps:
 
   - task: NodeTool@0
     inputs:
-      versionSpec: "14.x"
+      versionSpec: "16.x"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
     inputs:
@@ -106,7 +106,7 @@ steps:
 
   - script: |
       set -e
-      ./scripts/test.sh --build --tfs "Unit Tests" # Disable code coverage since it's currently broken --coverage
+      ./scripts/test.sh --build --tfs "Unit Tests" --coverage
     displayName: Run unit tests
     condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
@@ -128,14 +128,24 @@ steps:
       yarn gulp compile-extensions
     displayName: Compile Extensions
 
+  # Per https://developercommunity.visualstudio.com/t/variablesexpressions-dont-work-with-continueonerro/1187733 we can't use variables
+  # in continueOnError directly so instead make two copies of the task and only run one or the other based on the SMOKE_FAIL_ON_ERROR value
   - script: |
       set -e
       APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-x64
       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)
+    displayName: Run smoke tests (Electron) (Continue on Error)
     continueOnError: true
-    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+    condition: and(succeeded(), and(or(eq(variables['RUN_TESTS'], 'true'), eq(variables['RUN_SMOKE_TESTS'], 'true')), ne(variables['SMOKE_FAIL_ON_ERROR'], 'true')))
+
+  - script: |
+      set -e
+      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-x64
+      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')))
 
   # - script: |
   #     set -e
@@ -203,12 +213,12 @@ steps:
     condition: always()
 
   - task: PublishTestResults@2
-    displayName: 'Publish Test Results test-results.xml'
+    displayName: 'Publish Test Results'
     inputs:
-      testResultsFiles: 'test-results.xml'
+      testResultsFiles: "*-results.xml"
-      searchFolder: '$(Build.SourcesDirectory)'
+      searchFolder: "$(Build.ArtifactStagingDirectory)/test-results"
     continueOnError: true
-    condition: and(succeededOrFailed(), eq(variables['RUN_TESTS'], 'true'))
+    condition: and(succeededOrFailed(), or(eq(variables['RUN_TESTS'], 'true'), eq(variables['RUN_SMOKE_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: "14.x"
+      versionSpec: "16.x"
 
   - task: AzureKeyVault@1
     displayName: "Azure Key Vault: Get Secrets"

build/azure-pipelines/docker/Dockerfile

@@ -1,5 +1,5 @@
-#Download base image ubuntu 21.04
+#Download base image ubuntu 22.04
-FROM ubuntu:21.04
+FROM mcr.microsoft.com/mirror/docker/library/ubuntu:22.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: "14.x"
+      versionSpec: "16.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 ubuntu:18.04
+FROM mcr.microsoft.com/mirror/docker/library/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: "14.x"
+      versionSpec: "16.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"
+      imageName: "vscode-linux-build-agent:alpine-$(VSCODE_ARCH)"
       containerCommand: uname
 
   - script: |
@@ -106,15 +106,31 @@ 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 /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-$(VSCODE_ARCH) /root/vscode/build/azure-pipelines/linux/alpine/install-dependencies.sh
     displayName: Prebuild
 
   - script: |
       set -e
-      yarn gulp vscode-reh-linux-alpine-min-ci
+
-      yarn gulp vscode-reh-web-linux-alpine-min-ci
+      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
     displayName: Build
 
   - script: |
@@ -122,7 +138,14 @@ steps:
       REPO="$(pwd)"
       ROOT="$REPO/.."
 
-      PLATFORM_LINUX="linux-alpine"
+      case $VSCODE_ARCH in
+        x64)
+          PLATFORM_LINUX='linux-alpine'
+          ;;
+        arm64)
+          PLATFORM_LINUX='alpine-arm64'
+          ;;
+      esac
 
       # Publish Remote Extension Host
       LEGACY_SERVER_BUILD_NAME="vscode-reh-$PLATFORM_LINUX"
@@ -144,12 +167,23 @@ 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 server archive
+    displayName: Publish x64 server archive
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), eq(variables['VSCODE_ARCH'], 'x64'))
 
   - publish: $(Agent.BuildDirectory)/vscode-server-linux-alpine-web.tar.gz
     artifact: vscode_web_linux_alpine_archive-unsigned
-    displayName: Publish web server archive
+    displayName: Publish x64 web server archive
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), eq(variables['VSCODE_ARCH'], 'x64'))

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

@@ -76,7 +76,6 @@ 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
@@ -91,7 +90,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 -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 -D__NO_INLINE__ -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
 
@@ -212,7 +211,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/logs/smoke-tests
+      yarn smoketest-no-compile --build "$APP_PATH" --electronArgs="--disable-dev-shm-usage --use-gl=swiftshader" --screenshots $(Build.SourcesDirectory)/.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'))
@@ -221,7 +220,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/logs/smoke-tests
+      yarn smoketest-no-compile --build "$APP_PATH" --remote --electronArgs="--disable-dev-shm-usage --use-gl=swiftshader" --screenshots $(Build.SourcesDirectory)/.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: "14.x"
+      versionSpec: "16.x"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
     inputs:
@@ -119,7 +119,7 @@ steps:
 
   - script: |
       set -e
-      DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests" # Disable code coverage since it's currently broken --coverage
+      DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests" --coverage
     displayName: Run unit tests (Electron)
     condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 

build/azure-pipelines/product-build.yml

@@ -6,6 +6,7 @@ schedules:
     branches:
       include:
         - main
+        - joao/web
 
 parameters:
   - name: VSCODE_QUALITY
@@ -45,7 +46,11 @@ parameters:
     type: boolean
     default: true
   - name: VSCODE_BUILD_LINUX_ALPINE
-    displayName: "🎯 Alpine Linux"
+    displayName: "🎯 Alpine Linux x64"
+    type: boolean
+    default: true
+  - name: VSCODE_BUILD_LINUX_ALPINE_ARM64
+    displayName: "🎯 Alpine Linux arm64"
     type: boolean
     default: true
   - name: VSCODE_BUILD_MACOS
@@ -91,7 +96,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_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_LINUX_ALPINE_ARM64, 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
@@ -248,6 +253,15 @@ 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

@@ -6,6 +6,9 @@ trigger:
 
 pr: none
 
+pool:
+  vmImage: ubuntu-latest
+
 steps:
   - task: NodeTool@0
     inputs:
@@ -52,13 +55,13 @@ steps:
       git reset --hard upstream/master
       git push --force
 
-      # Update the type
+      # Update and format the typings file
       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,ESRP-SSL-AADAuth,vscode-storage-key,builds-docdb-key-readwrite"
+          SecretsFilter: "github-distro-mixin-password"
 
       - powershell: |
           . build/azure-pipelines/win32/exec.ps1
@@ -94,7 +94,6 @@ 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
@@ -106,7 +105,6 @@ 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
@@ -155,7 +153,7 @@ stages:
         inputs:
           azureSubscription: "vscode-builds-subscription"
           KeyVaultName: vscode
-          SecretsFilter: "github-distro-mixin-password,ESRP-SSL-AADAuth,vscode-storage-key,builds-docdb-key-readwrite"
+          SecretsFilter: "github-distro-mixin-password"
 
       - script: |
           set -e
@@ -190,7 +188,6 @@ 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-build.yml

@@ -47,7 +47,7 @@ jobs:
   steps:
   - template: linux/sql-product-build-linux.yml
     parameters:
-      extensionsToUnitTest: ["admin-tool-ext-win", "agent", "azcli", "azurecore", "cms", "dacpac", "data-workspace", "import", "machine-learning", "notebook", "resource-deployment", "schema-compare", "sql-database-projects"]
+      extensionsToUnitTest: ["admin-tool-ext-win", "agent", "azcli", "azurecore", "cms", "dacpac", "data-workspace", "import", "machine-learning", "notebook", "resource-deployment", "schema-compare", "sql-bindings", "sql-database-projects"]
   timeoutInMinutes: 90
 
 - job: Windows
@@ -60,16 +60,17 @@ jobs:
   - template: win32/sql-product-build-win32.yml
   timeoutInMinutes: 90
 
-- job: Windows_Test
+# disable due to invalid machine pool (karlb 3/9/2022)
-  condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
+# - job: Windows_Test
-  pool:
+#   condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
-    name: mssqltools
+#   pool:
-  dependsOn:
+#     name: mssqltools
-  - Linux
+#   dependsOn:
-  - Windows
+#   - Linux
-  steps:
+#   - Windows
-  - template: win32/sql-product-test-win32.yml
+#   steps:
-  timeoutInMinutes: 90
+#   - template: win32/sql-product-test-win32.yml
+#   timeoutInMinutes: 90
 
 - job: Release
   condition: and(succeeded(), or(eq(variables['VSCODE_RELEASE'], 'true'), and(eq(variables['VSCODE_QUALITY'], 'insider'), eq(variables['Build.Reason'], 'Schedule'))))
@@ -79,7 +80,8 @@ jobs:
   - macOS
   - Linux
   - Windows
-  - Windows_Test
+# disable due to invalid machine pool (karlb 3/9/2022)
+#  - Windows_Test
   - macOS_Signing
   steps:
   - template: sql-release.yml

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

@@ -1,7 +1,7 @@
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "14.x"
+    versionSpec: "16.x"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
   inputs:
@@ -77,9 +77,11 @@ 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 hygiene eslint valid-layers-check
+    yarn npm-run-all -lp core-ci extensions-ci
+    yarn npm-run-all -lp hygiene eslint valid-layers-check
   displayName: Compile & Hygiene
 
 - script: |
@@ -93,6 +95,7 @@ steps:
     AZURE_STORAGE_ACCESS_KEY="$(sourcemap-storage-key)" \
       node build/azure-pipelines/upload-sourcemaps
   displayName: Upload sourcemaps
+  condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
 - script: |
     set -e

build/azure-pipelines/upload-nlsmetadata.js

@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------------------------
+ *  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

@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 21.04
+#Download base image ubuntu 22.04
-FROM ubuntu:21.04
+FROM mcr.microsoft.com/mirror/docker/library/ubuntu:22.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,6 +119,13 @@ 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: "14.x"
+    versionSpec: "16.x"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
   inputs:
@@ -104,14 +104,26 @@ steps:
     yarn gulp compile-extensions
   displayName: Compile Extensions
 
-- script: |
+# disable smoke tests (karlb 3/2/2022)
-    set -e
+# # Per https://developercommunity.visualstudio.com/t/variablesexpressions-dont-work-with-continueonerro/1187733 we can't use variables
-    node ./node_modules/playwright/install.js
+# # in continueOnError directly so instead make two copies of the task and only run one or the other based on the SMOKE_FAIL_ON_ERROR value
-    APP_ROOT=$(Agent.BuildDirectory)/vscode-reh-web-linux-x64
+# - script: |
-    xvfb-run yarn smoketest --build "$(Agent.BuildDirectory)/vscode-reh-web-linux-x64" --web --headless --screenshots "$(Build.ArtifactStagingDirectory)/smokeshots" --log "$(Build.ArtifactStagingDirectory)/logs/web/smoke.log"
+#     set -e
-  displayName: Run smoke tests (Browser)
+#     node ./node_modules/playwright/install.js
-  continueOnError: true
+#     APP_ROOT=$(Agent.BuildDirectory)/vscode-reh-web-linux-x64
-  condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+#     xvfb-run yarn smoketest --build "$(Agent.BuildDirectory)/vscode-reh-web-linux-x64" --web --headless --screenshots "$(Build.ArtifactStagingDirectory)/smokeshots" --log "$(Build.ArtifactStagingDirectory)/logs/web/smoke.log"
+#   displayName: Run smoke tests (Browser) (Continue on Error)
+#   continueOnError: true
+#   condition: and(succeeded(), and(eq(variables['RUN_TESTS'], 'true'), ne(variables['SMOKE_FAIL_ON_ERROR'], 'true')))
+
+# disable smoke tests (karlb 3/2/2022)
+# - script: |
+#     set -e
+#     node ./node_modules/playwright/install.js
+#     APP_ROOT=$(Agent.BuildDirectory)/vscode-reh-web-linux-x64
+#     xvfb-run yarn smoketest --build "$(Agent.BuildDirectory)/vscode-reh-web-linux-x64" --web --headless --screenshots "$(Build.ArtifactStagingDirectory)/smokeshots" --log "$(Build.ArtifactStagingDirectory)/logs/web/smoke.log"
+#   displayName: Run smoke tests (Browser) (Fail on Error)
+#   condition: and(succeeded(), and(eq(variables['RUN_TESTS'], 'true'), eq(variables['SMOKE_FAIL_ON_ERROR'], 'true')))
 
 # - script: |
 #     set -e

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

@@ -79,7 +79,6 @@ 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:
@@ -104,6 +103,14 @@ 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"
@@ -116,7 +123,6 @@ 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'))
@@ -135,8 +141,8 @@ steps:
       . 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)" "playwright-install" }
+      exec { yarn npm-run-all -lp "playwright-install" }
-    displayName: Download Electron and Playwright
+    displayName: Download Playwright
     condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
   - powershell: |
@@ -200,20 +206,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\logs\smoke-tests }
+      exec { yarn smoketest-no-compile --build "$AppRoot" --screenshots $(Build.SourcesDirectory)\.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: |
+  - powershell: |
-  #     . build/azure-pipelines/win32/exec.ps1
+      . build/azure-pipelines/win32/exec.ps1
-  #     $ErrorActionPreference = "Stop"
+      $ErrorActionPreference = "Stop"
-  #     $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
+      $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
-  #     $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"
+      $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"
-  #     exec { yarn smoketest-no-compile --build "$AppRoot" --remote }
+      exec { yarn smoketest-no-compile --build "$AppRoot" --remote }
-  #   displayName: Run smoke tests (Remote)
+    displayName: Run smoke tests (Remote)
-  #   timeoutInMinutes: 5
+    timeoutInMinutes: 5
-  #   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
@@ -249,7 +255,7 @@ steps:
 
   - task: UseDotNet@2
     inputs:
-      version: 2.x
+      version: 3.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: "14.x"
+      versionSpec: "16.x"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
     inputs:
@@ -103,7 +103,6 @@ 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: "14.x"
+   versionSpec: "16.x"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
   inputs:
@@ -51,7 +51,7 @@ steps:
     $AppNameShort = $AppProductJson.nameShort
     exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; $env:INTEGRATION_TEST_CLI_PATH = "$AppRoot\bin\$AppNameShort"; .\scripts\sql-test-integration.bat }
   continueOnError: false
-  condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+  condition: and(succeeded(), and(eq(variables['RUN_TESTS'], 'true'), ne(variables['RUN_INTEGRATION_TESTS'], 'false')))
   displayName: Run stable tests
   env:
     BDC_BACKEND_USERNAME: $(ads-integration-test-bdc-server-username)
@@ -75,7 +75,7 @@ steps:
     $AppNameShort = $AppProductJson.nameShort
     exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; .\scripts\sql-test-integration-unstable.bat }
   continueOnError: true
-  condition: and(succeeded(), eq(variables['RUN_UNSTABLE_TESTS'], 'true'))
+  condition: and(succeeded(), and(eq(variables['RUN_UNSTABLE_TESTS'], 'true'), ne(variables['RUN_INTEGRATION_TESTS'], 'false')))
   displayName: Run unstable integration tests
   env:
     BDC_BACKEND_USERNAME: $(ads-integration-test-bdc-server-username)
@@ -99,4 +99,4 @@ steps:
     mergeTestResults: true
     failTaskOnFailedTests: true
   continueOnError: true
-  condition: and(succeededOrFailed(), eq(variables['RUN_TESTS'], 'true'))
+  condition: and(succeededOrFailed(), and(eq(variables['RUN_TESTS'], 'true'), ne(variables['RUN_INTEGRATION_TESTS'], 'false')))

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/common/insane/insane.js',
+	'!src/vs/base/browser/dompurify/*',
 	'!src/vs/base/common/marked/marked.js',
 	'!src/vs/base/common/semver/semver.js',
 	'!src/vs/base/node/terminateProcess.sh',
@@ -122,7 +122,8 @@ module.exports.indentationFilter = [
 	'!extensions/simple-browser/media/*.js',
 	'!resources/xlf/LocProject.json',
 	'!build/**/*',
-	'!test/coverage/**'
+	'!test/coverage/**',
+	'!extensions/**/coverage/**'
 ];
 
 module.exports.copyrightFilter = [
@@ -182,6 +183,7 @@ 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',
@@ -207,7 +209,7 @@ module.exports.jsHygieneFilter = [
 	'!src/vs/nls.js',
 	'!src/vs/css.build.js',
 	'!src/vs/nls.build.js',
-	'!src/**/insane.js',
+	'!src/**/dompurify.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 alayze the compilation error`);
+			console.log(`Open in VS Code the folder at '${destPath}' and you can analyze 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,7 +231,10 @@ function toExternalDTS(contents) {
 
 		if (line.indexOf('declare let MonacoEnvironment') === 0) {
 			lines[i] = `declare global {\n    let MonacoEnvironment: Environment | undefined;\n}`;
-			// lines[i] = line.replace('declare namespace monaco.', 'export namespace ');
+		}
+
+		if (line.indexOf('\tMonacoEnvironment?') === 0) {
+			lines[i] = `    MonacoEnvironment?: Environment | undefined;`;
 		}
 	}
 	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/**', 'package.json']
+	ignore: ['**/out/**', '**/node_modules/**', '**/sqltoolsservice/**',  'package.json']
 });
 
 //Run the localization packaging task on all extensions in ADS.

build/gulpfile.hygiene.js

@@ -14,6 +14,10 @@ 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,14 +38,17 @@ const REMOTE_FOLDER = path.join(REPO_ROOT, 'remote');
 // Targets
 
 const BUILD_TARGETS = [
-	{ platform: 'win32', arch: 'ia32', pkgTarget: 'node8-win-x86' },
+	{ platform: 'win32', arch: 'ia32' },
-	{ platform: 'win32', arch: 'x64', pkgTarget: 'node8-win-x64' },
+	{ platform: 'win32', arch: 'x64' },
-	{ platform: 'darwin', arch: null, pkgTarget: 'node8-macos-x64' },
+	{ platform: 'darwin', arch: null },
-	{ platform: 'linux', arch: 'ia32', pkgTarget: 'node8-linux-x86' },
+	{ platform: 'linux', arch: 'ia32' },
-	{ platform: 'linux', arch: 'x64', pkgTarget: 'node8-linux-x64' },
+	{ platform: 'linux', arch: 'x64' },
-	{ platform: 'linux', arch: 'armhf', pkgTarget: 'node8-linux-armv7' },
+	{ platform: 'linux', arch: 'armhf' },
-	{ platform: 'linux', arch: 'arm64', pkgTarget: 'node8-linux-arm64' },
+	{ platform: 'linux', arch: 'arm64' },
-	{ platform: 'linux', arch: 'alpine', pkgTarget: 'node8-linux-alpine' },
+	{ 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' },
 ];
 
 const serverResources = [
@@ -108,10 +111,6 @@ 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']
@@ -186,8 +185,9 @@ function nodejs(platform, arch) {
 			.pipe(rename('node.exe'));
 	}
 
-	if (arch === 'alpine') {
+	if (arch === 'alpine' || platform === 'alpine') {
-		const contents = cp.execSync(`docker run --rm node:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' });
+		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' });
 		return es.readArray([new File({ path: 'node', contents, stat: { mode: parseInt('755', 8) } })]);
 	}
 
@@ -508,32 +508,198 @@ function packagePkgTask(platform, arch, pkgTarget) {
 	});
 });
 
-function mixinServer(watch) {
+function packageTask(type, platform, arch, sourceFolderName, destinationFolderName) {
-	const packageJSONPath = path.join(path.dirname(__dirname), 'package.json');
+	const destination = path.join(BUILD_ROOT, destinationFolderName);
-	function exec(cmdLine) {
+
-		console.log(cmdLine);
+	return () => {
-		cp.execSync(cmdLine, { stdio: 'inherit' });
+		const json = require('gulp-json-editor');
-	}
+
-	function checkout() {
+		const src = gulp.src(sourceFolderName + '/**', { base: '.' })
-		const packageJSON = JSON.parse(fs.readFileSync(packageJSONPath).toString());
+			.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + sourceFolderName), 'out'); }))
-		exec('git fetch distro');
+			.pipe(util.setExecutableBit(['**/*.sh']))
-		exec(`git checkout ${packageJSON['distro']} -- src/vs/server resources/server`);
+			.pipe(filter(['**', '!**/*.js.map']));
-		exec('git reset HEAD src/vs/server resources/server');
+
-	}
+		const workspaceExtensionPoints = ['debuggers', 'jsonValidation'];
-	checkout();
+		const isUIExtension = (manifest) => {
-	if (watch) {
+			switch (manifest.extensionKind) {
-		console.log('Enter watch mode (observing package.json)');
+				case 'ui': return true;
-		const watcher = fs.watch(packageJSONPath);
+				case 'workspace': return false;
-		watcher.addListener('change', () => {
+				default: {
-			try {
+					if (manifest.main) {
-				checkout();
+						return false;
-			} catch (e) {
+					}
-				console.log(e);
+					if (manifest.contributes && Object.keys(manifest.contributes).some(key => workspaceExtensionPoints.indexOf(key) !== -1)) {
+						return false;
+					}
+					// Default is UI Extension
+					return true;
+				}
 			}
-		});
+		};
-	}
+		const localWorkspaceExtensions = glob.sync('extensions/*/package.json')
-	return Promise.resolve();
+			.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));
+	};
 }
 
-gulp.task(task.define('mixin-server', () => mixinServer(false)));
+['reh', 'reh-web'].forEach(type => {
-gulp.task(task.define('mixin-server-watch', () => mixinServer(true)));
+	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);
+		});
+	});
+});

build/gulpfile.sql.js

@@ -129,16 +129,19 @@ gulp.task('package-external-extensions', task.series(
 				const packageManifestPath = path.join(packageDir, 'package.json');
 				const json = require('gulp-json-editor');
 				const packageJsonStream = gulp.src(packageManifestPath) // Create stream for the original package.json
-					.pipe(json(data => { // And now use gulp-json-editor to modify the contents
+					.pipe(json(data => {
+						// And now use gulp-json-editor to modify the contents
 						const updateData = JSON.parse(fs.readFileSync(vscodeManifestFullPath)); // Read in the set of values to replace from package.vscode.json
 						Object.keys(updateData).forEach(key => {
 							data[key] = updateData[key];
 						});
-						// Remove ADS-only menus. This is a subset of the menus listed in https://github.com/microsoft/azuredatastudio/blob/main/src/vs/workbench/api/common/menusExtensionPoint.ts
+						if(data.contributes?.menus){
-						// More can be added to the list as needed.
+							// Remove ADS-only menus. This is a subset of the menus listed in https://github.com/microsoft/azuredatastudio/blob/main/src/vs/workbench/api/common/menusExtensionPoint.ts
-						['objectExplorer/item/context', 'dataExplorer/context', 'dashboard/toolbar'].forEach(menu => {
+							// More can be added to the list as needed.
-							delete data.contributes.menus[menu];
+							['objectExplorer/item/context', 'dataExplorer/context', 'dashboard/toolbar'].forEach(menu => {
-						});
+								delete data.contributes.menus[menu];
+							});
+						}
 						return data;
 					}, { beautify: false }))
 					.pipe(gulp.dest(packageDir));

build/gulpfile.vscode.js

@@ -39,6 +39,8 @@ const vscodeEntryPoints = _.flatten([
 	buildfile.workerExtensionHost,
 	buildfile.workerNotebook,
 	buildfile.workerLanguageDetection,
+	buildfile.workerSharedProcess,
+	buildfile.workerLocalFileSearch,
 	buildfile.workbenchDesktop,
 	buildfile.code
 ]);
@@ -135,6 +137,7 @@ const extensionsFilter = filter([
 	'**/schema-compare.xlf',
 	'**/server-report.xlf',
 	'**/sql-assessment.xlf',
+	'**/sql-bindings.xlf',
 	'**/sql-database-projects.xlf',
 	'**/sql-migration.xlf',
 	'**/xml-language-features.xlf'

build/gulpfile.vscode.web.js

@@ -6,11 +6,212 @@
 '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 noop = () => { return Promise.resolve(); };
+const REPO_ROOT = path.dirname(__dirname);
+const BUILD_ROOT = path.dirname(REPO_ROOT);
+const WEB_FOLDER = path.join(REPO_ROOT, 'remote', 'web');
 
-gulp.task('minify-vscode-web', noop);
+const commit = util.getVersion(REPO_ROOT);
-gulp.task('vscode-web', noop);
+const quality = product.quality;
-gulp.task('vscode-web-min', noop);
+const version = (quality && quality !== 'stable') ? `${packageJson.version}-${quality}` : packageJson.version;
-gulp.task('vscode-web-ci', noop);
+
-gulp.task('vscode-web-min-ci', noop);
+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);
+});

build/gulpfile.vscode.win32.js

@@ -156,9 +156,3 @@ 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,9 +37,19 @@ 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) });
-    if (!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,10 +44,20 @@ function createCompile(src: string, build: boolean, emitError?: boolean) {
 
 	const projectPath = path.join(__dirname, '../../', src, 'tsconfig.json');
 	const overrideOptions = { ...getTypeScriptCompilerOptions(src), inlineSources: Boolean(build) };
-	if (!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) {

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

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

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

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

build/lib/extensions.js

@@ -231,6 +231,7 @@ const externalExtensions = [
     'schema-compare',
     'server-report',
     'sql-assessment',
+    'sql-bindings',
     'sql-database-projects',
     'sql-migration'
 ];

build/lib/extensions.ts

@@ -267,6 +267,7 @@ const externalExtensions = [
 	'schema-compare',
 	'server-report',
 	'sql-assessment',
+	'sql-bindings',
 	'sql-database-projects',
 	'sql-migration'
 ];

build/lib/i18n.resources.json

@@ -102,6 +102,10 @@
 			"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,7 +49,8 @@ const CORE_TYPES = [
     'decode',
     'self',
     'trimLeft',
-    'trimRight'
+    'trimRight',
+    'queueMicrotask'
 ];
 // 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,7 +50,8 @@ const CORE_TYPES = [
 	'decode',
 	'self',
 	'trimLeft',
-	'trimRight'
+	'trimRight',
+	'queueMicrotask'
 ];
 
 // Types that are defined in a common layer but are known to be only

build/lib/locFunc.js

@@ -18,6 +18,13 @@ const File = require("vinyl");
 const rimraf = require("rimraf");
 const gulp = require("gulp");
 const vfs = require("vinyl-fs");
+/**
+ * If you need to compile this file for any changes, please run: yarn tsc -p ./build/tsconfig.json
+ */
+//List of extensions that we changed from vscode, so we can exclude them from having "Microsoft." appended in front.
+const alteredVSCodeExtensions = [
+    'git'
+];
 const root = path.dirname(path.dirname(__dirname));
 // Modified packageLocalExtensionsStream from extensions.ts, but for langpacks.
 function packageLangpacksStream() {
@@ -134,10 +141,13 @@ function modifyI18nPackFiles(existingTranslationFolder, resultingTranslationPath
             for (let extension in extensionsPacks) {
                 const translatedExtFile = i18n.createI18nFile(`extensions/${extension}`, extensionsPacks[extension]);
                 this.queue(translatedExtFile);
-                //handle edge case for 'Microsoft.sqlservernotebook' where extension name is the same as extension ID.
+                // exclude altered vscode extensions from having a new path even if we provide a new I18n file.
-                //(Other extensions need to have publisher appended in front as their ID.)
+                if (alteredVSCodeExtensions.indexOf(extension) === -1) {
-                const adsExtensionId = (extension === 'Microsoft.sqlservernotebook') ? extension : 'Microsoft.' + extension;
+                    //handle edge case for 'Microsoft.sqlservernotebook' where extension name is the same as extension ID.
-                resultingTranslationPaths.push({ id: adsExtensionId, resourceName: `extensions/${extension}.i18n.json` });
+                    //(Other extensions need to have publisher appended in front as their ID.)
+                    let adsExtensionId = (extension === 'Microsoft.sqlservernotebook') ? extension : 'Microsoft.' + extension;
+                    resultingTranslationPaths.push({ id: adsExtensionId, resourceName: `extensions/${extension}.i18n.json` });
+                }
             }
             this.queue(null);
         })
@@ -162,7 +172,6 @@ const VSCODEExtensions = [
     "bat",
     "configuration-editing",
     "docker",
-    "extension-editing",
     "git-ui",
     "git",
     "github-authentication",

build/lib/locFunc.ts

@@ -17,6 +17,15 @@ import * as rimraf from 'rimraf';
 import * as gulp from 'gulp';
 import * as vfs from 'vinyl-fs';
 
+/**
+ * If you need to compile this file for any changes, please run: yarn tsc -p ./build/tsconfig.json
+ */
+
+//List of extensions that we changed from vscode, so we can exclude them from having "Microsoft." appended in front.
+const alteredVSCodeExtensions = [
+	'git'
+]
+
 const root = path.dirname(path.dirname(__dirname));
 
 // Modified packageLocalExtensionsStream from extensions.ts, but for langpacks.
@@ -68,7 +77,7 @@ function updateMainI18nFile(existingTranslationFilePath: string, originalFilePat
 
 	// Delete any SQL strings that are no longer part of ADS in current langpack.
 	for (let contentKey of Object.keys(objectContents)) {
-		if(contentKey.startsWith('sql') && messages.contents[contentKey] === undefined){
+		if (contentKey.startsWith('sql') && messages.contents[contentKey] === undefined) {
 			delete objectContents[`${contentKey}`]
 		}
 	}
@@ -148,10 +157,14 @@ export function modifyI18nPackFiles(existingTranslationFolder: string, resulting
 					const translatedExtFile = i18n.createI18nFile(`extensions/${extension}`, extensionsPacks[extension]);
 					this.queue(translatedExtFile);
 
-					//handle edge case for 'Microsoft.sqlservernotebook' where extension name is the same as extension ID.
+					// exclude altered vscode extensions from having a new path even if we provide a new I18n file.
-					//(Other extensions need to have publisher appended in front as their ID.)
+					if (alteredVSCodeExtensions.indexOf(extension) === -1) {
-					const adsExtensionId = (extension === 'Microsoft.sqlservernotebook') ? extension : 'Microsoft.' + extension;
+						//handle edge case for 'Microsoft.sqlservernotebook' where extension name is the same as extension ID.
-					resultingTranslationPaths.push({ id: adsExtensionId, resourceName: `extensions/${extension}.i18n.json` });
+						//(Other extensions need to have publisher appended in front as their ID.)
+						let adsExtensionId = (extension === 'Microsoft.sqlservernotebook') ? extension : 'Microsoft.' + extension;
+
+						resultingTranslationPaths.push({ id: adsExtensionId, resourceName: `extensions/${extension}.i18n.json` });
+					}
 				}
 				this.queue(null);
 			})
@@ -399,7 +412,7 @@ export function renameVscodeLangpacks(): Promise<void> {
 
 		//Copy files to vscode langpack, then remove the ADS langpack, and finally rename the vscode langpack to match the ADS one.
 		globMDArray.forEach(element => {
-			fs.copyFileSync(element, path.join(locVSCODEFolder,path.parse(element).base));
+			fs.copyFileSync(element, path.join(locVSCODEFolder, path.parse(element).base));
 		});
 		rimraf.sync(locADSFolder);
 		fs.renameSync(locVSCODEFolder, locADSFolder);

build/lib/monaco-api.js

@@ -149,26 +149,6 @@ 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, '');
@@ -579,6 +559,13 @@ 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,25 +178,6 @@ 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 ');
@@ -703,6 +684,14 @@ 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,6 +107,13 @@ 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,6 +155,14 @@ 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) {
+function loader(src, bundledFileHeader, bundleLoader, externalLoaderInfo) {
     let sources = [
         `${src}/vs/loader.js`
     ];
@@ -63,6 +63,15 @@ function loader(src, bundledFileHeader, bundleLoader) {
         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')));
 }
@@ -148,7 +157,7 @@ function optimizeTask(opts) {
             }
             es.readArray(bundleInfoArray).pipe(bundleInfoStream);
         });
-        const result = es.merge(loader(src, bundledFileHeader, bundleLoader), bundlesStream, resourcesStream, bundleInfoStream);
+        const result = es.merge(loader(src, bundledFileHeader, bundleLoader, opts.externalLoaderInfo), 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): NodeJS.ReadWriteStream {
+function loader(src: string, bundledFileHeader: string, bundleLoader: boolean, externalLoaderInfo?: any): NodeJS.ReadWriteStream {
 	let sources = [
 		`${src}/vs/loader.js`
 	];
@@ -70,6 +70,15 @@ function loader(src: string, bundledFileHeader: string, bundleLoader: boolean):
 				} 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'))
 	);
@@ -135,6 +144,10 @@ 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)
 	 */
@@ -213,7 +226,7 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 		});
 
 		const result = es.merge(
-			loader(src, bundledFileHeader, bundleLoader),
+			loader(src, bundledFileHeader, bundleLoader, opts.externalLoaderInfo),
 			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://vortex.data.microsoft.com/collect/v1';
+            appInsights.defaultClient.config.endpointUrl = 'https://mobile.events.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://vortex.data.microsoft.com/collect/v1';
+			appInsights.defaultClient.config.endpointUrl = 'https://mobile.events.data.microsoft.com/collect/v1';
 
 			/* __GDPR__
 				"monacoworkbench/packagemetrics" : {

build/lib/treeshaking.js

@@ -167,6 +167,13 @@ 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,6 +245,14 @@ 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,6 +47,29 @@ 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.
 		 */
@@ -105,7 +128,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.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.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;
 const es = require("event-stream");
 const debounce = require("debounce");
 const _filter = require("gulp-filter");
@@ -301,6 +301,23 @@ 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,6 +366,23 @@ 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,39 +35,12 @@ END OF nodejs path library NOTICES AND INFORMATION
 
 
 
-%% string_scorer version 0.1.20 (https://github.com/joshaven/string_score)
+%% markedjs NOTICES AND INFORMATION BEGIN HERE
-=========================================
-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) 2011-2014, Christopher Jeffrey (https://github.com/chjj/)
+Copyright (c) 2018+, MarkedJS (https://github.com/markedjs/)
+Copyright (c) 2011-2018, 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
@@ -87,4 +60,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 chjj-marked NOTICES AND INFORMATION
+END OF markedjs NOTICES AND INFORMATION

build/monaco/api.js

@@ -578,6 +578,13 @@ 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,6 +699,14 @@ 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, IDiffEditorConstructionOptions, IStandaloneCodeEditor, IStandaloneDiffEditor
+#include(vs/editor/standalone/browser/standaloneCodeEditor): IActionDescriptor, IGlobalEditorOptions, IStandaloneEditorConstructionOptions, IStandaloneDiffEditorConstructionOptions, 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;LanguageIdentifier=>languages.LanguageIdentifier): IScrollEvent
+#includeAll(vs/editor/common/model): IScrollEvent
 #includeAll(vs/editor/common/editorCommon;editorOptions.=>): IScrollEvent
 #includeAll(vs/editor/common/model/textModelEvents):
 #includeAll(vs/editor/common/controller/cursorEvents):