Fix Notebook Viewlet Highlighting (#10868) (#10870)

* Stop double tree data provider registrations

* revert book finding logic, leverage currentBook

.config/CredScanSuppressions.json

@@ -12,10 +12,6 @@
         {
             "file": "build\\actions\\AutoMerge\\dist\\index.js",
             "_justification": "False positive from webpacked code"
-        },
-        {
-          "file": ".devcontainer\\devcontainer.json",
-          "_justification": "Local development environment - not used in production"
         }
     ]
 }

.devcontainer/README.md

@@ -1,100 +0,0 @@
-# Code - OSS Development Container
-
-This repository includes configuration for a development container for working with Code - OSS in an isolated local container or using [GitHub Codespaces](https://github.com/features/codespaces).
-
-> **Tip:** The default VNC password is `vscode`. The VNC server runs on port `5901` with a web client at `6080`. For better performance, we recommend using a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/). Applications like the macOS Screen Sharing app will not perform as well.
-
-## Quick start - local
-
-1. Install Docker Desktop or Docker for Linux on your local machine. (See [docs](https://aka.ms/vscode-remote/containers/getting-started) for additional details.)
-
-2. **Important**: Docker needs at least **4 Cores and 6 GB of RAM (8 GB recommended)** to run full build. If you on macOS, or using the old Hyper-V engine for Windows, update these values for Docker Desktop by right-clicking on the Docker status bar item, going to **Preferences/Settings > Resources > Advanced**.
-
-    > **Note:** The [Resource Monitor](https://marketplace.visualstudio.com/items?itemName=mutantdino.resourcemonitor) extension is included in the container so you can keep an eye on CPU/Memory in the status bar.
-
-3. Install [Visual Studio Code Stable](https://code.visualstudio.com/) or [Insiders](https://code.visualstudio.com/insiders/) and the [Remote - Containers](https://aka.ms/vscode-remote/download/containers) extension.
-
-    ![Image of Remote - Containers extension](https://microsoft.github.io/vscode-remote-release/images/remote-containers-extn.png)
-
-    > Note that the Remote - Containers extension requires the Visual Studio Code distribution of Code - OSS. See the [FAQ](https://aka.ms/vscode-remote/faq/license) for details.
-
-4. Press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> and select **Remote - Containers: Open Repository in Container...**.
-
-    > **Tip:** While you can use your local source tree instead, operations like `yarn install` can be slow on macOS or using the Hyper-V engine on Windows. We recommend the "open repository" approach instead since it uses "named volume" rather than the local filesystem.
-
-5. Type `https://github.com/microsoft/vscode` (or a branch or PR URL) in the input box and press <kbd>Enter</kbd>.
-
-6. After the container is running, open a web browser and go to [http://localhost:6080](http://localhost:6080) or use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password.
-
-Anything you start in VS Code or the integrated terminal will appear here.
-
-Next: **[Try it out!](#try-it)**
-
-## Quick start - GitHub Codespaces
-
-> **IMPORTANT:** The current free user beta for GitHub Codespaces uses a "Basic" sized codespace which does not have enough RAM to run a full build of VS Code and will be considerably slower during codespace start and running VS Code. You'll soon be able to use a "Standard" sized codespace (4-core, 8GB) that will be better suited for this purpose (along with even larger sizes should you need it).
-
-1. From the [microsoft/vscode GitHub repository](https://github.com/microsoft/vscode), click on the **Code** dropdown, select **Open with Codespaces**, and the **New codespace**
-
-    > Note that you will not see these options if you are not in the beta yet.
-
-2. After the codespace is up and running in your browser, press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> and select **View: Show Remote Explorer**.
-
-3. You should see port `6080` under **Forwarded Ports**. Select the line and click on the globe icon to open it in a browser tab.
-
-    > If you do not see port `6080`, press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd>, select **Forward a Port** and enter port `6080`.
-
-4. In the new tab, you should see noVNC. Click **Connect** and enter `vscode` as the password.
-
-Anything you start in VS Code or the integrated terminal will appear here.
-
-Next: **[Try it out!](#try-it)**
-
-### Using VS Code with GitHub Codespaces
-
-You will likely see better performance when accessing the codespace you created from VS Code since you can use a[VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/). Here's how to do it.
-
-1. [Create a codespace](#quick-start---github-codespaces) if you have not already.
-
-2. Set up [VS Code for use with GitHub Codespaces](https://docs.github.com/github/developing-online-with-codespaces/using-codespaces-in-visual-studio-code)
-
-3. After the VS Code is up and running, press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd>, choose **Codespaces: Connect to Codespace**, and select the codespace you created.
-
-4. After you've connected to the codespace, use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password.
-
-5. Anything you start in VS Code or the integrated terminal will appear here.
-
-Next: **[Try it out!](#try-it)**
-
-## Try it!
-
-This container uses the [Fluxbox](http://fluxbox.org/) window manager to keep things lean. **Right-click on the desktop** to see menu options. It works with GNOME and GTK applications, so other tools can be installed if needed.
-
-Note you can also set the resolution from the command line by typing `set-resolution`.
-
-To start working with Code - OSS, follow these steps:
-
-1. In your local VS Code, open a terminal (<kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>\`</kbd>) and type the following commands:
-
-    ```bash
-    yarn install
-    bash scripts/code.sh
-    ```
-
-    Note that a previous run of `yarn install`  will already be cached, so this step should simply pick up any recent differences.
-
-2. After the build is complete, open a web browser or a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to the desktop environnement as described in the quick start and enter `vscode` as the password.
-
-3. You should now see Code - OSS!
-
-Next, let's try debugging.
-
-1. Shut down Code - OSS by clicking the box in the upper right corner of the Code - OSS window through your browser or VNC viewer.
-
-2. Go to your local VS Code client, and use Run / Debug view to launch the **VS Code** configuration. (Typically the default, so you can likely just press <kbd>F5</kbd>).
-
-    > **Note:** If launching times out, you can increase the value of `timeout` in the "VS Code", "Attach Main Process", "Attach Extension Host", and "Attach to Shared Process" configurations in [launch.json](../.vscode/launch.json). However, running `scripts/code.sh` first will set up Electron which will usually solve timeout issues.
-
-3. After a bit, Code - OSS will appear with the debugger attached!
-
-Enjoy!

.devcontainer/cache/.gitignore

@@ -1 +0,0 @@
-*.manifest

.devcontainer/cache/before-cache.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# This file establishes a basline for the reposuitory before any steps in the "prepare.sh"
-# are run. Its just a find command that filters out a few things we don't need to watch.
-
-set -e
-
-SCRIPT_PATH="$(cd "$(dirname $0)" && pwd)"
-SOURCE_FOLDER="${1:-"."}"
-
-cd "${SOURCE_FOLDER}"
-echo "[$(date)] Generating ""before"" manifest..."
-find -L . -not -path "*/.git/*" -and -not -path "${SCRIPT_PATH}/*.manifest" -type f >  "${SCRIPT_PATH}/before.manifest"
-echo "[$(date)] Done!"
-

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

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-# This file simply wraps the dockeer build command used to build the image with the
-# cached result of the commands from "prepare.sh" and pushes it to the specified
-# container image registry.
-
-set -e
-
-SCRIPT_PATH="$(cd "$(dirname $0)" && pwd)"
-CONTAINER_IMAGE_REPOSITORY="$1"
-BRANCH="${2:-"master"}"
-
-if [ "${CONTAINER_IMAGE_REPOSITORY}" = "" ]; then
-	echo "Container repository not specified!"
-	exit 1
-fi
-
-TAG="branch-${BRANCH//\//-}"
-echo "[$(date)] ${BRANCH} => ${TAG}"
-cd "${SCRIPT_PATH}/../.."
-
-echo "[$(date)] Starting image build..."
-docker build -t ${CONTAINER_IMAGE_REPOSITORY}:"${TAG}" -f "${SCRIPT_PATH}/cache.Dockerfile" .
-echo "[$(date)] Image build complete."
-
-echo "[$(date)] Pushing image..."
-docker push ${CONTAINER_IMAGE_REPOSITORY}:"${TAG}"
-echo "[$(date)] Done!"

.devcontainer/cache/cache-diff.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# This file is used to archive off a copy of any differences in the source tree into another location
-# in the image. Once the codespace is up, this will be restored into its proper location (which is
-# quick and happens parallel to other startup activities)
-
-set -e
-
-SCRIPT_PATH="$(cd "$(dirname $0)" && pwd)"
-SOURCE_FOLDER="${1:-"."}"
-CACHE_FOLDER="${2:-"/usr/local/etc/devcontainer-cache"}"
-
-echo "[$(date)] Starting cache operation..."
-cd "${SOURCE_FOLDER}"
-echo "[$(date)] Determining diffs..."
-find -L . -not -path "*/.git/*" -and -not -path "${SCRIPT_PATH}/*.manifest" -type f > "${SCRIPT_PATH}/after.manifest"
-grep -Fxvf  "${SCRIPT_PATH}/before.manifest" "${SCRIPT_PATH}/after.manifest" > "${SCRIPT_PATH}/cache.manifest"
-echo "[$(date)] Archiving diffs..."
-mkdir -p "${CACHE_FOLDER}"
-tar -cf "${CACHE_FOLDER}/cache.tar" --totals --files-from "${SCRIPT_PATH}/cache.manifest"
-echo "[$(date)] Done! $(du -h "${CACHE_FOLDER}/cache.tar")"

.devcontainer/cache/cache.Dockerfile

@@ -1,14 +0,0 @@
-# This dockerfile is used to build up from a base image to create an image with cached results of running "prepare.sh".
-# Other image contents: https://github.com/microsoft/vscode-dev-containers/blob/master/repository-containers/images/github.com/microsoft/vscode/.devcontainer/base.Dockerfile
-FROM mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:dev
-
-ARG USERNAME=node
-COPY --chown=${USERNAME}:${USERNAME} . /repo-source-tmp/
-RUN mkdir /usr/local/etc/devcontainer-cache \
-	&& chown ${USERNAME} /usr/local/etc/devcontainer-cache /repo-source-tmp \
-	&& su ${USERNAME} -c "\
-		cd /repo-source-tmp \
-		&& .devcontainer/cache/before-cache.sh \
-		&& .devcontainer/prepare.sh \
-		&& .devcontainer/cache/cache-diff.sh" \
-	&& rm -rf /repo-source-tmp

.devcontainer/cache/restore-diff.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# This file restores the results of the "prepare.sh" into their proper locations
-# once the container has been created. It runs as a postCreateCommand which
-# in GitHub Codespaces occurs parallel to other startup activities and does not
-# really add to the overal startup time given how quick the operation ends up being.
-
-set -e
-
-SOURCE_FOLDER="$(cd "${1:-"."}" && pwd)"
-CACHE_FOLDER="${2:-"/usr/local/etc/devcontainer-cache"}"
-
-if [ ! -d "${CACHE_FOLDER}" ]; then
-	echo "No cache folder found."
-	exit 0
-fi
-
-echo "[$(date)] Expanding $(du -h "${CACHE_FOLDER}/cache.tar") file to ${SOURCE_FOLDER}..."
-cd "${SOURCE_FOLDER}"
-tar -xf "${CACHE_FOLDER}/cache.tar"
-rm -f "${CACHE_FOLDER}/cache.tar"
-echo "[$(date)] Done!"
-

.devcontainer/devcontainer.json

@@ -1,30 +0,0 @@
-{
-	"name": "Code - OSS",
-
-	// Image contents: https://github.com/microsoft/vscode-dev-containers/blob/master/repository-containers/images/github.com/microsoft/vscode/.devcontainer/base.Dockerfile
-	"image": "mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:branch-master",
-
-	"workspaceMount": "source=${localWorkspaceFolder},target=/home/node/workspace/vscode,type=bind,consistency=cached",
-	"workspaceFolder": "/home/node/workspace/vscode",
-	"overrideCommand": false,
-	"runArgs": [ "--init", "--security-opt", "seccomp=unconfined"],
-
-	"settings": {
-		"terminal.integrated.shell.linux": "/bin/bash",
-		"resmon.show.battery": false,
-		"resmon.show.cpufreq": false
-	},
-
-	// noVNC, VNC, debug ports
-	"forwardPorts": [6080, 5901, 9222],
-
-	"extensions": [
-		"dbaeumer.vscode-eslint",
-		"mutantdino.resourcemonitor"
-	],
-
-	// Optionally loads a cached yarn install for the repo
-	"postCreateCommand": ".devcontainer/cache/restore-diff.sh",
-
-	"remoteUser": "node"
-}

.devcontainer/prepare.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# This file contains the steps that should be run when creating the intermediary image that contains
-# contents for that should be in the image by default. It will be used to build up from the base image
-# to create an image that speeds up first time use of the dev container by "caching" the results
-# of these commands. Developers can still run these commands without an issue once the container is
-# up, but only differences will be processed which also speeds up the first time these operations occur.
-
-yarn install
-yarn electron

.eslintignore

@@ -5,7 +5,6 @@
 **/vs/loader.js
 **/insane/**
 **/marked/**
-**/semver/**
 **/test/**/*.js
 **/node_modules/**
 **/vscode-api-tests/testWorkspace/**

.eslintrc.json

@@ -7,8 +7,7 @@
     },
     "plugins": [
         "@typescript-eslint",
-        "jsdoc",
+        "jsdoc"
-        "mocha"
     ],
     "rules": {
         "constructor-super": "warn",
@@ -42,17 +41,8 @@
         "no-var": "warn",
         "jsdoc/no-types": "warn",
         "semi": "off",
-        "mocha/no-exclusive-tests": "warn",
         "@typescript-eslint/semi": "warn",
-        "@typescript-eslint/naming-convention": [
+        "@typescript-eslint/class-name-casing": "warn",
-            "warn",
-            {
-                "selector": "class",
-                "format": [
-                    "PascalCase"
-                ]
-            }
-        ],
         "code-no-unused-expressions": [
             "warn",
             {
@@ -73,18 +63,13 @@
                 "browser": [
                     "common"
                 ],
-                "electron-sandbox": [
+                "electron-main": [
                     "common",
-                    "browser"
+                    "node"
                 ],
                 "electron-browser": [
                     "common",
                     "browser",
-                    "node",
-                    "electron-sandbox"
-                ],
-                "electron-main": [
-                    "common",
                     "node"
                 ]
             }
@@ -121,14 +106,6 @@
                     "rxjs/*"
                 ]
             },
-            {
-                "target": "**/{vs,sql}/base/electron-sandbox/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/{vs,sql}/base/{common,browser,electron-sandbox}/**"
-                ]
-            },
             {
                 "target": "**/{vs,sql}/base/node/**",
                 "restrictions": [
@@ -178,22 +155,13 @@
                     "*" // node modules
                 ]
             },
-            {
-                "target": "**/{vs,sql}/base/parts/*/electron-sandbox/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/{vs,sql}/base/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/base/parts/*/{common,browser,electron-sandbox}/**"
-                ]
-            },
             {
                 "target": "**/{vs,sql}/base/parts/*/electron-browser/**",
                 "restrictions": [
                     "vs/nls",
                     "vs/css!./**/*",
-                    "**/{vs,sql}/base/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/base/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/base/parts/*/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**",
                     "*" // node modules
                 ]
             },
@@ -223,10 +191,10 @@
                     "typemoq",
                     "sinon",
                     "vs/nls",
-                    "azdata",
+					"azdata",
                     "**/{vs,sql}/base/common/**",
-                    "**/{vs,sql}/base/parts/*/common/**",
                     "**/{vs,sql}/base/test/common/**",
+                    "**/{vs,sql}/base/parts/*/common/**",
                     "**/{vs,sql}/platform/*/common/**",
                     "**/{vs,sql}/platform/*/test/common/**"
                 ]
@@ -253,25 +221,15 @@
                     "*" // node modules
                 ]
             },
-            {
-                "target": "**/{vs,sql}/platform/*/electron-sandbox/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/{vs,sql}/base/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/base/parts/*/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/platform/*/{common,browser,electron-sandbox}/**"
-                ]
-            },
             {
                 "target": "**/{vs,sql}/platform/*/electron-browser/**",
                 "restrictions": [
                     "vs/nls",
                     "azdata",
                     "vs/css!./**/*",
-                    "**/{vs,sql}/base/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/base/{common,browser,node}/**",
-                    "**/{vs,sql}/base/parts/*/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/platform/*/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/platform/*/{common,browser,node,electron-browser}/**",
                     "*" // node modules
                 ]
             },
@@ -484,34 +442,18 @@
                     "**/{vs,sql}/**/{common,worker}/**"
                 ]
             },
-            {
-                "target": "**/{vs,sql}/workbench/electron-sandbox/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/{vs,sql}/base/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/base/parts/*/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/platform/*/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/editor/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention
-                    "**/{vs,sql}/workbench/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/workbench/api/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/workbench/services/*/{common,browser,electron-sandbox}/**"
-                ]
-            },
             {
                 "target": "**/{vs,sql}/workbench/electron-browser/**",
                 "restrictions": [
                     "vs/nls",
                     "vs/css!./**/*",
-                    "**/{vs,sql}/base/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/base/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/base/parts/*/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/platform/*/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/platform/*/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/editor/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/editor/{common,browser,node,electron-browser}/**",
                     "**/{vs,sql}/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention
-                    "**/{vs,sql}/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/workbench/{common,browser,node,electron-browser,api}/**",
-                    "**/{vs,sql}/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/workbench/services/*/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/workbench/services/*/{common,browser,node,electron-sandbox,electron-browser}/**",
                     "*" // node modules
                 ]
             },
@@ -523,7 +465,7 @@
                     "**/{vs,sql}/base/**",
                     "**/{vs,sql}/platform/**",
                     "**/{vs,sql}/editor/**",
-                    "**/{vs,sql}/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/workbench/{common,browser,node,electron-browser}/**",
                     "vs/workbench/contrib/files/common/editors/fileEditorInput",
                     "**/{vs,sql}/workbench/services/**",
                     "**/{vs,sql}/workbench/test/**",
@@ -544,10 +486,7 @@
                     "**/{vs,sql}/workbench/api/**/common/**",
                     "vs/workbench/contrib/files/common/editors/fileEditorInput", // this should be fine, it only accesses constants from contrib
                     "vscode-textmate",
-                    "vscode-oniguruma",
+                    "vscode-oniguruma"
-                    "iconv-lite-umd",
-                    "tas-client-umd",
-                    "jschardet"
                 ]
             },
             {
@@ -598,34 +537,16 @@
                     "*" // node modules
                 ]
             },
-            {
-                "target": "**/{vs,sql}/workbench/services/**/electron-sandbox/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/{vs,sql}/base/**/{common,browser,worker,electron-sandbox}/**",
-                    "**/{vs,sql}/platform/**/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/editor/**",
-                    "**/{vs,sql}/workbench/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/workbench/api/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/workbench/services/**/{common,browser,electron-sandbox}/**",
-                    "vscode-textmate",
-                    "vscode-oniguruma",
-                    "iconv-lite-umd",
-                    "jschardet"
-                ]
-            },
             {
                 "target": "**/{vs,sql}/workbench/services/**/electron-browser/**",
                 "restrictions": [
                     "vs/nls",
                     "vs/css!./**/*",
-                    "**/{vs,sql}/base/**/{common,browser,worker,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/base/**/{common,browser,worker,node,electron-browser}/**",
-                    "**/{vs,sql}/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser,node,electron-browser}/**",
                     "**/{vs,sql}/editor/**",
-                    "**/{vs,sql}/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/workbench/{common,browser,node,electron-browser,api}/**",
-                    "**/{vs,sql}/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/workbench/services/**/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/workbench/services/**/{common,browser,node,electron-sandbox,electron-browser}/**",
                     "*" // node modules
                 ]
             },
@@ -638,7 +559,7 @@
                     "**/{vs,sql}/base/**",
                     "**/{vs,sql}/platform/**",
                     "**/{vs,sql}/editor/**",
-                    "**/{vs,sql}/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/workbench/{common,browser,node,electron-browser}/**",
                     "**/{vs,sql}/workbench/services/**",
                     "**/{vs,sql}/workbench/contrib/**",
                     "**/{vs,sql}/workbench/test/**",
@@ -689,20 +610,6 @@
                     "**/{vs,sql}/workbench/services/**/{common,browser}/**"
                 ]
             },
-            {
-                "target": "**/{vs,sql}/workbench/contrib/notebook/common/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/{vs,sql}/base/**/{common,worker}/**",
-                    "**/{vs,sql}/platform/**/common/**",
-                    "**/{vs,sql}/editor/**",
-                    "**/{vs,sql}/workbench/common/**",
-                    "**/{vs,sql}/workbench/api/common/**",
-                    "**/{vs,sql}/workbench/services/**/common/**",
-                    "**/{vs,sql}/workbench/contrib/**/common/**"
-                ]
-            },
             {
                 "target": "**/{vs,sql}/workbench/contrib/**/common/**",
                 "restrictions": [
@@ -738,13 +645,7 @@
 					"chart.js",
 					"plotly.js-dist-min",
 					"angular2-grid",
-					"html-query-plan",
+					"html-query-plan"
-					"turndown",
-					"mark.js",
-		            "vscode-textmate",
-                    "vscode-oniguruma",
-                    "iconv-lite-umd",
-                    "jschardet"
                 ]
             },
             {
@@ -762,51 +663,20 @@
                     "*" // node modules
                 ]
             },
-            {
-                "target": "**/{vs,sql}/workbench/contrib/**/electron-sandbox/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/{vs,sql}/base/**/{common,browser,worker,electron-sandbox}/**",
-                    "**/{vs,sql}/platform/**/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/editor/**",
-                    "**/{vs,sql}/workbench/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/workbench/api/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/workbench/services/**/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/workbench/contrib/**/{common,browser,electron-sandbox}/**",
-                    "vscode-textmate",
-                    "vscode-oniguruma",
-                    "iconv-lite-umd",
-                    "jschardet"
-                ]
-            },
             {
                 "target": "**/{vs,sql}/workbench/contrib/**/electron-browser/**",
                 "restrictions": [
                     "vs/nls",
                     "vs/css!./**/*",
-                    "**/{vs,sql}/base/**/{common,browser,worker,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/base/**/{common,browser,worker,node,electron-browser}/**",
-                    "**/{vs,sql}/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser,node,electron-browser}/**",
                     "**/{vs,sql}/editor/**",
-                    "**/{vs,sql}/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/workbench/{common,browser,node,electron-browser,api}/**",
-                    "**/{vs,sql}/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/workbench/services/**/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/workbench/services/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/workbench/contrib/**/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/workbench/contrib/**/{common,browser,node,electron-sandbox,electron-browser}/**",
                     "*" // node modules
                 ]
             },
-            {
-                "target": "**/{vs,sql}/code/browser/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/{vs,sql}/base/**/{common,browser}/**",
-                    "**/{vs,sql}/base/parts/**/{common,browser}/**",
-                    "**/{vs,sql}/platform/**/{common,browser}/**",
-                    "**/{vs,sql}/code/**/{common,browser}/**",
-                    "**/{vs,sql}/workbench/workbench.web.api"
-                ]
-            },
             {
                 "target": "**/{vs,sql}/code/node/**",
                 "restrictions": [
@@ -823,10 +693,10 @@
                 "restrictions": [
                     "vs/nls",
                     "vs/css!./**/*",
-                    "**/{vs,sql}/base/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/base/**/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/base/parts/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/base/parts/**/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/code/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/code/**/{common,browser,node,electron-browser}/**",
                     "*" // node modules
                 ]
             },
@@ -854,66 +724,6 @@
                     "*" // node modules
                 ]
             },
-            {
-                "target": "**/src/{vs,sql}/workbench/workbench.common.main.ts",
-                "restrictions": [
-                    "vs/nls",
-                    "**/{vs,sql}/base/**/{common,browser}/**",
-                    "**/{vs,sql}/base/parts/**/{common,browser}/**",
-                    "**/{vs,sql}/platform/**/{common,browser}/**",
-                    "**/{vs,sql}/editor/**",
-                    "**/{vs,sql}/workbench/**/{common,browser}/**"
-                ]
-            },
-            {
-                "target": "**/src/{vs,sql}/workbench/workbench.web.main.ts",
-                "restrictions": [
-                    "vs/nls",
-                    "**/{vs,sql}/base/**/{common,browser}/**",
-                    "**/{vs,sql}/base/parts/**/{common,browser}/**",
-                    "**/{vs,sql}/platform/**/{common,browser}/**",
-                    "**/{vs,sql}/editor/**",
-                    "**/{vs,sql}/workbench/**/{common,browser}/**",
-                    "**/{vs,sql}/workbench/workbench.common.main"
-                ]
-            },
-            {
-                "target": "**/src/{vs,sql}/workbench/workbench.web.api.ts",
-                "restrictions": [
-                    "vs/nls",
-                    "**/{vs,sql}/base/**/{common,browser}/**",
-                    "**/{vs,sql}/base/parts/**/{common,browser}/**",
-                    "**/{vs,sql}/platform/**/{common,browser}/**",
-                    "**/{vs,sql}/editor/**",
-                    "**/{vs,sql}/workbench/**/{common,browser}/**",
-                    "**/{vs,sql}/workbench/workbench.web.main"
-                ]
-            },
-            {
-                "target": "**/src/{vs,sql}/workbench/workbench.sandbox.main.ts",
-                "restrictions": [
-                    "vs/nls",
-                    "**/{vs,sql}/base/**/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/base/parts/**/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/platform/**/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/editor/**",
-                    "**/{vs,sql}/workbench/**/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/workbench/workbench.common.main"
-                ]
-            },
-            {
-                "target": "**/src/{vs,sql}/workbench/workbench.desktop.main.ts",
-                "restrictions": [
-                    "vs/nls",
-                    "**/{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}/**",
-                    "**/{vs,sql}/editor/**",
-                    "**/{vs,sql}/workbench/**/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/{vs,sql}/workbench/workbench.common.main",
-                    "**/{vs,sql}/workbench/workbench.sandbox.main"
-                ]
-            },
             {
                 "target": "**/extensions/**",
                 "restrictions": "**/*"
@@ -1039,7 +849,6 @@
                             "collapse",
                             "create",
                             "delete",
-                            "discover",
                             "dispose",
                             "edit",
                             "end",

.github/CODEOWNERS

@@ -1,16 +0,0 @@
-# Lines starting with '#' are comments.
-# Each line is a file pattern followed by one or more owners.
-# Syntax can be found here: https://docs.github.com/free-pro-team@latest/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
-
-/extensions/admin-tool-ext-win @Charles-Gagnon
-/extensions/arc/ @Charles-Gagnon
-/extensions/azdata/ @Charles-Gagnon
-/extensions/big-data-cluster/ @Charles-Gagnon
-/extensions/dacpac/ @kisantia
-/extensions/query-history/ @Charles-Gagnon
-/extensions/resource-deployment/ @Charles-Gagnon
-/extensions/schema-compare/ @kisantia
-/extensions/sql-database-projects/ @Benjin @kisantia
-/extensions/mssql/config.json @Charles-Gagnon @alanrenmsft @kburtram
-
-/src/sql/*.d.ts @alanrenmsft @Charles-Gagnon

.github/commands.yml

@@ -1,12 +1,11 @@
 {
   perform: true,
-  commands:
+  commands: [
-    [
+    {
-      {
+      type: 'label',
-        type: "label",
+      name: 'Needs Logs',
-        name: "Needs Logs",
+      action: 'comment',
-        action: "comment",
+      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.\n\nTo find your logs:\n\n- Open command palette (Click **View** -> **Command Palette**)\n- Run the command: **`Developer: Open Logs Folder`**\n\nThis will open the log file locally. Please include renderer.log"
-        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.\n\nTo find your logs:\n\n- Open command palette (Click **View** -> **Command Palette**)\n- Run the command: **`Developer: Open Logs Folder`**\n\nThis will open the log file locally. Please include renderer.log",
+    }
-      },
+  ]
-    ],
 }

.github/label-actions.yml

@@ -1,27 +0,0 @@
-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.
-
-
-There are two types of logs to collect:
-
-
-**Console Logs**
-
-
-- Open Developer Tools (Help -> Toggle Developer Tools)
-
-- Click the **Console** tab
-
-- Click in the log area and select all text (CTRL+A)
-
-- Save this text into a file named console.log and attach it to this issue.
-
-
-**Application Logs**
-
-
-- Open command palette (Click **View** -> **Command Palette**)
-
-- Run the command: **`Developer: Open Logs Folder`**
-
-- This will open the log folder locally. Please zip up this folder and attach it to the issue."

.github/pull_request_template.md

@@ -2,7 +2,7 @@
 * Read our Pull Request guidelines:
   https://github.com/Microsoft/azuredatastudio/wiki/How-to-Contribute#pull-requests.
 * Associate an issue with the Pull Request.
-* Ensure that the code is up-to-date with the `main` branch.
+* Ensure that the code is up-to-date with the `master` branch.
 * Include a description of the proposed changes and how to test them.
 -->
 

.github/similarity.yml

@@ -1,5 +1,5 @@
 {
   perform: true,
   whenCreatedByTeam: true,
-  comment: "Thanks for submitting this issue. Please also check if it is already covered by an existing one, like:\n${potentialDuplicates}",
+  comment: "Thanks for submitting this issue. Please also check if it is already covered by an existing one, like:\n${potentialDuplicates}"
 }

.github/subscribers.json

@@ -1,9 +0,0 @@
-{
-	"notebook": [
-		"claudiaregio",
-		"rchiodo",
-		"greazer",
-		"donjayamanne",
-		"jilljac"
-	]
-}

.github/workflows/ci.yml

@@ -3,65 +3,62 @@ name: CI
 on:
   push:
     branches:
-      - main
+      - master
       - release/*
   pull_request:
     branches:
-      - main
+      - master
       - release/*
 
 jobs:
-  # linux:
+  linux:
-  #   runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
-  #   env:
+    env:
-  #     CHILD_CONCURRENCY: "1"
+      CHILD_CONCURRENCY: "1"
-  #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  #   steps:
+    steps:
-  #     - uses: actions/checkout@v2.2.0
+    - uses: actions/checkout@v1
-  #     # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
+    # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
-  #     - run: |
+    - run: |
-  #         sudo apt-get update
+        sudo apt-get update
-  #         sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libkrb5-dev # {{SQL CARBON EDIT}} add kerberos dep
+        sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libkrb5-dev # {{SQL CARBON EDIT}} add kerberos dep
-  #         sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
+        sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
-  #         sudo chmod +x /etc/init.d/xvfb
+        sudo chmod +x /etc/init.d/xvfb
-  #         sudo update-rc.d xvfb defaults
+        sudo update-rc.d xvfb defaults
-  #         sudo service xvfb start
+        sudo service xvfb start
-  #       name: Setup Build Environment
+      name: Setup Build Environment
-  #     - uses: actions/setup-node@v1
+    - uses: actions/setup-node@v1
-  #       with:
+      with:
-  #         node-version: 10
+        node-version: 10
-  #     # TODO: cache node modules
+    # TODO: cache node modules
-  #     # Increase timeout to get around latency issues when fetching certain packages
+    - run: yarn --frozen-lockfile
-  #     - run: |
+      name: Install Dependencies
-  #         yarn config set network-timeout 300000
+    - run: yarn electron x64
-  #         yarn --frozen-lockfile
+      name: Download Electron
-  #       name: Install Dependencies
+    - run: yarn gulp hygiene
-  #     - run: yarn electron x64
+      name: Run Hygiene Checks
-  #       name: Download Electron
+    - run: yarn strict-vscode # {{SQL CARBON EDIT}} add step
-  #     - run: yarn gulp hygiene
+      name: Run Strict Compile Options
-  #       name: Run Hygiene Checks
+    # - run: yarn monaco-compile-check {{SQL CARBON EDIT}} remove step
-  #     - run: yarn strict-vscode # {{SQL CARBON EDIT}} add step
+    #   name: Run Monaco Editor Checks
-  #       name: Run Strict Compile Options
+    - run: yarn valid-layers-check
-  #     # - run: yarn monaco-compile-check {{SQL CARBON EDIT}} remove step
+      name: Run Valid Layers Checks
-  #     #   name: Run Monaco Editor Checks
+    - run: yarn compile
-  #     - run: yarn valid-layers-check
+      name: Compile Sources
-  #       name: Run Valid Layers Checks
+    # - run: yarn download-builtin-extensions {{SQL CARBON EDIT}} remove step
-  #     - run: yarn compile
+    #   name: Download Built-in Extensions
-  #       name: Compile Sources
+    - run: DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests" --coverage --runGlob "**/sql/**/*.test.js"
-  #     # - run: yarn download-builtin-extensions {{SQL CARBON EDIT}} remove step
+      name: Run Unit Tests (Electron)
-  #     #   name: Download Built-in Extensions
+    - run: DISPLAY=:10 ./scripts/test-extensions-unit.sh
-  #     - run: DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests" --coverage --runGlob "**/sql/**/*.test.js"
+      name: Run Extension Unit Tests (Electron)
-  #       name: Run Unit Tests (Electron)
+      # {{SQL CARBON EDIT}} Add coveralls. We merge first to get around issue where parallel builds weren't being combined correctly
-  #     - run: DISPLAY=:10 ./scripts/test-extensions-unit.sh
+    - run: node test/combineCoverage
-  #       name: Run Extension Unit Tests (Electron)
+      name: Combine code coverage files
-  #       # {{SQL CARBON EDIT}} Add coveralls. We merge first to get around issue where parallel builds weren't being combined correctly
+    - name: Upload Code Coverage
-  #     - run: node test/combineCoverage
+      uses: coverallsapp/github-action@v1.1.1
-  #       name: Combine code coverage files
+      with:
-  #     - name: Upload Code Coverage
+        github-token: ${{ secrets.GITHUB_TOKEN }}
-  #       uses: coverallsapp/github-action@v1.1.1
+        path-to-lcov: 'test/coverage/lcov.info'
-  #       with:
-  #         github-token: ${{ secrets.GITHUB_TOKEN }}
-  #         path-to-lcov: "test/coverage/lcov.info"
 
     # Fails with cryptic error (e.g. https://github.com/microsoft/vscode/pull/90292/checks?check_run_id=433681926#step:13:9)
     # - run: DISPLAY=:10 yarn test-browser --browser chromium
@@ -75,34 +72,31 @@ jobs:
       CHILD_CONCURRENCY: "1"
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2.2.0
+    - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
+    - uses: actions/setup-node@v1
-        with:
+      with:
-          node-version: 10
+        node-version: 10
-      - uses: actions/setup-python@v1
+    - uses: actions/setup-python@v1
-        with:
+      with:
-          python-version: "2.x"
+        python-version: '2.x'
-      # Increase timeout to get around latency issues when fetching certain packages
+    - run: yarn --frozen-lockfile
-      - run: |
+      name: Install Dependencies
-          yarn config set network-timeout 300000
+    - run: yarn electron
-          yarn --frozen-lockfile
+      name: Download Electron
-        name: Install Dependencies
+    - run: yarn gulp hygiene
-      - run: yarn electron
+      name: Run Hygiene Checks
-        name: Download Electron
+    - run: yarn strict-vscode # {{SQL CARBON EDIT}} add step
-      - run: yarn gulp hygiene
+      name: Run Strict Compile Options
-        name: Run Hygiene Checks
+    # - run: yarn monaco-compile-check {{SQL CARBON EDIT}} remove step
-      - run: yarn strict-vscode # {{SQL CARBON EDIT}} add step
+    #   name: Run Monaco Editor Checks
-        name: Run Strict Compile Options
+    - run: yarn valid-layers-check
-      # - run: yarn monaco-compile-check {{SQL CARBON EDIT}} remove step
+      name: Run Valid Layers Checks
-      #   name: Run Monaco Editor Checks
+    - run: yarn compile
-      - run: yarn valid-layers-check
+      name: Compile Sources
-        name: Run Valid Layers Checks
+    # - run: yarn download-builtin-extensions {{SQL CARBON EDIT}} remove step
-      - run: yarn compile
+    #   name: Download Built-in Extensions
-        name: Compile Sources
+    - run: .\scripts\test.bat --tfs "Unit Tests"
-      # - run: yarn download-builtin-extensions {{SQL CARBON EDIT}} remove step
+      name: Run Unit Tests (Electron)
-      #   name: Download Built-in Extensions
-      - run: .\scripts\test.bat --tfs "Unit Tests"
-        name: Run Unit Tests (Electron)
     # - run: yarn test-browser --browser chromium {{SQL CARBON EDIT}} disable for now @TODO @anthonydresser
     #   name: Run Unit Tests (Browser)
     # - run: .\scripts\test-integration.bat --tfs "Integration Tests" {{SQL CARBON EDIT}} remove step
@@ -114,31 +108,28 @@ jobs:
       CHILD_CONCURRENCY: "1"
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2.2.0
+    - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
+    - uses: actions/setup-node@v1
-        with:
+      with:
-          node-version: 10
+        node-version: 10
-      # Increase timeout to get around latency issues when fetching certain packages
+    - run: yarn --frozen-lockfile
-      - run: |
+      name: Install Dependencies
-          yarn config set network-timeout 300000
+    - run: yarn electron x64
-          yarn --frozen-lockfile
+      name: Download Electron
-        name: Install Dependencies
+    - run: yarn gulp hygiene
-      - run: yarn electron x64
+      name: Run Hygiene Checks
-        name: Download Electron
+    - run: yarn strict-vscode # {{SQL CARBON EDIT}} add step
-      - run: yarn gulp hygiene
+      name: Run Strict Compile Options
-        name: Run Hygiene Checks
+    # - run: yarn monaco-compile-check {{SQL CARBON EDIT}} remove step
-      - run: yarn strict-vscode # {{SQL CARBON EDIT}} add step
+    #   name: Run Monaco Editor Checks
-        name: Run Strict Compile Options
+    - run: yarn valid-layers-check
-      # - run: yarn monaco-compile-check {{SQL CARBON EDIT}} remove step
+      name: Run Valid Layers Checks
-      #   name: Run Monaco Editor Checks
+    - run: yarn compile
-      - run: yarn valid-layers-check
+      name: Compile Sources
-        name: Run Valid Layers Checks
+    # - run: yarn download-builtin-extensions {{SQL CARBON EDIT}} remove step
-      - run: yarn compile
+    #   name: Download Built-in Extensions
-        name: Compile Sources
+    - run: ./scripts/test.sh --tfs "Unit Tests"
-      # - run: yarn download-builtin-extensions {{SQL CARBON EDIT}} remove step
+      name: Run Unit Tests (Electron)
-      #   name: Download Built-in Extensions
-      - run: ./scripts/test.sh --tfs "Unit Tests"
-        name: Run Unit Tests (Electron)
   #   - run: yarn test-browser --browser chromium --browser webkit
   #     name: Run Unit Tests (Browser)
   #   - run: ./scripts/test-integration.sh --tfs "Integration Tests"
@@ -150,7 +141,7 @@ jobs:
   #     CHILD_CONCURRENCY: "1"
   #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   #   steps:
-  #   - uses: actions/checkout@v2.2.0
+  #   - uses: actions/checkout@v1
   #   # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
   #   - run: |
   #       sudo apt-get update

.github/workflows/codeql.yml

@@ -1,44 +0,0 @@
-name: "Code Scanning - Action"
-
-on:
-  push:
-  schedule:
-    - cron: "0 0 * * 0"
-
-jobs:
-  CodeQL-Build:
-    strategy:
-      fail-fast: false
-
-    # CodeQL runs on ubuntu-latest, windows-latest, and macos-latest
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
-        # Override language selection by uncommenting this and choosing your languages
-        # with:
-        #   languages: go, javascript, csharp, python, cpp, java
-
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below).
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
-
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
-
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-      #    and modify them (or add more) to build your code if your project
-      #    uses a compiled language
-
-      #- run: |
-      #   make bootstrap
-      #   make release
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1

.github/workflows/deep-classifier-runner.yml

@@ -1,50 +0,0 @@
-name: "Deep Classifier: Runner"
-on:
-  schedule:
-    - cron: 0 * * * *
-  repository_dispatch:
-    types: [trigger-deep-classifier-runner]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v2
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: v40
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Install Additional Dependencies
-        # Pulls in a bunch of other packages that arent needed for the rest of the actions
-        run: npm install @azure/storage-blob@12.1.1
-      - name: "Run Classifier: Scraper"
-        uses: ./actions/classifier-deep/apply/fetch-sources
-        with:
-          # slightly overlapping to protect against issues slipping through the cracks if a run is delayed
-          from: 80
-          until: 5
-          configPath: classifier
-          blobContainerName: vscode-issue-classifier
-          blobStorageKey: ${{secrets.AZURE_BLOB_STORAGE_CONNECTION_STRING}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install --upgrade numpy scipy scikit-learn joblib nltk simpletransformers torch torchvision
-      - name: "Run Classifier: Generator"
-        run: python ./actions/classifier-deep/apply/generate-labels/main.py
-      - name: "Run Classifier: Labeler"
-        uses: ./actions/classifier-deep/apply/apply-labels
-        with:
-          configPath: classifier
-          allowLabels: "needs more info|new release"
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}

.github/workflows/deep-classifier-scraper.yml

@@ -1,27 +0,0 @@
-name: "Deep Classifier: Scraper"
-on:
-  repository_dispatch:
-    types: [trigger-deep-classifier-scraper]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v2
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: v40
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Install Additional Dependencies
-        # Pulls in a bunch of other packages that arent needed for the rest of the actions
-        run: npm install @azure/storage-blob@12.1.1
-      - name: "Run Classifier: Scraper"
-        uses: ./actions/classifier-deep/train/fetch-issues
-        with:
-          blobContainerName: vscode-issue-classifier
-          blobStorageKey: ${{secrets.AZURE_BLOB_STORAGE_CONNECTION_STRING}}
-          token: ${{secrets.ISSUE_SCRAPER_TOKEN}}
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}

.github/workflows/devcontainer-cache.yml

@@ -1,40 +0,0 @@
-name: VS Code Repo Dev Container Cache Image Generation
-
-on:
-  push:
-    # Currently doing this for master, but could be done for PRs as well
-    branches:
-      - "master"
-
-    # Only updates to these files result in changes to installed packages, so skip otherwise
-    paths:
-      - "**/package-lock.json"
-      - "**/yarn.lock"
-
-jobs:
-  devcontainer:
-    name: Generate cache image
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        id: checkout
-        uses: actions/checkout@v2
-
-      - name: Azure CLI login
-        id: az_login
-        uses: azure/login@v1
-        with:
-          creds: ${{ secrets.AZ_ACR_CREDS }}
-
-      - name: Build and push
-        id: build_and_push
-        run: |
-          set -e
-
-          ACR_REGISTRY_NAME=$(echo ${{ secrets.CONTAINER_IMAGE_REGISTRY }} | grep -oP '(.+)(?=\.azurecr\.io)')
-          az acr login --name $ACR_REGISTRY_NAME
-
-          GIT_BRANCH=$(echo "${{ github.ref }}" | grep -oP 'refs/(heads|tags)/\K(.+)')
-          if [ "$GIT_BRANCH" == "" ]; then GIT_BRANCH=master; fi
-
-          .devcontainer/cache/build-cache-image.sh "${{ secrets.CONTAINER_IMAGE_REGISTRY }}/public/vscode/devcontainers/repos/microsoft/vscode" "${GIT_BRANCH}"

.github/workflows/latest-release-monitor.yml

@@ -1,27 +0,0 @@
-name: Latest Release Monitor
-on:
-  schedule:
-    - cron: 0/5 * * * *
-  repository_dispatch:
-    types: [trigger-latest-release-monitor]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v2
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          path: ./actions
-          ref: v40
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Install Storage Module
-        run: npm install @azure/storage-blob@12.1.1
-      - name: Run Latest Release Monitor
-        uses: ./actions/latest-release-monitor
-        with:
-          storageKey: ${{secrets.AZURE_BLOB_STORAGE_CONNECTION_STRING}}
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}

.github/workflows/on-issue-open.yml

@@ -8,10 +8,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v2.2.0
+        uses: actions/checkout@v2
         with:
           repository: 'microsoft/azuredatastudio'
-          ref: main
+          ref: master
           path: ./actions
       - name: Install Actions
         run: npm install --production --prefix ./actions/build/actions

.github/workflows/on-label.yml

@@ -1,15 +0,0 @@
-name: On Label
-on:
-  issues:
-    types: [labeled]
-
-jobs:
-  processLabelAction:
-    name: Process Label Action
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Process Label Action
-        uses: hramos/label-actions@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/on-pr-open.yml

@@ -12,7 +12,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: 'microsoft/azuredatastudio'
-          ref: main
+          ref: master
           path: ./actions
       - name: Install Actions
         run: npm install --production --prefix ./actions/build/actions

.gitignore

@@ -24,7 +24,6 @@ out-vscode-reh-web-min/
 out-vscode-reh-web-pkg/
 out-vscode-web/
 out-vscode-web-min/
-out-vscode-web-pkg/
 src/vs/server
 resources/server
 build/node_modules

.nvmrc

@@ -0,0 +1 @@
+10

.vscode/launch.json

@@ -19,15 +19,16 @@
 			"timeout": 30000,
 			"port": 5870,
 			"outFiles": [
-				"${workspaceFolder}/out/**/*.js",
+				"${workspaceFolder}/out/**/*.js"
-				"${workspaceFolder}/extensions/*/out/**/*.js"
+			],
-			]
+			"presentation": {
+				"hidden": true
+			}
 		},
 		{
 			"type": "pwa-chrome",
 			"request": "attach",
 			"name": "Attach to Shared Process",
-			"timeout": 30000,
 			"port": 9222,
 			"urlFilter": "*sharedProcess.html*",
 			"presentation": {
@@ -41,7 +42,10 @@
 			"port": 5876,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
-			]
+			],
+			"presentation": {
+				"hidden": true,
+			}
 		},
 		{
 			"type": "node",
@@ -56,7 +60,6 @@
 			"type": "node",
 			"request": "attach",
 			"name": "Attach to Main Process",
-			"timeout": 30000,
 			"port": 5875,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
@@ -66,9 +69,10 @@
 			}
 		},
 		{
-			"type": "chrome",
+			"type": "pwa-chrome",
 			"request": "attach",
 			"name": "Attach to azuredatastudio",
+			"timeout": 50000,
 			"port": 9222
 		},
 		{
@@ -87,32 +91,55 @@
 			"port": 9222,
 			"timeout": 20000,
 			"env": {
-				"VSCODE_EXTHOST_WILL_SEND_SOCKET": null,
+				"VSCODE_EXTHOST_WILL_SEND_SOCKET": null
-				"VSCODE_SKIP_PRELAUNCH": "1"
 			},
-			"cleanUp": "wholeBrowser",
+			"breakOnLoad": false,
 			"urlFilter": "*workbench.html*",
 			"runtimeArgs": [
 				"--inspect=5875",
 				"--no-cached-data",
 			],
 			"webRoot": "${workspaceFolder}",
-			"cascadeTerminateToConfigurations": [
+			// Settings for js-debug:
-				"Attach to Extension Host"
-			],
 			"userDataDir": false,
 			"pauseForSourceMap": false,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			],
-			"browserLaunchLocation": "workspace",
+			"browserLaunchLocation": "workspace"
-			"preLaunchTask": "Ensure Prelaunch Dependencies",
 		},
 		{
-			"type": "node",
+			"type": "chrome",
+			"request": "launch",
+			"name": "Launch azuredatastudio with new notebook command",
+			"windows": {
+				"runtimeExecutable": "${workspaceFolder}/scripts/sql.bat"
+			},
+			"osx": {
+				"runtimeExecutable": "${workspaceFolder}/scripts/sql.sh"
+			},
+			"linux": {
+				"runtimeExecutable": "${workspaceFolder}/scripts/sql.sh"
+			},
+			"urlFilter": "*index.html*",
+			"runtimeArgs": [
+				"--inspect=5875",
+				"--command=notebook.command.new"
+			],
+			"skipFiles": [
+				"**/winjs*.js"
+			],
+			"webRoot": "${workspaceFolder}",
+			"timeout": 45000
+		},
+		{
+			"type": "chrome",
 			"request": "launch",
 			"name": "Launch ADS (Web) (TBD)",
-			"program": "${workspaceFolder}/resources/web/code-web.js",
+			"runtimeExecutable": "yarn",
+			"runtimeArgs": [
+				"web"
+			],
 			"presentation": {
 				"group": "0_vscode",
 				"order": 2
@@ -138,12 +165,9 @@
 			}
 		},
 		{
-			"type": "pwa-chrome",
+			"type": "chrome",
 			"request": "launch",
-			"outFiles": [],
+			"name": "Launch ADS (Web, Chrome) (TBD)",
-			"outFiles": [],
-			"perScriptSourcemaps": "yes",
-			"name": "VS Code (Web, Chrome)",
 			"url": "http://localhost:8080",
 			"preLaunchTask": "Run web",
 			"presentation": {
@@ -151,20 +175,6 @@
 				"order": 3
 			}
 		},
-		{
-			"type": "pwa-msedge",
-			"request": "launch",
-			"outFiles": [],
-			"perScriptSourcemaps": "yes",
-			"name": "VS Code (Web, Edge)",
-			"url": "http://localhost:8080",
-			"pauseForSourceMap": false,
-			"preLaunchTask": "Run web",
-			"presentation": {
-				"group": "0_vscode",
-				"order": 3
-			}
-		},
 		{
 			"type": "node",
 			"request": "launch",
@@ -195,7 +205,7 @@
 			}
 		},
 		{
-			"type": "pwa-node",
+			"type": "node",
 			"request": "launch",
 			"name": "Run Unit Tests",
 			"program": "${workspaceFolder}/test/unit/electron/index.js",
@@ -214,41 +224,6 @@
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			],
-			"cascadeTerminateToConfigurations": [
-				"Attach to VS Code"
-			],
-			"env": {
-				"MOCHA_COLORS": "true"
-			},
-			"presentation": {
-				"hidden": true
-			}
-		},
-		{
-			"type": "pwa-node",
-			"request": "launch",
-			"name": "Run Unit Tests For Current File",
-			"program": "${workspaceFolder}/test/unit/electron/index.js",
-			"runtimeExecutable": "${workspaceFolder}/.build/electron/Code - OSS.app/Contents/MacOS/Electron",
-			"windows": {
-				"runtimeExecutable": "${workspaceFolder}/.build/electron/Code - OSS.exe"
-			},
-			"linux": {
-				"runtimeExecutable": "${workspaceFolder}/.build/electron/code-oss"
-			},
-			"cascadeTerminateToConfigurations": [
-				"Attach to VS Code"
-			],
-			"outputCapture": "std",
-			"args": [
-				"--remote-debugging-port=9222",
-				"--run",
-				"${relativeFile}"
-			],
-			"cwd": "${workspaceFolder}",
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
 			"env": {
 				"MOCHA_COLORS": "true"
 			},
@@ -306,14 +281,12 @@
 		},
 		{
 			"name": "Azure Data Studio",
-			"stopAll": true,
 			"configurations": [
 				"Launch azuredatastudio",
 				"Attach to Main Process",
 				"Attach to Extension Host",
 				"Attach to Shared Process",
 			],
-			"preLaunchTask": "Ensure Prelaunch Dependencies",
 			"presentation": {
 				"group": "0_vscode",
 				"order": 1
@@ -352,17 +325,6 @@
 				"group": "1_vscode",
 				"order": 2
 			}
-		},
-		{
-			"name": "Debug Unit Tests (Current File)",
-			"configurations": [
-				"Attach to VS Code",
-				"Run Unit Tests For Current File"
-			],
-			"presentation": {
-				"group": "1_vscode",
-				"order": 2
-			}
 		}
 	]
 }

.vscode/notebooks/api.github-issues

@@ -1,38 +0,0 @@
-[
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "#### Config",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"November 2020\"",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "### Finalization",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$repo $milestone label:api-finalization",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "### Proposals",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$repo $milestone is:open label:api-proposal ",
-    "editable": true
-  }
-]

.vscode/notebooks/endgame.github-issues

@@ -1,110 +0,0 @@
-[
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "#### Macros",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server\n\n$MILESTONE=milestone:\"November 2020\"",
-    "editable": false
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# Preparation",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Open Pull Requests on the Milestone",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS $MILESTONE is:pr is:open",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Open Issues on the Milestone",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS $MILESTONE is:issue is:open -label:iteration-plan -label:endgame-plan -label:testplan-item",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Feature Requests Missing Labels",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS $MILESTONE is:issue is:closed label:feature-request -label:verification-needed -label:on-testplan -label:verified -label:*duplicate",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# Testing",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Test Plan Items",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS $MILESTONE is:issue is:open label:testplan-item",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Verification Needed",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS $MILESTONE is:issue is:closed label:feature-request label:verification-needed",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# Verification",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS $MILESTONE is:issue is:closed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# Candidates",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS $MILESTONE label:candidate",
-    "editable": true
-  }
-]

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

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

.vscode/notebooks/grooming.github-issues

@@ -1,26 +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
-  },
-  {
-    "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
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "### Feature Areas\n\nEach issue should be assigned to a feature area",
-    "editable": true
-  },
-  {
-    "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
-  }
-]

.vscode/notebooks/inbox.github-issues

@@ -1,50 +0,0 @@
-[
-  {
-    "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",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$inbox -label:\"needs more info\"",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "##### `Config`: defines the inbox query",
-    "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/master/.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": "## 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/master/.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**.",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$inbox",
-    "editable": true
-  }
-]

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

@@ -1,206 +0,0 @@
-[
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "#### Macros",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server\n\n$MILESTONE=milestone:\"November 2020\"\n\n$MINE=assignee:@me",
-    "editable": false
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# Preparation",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Open Pull Requests on the Milestone",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS $MILESTONE $MINE is:pr is:open",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Open Issues on the Milestone",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS $MILESTONE $MINE is:issue is:open -label:iteration-plan -label:endgame-plan -label:testplan-item",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Feature Requests Missing Labels",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS $MILESTONE $MINE is:issue is:closed label:feature-request -label:verification-needed -label:on-testplan -label:verified -label:*duplicate",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Test Plan Items",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS $MILESTONE is:issue is:open author:@me label:testplan-item",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Verification Needed",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS $MILESTONE $MINE is:issue is:closed label:feature-request label:verification-needed",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# Testing",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Test Plan Items",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS $MILESTONE $MINE is:issue is:open label:testplan-item",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Verification Needed",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed -assignee:@me -label:verified label:feature-request label:verification-needed",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# Fixing",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Open Issues",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS $MILESTONE $MINE is:issue is:open",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Open Bugs",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS $MILESTONE $MINE is:issue is:open label:bug",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# Verification",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## My Issues (verification-steps-needed)",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS $MILESTONE $MINE is:issue is:open label:bug label:verification-steps-needed",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## My Issues (verification-found)",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS $MILESTONE $MINE is:issue is:open label:bug label:verification-found",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Issues filed by me",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed author:@me sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Issues filed by others",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed -author:@me sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# Release Notes",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/vscode $MILESTONE is:issue is:closed label:feature-request -label:on-release-notes",
-    "editable": true
-  }
-]

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

@@ -1,98 +0,0 @@
-[
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "##### `Config`: This should be changed every month/milestone",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog\n\n// current milestone name\n$milestone=milestone:\"November 2020\"",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "github-issues",
-    "value": "## Milestone Work",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$repos $milestone assignee:@me is:open",
-    "editable": false
-  },
-  {
-    "kind": 1,
-    "language": "github-issues",
-    "value": "## Bugs, Debt, Features...",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "#### My Bugs",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$repos assignee:@me is:open label:bug",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "#### Debt & Engineering",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$repos assignee:@me is:open label:debt OR $repos assignee:@me is:open label:engineering",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "#### Performance 🐌 🔜 🏎",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$repos assignee:@me is:open label:perf OR $repos assignee:@me is:open label:perf-startup OR $repos assignee:@me is:open label:perf-bloat OR $repos assignee:@me is:open label:freeze-slow-crash-leak",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "#### Feature Requests",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$repos assignee:@me is:open label:feature-request milestone:Backlog sort:reactions-+1-desc",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$repos assignee:@me is:open milestone:\"Backlog Candidates\"",
-    "editable": false
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "#### Not Actionable",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$repos assignee:@me is:open label:\"needs more info\"",
-    "editable": false
-  }
-]

.vscode/notebooks/verification.github-issues

@@ -1,56 +0,0 @@
-[
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "### Bug Verification Queries\n\nBefore shipping we want to verify _all_ bugs. That means when a bug is fixed we check that the fix actually works. It's always best to start with bugs that you have filed and the proceed with bugs that have been filed from users outside the development team. ",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "#### Config: update list of `repos` and the `milestone`",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks \n$milestone=milestone:\"October 2020\"",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "### Bugs You Filed",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$repos $milestone is:closed -assignee:@me label:bug -label:verified -label:*duplicate author:@me",
-    "editable": false
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "### Bugs From Outside",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$repos $milestone is:closed  -assignee:@me label:bug -label:verified -label:*duplicate -author:@me -assignee:@me label:bug -label:verified -author:@me -author:aeschli -author:alexdima -author:alexr00 -author:bpasero -author:chrisdias -author:chrmarti -author:connor4312 -author:dbaeumer -author:deepak1556 -author:eamodio -author:egamma -author:gregvanl  -author:isidorn -author:JacksonKearl -author:joaomoreno -author:jrieken -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:RMacfarlane -author:roblourens -author:sana-ajani -author:sandy081 -author:sbatten -author:Tyriar -author:weinand",
-    "editable": false
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "### All",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$repos $milestone is:closed -assignee:@me label:bug -label:verified -label:*duplicate",
-    "editable": false
-  }
-]

.vscode/searches/TrustedTypes.code-search

@@ -1,101 +0,0 @@
-# Query: .innerHTML = 
-# Flags: CaseSensitive WordMatch
-# Including: src/vs/**/*.{t,j}s
-# Excluding: *.test.ts, **/test/**
-# ContextLines: 3
-
-12 results - 9 files
-
-src/vs/base/browser/dom.ts:
-  1359  	);
-  1360  
-  1361  	const html = _ttpSafeInnerHtml?.createHTML(value, options) ?? insane(value, options);
-  1362: 	node.innerHTML = html as unknown as string;
-  1363  }
-
-src/vs/base/browser/markdownRenderer.ts:
-  272  	};
-  273  
-  274  	if (_ttpInsane) {
-  275: 		element.innerHTML = _ttpInsane.createHTML(renderedMarkdown, insaneOptions) as unknown as string;
-  276  	} else {
-  277: 		element.innerHTML = insane(renderedMarkdown, insaneOptions);
-  278  	}
-  279  
-  280  	// signal that async code blocks can be now be inserted
-
-src/vs/editor/browser/core/markdownRenderer.ts:
-  88  
-  89  				const element = document.createElement('span');
-  90  
-  91: 				element.innerHTML = MarkdownRenderer._ttpTokenizer
-  92  					? MarkdownRenderer._ttpTokenizer.createHTML(value, tokenization) as unknown as string
-  93  					: tokenizeToString(value, tokenization);
-  94  
-
-src/vs/editor/browser/view/domLineBreaksComputer.ts:
-  107  		allCharOffsets[i] = tmp[0];
-  108  		allVisibleColumns[i] = tmp[1];
-  109  	}
-  110: 	containerDomNode.innerHTML = sb.build();
-  111  
-  112  	containerDomNode.style.position = 'absolute';
-  113  	containerDomNode.style.top = '10000';
-
-src/vs/editor/browser/view/viewLayer.ts:
-  512  		}
-  513  		const lastChild = <HTMLElement>this.domNode.lastChild;
-  514  		if (domNodeIsEmpty || !lastChild) {
-  515: 			this.domNode.innerHTML = newLinesHTML;
-  516  		} else {
-  517  			lastChild.insertAdjacentHTML('afterend', newLinesHTML);
-  518  		}
-
-  533  		if (ViewLayerRenderer._ttPolicy) {
-  534  			invalidLinesHTML = ViewLayerRenderer._ttPolicy.createHTML(invalidLinesHTML) as unknown as string;
-  535  		}
-  536: 		hugeDomNode.innerHTML = invalidLinesHTML;
-  537  
-  538  		for (let i = 0; i < ctx.linesLength; i++) {
-  539  			const line = ctx.lines[i];
-
-src/vs/editor/browser/widget/diffEditorWidget.ts:
-  2157  
-  2158  		let domNode = document.createElement('div');
-  2159  		domNode.className = `view-lines line-delete ${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`;
-  2160: 		domNode.innerHTML = sb.build();
-  2161  		Configuration.applyFontInfoSlow(domNode, fontInfo);
-  2162  
-  2163  		let marginDomNode = document.createElement('div');
-  2164  		marginDomNode.className = 'inline-deleted-margin-view-zone';
-  2165: 		marginDomNode.innerHTML = marginHTML.join('');
-  2166  		Configuration.applyFontInfoSlow(marginDomNode, fontInfo);
-  2167  
-  2168  		return {
-
-src/vs/editor/standalone/browser/colorizer.ts:
-  40  		let text = domNode.firstChild ? domNode.firstChild.nodeValue : '';
-  41  		domNode.className += ' ' + theme;
-  42  		let render = (str: string) => {
-  43: 			domNode.innerHTML = str;
-  44  		};
-  45  		return this.colorize(modeService, text || '', mimeType, options).then(render, (err) => console.error(err));
-  46  	}
-
-src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts:
-  580  		const element = DOM.$('div', { style });
-  581  
-  582  		const linesHtml = this.getRichTextLinesAsHtml(model, modelRange, colorMap);
-  583: 		element.innerHTML = linesHtml as unknown as string;
-  584  		return element;
-  585  	}
-  586  
-
-src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts:
-  375  					addMouseoverListeners(outputNode, outputId);
-  376  					const content = data.content;
-  377  					if (content.type === RenderOutputType.Html) {
-  378: 						outputNode.innerHTML = content.htmlContent;
-  379  						cellOutputContainer.appendChild(outputNode);
-  380  						domEval(outputNode);
-  381  					} else if (preloadErrs.some(e => !!e)) {

.vscode/searches/es6.code-search

@@ -0,0 +1,86 @@
+# Query: @deprecated ES6
+# Flags: CaseSensitive WordMatch
+# ContextLines: 2
+
+16 results - 5 files
+
+src/vs/base/browser/dom.ts:
+  81  };
+  82  
+  83: /** @deprecated ES6 - use classList*/
+  84  export const hasClass: (node: HTMLElement | SVGElement, className: string) => boolean = _classList.hasClass.bind(_classList);
+  85: /** @deprecated ES6 - use classList*/
+  86  export const addClass: (node: HTMLElement | SVGElement, className: string) => void = _classList.addClass.bind(_classList);
+  87: /** @deprecated ES6 - use classList*/
+  88  export const addClasses: (node: HTMLElement | SVGElement, ...classNames: string[]) => void = _classList.addClasses.bind(_classList);
+  89: /** @deprecated ES6 - use classList*/
+  90  export const removeClass: (node: HTMLElement | SVGElement, className: string) => void = _classList.removeClass.bind(_classList);
+  91: /** @deprecated ES6 - use classList*/
+  92  export const removeClasses: (node: HTMLElement | SVGElement, ...classNames: string[]) => void = _classList.removeClasses.bind(_classList);
+  93: /** @deprecated ES6 - use classList*/
+  94  export const toggleClass: (node: HTMLElement | SVGElement, className: string, shouldHaveIt?: boolean) => void = _classList.toggleClass.bind(_classList);
+  95  
+
+src/vs/base/common/arrays.ts:
+  401  
+  402  /**
+  403:  * @deprecated ES6: use `Array.findIndex`
+  404   */
+  405  export function firstIndex<T>(array: ReadonlyArray<T>, fn: (item: T) => boolean): number {
+
+  417  
+  418  /**
+  419:  * @deprecated ES6: use `Array.find`
+  420   */
+  421  export function first<T>(array: ReadonlyArray<T>, fn: (item: T) => boolean, notFoundValue: T): T;
+
+  560  
+  561  /**
+  562:  * @deprecated ES6: use `Array.find`
+  563   */
+  564  export function find<T>(arr: ArrayLike<T>, predicate: (value: T, index: number, arr: ArrayLike<T>) => any): T | undefined {
+
+src/vs/base/common/map.ts:
+  11  
+  12  /**
+  13:  * @deprecated ES6: use `[...SetOrMap.values()]`
+  14   */
+  15  export function values<V = any>(set: Set<V>): V[];
+
+  22  
+  23  /**
+  24:  * @deprecated ES6: use `[...map.keys()]`
+  25   */
+  26  export function keys<K, V>(map: Map<K, V>): K[] {
+
+src/vs/base/common/objects.ts:
+  115  
+  116  /**
+  117:  * @deprecated ES6
+  118   */
+  119  export function assign<T>(destination: T): T;
+
+src/vs/base/common/strings.ts:
+   15  
+   16  /**
+   17:  * @deprecated ES6: use `String.padStart`
+   18   */
+   19  export function pad(n: number, l: number, char: string = '0'): string {
+
+  146  
+  147  /**
+  148:  * @deprecated ES6: use `String.startsWith`
+  149   */
+  150  export function startsWith(haystack: string, needle: string): boolean {
+
+  167  
+  168  /**
+  169:  * @deprecated ES6: use `String.endsWith`
+  170   */
+  171  export function endsWith(haystack: string, needle: string): boolean {
+
+  853  
+  854  /**
+  855:  * @deprecated ES6
+  856   */
+  857  export function repeat(s: string, count: number): string {

.vscode/searches/ts36031.code-search

@@ -2,52 +2,18 @@
 # Flags: RegExp
 # ContextLines: 2
 
-8 results - 4 files
+2 results - 2 files
 
 src/vs/base/browser/ui/tree/asyncDataTree.ts:
-  241  			} : () => 'treeitem',
+  243  			} : () => 'treeitem',
-  242  			isChecked: options.accessibilityProvider!.isChecked ? (e) => {
+  244  			isChecked: options.accessibilityProvider!.isChecked ? (e) => {
-  243: 				return !!(options.accessibilityProvider?.isChecked!(e.element as T));
+  245: 				return !!(options.accessibilityProvider?.isChecked!(e.element as T));
-  244  			} : undefined,
+  246  			} : undefined,
-  245  			getAriaLabel(e) {
+  247  			getAriaLabel(e) {
 
-src/vs/platform/list/browser/listService.ts:
+src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts:
-  463  
+  254  
-  464  		if (typeof options?.openOnSingleClick !== 'boolean' && options?.configurationService) {
+  255  		return debugDynamicExtensions.map(e => {
-  465: 			this.openOnSingleClick = options?.configurationService!.getValue(openModeSettingKey) !== 'doubleClick';
+  256: 			const type = e.contributes?.debuggers![0].type!;
-  466  			this._register(options?.configurationService.onDidChangeConfiguration(() => {
+  257  			return {
-  467: 				this.openOnSingleClick = options?.configurationService!.getValue(openModeSettingKey) !== 'doubleClick';
+  258  				label: this.getDebuggerLabel(type)!,
-  468  			}));
-  469  		} else {
-
-src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts:
-  1526  
-  1527  		await this._ensureActiveKernel();
-  1528: 		await this._activeKernel?.cancelNotebookCell!(this._notebookViewModel!.uri, undefined);
-  1529  	}
-  1530  
-
-  1535  
-  1536  		await this._ensureActiveKernel();
-  1537: 		await this._activeKernel?.executeNotebookCell!(this._notebookViewModel!.uri, undefined);
-  1538  	}
-  1539  
-
-  1553  
-  1554  		await this._ensureActiveKernel();
-  1555: 		await this._activeKernel?.cancelNotebookCell!(this._notebookViewModel!.uri, cell.handle);
-  1556  	}
-  1557  
-
-  1567  
-  1568  		await this._ensureActiveKernel();
-  1569: 		await this._activeKernel?.executeNotebookCell!(this._notebookViewModel!.uri, cell.handle);
-  1570  	}
-  1571  
-
-src/vs/workbench/contrib/webview/electron-browser/iframeWebviewElement.ts:
-  89  			.then(() => this._resourceRequestManager.ensureReady())
-  90  			.then(() => {
-  91: 				this.element?.contentWindow!.postMessage({ channel, args: data }, '*');
-  92  			});
-  93  	}

.vscode/settings.json

@@ -26,7 +26,6 @@
 		"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/server": false
 	},
 	"lcov.path": [
@@ -73,10 +72,7 @@
 	},
 	"gulp.autoDetect": "off",
 	"files.insertFinalNewline": true,
-	"[plaintext]": {
+  "[typescript]": {
-		"files.insertFinalNewline": false,
-	},
-	"[typescript]": {
 		"editor.defaultFormatter": "vscode.typescript-language-features"
 	},
 	"typescript.tsc.autoDetect": "off"

.vscode/tasks.json

@@ -3,95 +3,34 @@
 	"tasks": [
 		{
 			"type": "npm",
-			"script": "watch-clientd",
+			"script": "watchd",
-			"label": "Build VS Code Core",
-			"isBackground": true,
-			"presentation": {
-				"reveal": "never"
-			},
-			"problemMatcher": {
-				"owner": "typescript",
-				"applyTo": "closedDocuments",
-				"fileLocation": [
-					"absolute"
-				],
-				"pattern": {
-					"regexp": "Error: ([^(]+)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\): (.*)$",
-					"file": 1,
-					"location": 2,
-					"message": 3
-				},
-				"background": {
-					"beginsPattern": "Starting compilation",
-					"endsPattern": "Finished compilation"
-				}
-			}
-		},
-		{
-			"type": "npm",
-			"script": "watch-extensionsd",
-			"label": "Build VS Code Extensions",
-			"isBackground": true,
-			"presentation": {
-				"reveal": "never"
-			},
-			"problemMatcher": {
-				"owner": "typescript",
-				"applyTo": "closedDocuments",
-				"fileLocation": [
-					"absolute"
-				],
-				"pattern": {
-					"regexp": "Error: ([^(]+)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\): (.*)$",
-					"file": 1,
-					"location": 2,
-					"message": 3
-				},
-				"background": {
-					"beginsPattern": "Starting compilation",
-					"endsPattern": "Finished compilation"
-				}
-			}
-		},
-		{
 			"label": "Build VS Code",
-			"dependsOn": [
-				"Build VS Code Core",
-				"Build VS Code Extensions"
-			],
 			"group": {
 				"kind": "build",
 				"isDefault": true
+			},
+			"isBackground": true,
+			"presentation": {
+				"reveal": "never"
+			},
+			"problemMatcher": {
+				"owner": "typescript",
+				"applyTo": "closedDocuments",
+				"fileLocation": [
+					"absolute"
+				],
+				"pattern": {
+					"regexp": "Error: ([^(]+)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\): (.*)$",
+					"file": 1,
+					"location": 2,
+					"message": 3
+				},
+				"background": {
+					"beginsPattern": "Starting compilation",
+					"endsPattern": "Finished compilation"
+				}
 			}
 		},
-		{
-			"type": "npm",
-			"script": "kill-watch-clientd",
-			"label": "Kill Build VS Code Core",
-			"group": "build",
-			"presentation": {
-				"reveal": "never"
-			},
-			"problemMatcher": "$tsc"
-		},
-		{
-			"type": "npm",
-			"script": "kill-watch-extensionsd",
-			"label": "Kill Build VS Code Extensions",
-			"group": "build",
-			"presentation": {
-				"reveal": "never"
-			},
-			"problemMatcher": "$tsc"
-		},
-		{
-			"label": "Kill Build VS Code",
-			"dependsOn": [
-				"Kill Build VS Code Core",
-				"Kill Build VS Code Extensions"
-			],
-			"group": "build"
-		},
 		{
 			"type": "npm",
 			"script": "strict-vscode-watch",
@@ -108,35 +47,8 @@
 		},
 		{
 			"type": "npm",
-			"script": "watch-webd",
+			"script": "kill-watchd",
-			"label": "Build Web Extensions",
+			"label": "Kill Build VS Code",
-			"group": "build",
-			"isBackground": true,
-			"presentation": {
-				"reveal": "never"
-			},
-			"problemMatcher": {
-				"owner": "typescript",
-				"applyTo": "closedDocuments",
-				"fileLocation": [
-					"absolute"
-				],
-				"pattern": {
-					"regexp": "Error: ([^(]+)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\): (.*)$",
-					"file": 1,
-					"location": 2,
-					"message": 3
-				},
-				"background": {
-					"beginsPattern": "Starting compilation",
-					"endsPattern": "Finished compilation"
-				}
-			}
-		},
-		{
-			"type": "npm",
-			"script": "kill-watch-webd",
-			"label": "Kill Build Web Extensions",
 			"group": "build",
 			"presentation": {
 				"reveal": "never"
@@ -177,7 +89,7 @@
 		},
 		{
 			"type": "shell",
-			"command": "yarn web --no-launch",
+			"command": "yarn web -- --no-launch",
 			"label": "Run web",
 			"isBackground": true,
 			"problemMatcher": {
@@ -200,28 +112,6 @@
 				"source": "eslint",
 				"base": "$eslint-stylish"
 			}
-		},
-		{
-			"type": "shell",
-			"command": "node build/lib/preLaunch.js",
-			"label": "Ensure Prelaunch Dependencies",
-			"presentation": {
-				"reveal": "silent"
-			}
-		},
-		{
-			"type": "npm",
-			"script": "tsec-compile-check",
-			"problemMatcher": [
-				{
-					"base": "$tsc",
-					"applyTo": "allDocuments",
-					"owner": "tsec"
-				},
-			],
-			"group": "build",
-			"label": "npm: tsec-compile-check",
-			"detail": "node_modules/tsec/bin/tsec -p src/tsconfig.json --noEmit"
 		}
 	]
 }

.yarnrc

@@ -1,3 +1,3 @@
-disturl "https://electronjs.org/headers"
+disturl "https://atom.io/download/electron"
-target "9.4.3"
+target "7.2.4"
 runtime "electron"

CHANGELOG.md

@@ -1,121 +1,5 @@
 # Change Log
 
-## Version 1.25.2
-* Release date: January 22, 2021
-* Release status: General Availability
-* Fixes https://github.com/microsoft/azuredatastudio/issues/13899
-
-## Version 1.25.1
-* Release date: December 10, 2020
-* Release status: General Availability
-* Fixes https://github.com/microsoft/azuredatastudio/issues/13751
-
-## Version 1.25.0
-* Release date: December 8, 2020
-* Release status: General Availability
-* Kusto extension improvements
-* SQL Project extension improvements
-* Notebook improvements
-* Azure Browse Connections Preview performance improvements
-* Bug Fixes
-
-## Version 1.24.0
-* Release date: November 12, 2020
-* Release status: General Availability
-* SQL Project improvements
-* Notebook improvements, including in WYSIWYG editor enhancements
-* Azure Arc improvements
-* Azure SQL Deployment UX improvements
-* Azure Browse Connections Preview
-* Bug Fixes
-
-## Version 1.23.0
-* Release date: October 14, 2020
-* Release status: General Availability
-* Added deployments of Azure SQL DB and VM
-* Added PowerShell kernel results streaming support
-* Added improvements to SQL Database Projects extension
-* Bug Fixes
-* Extension Updates:
-    * SQL Server Import
-    * Machine Learning
-    * Schema Compare
-    * Kusto
-    * SQL Assessment
-    * SQL Database Projects
-    * Azure Arc
-    * azdata
-
-## Version 1.22.1
-* Release date: September 30, 2020
-* Release status: General Availability
-* Fix bug #12615 Active connection filter doesn't untoggle | [#12615](https://github.com/microsoft/azuredatastudio/issues/12615)
-* Fix bug #12572 Edit Data grid doesn't escape special characters | [#12572](https://github.com/microsoft/azuredatastudio/issues/12572)
-* Fix bug #12570 Dashboard Explorer table doesn't escape special characters | [#12570](https://github.com/microsoft/azuredatastudio/issues/12570)
-* Fix bug #12582 Delete row on Edit Data fails | [#12582](https://github.com/microsoft/azuredatastudio/issues/12582)
-* Fix bug #12646 SQL Notebooks: Cells being treated isolated | [#12646](https://github.com/microsoft/azuredatastudio/issues/12646)
-
-## Version 1.22.0
-* Release date: September 22, 2020
-* Release status: General Availability
-* New Notebook Features
-    * Supports brand new text cell editing experience based on rich text formatting and seamless conversion to markdown, also known as WYSIWYG toolbar (What You See Is What You Get)
-    * Supports Kusto kernel
-    * Supports pinning of notebooks
-    * Added support for new version of Jupyter Books
-    * Improved Jupyter Shortcuts
-    * Introduced perf loading improvements
-* Added Azure Arc extension - Users can try out Azure Arc public preview through Azure Data Studio. This includes:
-    * Deploy data controller
-    * Deploy Postgres
-    * Deploy Managed Instance for Azure Arc
-    * Connect to data controller
-    * Access data service dashboards
-    * Azure Arc Jupyter Book
-* Added new deployment options
-    * Azure SQL Database Edge
-    * (Edge will require Azure SQL Edge Deployment Extension)
-* Added SQL Database Projects extension - The SQL Database Projects extension brings project-based database development to Azure Data Studio. In this preview release, SQL projects can be created and published from Azure Data Studio.
-* Added Kusto (KQL) extension - Brings native Kusto experiences in Azure Data Studio for data exploration and data analytics against massive amount of real-time streaming data stored in Azure Data Explorer. This preview release supports connecting and browsing Azure Data Explorer clusters, writing KQL queries as well as authoring notebooks with Kusto kernel.
-* SQL Server Import extension GA - Announcing the GA of the SQL Server Import extension, features no longer in preview. This extension facilitates importing csv/txt files. Learn more about the extension in [this article](sql-server-import-extension.md).
-* Resolved [bugs and issues](https://github.com/microsoft/azuredatastudio/issues?q=is%3Aissue+milestone%3A%22September+2020+Release%22+is%3Aclosed).
-
-## Version 1.21.0
-* Release date: August 12, 2020
-* Release status: General Availability
-* New Notebook Features
-   * Move cell locations changd
-   * Added action to convert cells to Text Cell or Code cell
-* Jupyter Books picker to open Jupyter Books directly from Github
-* Search bar added to Notebooks Viewlet for searching through Jupyter Books
-* Address issues in [August 2020 Milestone](https://github.com/microsoft/azuredatastudio/milestone/59?closed=1)
-
-## Version 1.20.1
-* Release date: July 17, 2020
-* Release status: General Availability
-* Fix bug #11372 Object Explorer drag-and-drop table incorrectly wraps table names [#11372](https://github.com/microsoft/azuredatastudio/issues/11372)
-* Fix bug #11356 Dark theme is now the default theme [#11356](https://github.com/microsoft/azuredatastudio/issues/11356)
-* Known Issues:
-    * Some users have reported connection errors from the new Microsoft.Data.SqlClient v2.0.0 included in this release. Users have found [following these instructions](https://github.com/microsoft/azuredatastudio/issues/11367#issuecomment-659614111) to successfully connect. This issue was caused by a client driver update which fixed an issue where TLS encryption wasn't enforced correctly. See https://github.com/dotnet/SqlClient/blob/master/release-notes/2.0/2.0.0.md#breaking-changes-1 and https://docs.microsoft.com/en-us/sql/relational-databases/native-client/features/using-encryption-without-validation for more information.
-
-## Version 1.20.0
-* Release date: July 15, 2020
-* Release status: General Availability
-* Feature Tour
-* New Notebook Features
-    * Header support in Markdown Toolbar
-    * Side-by-side Markdown preview in Text Cells
-* Drag and drop columns and tables into Query Editor
-* Azure Account icon added to Activity Bar
-* Address issues in [July 2020 Milestone](https://github.com/microsoft/azuredatastudio/milestone/57?closed=1)
-* Bug fixes
-
-## Version 1.19.0
-* Release date: June 15, 2020
-* Release status: General Availability
-* Address issues in https://github.com/microsoft/azuredatastudio/milestone/55?closed=1
-* Bug fixes
-
 ## Version 1.18.1
 * Release date: May 27, 2020
 * Release status: General Availability

README.md

@@ -1,7 +1,7 @@
 # Azure Data Studio
 
 [![Join the chat at https://gitter.im/Microsoft/sqlopsstudio](https://badges.gitter.im/Microsoft/sqlopsstudio.svg)](https://gitter.im/Microsoft/sqlopsstudio?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://dev.azure.com/azuredatastudio/azuredatastudio/_apis/build/status/Azure%20Data%20Studio%20CI?branchName=main)](https://dev.azure.com/azuredatastudio/azuredatastudio/_build/latest?definitionId=4&branchName=main)
+[![Build Status](https://dev.azure.com/azuredatastudio/azuredatastudio/_apis/build/status/Azure%20Data%20Studio%20CI?branchName=master)](https://dev.azure.com/azuredatastudio/azuredatastudio/_build/latest?definitionId=4&branchName=master)
 [![Twitter Follow](https://img.shields.io/twitter/follow/azuredatastudio?style=social)](https://twitter.com/azuredatastudio)
 
 Azure Data Studio is a data management tool that enables you to work with SQL Server, Azure SQL DB and SQL DW from Windows, macOS and Linux.
@@ -19,18 +19,16 @@ Azure Data Studio is a data management tool that enables you to work with SQL Se
 | [Linux DEB][linux-deb]									|
 
 
-Go to our [download page](https://aka.ms/getazuredatastudio) for more specific instructions.
+Go to our [download page](https://aka.ms/azuredatastudio) for more specific instructions.
 
-## Try out the latest insiders build from `main`:
+## Try out the latest insiders build from `master`:
 - [Windows User Installer - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/win32-x64-user/insider)
 - [Windows System Installer - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/win32-x64/insider)
 - [Windows ZIP - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/win32-x64-archive/insider)
 - [macOS ZIP - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/darwin/insider)
 - [Linux TAR.GZ - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/linux-x64/insider)
 
-See the [change log](https://github.com/Microsoft/azuredatastudio/blob/main/CHANGELOG.md) for additional details of what's in this release.
+See the [change log](https://github.com/Microsoft/azuredatastudio/blob/master/CHANGELOG.md) for additional details of what's in this release.
-Go to our [download page](https://aka.ms/getazuredatastudio) for more specific instructions.
-
 
 ## **Feature Highlights**
 
@@ -49,7 +47,7 @@ Go to our [download page](https://aka.ms/getazuredatastudio) for more specific i
 
 Here are some of these features in action.
 
-<img src='https://github.com/Microsoft/azuredatastudio/blob/main/docs/overview_screen.jpg' width='800px'>
+<img src='https://github.com/Microsoft/azuredatastudio/blob/master/docs/overview_screen.jpg' width='800px'>
 
 ## Contributing
 If you are interested in fixing issues and contributing directly to the code base,
@@ -123,7 +121,7 @@ We would like to thank all our users who raised issues, and in particular the fo
 * olljanat for `Implemented npm version check (#314)`
 * Adam Machanic for helping with the `whoisactive` extension
 
-And of course, we'd like to thank the authors of all upstream dependencies.  Please see a full list in the [ThirdPartyNotices.txt](https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/ThirdPartyNotices.txt)
+And of course, we'd like to thank the authors of all upstream dependencies.  Please see a full list in the [ThirdPartyNotices.txt](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/ThirdPartyNotices.txt)
 
 ## License
 
@@ -131,10 +129,10 @@ Copyright (c) Microsoft Corporation. All rights reserved.
 
 Licensed under the [Source EULA](LICENSE.txt).
 
-[win-user]: https://go.microsoft.com/fwlink/?linkid=2150927
+[win-user]: https://go.microsoft.com/fwlink/?linkid=2127522
-[win-system]: https://go.microsoft.com/fwlink/?linkid=2150928
+[win-system]: https://go.microsoft.com/fwlink/?linkid=2127432
-[win-zip]: https://go.microsoft.com/fwlink/?linkid=2151312
+[win-zip]: https://go.microsoft.com/fwlink/?linkid=2127716
-[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2151311
+[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2127431
-[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2151508
+[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2127523
-[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2151407
+[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2127433
-[linux-deb]: https://go.microsoft.com/fwlink/?linkid=2151506
+[linux-deb]: https://go.microsoft.com/fwlink/?linkid=2127524

ThirdPartyNotices.txt

@@ -41,7 +41,6 @@ expressly granted herein, whether by implication, estoppel or otherwise.
     JupyterLab: https://github.com/jupyterlab/jupyterlab
 		keytar: https://github.com/atom/node-keytar
     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
     native-keymap: https://github.com/Microsoft/node-native-keymap
@@ -64,8 +63,6 @@ expressly granted herein, whether by implication, estoppel or otherwise.
     svg.js: https://github.com/svgdotjs/svg.js
     systemjs: https://github.com/systemjs/systemjs
     temp-write: https://github.com/sindresorhus/temp-write
-    turndown: https://github.com/domchristie/turndown
-    turndown-plugin-gfm: https://github.com/domchristie/turndown-plugin-gfm
     underscore: https://github.com/jashkenas/underscore
     v8-profiler: https://github.com/node-inspector/v8-profiler
     vscode: https://github.com/microsoft/vscode
@@ -75,8 +72,6 @@ expressly granted herein, whether by implication, estoppel or otherwise.
     vscode-ripgrep: https://github.com/roblourens/vscode-ripgrep
     vscode-textmate: https://github.com/Microsoft/vscode-textmate
     winreg: https://github.com/fresc81/node-winreg
-    xmldom: https://github.com/xmldom/xmldom
-    xml-formatter: https://github.com/chrisbottin/xml-formatter
     xterm: https://github.com/sourcelair/xterm.js
     yargs: https://github.com/yargs/yargs
     yauzl: https://github.com/thejoshwolfe/yauzl
@@ -1257,32 +1252,6 @@ ISC © Julien Fontanet
 =========================================
 END OF make-error NOTICES AND INFORMATION
 
-%% mark.js NOTICES AND INFORMATION BEGIN HERE
-=========================================
-The MIT License (MIT)
-
-Copyright (c) 2014–2019 Julian Kühnel
-
-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 mark.js NOTICES AND INFORMATION
-
 %% minimist NOTICES AND INFORMATION BEGIN HERE
 =========================================
 This software is released under the MIT license:
@@ -1526,6 +1495,30 @@ END OF primeng NOTICES AND INFORMATION
 
 %% process-nextick-args NOTICES AND INFORMATION BEGIN HERE
 =========================================
+# Copyright (c) 2015 Calvin Metcalf
+
+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 process-nextick-args NOTICES AND INFORMATION
+
+%% pty.js NOTICES AND INFORMATION BEGIN HERE
+=========================================
 Copyright (c) 2012-2015, Christopher Jeffrey (https://github.com/chjj/)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -2007,58 +2000,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 =========================================
 END OF temp-write NOTICES AND INFORMATION
 
-%% turndown NOTICES AND INFORMATION BEGIN HERE
-=========================================
-MIT License
-
-Copyright (c) 2017 Dom Christie
-
-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 turndown NOTICES AND INFORMATION
-
-%% turndown-plugin-gfm NOTICES AND INFORMATION BEGIN HERE
-=========================================
-MIT License
-
-Copyright (c) 2017 Dom Christie
-
-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 turndown-plugin-gfm NOTICES AND INFORMATION
-
 %% underscore NOTICES AND INFORMATION BEGIN HERE
 =========================================
 Copyright (c) 2009-2017 Jeremy Ashkenas, DocumentCloud and Investigative
@@ -2284,51 +2225,6 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 =========================================
 END OF winreg NOTICES AND INFORMATION
 
-%% xmldom NOTICES AND INFORMATION BEGIN HERE
-=========================================
-The MIT License (MIT)
-
-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 xmldom NOTICES AND INFORMATION
-
-%% xml-formatter NOTICES AND INFORMATION BEGIN HERE
-=========================================
-The MIT License (MIT)
-
-Copyright 2019 Chris Bottin (https://github.com/chrisbottin)
-
-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 xml-formatter NOTICES AND INFORMATION
-
 %% xterm NOTICES AND INFORMATION BEGIN HERE
 =========================================
 Copyright (c) 2014-2016, SourceLair Private Company (https://www.sourcelair.com)

azure-pipelines.yml

@@ -1,5 +1,5 @@
 trigger:
-  - main
+  - master
   - release/*
 
 jobs:

build/.gitattributes

@@ -1,3 +0,0 @@
-* text eol=lf
-*.exe binary
-*.dll binary

build/.webignore

@@ -1,31 +0,0 @@
-# cleanup rules for web node modules, .gitignore style
-
-**/*.txt
-**/*.json
-**/*.md
-**/*.d.ts
-**/*.js.map
-**/LICENSE
-**/CONTRIBUTORS
-
-**/docs/**
-**/example/**
-**/examples/**
-
-jschardet/index.js
-jschardet/src/**
-jschardet/dist/jschardet.js
-
-vscode-textmate/webpack.config.js
-
-xterm/src/**
-
-xterm-addon-search/src/**
-xterm-addon-search/out/**
-xterm-addon-search/fixtures/**
-
-xterm-addon-unicode11/src/**
-xterm-addon-unicode11/out/**
-
-xterm-addon-webgl/src/**
-xterm-addon-webgl/out/**

build/actions/package.json

@@ -15,9 +15,9 @@
 	"keywords": [],
 	"author": "",
 	"dependencies": {
-		"@actions/core": "^1.2.6",
+		"@actions/core": "^1.2.3",
 		"@actions/github": "^2.1.1",
-		"axios": "^0.21.1",
+		"axios": "^0.19.2",
     "ts-node": "^8.6.2",
     "typescript": "^3.8.3"
 	}

build/actions/yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@actions/core@^1.2.6":
+"@actions/core@^1.2.3":
-  version "1.2.6"
+  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.2.6.tgz#a78d49f41a4def18e88ce47c2cac615d5694bf09"
+  resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.2.3.tgz#e844b4fa0820e206075445079130868f95bfca95"
-  integrity sha512-ZQYitnqiyBc3D+k7LsgSBmMDVkOVidaagDG7j3fOym77jNunWRuYx7VSHa9GNfFZh+zh61xsCjRj4JxMZlDqTA==
+  integrity sha512-Wp4xnyokakM45Uuj4WLUxdsa8fJjKVl1fDTsPbTEcTcuu0Nb26IPQbOtjmnfaCPGcaoPOOqId8H9NapZ8gii4w==
 
 "@actions/github@^2.1.1":
   version "2.1.1"
@@ -144,12 +144,12 @@ atob-lite@^2.0.0:
   resolved "https://registry.yarnpkg.com/atob-lite/-/atob-lite-2.0.0.tgz#0fef5ad46f1bd7a8502c65727f0367d5ee43d696"
   integrity sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY=
 
-axios@^0.21.1:
+axios@^0.19.2:
-  version "0.21.1"
+  version "0.19.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
-  integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
+  integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
   dependencies:
-    follow-redirects "^1.10.0"
+    follow-redirects "1.5.10"
 
 before-after-hook@^2.0.0:
   version "2.1.0"
@@ -177,6 +177,13 @@ cross-spawn@^6.0.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+debug@=3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
+  dependencies:
+    ms "2.0.0"
+
 deprecation@^2.0.0, deprecation@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
@@ -207,10 +214,12 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-follow-redirects@^1.10.0:
+follow-redirects@1.5.10:
-  version "1.13.1"
+  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
-  integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==
+  integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
+  dependencies:
+    debug "=3.1.0"
 
 get-stream@^4.0.0:
   version "4.1.0"
@@ -266,15 +275,20 @@ make-error@^1.1.1:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 node-fetch@^2.3.0:
-  version "2.6.1"
+  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
-  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
 
 npm-run-path@^2.0.0:
   version "2.0.2"

build/azure-pipelines/common/copyArtifacts.ts

@@ -24,7 +24,7 @@ const files = [
 ];
 
 async function main() {
-	return new Promise<void>((resolve, reject) => {
+	return new Promise((resolve, reject) => {
 		const stream = vfs.src(files, { base: '.build', allowEmpty: true })
 			.pipe(es.through(file => {
 				const filePath = path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY!,

build/azure-pipelines/common/createAsset.ts

@@ -53,7 +53,7 @@ async function uploadBlob(blobService: azure.BlobService, quality: string, blobN
 		}
 	};
 
-	await new Promise<void>((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, filePath, blobOptions, err => err ? e(err) : c()));
+	await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, filePath, blobOptions, err => err ? e(err) : c()));
 }
 
 function getEnv(name: string): string {

build/azure-pipelines/common/extract-telemetry.sh

@@ -10,10 +10,10 @@ git clone --depth 1 https://github.com/Microsoft/vscode-node-debug2.git
 git clone --depth 1 https://github.com/Microsoft/vscode-node-debug.git
 git clone --depth 1 https://github.com/Microsoft/vscode-html-languageservice.git
 git clone --depth 1 https://github.com/Microsoft/vscode-json-languageservice.git
-node $BUILD_SOURCESDIRECTORY/build/node_modules/.bin/vscode-telemetry-extractor --sourceDir $BUILD_SOURCESDIRECTORY --excludedDir $BUILD_SOURCESDIRECTORY/extensions --outputDir . --applyEndpoints
+$BUILD_SOURCESDIRECTORY/build/node_modules/.bin/vscode-telemetry-extractor --sourceDir $BUILD_SOURCESDIRECTORY --excludedDir $BUILD_SOURCESDIRECTORY/extensions --outputDir . --applyEndpoints
-node $BUILD_SOURCESDIRECTORY/build/node_modules/.bin/vscode-telemetry-extractor --config $BUILD_SOURCESDIRECTORY/build/azure-pipelines/common/telemetry-config.json -o .
+$BUILD_SOURCESDIRECTORY/build/node_modules/.bin/vscode-telemetry-extractor --config $BUILD_SOURCESDIRECTORY/build/azure-pipelines/common/telemetry-config.json -o .
 mkdir -p $BUILD_SOURCESDIRECTORY/.build/telemetry
 mv declarations-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-core.json
 mv config-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-extensions.json
 cd ..
-rm -rf extraction
+rm -rf extraction

build/azure-pipelines/common/publish-webview.ts

@@ -17,7 +17,7 @@ const fileNames = [
 ];
 
 async function assertContainer(blobService: azure.BlobService, container: string): Promise<void> {
-	await new Promise<void>((c, e) => blobService.createContainerIfNotExists(container, { publicAccessLevel: 'blob' }, err => err ? e(err) : c()));
+	await new Promise((c, e) => blobService.createContainerIfNotExists(container, { publicAccessLevel: 'blob' }, err => err ? e(err) : c()));
 }
 
 async function doesBlobExist(blobService: azure.BlobService, container: string, blobName: string): Promise<boolean | undefined> {
@@ -33,7 +33,7 @@ async function uploadBlob(blobService: azure.BlobService, container: string, blo
 		}
 	};
 
-	await new Promise<void>((c, e) => blobService.createBlockBlobFromLocalFile(container, blobName, file, blobOptions, err => err ? e(err) : c()));
+	await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(container, blobName, file, blobOptions, err => err ? e(err) : c()));
 }
 
 async function publish(commit: string, files: readonly string[]): Promise<void> {

build/azure-pipelines/common/publish.ts

@@ -43,7 +43,6 @@ function createDefaultConfig(quality: string): Config {
 }
 
 function getConfig(quality: string): Promise<Config> {
-	console.log(`Getting config for quality ${quality}`);
 	const client = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT']!, { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
 	const collection = 'dbs/builds/colls/config';
 	const query = {
@@ -53,13 +52,13 @@ function getConfig(quality: string): Promise<Config> {
 		]
 	};
 
-	return retry(() => new Promise<Config>((c, e) => {
+	return new Promise<Config>((c, e) => {
 		client.queryDocuments(collection, query, { enableCrossPartitionQuery: true }).toArray((err, results) => {
 			if (err && err.code !== 409) { return e(err); }
 
 			c(!results || results.length === 0 ? createDefaultConfig(quality) : results[0] as any as Config);
 		});
-	}));
+	});
 }
 
 interface Asset {
@@ -87,7 +86,6 @@ function createOrUpdate(commit: string, quality: string, platform: string, type:
 		updateTries++;
 
 		return new Promise<void>((c, e) => {
-			console.log(`Querying existing documents to update...`);
 			client.queryDocuments(collection, updateQuery, { enableCrossPartitionQuery: true }).toArray((err, results) => {
 				if (err) { return e(err); }
 				if (results.length !== 1) { return e(new Error('No documents')); }
@@ -103,7 +101,6 @@ function createOrUpdate(commit: string, quality: string, platform: string, type:
 					release.updates[platform] = type;
 				}
 
-				console.log(`Replacing existing document with updated version`);
 				client.replaceDocument(release._self, release, err => {
 					if (err && err.code === 409 && updateTries < 5) { return c(update()); }
 					if (err) { return e(err); }
@@ -115,8 +112,7 @@ function createOrUpdate(commit: string, quality: string, platform: string, type:
 		});
 	}
 
-	return retry(() => new Promise<void>((c, e) => {
+	return new Promise<void>((c, e) => {
-		console.log(`Attempting to create document`);
 		client.createDocument(collection, release, err => {
 			if (err && err.code === 409) { return c(update()); }
 			if (err) { return e(err); }
@@ -124,11 +120,11 @@ function createOrUpdate(commit: string, quality: string, platform: string, type:
 			console.log('Build successfully published.');
 			c();
 		});
-	}));
+	});
 }
 
 async function assertContainer(blobService: azure.BlobService, quality: string): Promise<void> {
-	await new Promise<void>((c, e) => blobService.createContainerIfNotExists(quality, { publicAccessLevel: 'blob' }, err => err ? e(err) : c()));
+	await new Promise((c, e) => blobService.createContainerIfNotExists(quality, { publicAccessLevel: 'blob' }, err => err ? e(err) : c()));
 }
 
 async function doesAssetExist(blobService: azure.BlobService, quality: string, blobName: string): Promise<boolean | undefined> {
@@ -144,7 +140,7 @@ async function uploadBlob(blobService: azure.BlobService, quality: string, blobN
 		}
 	};
 
-	await new Promise<void>((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, file, blobOptions, err => err ? e(err) : c()));
+	await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, file, blobOptions, err => err ? e(err) : c()));
 }
 
 interface PublishOptions {
@@ -192,6 +188,7 @@ async function publish(commit: string, quality: string, platform: string, type:
 		console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`);
 		return;
 	}
+
 	console.log('Uploading blobs to Azure storage...');
 
 	await uploadBlob(blobService, quality, blobName, file);
@@ -219,10 +216,10 @@ async function publish(commit: string, quality: string, platform: string, type:
 	console.log('Asset:', JSON.stringify(asset, null, '  '));
 
 	// {{SQL CARBON EDIT}}
-	// Insiders: nightly build from main
+	// Insiders: nightly build from master
 	const isReleased = (
 		(
-			(quality === 'insider' && /^main$|^refs\/heads\/main$/.test(sourceBranch)) ||
+			(quality === 'insider' && /^master$|^refs\/heads\/master$/.test(sourceBranch)) ||
 			(quality === 'rc1' && /^release\/|^refs\/heads\/release\//.test(sourceBranch))
 		) &&
 		/Project Collection Service Accounts|Microsoft.VisualStudio.Services.TFS/.test(queuedBy)
@@ -250,22 +247,6 @@ async function publish(commit: string, quality: string, platform: string, type:
 	await createOrUpdate(commit, quality, platform, type, release, asset, isUpdate);
 }
 
-const RETRY_TIMES = 10;
-async function retry<T>(fn: () => Promise<T>): Promise<T> {
-	for (let run = 1; run <= RETRY_TIMES; run++) {
-		try {
-			return await fn();
-		} catch (err) {
-			if (!/ECONNRESET/.test(err.message)) {
-				throw err;
-			}
-			console.log(`Caught error ${err} - ${run}/${RETRY_TIMES}`);
-		}
-	}
-
-	throw new Error('Retried too many times');
-}
-
 function main(): void {
 	const commit = process.env['BUILD_SOURCEVERSION'];
 

build/azure-pipelines/common/symbols.ts

@@ -0,0 +1,228 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 request from 'request';
+import { createReadStream, createWriteStream, unlink, mkdir } from 'fs';
+import * as github from 'github-releases';
+import { join } from 'path';
+import { tmpdir } from 'os';
+import { promisify } from 'util';
+
+const BASE_URL = 'https://rink.hockeyapp.net/api/2/';
+const HOCKEY_APP_TOKEN_HEADER = 'X-HockeyAppToken';
+
+export interface IVersions {
+	app_versions: IVersion[];
+}
+
+export interface IVersion {
+	id: number;
+	version: string;
+}
+
+export interface IApplicationAccessor {
+	accessToken: string;
+	appId: string;
+}
+
+export interface IVersionAccessor extends IApplicationAccessor {
+	id: string;
+}
+
+enum Platform {
+	WIN_32 = 'win32-ia32',
+	WIN_64 = 'win32-x64',
+	LINUX_64 = 'linux-x64',
+	MAC_OS = 'darwin-x64'
+}
+
+function symbolsZipName(platform: Platform, electronVersion: string, insiders: boolean): string {
+	return `${insiders ? 'insiders' : 'stable'}-symbols-v${electronVersion}-${platform}.zip`;
+}
+
+const SEED = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+async function tmpFile(name: string): Promise<string> {
+	let res = '';
+	for (let i = 0; i < 8; i++) {
+		res += SEED.charAt(Math.floor(Math.random() * SEED.length));
+	}
+
+	const tmpParent = join(tmpdir(), res);
+
+	await promisify(mkdir)(tmpParent);
+
+	return join(tmpParent, name);
+}
+
+function getVersions(accessor: IApplicationAccessor): Promise<IVersions> {
+	return asyncRequest<IVersions>({
+		url: `${BASE_URL}/apps/${accessor.appId}/app_versions`,
+		method: 'GET',
+		headers: {
+			[HOCKEY_APP_TOKEN_HEADER]: accessor.accessToken
+		}
+	});
+}
+
+function createVersion(accessor: IApplicationAccessor, version: string): Promise<IVersion> {
+	return asyncRequest<IVersion>({
+		url: `${BASE_URL}/apps/${accessor.appId}/app_versions/new`,
+		method: 'POST',
+		headers: {
+			[HOCKEY_APP_TOKEN_HEADER]: accessor.accessToken
+		},
+		formData: {
+			bundle_version: version
+		}
+	});
+}
+
+function updateVersion(accessor: IVersionAccessor, symbolsPath: string) {
+	return asyncRequest<IVersions>({
+		url: `${BASE_URL}/apps/${accessor.appId}/app_versions/${accessor.id}`,
+		method: 'PUT',
+		headers: {
+			[HOCKEY_APP_TOKEN_HEADER]: accessor.accessToken
+		},
+		formData: {
+			dsym: createReadStream(symbolsPath)
+		}
+	});
+}
+
+function asyncRequest<T>(options: request.UrlOptions & request.CoreOptions): Promise<T> {
+	return new Promise<T>((resolve, reject) => {
+		request(options, (error, _response, body) => {
+			if (error) {
+				reject(error);
+			} else {
+				resolve(JSON.parse(body));
+			}
+		});
+	});
+}
+
+function downloadAsset(repository: any, assetName: string, targetPath: string, electronVersion: string) {
+	return new Promise((resolve, reject) => {
+		repository.getReleases({ tag_name: `v${electronVersion}` }, (err: any, releases: any) => {
+			if (err) {
+				reject(err);
+			} else {
+				const asset = releases[0].assets.filter((asset: any) => asset.name === assetName)[0];
+				if (!asset) {
+					reject(new Error(`Asset with name ${assetName} not found`));
+				} else {
+					repository.downloadAsset(asset, (err: any, reader: any) => {
+						if (err) {
+							reject(err);
+						} else {
+							const writer = createWriteStream(targetPath);
+							writer.on('error', reject);
+							writer.on('close', resolve);
+							reader.on('error', reject);
+
+							reader.pipe(writer);
+						}
+					});
+				}
+			}
+		});
+	});
+}
+
+interface IOptions {
+	repository: string;
+	platform: Platform;
+	versions: { code: string; insiders: boolean; electron: string; };
+	access: { hockeyAppToken: string; hockeyAppId: string; githubToken: string };
+}
+
+async function ensureVersionAndSymbols(options: IOptions) {
+
+	// Check version does not exist
+	console.log(`HockeyApp: checking for existing version ${options.versions.code} (${options.platform})`);
+	const versions = await getVersions({ accessToken: options.access.hockeyAppToken, appId: options.access.hockeyAppId });
+	if (!Array.isArray(versions.app_versions)) {
+		throw new Error(`Unexpected response: ${JSON.stringify(versions)}`);
+	}
+
+	if (versions.app_versions.some(v => v.version === options.versions.code)) {
+		console.log(`HockeyApp: Returning without uploading symbols because version ${options.versions.code} (${options.platform}) was already found`);
+		return;
+	}
+
+	// Download symbols for platform and electron version
+	const symbolsName = symbolsZipName(options.platform, options.versions.electron, options.versions.insiders);
+	const symbolsPath = await tmpFile('symbols.zip');
+	console.log(`HockeyApp: downloading symbols ${symbolsName} for electron ${options.versions.electron} (${options.platform}) into ${symbolsPath}`);
+	await downloadAsset(new (github as any)({ repo: options.repository, token: options.access.githubToken }), symbolsName, symbolsPath, options.versions.electron);
+
+	// Create version
+	console.log(`HockeyApp: creating new version ${options.versions.code} (${options.platform})`);
+	const version = await createVersion({ accessToken: options.access.hockeyAppToken, appId: options.access.hockeyAppId }, options.versions.code);
+
+	// Upload symbols
+	console.log(`HockeyApp: uploading symbols for version ${options.versions.code} (${options.platform})`);
+	await updateVersion({ id: String(version.id), accessToken: options.access.hockeyAppToken, appId: options.access.hockeyAppId }, symbolsPath);
+
+	// Cleanup
+	await promisify(unlink)(symbolsPath);
+}
+
+// Environment
+const pakage = require('../../../package.json');
+const product = require('../../../product.json');
+const repository = product.electronRepository;
+const electronVersion = require('../../lib/electron').getElectronVersion();
+const insiders = product.quality !== 'stable';
+let codeVersion = pakage.version;
+if (insiders) {
+	codeVersion = `${codeVersion}-insider`;
+}
+const githubToken = process.argv[2];
+const hockeyAppToken = process.argv[3];
+const is64 = process.argv[4] === 'x64';
+const hockeyAppId = process.argv[5];
+
+if (process.argv.length !== 6) {
+	throw new Error(`HockeyApp: Unexpected number of arguments. Got ${process.argv}`);
+}
+
+let platform: Platform;
+if (process.platform === 'darwin') {
+	platform = Platform.MAC_OS;
+} else if (process.platform === 'win32') {
+	platform = is64 ? Platform.WIN_64 : Platform.WIN_32;
+} else {
+	platform = Platform.LINUX_64;
+}
+
+// Create version and upload symbols in HockeyApp
+if (repository && codeVersion && electronVersion && (product.quality === 'stable' || product.quality === 'insider')) {
+	ensureVersionAndSymbols({
+		repository,
+		platform,
+		versions: {
+			code: codeVersion,
+			insiders,
+			electron: electronVersion
+		},
+		access: {
+			githubToken,
+			hockeyAppToken,
+			hockeyAppId
+		}
+	}).then(() => {
+		console.log('HockeyApp: done');
+	}).catch(error => {
+		console.error(`HockeyApp: error ${error} (AppID: ${hockeyAppId})`);
+
+		return process.exit(1);
+	});
+} else {
+	console.log(`HockeyApp: skipping due to unexpected context (repository: ${repository}, codeVersion: ${codeVersion}, electronVersion: ${electronVersion}, quality: ${product.quality})`);
+}

build/azure-pipelines/darwin/app-entitlements.plist

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>com.apple.security.cs.allow-jit</key>
-    <true/>
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-    <true/>
-    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
-    <true/>
-</dict>
-</plist>

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

@@ -1,26 +1,24 @@
 steps:
-  - task: NodeTool@0
+- task: NodeTool@0
-    inputs:
+  inputs:
-      versionSpec: "12.14.1"
+    versionSpec: "12.13.0"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3 # {{SQL CARBON EDIT}} update version
   inputs:
     versionSpec: "1.x"
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  displayName: Restore Cache - Node Modules # {{SQL CARBON EDIT}}
   inputs:
     keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
     targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
     vstsFeed: 'npm-cache' # {{SQL CARBON EDIT}} update build cache
 
-  - script: |
+- script: |
-      CHILD_CONCURRENCY=1 yarn --frozen-lockfile
+    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
-    displayName: Install Dependencies
+  displayName: Install Dependencies
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-  displayName: Save Cache - Node Modules # {{SQL CARBON EDIT}}
   inputs:
     keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
     targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
@@ -31,45 +29,52 @@ steps:
     yarn electron x64
   displayName: Download Electron
 
-# - script: | {{SQL CARBON EDIT}} remove editor checks
+- script: |
+    yarn gulp hygiene
+  displayName: Run Hygiene Checks
+
+- script: | # {{SQL CARBON EDIT}} add step
+    yarn strict-vscode
+  displayName: Run Strict Null Check.
+
+# - script: | {{SQL CARBON EDIT}} remove step
 #     yarn monaco-compile-check
 #   displayName: Run Monaco Editor Checks
 
-  - script: |
+- script: |
-      yarn valid-layers-check
+    yarn valid-layers-check
-    displayName: Run Valid Layers Checks
+  displayName: Run Valid Layers Checks
 
-  - script: |
+- script: |
-      yarn compile
+    yarn compile
-    displayName: Compile Sources
+  displayName: Compile Sources
 
 # - script: | {{SQL CARBON EDIT}} remove step
 #     yarn download-builtin-extensions
 #   displayName: Download Built-in Extensions
 
-  - script: |
+- script: |
-      ./scripts/test.sh --tfs "Unit Tests"
+    ./scripts/test.sh --tfs "Unit Tests"
-    displayName: Run Unit Tests (Electron)
+  displayName: Run Unit Tests (Electron)
 
 # - script: | {{SQL CARBON EDIT}} disable
-#     yarn test-browser --browser chromium --browser webkit --browser firefox --tfs "Browser Unit Tests"
+#     yarn test-browser --browser chromium --browser webkit --browser firefox
 #   displayName: Run Unit Tests (Browser)
 
 # - script: | {{SQL CARBON EDIT}} disable
 #     ./scripts/test-integration.sh --tfs "Integration Tests"
 #   displayName: Run Integration Tests (Electron)
 
-  - task: PublishPipelineArtifact@0
+# - task: PublishPipelineArtifact@0
-    inputs:
+#   inputs:
-      artifactName: crash-dump-macos
+#     artifactName: crash-dump-macos
-      targetPath: .build/crashes
+#     targetPath: .build/crashes
-    displayName: "Publish Crash Reports"
+#   displayName: 'Publish Crash Reports'
-    continueOnError: true
+#   condition: succeededOrFailed()
-    condition: failed()
 
-  - task: PublishTestResults@2
+- task: PublishTestResults@2
-    displayName: Publish Tests Results
+  displayName: Publish Tests Results
-    inputs:
+  inputs:
-      testResultsFiles: "*-results.xml"
+    testResultsFiles: '*-results.xml'
-      searchFolder: "$(Build.ArtifactStagingDirectory)/test-results"
+    searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
-    condition: succeededOrFailed()
+  condition: succeededOrFailed()

build/azure-pipelines/darwin/entitlements.plist

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+</dict>
+</plist>

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

@@ -1,337 +1,263 @@
 steps:
-  - script: |
+- script: |
-      mkdir -p .build
+    mkdir -p .build
-      echo -n $BUILD_SOURCEVERSION > .build/commit
+    echo -n $BUILD_SOURCEVERSION > .build/commit
-      echo -n $VSCODE_QUALITY > .build/quality
+    echo -n $VSCODE_QUALITY > .build/quality
-      echo -n $ENABLE_TERRAPIN > .build/terrapin
+  displayName: Prepare cache flag
-    displayName: Prepare compilation cache flags
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    inputs:
+  inputs:
-      keyfile: "build/.cachesalt, .build/commit, .build/quality, .build/terrapin"
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
-      targetfolder: ".build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min"
+    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
-      vstsFeed: "npm-vscode"
+    vstsFeed: 'npm-vscode'
-      platformIndependent: true
+    platformIndependent: true
-      alias: "Compilation"
+    alias: 'Compilation'
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      exit 1
+    exit 1
-    displayName: Check RestoreCache
+  displayName: Check RestoreCache
-    condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
+  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
 
-  - task: NodeTool@0
+- task: NodeTool@0
-    inputs:
+  inputs:
-      versionSpec: "12.14.1"
+    versionSpec: "12.13.0"
 
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
+  inputs:
-      versionSpec: "1.x"
+    versionSpec: "1.x"
 
-  - task: AzureKeyVault@1
+- task: AzureKeyVault@1
-    displayName: "Azure Key Vault: Get Secrets"
+  displayName: 'Azure Key Vault: Get Secrets'
-    inputs:
+  inputs:
-      azureSubscription: "vscode-builds-subscription"
+    azureSubscription: 'vscode-builds-subscription'
-      KeyVaultName: vscode
+    KeyVaultName: vscode
 
-  - script: |
+- script: |
-      set -e
+    set -e
 
-      cat << EOF > ~/.netrc
+    cat << EOF > ~/.netrc
-      machine github.com
+    machine github.com
-      login vscode
+    login vscode
-      password $(github-distro-mixin-password)
+    password $(github-distro-mixin-password)
-      EOF
+    EOF
 
-      git config user.email "vscode@microsoft.com"
+    git config user.email "vscode@microsoft.com"
-      git config user.name "VSCode"
+    git config user.name "VSCode"
-    displayName: Prepare tooling
+  displayName: Prepare tooling
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      sudo xcode-select -s /Applications/Xcode_12.2.app
+    git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
-    displayName: Switch to Xcode 12
+    git fetch distro
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
+    git merge $(node -p "require('./package.json').distro")
+  displayName: Merge distro
 
-  - script: |
+- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-      set -e
+  inputs:
-      git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
+    keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-      git fetch distro
+    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-      git merge $(node -p "require('./package.json').distro")
+    vstsFeed: 'npm-vscode'
-    displayName: Merge distro
 
-  - script: |
+- script: |
-      npx https://aka.ms/enablesecurefeed standAlone
+    set -e
-    displayName: Switch to Terrapin packages
+    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
-    timeoutInMinutes: 5
+  displayName: Install dependencies
-    condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true'))
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-  - script: |
+- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-      echo -n $(VSCODE_ARCH) > .build/arch
+  inputs:
-    displayName: Prepare yarn cache flags
+    keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+    vstsFeed: 'npm-vscode'
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+- script: |
-    inputs:
+    set -e
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
+    yarn postinstall
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
+  displayName: Run postinstall scripts
-      vstsFeed: "npm-vscode"
+  condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      npm install -g node-gyp@7.1.0
+    node build/azure-pipelines/mixin
-      node-gyp --version
+  displayName: Mix in quality
-    displayName: Update node-gyp
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      export npm_config_arch=$(VSCODE_ARCH)
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      export npm_config_node_gyp=$(which node-gyp)
+      yarn gulp vscode-darwin-min-ci
-      export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      export CHILD_CONCURRENCY="1"
+      yarn gulp vscode-reh-darwin-min-ci
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+      yarn gulp vscode-reh-web-darwin-min-ci
+  displayName: Build
 
-      for i in {1..3}; do # try 3 times, for Terrapin
+- script: |
-        yarn --frozen-lockfile && break
+    set -e
-        if [ $i -eq 3 ]; then
+    ./scripts/test.sh --build --tfs "Unit Tests"
-          echo "Yarn failed too many times" >&2
+  displayName: Run unit tests (Electron)
-          exit 1
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-        fi
-        echo "Yarn failed $i, trying again..."
-      done
-    displayName: Install dependencies
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+- script: |
-    inputs:
+    set -e
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
+    yarn test-browser --build --browser chromium --browser webkit --browser firefox
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
+  displayName: Run unit tests (Browser)
-      vstsFeed: "npm-vscode"
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-  - script: |
+- script: |
-      set -e
+    # Figure out the full absolute path of the product we just built
-      export npm_config_arch=$(VSCODE_ARCH)
+    # including the remote server and configure the integration tests
-      export npm_config_node_gyp=$(which node-gyp)
+    # to run with these builds instead of running out of sources.
-      export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
+    set -e
-      ls /Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
+    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
-      yarn postinstall
+    APP_NAME="`ls $APP_ROOT | head -n 1`"
-    displayName: Run postinstall scripts
+    INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
-    condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
+    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin" \
+    ./scripts/test-integration.sh --build --tfs "Integration Tests"
+  displayName: Run integration tests (Electron)
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      export npm_config_arch=$(VSCODE_ARCH)
+    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
-      export npm_config_node_gyp=$(which node-gyp)
+    APP_NAME="`ls $APP_ROOT | head -n 1`"
-      export npm_config_build_from_source=true
+    INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
-      export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
+    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin" \
-      ls /Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
+    ./resources/server/test/test-remote-integration.sh
-      yarn electron-rebuild
+  displayName: Run remote integration tests (Electron)
-      cd ./node_modules/keytar
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-      node-gyp rebuild
-    displayName: Rebuild native modules for ARM64
-    condition: eq(variables['VSCODE_ARCH'], 'arm64')
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      node build/azure-pipelines/mixin
+    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
-    displayName: Mix in quality
+    ./resources/server/test/test-web-integration.sh --browser webkit
+  displayName: Run integration tests (Browser)
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
-        yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
+    APP_NAME="`ls $APP_ROOT | head -n 1`"
-    displayName: Build
+    yarn smoketest --build "$APP_ROOT/$APP_NAME"
+  continueOnError: true
+  displayName: Run smoke tests (Electron)
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
-        yarn gulp vscode-reh-darwin-min-ci
+    yarn smoketest --web --headless
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+  continueOnError: true
-        yarn gulp vscode-reh-web-darwin-min-ci
+  displayName: Run smoke tests (Browser)
-    displayName: Build reh
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
 
-  - script: |
+- task: PublishPipelineArtifact@0
-      set -e
+  inputs:
-      yarn electron $(VSCODE_ARCH)
+    artifactName: crash-dump-macos
-    displayName: Download Electron
+    targetPath: .build/crashes
-    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  displayName: 'Publish Crash Reports'
+  condition: succeededOrFailed()
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
-      security default-keychain -s $(agent.tempdirectory)/buildagent.keychain
+    APP_NAME="`ls $APP_ROOT | head -n 1`"
-      security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+    HELPER_APP_NAME="`echo $APP_NAME | sed -e 's/^Visual Studio //;s/\.app$//'`"
-      echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12
+    APP_FRAMEWORK_PATH="$APP_ROOT/$APP_NAME/Contents/Frameworks"
-      security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
+    security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
-      security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
+    security default-keychain -s $(agent.tempdirectory)/buildagent.keychain
-      VSCODE_ARCH="$(VSCODE_ARCH)" DEBUG=electron-osx-sign* node build/darwin/sign.js
+    security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
-    displayName: Set Hardened Entitlements
+    echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12
+    security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
+    security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
+    codesign -s 99FM488X57 --deep --force --options runtime --entitlements build/azure-pipelines/darwin/entitlements.plist "$APP_ROOT"/*.app
+    codesign -s 99FM488X57 --force --options runtime --entitlements build/azure-pipelines/darwin/helper-gpu-entitlements.plist "$APP_FRAMEWORK_PATH/$HELPER_APP_NAME Helper (GPU).app"
+    codesign -s 99FM488X57 --force --options runtime --entitlements build/azure-pipelines/darwin/helper-plugin-entitlements.plist "$APP_FRAMEWORK_PATH/$HELPER_APP_NAME Helper (Plugin).app"
+    codesign -s 99FM488X57 --force --options runtime --entitlements build/azure-pipelines/darwin/helper-renderer-entitlements.plist "$APP_FRAMEWORK_PATH/$HELPER_APP_NAME Helper (Renderer).app"
+  displayName: Set Hardened Entitlements
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      ./scripts/test.sh --build --tfs "Unit Tests"
+    pushd $(agent.builddirectory)/VSCode-darwin && zip -r -X -y $(agent.builddirectory)/VSCode-darwin.zip * && popd
-    displayName: Run unit tests (Electron)
+  displayName: Archive build
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
+- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-      set -e
+  inputs:
-      yarn test-browser --build --browser chromium --browser webkit --browser firefox --tfs "Browser Unit Tests"
+    ConnectedServiceName: 'ESRP CodeSign'
-    displayName: Run unit tests (Browser)
+    FolderPath: '$(agent.builddirectory)'
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+    Pattern: 'VSCode-darwin.zip'
+    signConfigType: inlineSignParams
+    inlineOperation: |
+      [
+        {
+          "keyCode": "CP-401337-Apple",
+          "operationSetCode": "MacAppDeveloperSign",
+          "parameters": [
+            {
+              "parameterName": "Hardening",
+              "parameterValue": "--options=runtime"
+            }
+          ],
+          "toolName": "sign",
+          "toolVersion": "1.0"
+        }
+      ]
+    SessionTimeout: 60
+  displayName: Codesign
 
-  - script: |
+- script: |
-      # Figure out the full absolute path of the product we just built
+    zip -d $(agent.builddirectory)/VSCode-darwin.zip "*.pkg"
-      # including the remote server and configure the integration tests
+  displayName: Clean Archive
-      # to run with these builds instead of running out of sources.
-      set -e
-      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-      APP_NAME="`ls $APP_ROOT | head -n 1`"
-      INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
-      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin" \
-      ./scripts/test-integration.sh --build --tfs "Integration Tests"
-    displayName: Run integration tests (Electron)
-    condition: and(succeeded(),  eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
+    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-      ./resources/server/test/test-web-integration.sh --browser webkit
+    AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-    displayName: Run integration tests (Browser)
+    node build/azure-pipelines/common/createAsset.js darwin-unnotarized archive "VSCode-darwin-$VSCODE_QUALITY.zip" $(agent.builddirectory)/VSCode-darwin.zip
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  displayName: Publish Unnotarized Build
 
-  - script: |
+- script: |
-      set -e
+    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
-      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+    APP_NAME="`ls $APP_ROOT | head -n 1`"
-      APP_NAME="`ls $APP_ROOT | head -n 1`"
+    BUNDLE_IDENTIFIER=$(node -p "require(\"$APP_ROOT/$APP_NAME/Contents/Resources/app/product.json\").darwinBundleIdentifier")
-      INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
+    echo "##vso[task.setvariable variable=BundleIdentifier]$BUNDLE_IDENTIFIER"
-      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin" \
+  displayName: Export bundle identifier
-      ./resources/server/test/test-remote-integration.sh
-    displayName: Run remote integration tests (Electron)
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
+- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-      set -e
+  inputs:
-      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+    ConnectedServiceName: 'ESRP CodeSign'
-      APP_NAME="`ls $APP_ROOT | head -n 1`"
+    FolderPath: '$(agent.builddirectory)'
-      yarn smoketest --build "$APP_ROOT/$APP_NAME"
+    Pattern: 'VSCode-darwin.zip'
-    continueOnError: true
+    signConfigType: inlineSignParams
-    displayName: Run smoke tests (Electron)
+    inlineOperation: |
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+      [
+        {
+          "keyCode": "CP-401337-Apple",
+          "operationSetCode": "MacAppNotarize",
+          "parameters": [
+            {
+              "parameterName": "BundleId",
+              "parameterValue": "$(BundleIdentifier)"
+            }
+          ],
+          "toolName": "sign",
+          "toolVersion": "1.0"
+        }
+      ]
+    SessionTimeout: 60
+  displayName: Notarization
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn smoketest --web --headless
+    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-    continueOnError: true
+    AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
-    displayName: Run smoke tests (Browser)
+    AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+    VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \
+    ./build/azure-pipelines/darwin/publish.sh
+  displayName: Publish
 
-  - task: PublishPipelineArtifact@0
+- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    inputs:
+  displayName: 'Component Detection'
-      artifactName: crash-dump-macos-$(VSCODE_ARCH)
+  continueOnError: true
-      targetPath: .build/crashes
-    displayName: "Publish Crash Reports"
-    continueOnError: true
-    condition: failed()
-
-  - task: PublishTestResults@2
-    displayName: Publish Tests Results
-    inputs:
-      testResultsFiles: "*-results.xml"
-      searchFolder: "$(Build.ArtifactStagingDirectory)/test-results"
-    condition: succeededOrFailed()
-
-  - script: |
-      set -e
-      pushd $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) && zip -r -X -y $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip * && popd
-    displayName: Archive build
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-    inputs:
-      ConnectedServiceName: "ESRP CodeSign"
-      FolderPath: "$(agent.builddirectory)"
-      Pattern: "VSCode-darwin-$(VSCODE_ARCH).zip"
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-          {
-            "keyCode": "CP-401337-Apple",
-            "operationSetCode": "MacAppDeveloperSign",
-            "parameters": [
-              {
-                "parameterName": "Hardening",
-                "parameterValue": "--options=runtime"
-              }
-            ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          }
-        ]
-      SessionTimeout: 60
-    displayName: Codesign
-
-  - script: |
-      zip -d $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip "*.pkg"
-    displayName: Clean Archive
-
-  - script: |
-      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-      APP_NAME="`ls $APP_ROOT | head -n 1`"
-      BUNDLE_IDENTIFIER=$(node -p "require(\"$APP_ROOT/$APP_NAME/Contents/Resources/app/product.json\").darwinBundleIdentifier")
-      echo "##vso[task.setvariable variable=BundleIdentifier]$BUNDLE_IDENTIFIER"
-    displayName: Export bundle identifier
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-    inputs:
-      ConnectedServiceName: "ESRP CodeSign"
-      FolderPath: "$(agent.builddirectory)"
-      Pattern: "VSCode-darwin-$(VSCODE_ARCH).zip"
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-          {
-            "keyCode": "CP-401337-Apple",
-            "operationSetCode": "MacAppNotarize",
-            "parameters": [
-              {
-                "parameterName": "BundleId",
-                "parameterValue": "$(BundleIdentifier)"
-              }
-            ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          }
-        ]
-      SessionTimeout: 60
-    displayName: Notarization
-
-  - script: |
-      set -e
-      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-      APP_NAME="`ls $APP_ROOT | head -n 1`"
-      "$APP_ROOT/$APP_NAME/Contents/Resources/app/bin/code" --export-default-configuration=.build
-    displayName: Verify start after signing (export configuration)
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
-
-  - script: |
-      set -e
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-      AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
-      AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-      VSCODE_ARCH="$(VSCODE_ARCH)" \
-      ./build/azure-pipelines/darwin/publish.sh
-    displayName: Publish
-
-  - script: |
-      AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
-      VSCODE_ARCH="$(VSCODE_ARCH)" \
-      yarn gulp upload-vscode-configuration
-    displayName: Upload configuration (for Bing settings search)
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
-    continueOnError: true
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: "Component Detection"
-    continueOnError: true

build/azure-pipelines/darwin/publish.sh

@@ -1,27 +1,27 @@
 #!/usr/bin/env bash
 set -e
 
-# Publish DEB
-case $VSCODE_ARCH in
-	x64) ASSET_ID="darwin" ;;
-	arm64) ASSET_ID="darwin-arm64" ;;
-esac
-
 # publish the build
 node build/azure-pipelines/common/createAsset.js \
-	"$ASSET_ID" \
+	darwin \
 	archive \
-	"VSCode-$ASSET_ID.zip" \
+	"VSCode-darwin-$VSCODE_QUALITY.zip" \
-	../VSCode-darwin-$VSCODE_ARCH.zip
+	../VSCode-darwin.zip
 
-if [ "$VSCODE_ARCH" == "x64" ]; then
+# package Remote Extension Host
-	# package Remote Extension Host
+pushd .. && mv vscode-reh-darwin vscode-server-darwin && zip -Xry vscode-server-darwin.zip vscode-server-darwin && popd
-	pushd .. && mv vscode-reh-darwin vscode-server-darwin && zip -Xry vscode-server-darwin.zip vscode-server-darwin && popd
 
-	# publish Remote Extension Host
+# publish Remote Extension Host
-	node build/azure-pipelines/common/createAsset.js \
+node build/azure-pipelines/common/createAsset.js \
-		server-darwin \
+	server-darwin \
-		archive-unsigned \
+	archive-unsigned \
-		"vscode-server-darwin.zip" \
+	"vscode-server-darwin.zip" \
-		../vscode-server-darwin.zip
+	../vscode-server-darwin.zip
-fi
+
+# publish hockeyapp symbols
+# node build/azure-pipelines/common/symbols.js "$VSCODE_MIXIN_PASSWORD" "$VSCODE_HOCKEYAPP_TOKEN" x64 "$VSCODE_HOCKEYAPP_ID_MACOS"
+# Skip hockey app because build failure.
+# https://github.com/microsoft/vscode/issues/90491
+
+# upload configuration
+yarn gulp upload-vscode-configuration

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

@@ -1,82 +0,0 @@
-steps:
-  - task: InstallAppleCertificate@2
-    displayName: 'Install developer certificate'
-    inputs:
-      certSecureFile: 'osx_signing_key.p12'
-    condition: eq(variables['signed'], true)
-
-  - task: DownloadBuildArtifacts@0
-    displayName: 'Download Build Artifacts'
-    inputs:
-      downloadType: specific
-      itemPattern: 'drop/darwin/archive/azuredatastudio-darwin-unsigned.zip'
-      downloadPath: '$(Build.SourcesDirectory)/.build/'
-
-  - script: |
-      pushd $(Build.SourcesDirectory)/.build/drop/darwin/archive
-      mv azuredatastudio-darwin-unsigned.zip azuredatastudio-darwin.zip
-    displayName: 'Rename the file'
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-    displayName: 'ESRP CodeSigning'
-    inputs:
-      ConnectedServiceName: 'Code Signing'
-      FolderPath: '$(Build.SourcesDirectory)/.build/drop/darwin/archive'
-      Pattern: 'azuredatastudio-darwin.zip'
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-          {
-            "keyCode": "CP-401337-Apple",
-            "operationCode": "MacAppDeveloperSign",
-            "parameters": {
-              "Hardening": "Enable"
-            },
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          }
-        ]
-      SessionTimeout: 90
-    condition: and(succeeded(), eq(variables['signed'], true))
-
-  - script: |
-      zip -d $(Build.SourcesDirectory)/.build/drop/darwin/archive/azuredatastudio-darwin.zip "*.pkg"
-    displayName: Clean Archive
-    condition: and(succeeded(), eq(variables['signed'], true))
-
-  - task: EsrpCodeSigning@1
-    displayName: 'ESRP Notarization'
-    inputs:
-      ConnectedServiceName: 'Code Signing'
-      FolderPath: '$(Build.SourcesDirectory)/.build/drop/darwin/archive'
-      Pattern: 'azuredatastudio-darwin.zip'
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-          {
-            "KeyCode": "CP-401337-Apple",
-            "OperationCode": "MacAppNotarize",
-            "Parameters": {
-              "BundleId": "com.microsoft.azuredatastudio-$(VSCODE_QUALITY)"
-            },
-            "ToolName": "sign",
-            "ToolVersion": "1.0"
-          }
-        ]
-      SessionTimeout: 120
-    condition: and(succeeded(), eq(variables['signed'], true))
-
-  - task: CopyFiles@2
-    displayName: 'Copy Files to: $(Build.ArtifactStagingDirectory)/darwin/archive'
-    inputs:
-      SourceFolder: '$(Build.SourcesDirectory)/.build/drop/darwin/archive'
-      TargetFolder: '$(Build.ArtifactStagingDirectory)/darwin/archive'
-
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish Artifact: drop'
-    condition: always()
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: 'Component Detection'
-    inputs:
-      failOnAlert: true

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

@@ -12,7 +12,6 @@ steps:
     displayName: Prepare cache flag
 
   - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    displayName: Restore Cache - Compiled Files
     inputs:
       keyfile: 'build/.cachesalt, .build/commit, .build/quality'
       targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
@@ -28,11 +27,11 @@ steps:
 
   - task: NodeTool@0
     inputs:
-      versionSpec: "12.13.0"
+      versionSpec: '10.15.3'
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
     inputs:
-      versionSpec: "1.x"
+      versionSpec: '1.x'
 
   - task: AzureKeyVault@1
     displayName: 'Azure Key Vault: Get Secrets'
@@ -50,7 +49,7 @@ steps:
       password $(github-distro-mixin-password)
       EOF
 
-      git config user.email "sqltools@service.microsoft.com"
+      git config user.email "andresse@microsoft.com"
       git config user.name "AzureDataStudio"
     displayName: Prepare tooling
 
@@ -62,7 +61,6 @@ steps:
     displayName: Merge distro
 
   - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    displayName: Restore Cache - Node Modules
     inputs:
       keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
       targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
@@ -77,7 +75,6 @@ steps:
     condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
   - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    displayName: Save Cache - Node Modules
     inputs:
       keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
       targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
@@ -98,7 +95,9 @@ steps:
   - script: |
       set -e
       yarn gulp package-rebuild-extensions
-      yarn gulp vscode-darwin-x64-min-ci
+      yarn gulp vscode-darwin-min-ci
+      yarn gulp vscode-reh-darwin-min-ci
+      yarn gulp vscode-reh-web-darwin-min-ci
     displayName: Build
     env:
       VSCODE_MIXIN_PASSWORD: $(github-distro-mixin-password)
@@ -114,7 +113,7 @@ steps:
       # including the remote server and configure the integration tests
       # to run with these builds instead of running out of sources.
       set -e
-      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-x64
+      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin
       APP_NAME="`ls $APP_ROOT | head -n 1`"
       INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
       VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/azuredatastudio-reh-darwin" \
@@ -122,27 +121,24 @@ steps:
     displayName: Run integration tests (Electron)
     condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
-  # - script: |
+  - script: |
-  #     set -e
+      set -e
-  #     APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-x64
+      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin
-  #     APP_NAME="`ls $APP_ROOT | head -n 1`"
+      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"
+      yarn smoketest --build "$APP_ROOT/$APP_NAME" --screenshots "$(build.artifactstagingdirectory)/smokeshots"
-  #   displayName: Run smoke tests (Electron)
+    displayName: Run smoke tests (Electron)
-  #   continueOnError: true
+    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
-  #   condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
   # - script: |
   #     set -e
-  #     node ./node_modules/playwright/install.js
   #     VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/azuredatastudio-reh-web-darwin" \
   #     yarn smoketest --web --headless  --screenshots "$(build.artifactstagingdirectory)/smokeshots"
   #   displayName: Run smoke tests (Browser)
-  #   continueOnError: true
   #   condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
   - script: |
       set -e
-      pushd ../azuredatastudio-darwin-x64
+      pushd ../azuredatastudio-darwin
       ls
 
       echo "Cleaning the application"
@@ -172,19 +168,58 @@ steps:
   - script: |
       set -e
       mkdir -p .build/darwin/archive
-      pushd ../azuredatastudio-darwin-x64
+      pushd ../azuredatastudio-darwin
       ditto -c -k --keepParent *.app $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin.zip
       popd
-    displayName: 'Archive (no signing)'
+    displayName: 'Archive'
-    condition: and(succeeded(), eq(variables['signed'], false))
+
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+    displayName: 'ESRP CodeSigning'
+    inputs:
+      ConnectedServiceName: 'Code Signing'
+      FolderPath: '$(Build.SourcesDirectory)/.build/darwin/archive'
+      Pattern: 'azuredatastudio-darwin.zip'
+      signConfigType: inlineSignParams
+      inlineOperation: |
+        [
+          {
+            "keyCode": "CP-401337-Apple",
+            "operationCode": "MacAppDeveloperSign",
+            "parameters": {
+              "Hardening": "Enable"
+            },
+            "toolName": "sign",
+            "toolVersion": "1.0"
+          }
+        ]
+      SessionTimeout: 90
+    condition: and(succeeded(), eq(variables['signed'], true))
 
   - script: |
-      set -e
+      zip -d $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin.zip "*.pkg"
-      mkdir -p .build/darwin/archive
+    displayName: Clean Archive
-      pushd ../azuredatastudio-darwin-x64
+    condition: and(succeeded(), eq(variables['signed'], true))
-      ditto -c -k --keepParent *.app $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin-unsigned.zip
+
-      popd
+  - task: EsrpCodeSigning@1
-    displayName: 'Archive'
+    displayName: 'ESRP Notarization'
+    inputs:
+      ConnectedServiceName: 'Code Signing'
+      FolderPath: '$(Build.SourcesDirectory)/.build/darwin/archive'
+      Pattern: 'azuredatastudio-darwin.zip'
+      signConfigType: inlineSignParams
+      inlineOperation: |
+        [
+          {
+            "KeyCode": "CP-401337-Apple",
+            "OperationCode": "MacAppNotarize",
+            "Parameters": {
+              "BundleId": "com.microsoft.azuredatastudio-$(VSCODE_QUALITY)"
+            },
+            "ToolName": "sign",
+            "ToolVersion": "1.0"
+          }
+        ]
+      SessionTimeout: 120
     condition: and(succeeded(), eq(variables['signed'], true))
 
   - script: |
@@ -202,7 +237,7 @@ steps:
       testResultsFiles: 'test-results.xml'
       searchFolder: '$(Build.SourcesDirectory)'
     continueOnError: true
-    condition: and(succeededOrFailed(), eq(variables['RUN_TESTS'], 'true'))
+    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
   - task: PublishCodeCoverageResults@1
     displayName: 'Publish code coverage from $(Build.SourcesDirectory)/.build/coverage/cobertura-coverage.xml'

build/azure-pipelines/distro-build.yml

@@ -3,15 +3,15 @@ pool:
 
 trigger:
   branches:
-    include: ['main', 'release/*']
+    include: ['master', 'release/*']
 pr:
   branches:
-    include: ['main', 'release/*']
+    include: ['master', 'release/*']
 
 steps:
-  - task: NodeTool@0
+- task: NodeTool@0
-    inputs:
+  inputs:
-      versionSpec: "12.14.1"
+    versionSpec: "12.13.0"
 
 - task: AzureKeyVault@1
   displayName: 'Azure Key Vault: Get Secrets'
@@ -19,8 +19,8 @@ steps:
     azureSubscription: 'azuredatastudio-adointegration'
     KeyVaultName: ado-secrets
 
-  - script: |
+- script: |
-      set -e
+    set -e
 
     cat << EOF > ~/.netrc
     machine github.com
@@ -28,18 +28,18 @@ steps:
     password $(github-distro-mixin-password)
     EOF
 
-    git config user.email "sqltools@service.microsoft.com"
+    git config user.email "andresse@microsoft.com"
     git config user.name "AzureDataStudio"
 
     git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
     git fetch distro
 
-    # Push main branch into oss/master
+    # Push master branch into oss/master
-    git push distro origin/main:refs/heads/oss/master
+    git push distro origin/master:refs/heads/oss/master
 
-      # Push every release branch into oss/release
+    # Push every release branch into oss/release
-      git for-each-ref --format="%(refname:short)" refs/remotes/origin/release/* | sed 's/^origin\/\(.*\)$/\0:refs\/heads\/oss\/\1/' | xargs git push distro
+    git for-each-ref --format="%(refname:short)" refs/remotes/origin/release/* | sed 's/^origin\/\(.*\)$/\0:refs\/heads\/oss\/\1/' | xargs git push distro
 
-      git merge $(node -p "require('./package.json').distro")
+    git merge $(node -p "require('./package.json').distro")
 
-    displayName: Sync & Merge Distro
+  displayName: Sync & Merge Distro

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

@@ -1,7 +1,7 @@
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "12.13.0"
+      versionSpec: '10.15.1'
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
     inputs:
@@ -22,7 +22,7 @@ steps:
       password $(github-distro-mixin-password)
       EOF
 
-      git config user.email "sqltools@service.microsoft.com"
+      git config user.email "andresse@microsoft.com"
       git config user.name "AzureDataStudio"
     displayName: Prepare tooling
 
@@ -34,7 +34,6 @@ steps:
     displayName: Merge distro
 
   - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    displayName: Restore Cache - Node Modules
     inputs:
       keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
       targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
@@ -49,7 +48,6 @@ steps:
     condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
   - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    displayName: Save Cache - Node Modules
     inputs:
       keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
       targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'

build/azure-pipelines/exploration-build.yml

@@ -1,40 +1,40 @@
 pool:
-  vmImage: "Ubuntu-16.04"
+  vmImage: 'Ubuntu-16.04'
 
 trigger:
   branches:
-    include: ["main"]
+    include: ['master']
 pr:
   branches:
-    include: ["main"]
+    include: ['master']
 
 steps:
-  - task: NodeTool@0
+- task: NodeTool@0
-    inputs:
+  inputs:
-      versionSpec: "12.14.1"
+    versionSpec: "12.13.0"
 
-  - task: AzureKeyVault@1
+- task: AzureKeyVault@1
-    displayName: "Azure Key Vault: Get Secrets"
+  displayName: 'Azure Key Vault: Get Secrets'
-    inputs:
+  inputs:
-      azureSubscription: "vscode-builds-subscription"
+    azureSubscription: 'vscode-builds-subscription'
-      KeyVaultName: vscode
+    KeyVaultName: vscode
 
-  - script: |
+- script: |
-      set -e
+    set -e
 
-      cat << EOF > ~/.netrc
+    cat << EOF > ~/.netrc
-      machine github.com
+    machine github.com
-      login vscode
+    login vscode
-      password $(github-distro-mixin-password)
+    password $(github-distro-mixin-password)
-      EOF
+    EOF
 
-      git config user.email "vscode@microsoft.com"
+    git config user.email "vscode@microsoft.com"
-      git config user.name "VSCode"
+    git config user.name "VSCode"
 
-      git checkout origin/electron-11.x.y
+    git checkout origin/electron-8.0.x
-      git merge origin/master
+    git merge origin/master
 
-      # Push master branch into exploration branch
+    # Push master branch into exploration branch
-      git push origin HEAD:electron-11.x.y
+    git push origin HEAD:electron-8.0.x
 
-    displayName: Sync & Merge Exploration
+  displayName: Sync & Merge Exploration

build/azure-pipelines/linux/alpine/install-dependencies.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-echo "Installing remote dependencies"
-(cd remote && rm -rf node_modules && yarn)

build/azure-pipelines/linux/alpine/publish.sh

@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-set -e
-REPO="$(pwd)"
-ROOT="$REPO/.."
-
-PLATFORM_LINUX="linux-alpine"
-
-# Publish Remote Extension Host
-LEGACY_SERVER_BUILD_NAME="vscode-reh-$PLATFORM_LINUX"
-SERVER_BUILD_NAME="vscode-server-$PLATFORM_LINUX"
-SERVER_TARBALL_FILENAME="vscode-server-$PLATFORM_LINUX.tar.gz"
-SERVER_TARBALL_PATH="$ROOT/$SERVER_TARBALL_FILENAME"
-
-rm -rf $ROOT/vscode-server-*.tar.*
-(cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME)
-
-node build/azure-pipelines/common/createAsset.js "server-$PLATFORM_LINUX" archive-unsigned "$SERVER_TARBALL_FILENAME" "$SERVER_TARBALL_PATH"
-
-# Publish Remote Extension Host (Web)
-LEGACY_SERVER_BUILD_NAME="vscode-reh-web-$PLATFORM_LINUX"
-SERVER_BUILD_NAME="vscode-server-$PLATFORM_LINUX-web"
-SERVER_TARBALL_FILENAME="vscode-server-$PLATFORM_LINUX-web.tar.gz"
-SERVER_TARBALL_PATH="$ROOT/$SERVER_TARBALL_FILENAME"
-
-rm -rf $ROOT/vscode-server-*.tar.*
-(cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME)
-
-node build/azure-pipelines/common/createAsset.js "server-$PLATFORM_LINUX-web" archive-unsigned "$SERVER_TARBALL_FILENAME" "$SERVER_TARBALL_PATH"

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

@@ -1,99 +1,89 @@
 steps:
-  - script: |
+- script: |
-      set -e
+    set -e
-      sudo apt-get update
+    sudo apt-get update
-      sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libkrb5-dev #{{SQL CARBON EDIT}} add kerberos dep
+    sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libkrb5-dev #{{SQL CARBON EDIT}} add kerberos dep
-      sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
+    sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
-      sudo chmod +x /etc/init.d/xvfb
+    sudo chmod +x /etc/init.d/xvfb
-      sudo update-rc.d xvfb defaults
+    sudo update-rc.d xvfb defaults
-      sudo service xvfb start
+    sudo service xvfb start
 
-  - task: NodeTool@0
+- task: NodeTool@0
-    inputs:
+  inputs:
-      versionSpec: "12.14.1"
+    versionSpec: "12.13.0"
 
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
-    inputs:
+  inputs:
-      versionSpec: "1.x"
+    versionSpec: "1.x"
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  displayName: Restore Cache - Node Modules # {{SQL CARBON EDIT}}
+  inputs:
-    inputs:
+    keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
-      keyfile: "build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock"
+    targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules"
+    vstsFeed: 'npm-cache' # {{SQL CARBON EDIT}} update build cache
-      vstsFeed: "npm-cache" # {{SQL CARBON EDIT}} update build cache
 
-  - script: |
+- script: |
-      CHILD_CONCURRENCY=1 yarn --frozen-lockfile
+    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
-    displayName: Install Dependencies
+  displayName: Install Dependencies
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-  displayName: Save Cache - Node Modules # {{SQL CARBON EDIT}}
+  inputs:
-    inputs:
+    keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
-      keyfile: "build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock"
+    targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules"
+    vstsFeed: 'npm-cache' # {{SQL CARBON EDIT}} update build cache
-      vstsFeed: "npm-cache" # {{SQL CARBON EDIT}} update build cache
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-  - script: |
+- script: |
-      yarn electron x64
+    yarn electron x64
-    displayName: Download Electron
+  displayName: Download Electron
 
-  - script: |
+- script: |
-      yarn gulp hygiene
+    yarn gulp hygiene
-    displayName: Run Hygiene Checks
+  displayName: Run Hygiene Checks
 
-  - script: | # {{SQL CARBON EDIT}} add strict null check
+- script: | # {{SQL CARBON EDIT}} add strict null check
-      yarn strict-vscode
+    yarn strict-vscode
-    displayName: Run Strict Null Check
 
-  # - script: | {{SQL CARBON EDIT}} remove monaco editor checks
+  displayName: Run Strict Null Check
-  #     yarn monaco-compile-check
+# - script: | {{SQL CARBON EDIT}} remove monaco editor checks
-  #   displayName: Run Monaco Editor Checks
+#     yarn monaco-compile-check
+#   displayName: Run Monaco Editor Checks
 
-  - script: |
+- script: |
-      yarn valid-layers-check
+    yarn valid-layers-check
-    displayName: Run Valid Layers Checks
+  displayName: Run Valid Layers Checks
 
-  - script: |
+- script: |
-      yarn compile
+    yarn compile
-    displayName: Compile Sources
+  displayName: Compile Sources
 
-  # - script: | {{SQL CARBON EDIT}} remove step
+# - script: | {{SQL CARBON EDIT}} remove step
-  #     yarn download-builtin-extensions
+#     yarn download-builtin-extensions
-  #   displayName: Download Built-in Extensions
+#   displayName: Download Built-in Extensions
 
-  - script: |
+- script: |
-      DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
+    DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
-    displayName: Run Unit Tests (Electron)
+  displayName: Run Unit Tests (Electron)
 
-  # - script: |  {{SQL CARBON EDIT}} disable
+# - script: |  {{SQL CARBON EDIT}} disable
-  #     DISPLAY=:10 yarn test-browser --browser chromium --tfs "Browser Unit Tests"
+#     DISPLAY=:10 yarn test-browser --browser chromium
-  #   displayName: Run Unit Tests (Browser)
+#   displayName: Run Unit Tests (Browser)
 
-  # - script: |  {{SQL CARBON EDIT}} disable
+# - script: |  {{SQL CARBON EDIT}} disable
-  #     DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests"
+#     DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests"
-  #   displayName: Run Integration Tests (Electron)
+#   displayName: Run Integration Tests (Electron)
 
-  # - task: PublishPipelineArtifact@0
+# - task: PublishPipelineArtifact@0
-  #   inputs:
+#   inputs:
-  #     artifactName: crash-dump-linux
+#     artifactName: crash-dump-linux
-  #     targetPath: .build/crashes
+#     targetPath: .build/crashes
-  #   displayName: 'Publish Crash Reports'
+#   displayName: 'Publish Crash Reports'
-  #   condition: succeededOrFailed()
+#   condition: succeededOrFailed()
 
-  - task: PublishPipelineArtifact@0
+- task: PublishTestResults@2
-    inputs:
+  displayName: Publish Tests Results
-      artifactName: crash-dump-linux
+  inputs:
-      targetPath: .build/crashes
+    testResultsFiles: '*-results.xml'
-    displayName: "Publish Crash Reports"
+    searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
-    continueOnError: true
+  condition: succeededOrFailed()
-    condition: failed()
-
-  - task: PublishTestResults@2
-    displayName: Publish Tests Results
-    inputs:
-      testResultsFiles: "*-results.xml"
-      searchFolder: "$(Build.ArtifactStagingDirectory)/test-results"
-    condition: succeededOrFailed()

build/azure-pipelines/linux/multiarch/alpine/build.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -e
+echo 'noop'

build/azure-pipelines/linux/multiarch/alpine/prebuild.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -e
+echo 'noop'

build/azure-pipelines/linux/multiarch/alpine/publish.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -e
+echo 'noop'

build/azure-pipelines/linux/multiarch/arm64/build.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -e
+echo 'noop'

build/azure-pipelines/linux/multiarch/arm64/prebuild.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -e
+echo 'noop'

build/azure-pipelines/linux/multiarch/arm64/publish.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -e
+echo 'noop'

build/azure-pipelines/linux/multiarch/armhf/build.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -e
+echo 'noop'

build/azure-pipelines/linux/multiarch/armhf/prebuild.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -e
+echo 'noop'

build/azure-pipelines/linux/multiarch/armhf/publish.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -e
+echo 'noop'

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

@@ -1,135 +0,0 @@
-steps:
-  - script: |
-      mkdir -p .build
-      echo -n $BUILD_SOURCEVERSION > .build/commit
-      echo -n $VSCODE_QUALITY > .build/quality
-      echo -n $ENABLE_TERRAPIN > .build/terrapin
-    displayName: Prepare compilation cache flags
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    inputs:
-      keyfile: "build/.cachesalt, .build/commit, .build/quality, .build/terrapin"
-      targetfolder: ".build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min"
-      vstsFeed: "npm-vscode"
-      platformIndependent: true
-      alias: "Compilation"
-
-  - script: |
-      set -e
-      exit 1
-    displayName: Check RestoreCache
-    condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
-  - task: NodeTool@0
-    inputs:
-      versionSpec: "12.14.1"
-
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
-      versionSpec: "1.x"
-
-  - task: AzureKeyVault@1
-    displayName: "Azure Key Vault: Get Secrets"
-    inputs:
-      azureSubscription: "vscode-builds-subscription"
-      KeyVaultName: vscode
-
-  - task: Docker@1
-    displayName: "Pull image"
-    inputs:
-      azureSubscriptionEndpoint: "vscode-builds-subscription"
-      azureContainerRegistry: vscodehub.azurecr.io
-      command: "Run an image"
-      imageName: "vscode-linux-build-agent:alpine"
-      containerCommand: uname
-
-  - script: |
-      set -e
-
-      cat << EOF > ~/.netrc
-      machine github.com
-      login vscode
-      password $(github-distro-mixin-password)
-      EOF
-
-      git config user.email "vscode@microsoft.com"
-      git config user.name "VSCode"
-    displayName: Prepare tooling
-
-  - script: |
-      set -e
-      git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
-      git fetch distro
-      git merge $(node -p "require('./package.json').distro")
-    displayName: Merge distro
-
-  - script: |
-      npx https://aka.ms/enablesecurefeed standAlone
-    displayName: Switch to Terrapin packages
-    timeoutInMinutes: 5
-    condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true'))
-
-  - script: |
-      echo -n "alpine" > .build/arch
-    displayName: Prepare yarn cache flags
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    inputs:
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "npm-vscode"
-
-  - script: |
-      set -e
-      export CHILD_CONCURRENCY="1"
-      for i in {1..3}; do # try 3 times, for Terrapin
-        yarn --frozen-lockfile && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
-          exit 1
-        fi
-        echo "Yarn failed $i, trying again..."
-      done
-    displayName: Install dependencies
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    inputs:
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "npm-vscode"
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
-  - script: |
-      set -e
-      yarn postinstall
-    displayName: Run postinstall scripts
-    condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
-
-  - script: |
-      set -e
-      node build/azure-pipelines/mixin
-    displayName: Mix in quality
-
-  - script: |
-      set -e
-      docker run -e VSCODE_QUALITY -e CHILD_CONCURRENCY=1 -v $(pwd):/root/vscode -v ~/.netrc:/root/.netrc vscodehub.azurecr.io/vscode-linux-build-agent:alpine /root/vscode/build/azure-pipelines/linux/alpine/install-dependencies.sh
-    displayName: Prebuild
-
-  - script: |
-      set -e
-      yarn gulp vscode-reh-linux-alpine-min-ci
-      yarn gulp vscode-reh-web-linux-alpine-min-ci
-    displayName: Build
-
-  - script: |
-      set -e
-      AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-      AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      ./build/azure-pipelines/linux/alpine/publish.sh
-    displayName: Publish
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: "Component Detection"
-    continueOnError: true

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

@@ -0,0 +1,116 @@
+steps:
+- script: |
+    mkdir -p .build
+    echo -n $BUILD_SOURCEVERSION > .build/commit
+    echo -n $VSCODE_QUALITY > .build/quality
+  displayName: Prepare cache flag
+
+- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+  inputs:
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
+    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
+    vstsFeed: 'npm-vscode'
+    platformIndependent: true
+    alias: 'Compilation'
+
+- script: |
+    set -e
+    exit 1
+  displayName: Check RestoreCache
+  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
+
+- task: NodeTool@0
+  inputs:
+    versionSpec: "12.13.0"
+
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.x"
+
+- task: AzureKeyVault@1
+  displayName: 'Azure Key Vault: Get Secrets'
+  inputs:
+    azureSubscription: 'vscode-builds-subscription'
+    KeyVaultName: vscode
+
+- task: Docker@1
+  displayName: 'Pull image'
+  inputs:
+    azureSubscriptionEndpoint: 'vscode-builds-subscription'
+    azureContainerRegistry: vscodehub.azurecr.io
+    command: 'Run an image'
+    imageName: 'vscode-linux-build-agent:$(VSCODE_ARCH)'
+    containerCommand: uname
+
+- script: |
+    set -e
+
+    cat << EOF > ~/.netrc
+    machine github.com
+    login vscode
+    password $(github-distro-mixin-password)
+    EOF
+
+    git config user.email "vscode@microsoft.com"
+    git config user.name "VSCode"
+  displayName: Prepare tooling
+
+- script: |
+    set -e
+    git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
+    git fetch distro
+    git merge $(node -p "require('./package.json').distro")
+  displayName: Merge distro
+
+- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+  inputs:
+    keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+    vstsFeed: 'npm-vscode'
+
+- script: |
+    set -e
+    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
+  displayName: Install dependencies
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+
+- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+  inputs:
+    keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+    vstsFeed: 'npm-vscode'
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+
+- script: |
+    set -e
+    yarn postinstall
+  displayName: Run postinstall scripts
+  condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
+
+- script: |
+    set -e
+    node build/azure-pipelines/mixin
+  displayName: Mix in quality
+
+- script: |
+    set -e
+    CHILD_CONCURRENCY=1 ./build/azure-pipelines/linux/multiarch/$(VSCODE_ARCH)/prebuild.sh
+  displayName: Prebuild
+
+- script: |
+    set -e
+    ./build/azure-pipelines/linux/multiarch/$(VSCODE_ARCH)/build.sh
+  displayName: Build
+
+- script: |
+    set -e
+    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
+    AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+    VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \
+    ./build/azure-pipelines/linux/multiarch/$(VSCODE_ARCH)/publish.sh
+  displayName: Publish
+
+- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+  displayName: 'Component Detection'
+  continueOnError: true

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

@@ -1,231 +1,193 @@
 steps:
-  - script: |
+- script: |
-      mkdir -p .build
+    mkdir -p .build
-      echo -n $BUILD_SOURCEVERSION > .build/commit
+    echo -n $BUILD_SOURCEVERSION > .build/commit
-      echo -n $VSCODE_QUALITY > .build/quality
+    echo -n $VSCODE_QUALITY > .build/quality
-      echo -n $ENABLE_TERRAPIN > .build/terrapin
+  displayName: Prepare cache flag
-    displayName: Prepare compilation cache flags
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    inputs:
+  inputs:
-      keyfile: "build/.cachesalt, .build/commit, .build/quality, .build/terrapin"
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
-      targetfolder: ".build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min"
+    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
-      vstsFeed: "npm-vscode"
+    vstsFeed: 'npm-vscode'
-      platformIndependent: true
+    platformIndependent: true
-      alias: "Compilation"
+    alias: 'Compilation'
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      exit 1
+    exit 1
-    displayName: Check RestoreCache
+  displayName: Check RestoreCache
-    condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
+  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
 
-  - task: NodeTool@0
+- task: NodeTool@0
-    inputs:
+  inputs:
-      versionSpec: "12.14.1"
+    versionSpec: "12.13.0"
 
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
+  inputs:
-      versionSpec: "1.x"
+    versionSpec: "1.x"
 
-  - task: AzureKeyVault@1
+- task: AzureKeyVault@1
-    displayName: "Azure Key Vault: Get Secrets"
+  displayName: 'Azure Key Vault: Get Secrets'
-    inputs:
+  inputs:
-      azureSubscription: "vscode-builds-subscription"
+    azureSubscription: 'vscode-builds-subscription'
-      KeyVaultName: vscode
+    KeyVaultName: vscode
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      cat << EOF > ~/.netrc
+    cat << EOF > ~/.netrc
-      machine github.com
+    machine github.com
-      login vscode
+    login vscode
-      password $(github-distro-mixin-password)
+    password $(github-distro-mixin-password)
-      EOF
+    EOF
 
-      git config user.email "vscode@microsoft.com"
+    git config user.email "vscode@microsoft.com"
-      git config user.name "VSCode"
+    git config user.name "VSCode"
-    displayName: Prepare tooling
+  displayName: Prepare tooling
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
+    git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
-      git fetch distro
+    git fetch distro
-      git merge $(node -p "require('./package.json').distro")
+    git merge $(node -p "require('./package.json').distro")
-    displayName: Merge distro
+  displayName: Merge distro
 
-  - script: |
+- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-      npx https://aka.ms/enablesecurefeed standAlone
+  inputs:
-    displayName: Switch to Terrapin packages
+    keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    timeoutInMinutes: 5
+    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true'))
+    vstsFeed: 'npm-vscode'
 
-  - script: |
+- script: |
-      echo -n $(VSCODE_ARCH) > .build/arch
+    set -e
-    displayName: Prepare yarn cache flags
+    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
+  displayName: Install dependencies
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    inputs:
+  inputs:
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
+    keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
+    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-      vstsFeed: "npm-vscode"
+    vstsFeed: 'npm-vscode'
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      export npm_config_arch=$(NPM_ARCH)
+    yarn postinstall
-      export CHILD_CONCURRENCY="1"
+  displayName: Run postinstall scripts
-      for i in {1..3}; do # try 3 times, for Terrapin
+  condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
-        yarn --frozen-lockfile && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
-          exit 1
-        fi
-        echo "Yarn failed $i, trying again..."
-      done
-    displayName: Install dependencies
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+- script: |
-    inputs:
+    set -e
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
+    node build/azure-pipelines/mixin
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
+  displayName: Mix in quality
-      vstsFeed: "npm-vscode"
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      yarn postinstall
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-    displayName: Run postinstall scripts
+      yarn gulp vscode-linux-x64-min-ci
-    condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+      yarn gulp vscode-reh-linux-x64-min-ci
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+      yarn gulp vscode-reh-web-linux-x64-min-ci
+  displayName: Build
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      node build/azure-pipelines/mixin
+    service xvfb start
-    displayName: Mix in quality
+  displayName: Start xvfb
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+    DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
-        yarn gulp vscode-linux-$(VSCODE_ARCH)-min-ci
+  displayName: Run unit tests (Electron)
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-        yarn gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-        yarn gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci
-    displayName: Build
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      service xvfb start
+    DISPLAY=:10 yarn test-browser --build --browser chromium
-    displayName: Start xvfb
+  displayName: Run unit tests (Browser)
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
+- script: |
-      set -e
+    # Figure out the full absolute path of the product we just built
-      DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
+    # including the remote server and configure the integration tests
-    displayName: Run unit tests (Electron)
+    # to run with these builds instead of running out of sources.
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+    set -e
+    APP_ROOT=$(agent.builddirectory)/VSCode-linux-x64
+    APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
+    INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
+    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-x64" \
+    DISPLAY=:10 ./scripts/test-integration.sh --build --tfs "Integration Tests"
+  displayName: Run integration tests (Electron)
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      DISPLAY=:10 yarn test-browser --build --browser chromium --tfs "Browser Unit Tests"
+    APP_ROOT=$(agent.builddirectory)/VSCode-linux-x64
-    displayName: Run unit tests (Browser)
+    APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+    INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
+    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-x64" \
+    DISPLAY=:10 ./resources/server/test/test-remote-integration.sh
+  displayName: Run remote integration tests (Electron)
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
+- script: |
-      # Figure out the full absolute path of the product we just built
+    set -e
-      # including the remote server and configure the integration tests
+    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-x64" \
-      # to run with these builds instead of running out of sources.
+    DISPLAY=:10 ./resources/server/test/test-web-integration.sh --browser chromium
-      set -e
+  displayName: Run integration tests (Browser)
-      APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-      APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
-      INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
-      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
-      DISPLAY=:10 ./scripts/test-integration.sh --build --tfs "Integration Tests"
-    displayName: Run integration tests (Electron)
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
+- task: PublishPipelineArtifact@0
-      set -e
+  inputs:
-      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-$(VSCODE_ARCH)" \
+    artifactName: crash-dump-linux
-      DISPLAY=:10 ./resources/server/test/test-web-integration.sh --browser chromium
+    targetPath: .build/crashes
-    displayName: Run integration tests (Browser)
+  displayName: 'Publish Crash Reports'
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  condition: succeededOrFailed()
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
+    yarn gulp "vscode-linux-x64-build-deb"
-      APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
+    yarn gulp "vscode-linux-x64-build-rpm"
-      INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
+    yarn gulp "vscode-linux-x64-prepare-snap"
-      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
+  displayName: Build packages
-      DISPLAY=:10 ./resources/server/test/test-remote-integration.sh
-    displayName: Run remote integration tests (Electron)
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - task: PublishPipelineArtifact@0
+- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-    inputs:
+  inputs:
-      artifactName: "crash-dump-linux-$(VSCODE_ARCH)"
+    ConnectedServiceName: 'ESRP CodeSign'
-      targetPath: .build/crashes
+    FolderPath: '.build/linux/rpm/x86_64'
-    displayName: "Publish Crash Reports"
+    Pattern: '*.rpm'
-    continueOnError: true
+    signConfigType: inlineSignParams
-    condition: failed()
+    inlineOperation: |
+      [
+        {
+          "keyCode": "CP-450779-Pgp",
+          "operationSetCode": "LinuxSign",
+          "parameters": [ ],
+          "toolName": "sign",
+          "toolVersion": "1.0"
+        }
+      ]
+    SessionTimeout: 120
+  displayName: Codesign rpm
 
-  - task: PublishTestResults@2
+- script: |
-    displayName: Publish Tests Results
+    set -e
-    inputs:
+    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-      testResultsFiles: "*-results.xml"
+    AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-      searchFolder: "$(Build.ArtifactStagingDirectory)/test-results"
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-    condition: and(succeededOrFailed(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+    VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \
+    ./build/azure-pipelines/linux/publish.sh
+  displayName: Publish
 
-  - script: |
+- task: PublishPipelineArtifact@0
-      set -e
+  displayName: 'Publish Pipeline Artifact'
-      yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-deb"
+  inputs:
-      yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-rpm"
+    artifactName: snap-x64
-    displayName: Build deb, rpm packages
+    targetPath: .build/linux/snap-tarball
 
-  - script: |
+- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-      set -e
+  displayName: 'Component Detection'
-      yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
+  continueOnError: true
-    displayName: Prepare snap package
-
-  # needed for code signing
-  - task: UseDotNet@2
-    displayName: "Install .NET Core SDK 2.x"
-    inputs:
-      version: 2.x
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-    inputs:
-      ConnectedServiceName: "ESRP CodeSign"
-      FolderPath: ".build/linux/rpm"
-      Pattern: "*.rpm"
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-          {
-            "keyCode": "CP-450779-Pgp",
-            "operationSetCode": "LinuxSign",
-            "parameters": [ ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          }
-        ]
-      SessionTimeout: 120
-    displayName: Codesign rpm
-
-  - script: |
-      set -e
-      AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-      AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      VSCODE_ARCH="$(VSCODE_ARCH)" \
-      ./build/azure-pipelines/linux/publish.sh
-    displayName: Publish
-
-  - task: PublishPipelineArtifact@0
-    displayName: "Publish Pipeline Artifact"
-    inputs:
-      artifactName: "snap-$(VSCODE_ARCH)"
-      targetPath: .build/linux/snap-tarball
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: "Component Detection"
-    continueOnError: true

build/azure-pipelines/linux/publish.sh

@@ -4,10 +4,11 @@ REPO="$(pwd)"
 ROOT="$REPO/.."
 
 # Publish tarball
-PLATFORM_LINUX="linux-$VSCODE_ARCH"
+PLATFORM_LINUX="linux-x64"
 BUILDNAME="VSCode-$PLATFORM_LINUX"
+BUILD="$ROOT/$BUILDNAME"
 BUILD_VERSION="$(date +%s)"
-[ -z "$VSCODE_QUALITY" ] && TARBALL_FILENAME="code-$VSCODE_ARCH-$BUILD_VERSION.tar.gz" || TARBALL_FILENAME="code-$VSCODE_QUALITY-$VSCODE_ARCH-$BUILD_VERSION.tar.gz"
+[ -z "$VSCODE_QUALITY" ] && TARBALL_FILENAME="code-$BUILD_VERSION.tar.gz" || TARBALL_FILENAME="code-$VSCODE_QUALITY-$BUILD_VERSION.tar.gz"
 TARBALL_PATH="$ROOT/$TARBALL_FILENAME"
 
 rm -rf $ROOT/code-*.tar.*
@@ -26,27 +27,22 @@ rm -rf $ROOT/vscode-server-*.tar.*
 
 node build/azure-pipelines/common/createAsset.js "server-$PLATFORM_LINUX" archive-unsigned "$SERVER_TARBALL_FILENAME" "$SERVER_TARBALL_PATH"
 
-# Publish DEB
+# Publish hockeyapp symbols
-case $VSCODE_ARCH in
+# node build/azure-pipelines/common/symbols.js "$VSCODE_MIXIN_PASSWORD" "$VSCODE_HOCKEYAPP_TOKEN" "x64" "$VSCODE_HOCKEYAPP_ID_LINUX64"
-	x64) DEB_ARCH="amd64" ;;
+# Skip hockey app because build failure.
-	*) DEB_ARCH="$VSCODE_ARCH" ;;
+# https://github.com/microsoft/vscode/issues/90491
-esac
 
-PLATFORM_DEB="linux-deb-$VSCODE_ARCH"
+# Publish DEB
+PLATFORM_DEB="linux-deb-x64"
+DEB_ARCH="amd64"
 DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
 DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
 
 node build/azure-pipelines/common/createAsset.js "$PLATFORM_DEB" package "$DEB_FILENAME" "$DEB_PATH"
 
 # Publish RPM
-case $VSCODE_ARCH in
+PLATFORM_RPM="linux-rpm-x64"
-	x64) RPM_ARCH="x86_64" ;;
+RPM_ARCH="x86_64"
-	armhf) RPM_ARCH="armv7hl" ;;
-	arm64) RPM_ARCH="aarch64" ;;
-	*) RPM_ARCH="$VSCODE_ARCH" ;;
-esac
-
-PLATFORM_RPM="linux-rpm-$VSCODE_ARCH"
 RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
 RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME"
 
@@ -55,6 +51,6 @@ node build/azure-pipelines/common/createAsset.js "$PLATFORM_RPM" package "$RPM_F
 # Publish Snap
 # Pack snap tarball artifact, in order to preserve file perms
 mkdir -p $REPO/.build/linux/snap-tarball
-SNAP_TARBALL_PATH="$REPO/.build/linux/snap-tarball/snap-$VSCODE_ARCH.tar.gz"
+SNAP_TARBALL_PATH="$REPO/.build/linux/snap-tarball/snap-x64.tar.gz"
 rm -rf $SNAP_TARBALL_PATH
 (cd .build/linux && tar -czf $SNAP_TARBALL_PATH snap)

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

@@ -1,56 +1,52 @@
 steps:
-  - task: NodeTool@0
+- task: NodeTool@0
-    inputs:
+  inputs:
-      versionSpec: "12.14.1"
+    versionSpec: "12.13.0"
 
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
+  inputs:
-      versionSpec: "1.x"
+    versionSpec: "1.x"
 
-  - task: AzureKeyVault@1
+- task: AzureKeyVault@1
-    displayName: "Azure Key Vault: Get Secrets"
+  displayName: 'Azure Key Vault: Get Secrets'
-    inputs:
+  inputs:
-      azureSubscription: "vscode-builds-subscription"
+    azureSubscription: 'vscode-builds-subscription'
-      KeyVaultName: vscode
+    KeyVaultName: vscode
 
-  - task: DownloadPipelineArtifact@0
+- task: DownloadPipelineArtifact@0
-    displayName: "Download Pipeline Artifact"
+  displayName: 'Download Pipeline Artifact'
-    inputs:
+  inputs:
-      artifactName: snap-$(VSCODE_ARCH)
+    artifactName: snap-x64
-      targetPath: .build/linux/snap-tarball
+    targetPath: .build/linux/snap-tarball
 
-  - script: |
+- script: |
-      set -e
+    set -e
 
-      # Get snapcraft version
+    # Get snapcraft version
-      snapcraft --version
+    snapcraft --version
 
-      # Make sure we get latest packages
+    # Make sure we get latest packages
-      sudo apt-get update
+    sudo apt-get update
-      sudo apt-get upgrade -y
+    sudo apt-get upgrade -y
 
-      # Define variables
+    # Define variables
-      REPO="$(pwd)"
+    REPO="$(pwd)"
-      SNAP_ROOT="$REPO/.build/linux/snap/$(VSCODE_ARCH)"
+    SNAP_ROOT="$REPO/.build/linux/snap/x64"
 
-      # Install build dependencies
+    # Install build dependencies
-      (cd build && yarn)
+    (cd build && yarn)
 
-      # Unpack snap tarball artifact, in order to preserve file perms
+    # Unpack snap tarball artifact, in order to preserve file perms
-      SNAP_TARBALL_PATH="$REPO/.build/linux/snap-tarball/snap-$(VSCODE_ARCH).tar.gz"
+    SNAP_TARBALL_PATH="$REPO/.build/linux/snap-tarball/snap-x64.tar.gz"
-      (cd .build/linux && tar -xzf $SNAP_TARBALL_PATH)
+    (cd .build/linux && tar -xzf $SNAP_TARBALL_PATH)
 
-      # Create snap package
+    # Create snap package
-      BUILD_VERSION="$(date +%s)"
+    BUILD_VERSION="$(date +%s)"
-      SNAP_FILENAME="code-$VSCODE_QUALITY-$(VSCODE_ARCH)-$BUILD_VERSION.snap"
+    SNAP_FILENAME="code-$VSCODE_QUALITY-$BUILD_VERSION.snap"
-      SNAP_PATH="$SNAP_ROOT/$SNAP_FILENAME"
+    SNAP_PATH="$SNAP_ROOT/$SNAP_FILENAME"
-      case $(VSCODE_ARCH) in
+    (cd $SNAP_ROOT/code-* && sudo --preserve-env snapcraft snap --output "$SNAP_PATH")
-        x64) SNAPCRAFT_TARGET_ARGS="" ;;
-        *) SNAPCRAFT_TARGET_ARGS="--target-arch $(VSCODE_ARCH)" ;;
-      esac
-      (cd $SNAP_ROOT/code-* && sudo --preserve-env snapcraft snap $SNAPCRAFT_TARGET_ARGS --output "$SNAP_PATH")
 
-      # Publish snap package
+    # Publish snap package
-      AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
+    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-      AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
+    AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-      node build/azure-pipelines/common/createAsset.js "linux-snap-$(VSCODE_ARCH)" package "$SNAP_FILENAME" "$SNAP_PATH"
+    node build/azure-pipelines/common/createAsset.js "linux-snap-x64" package "$SNAP_FILENAME" "$SNAP_PATH"

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

@@ -1,6 +1,3 @@
-parameters:
-  extensionsToUnitTest: []
-
 steps:
   - script: |
       mkdir -p .build
@@ -9,7 +6,6 @@ steps:
     displayName: Prepare cache flag
 
   - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    displayName: Restore Cache - Compiled Files
     inputs:
       keyfile: 'build/.cachesalt, .build/commit, .build/quality'
       targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
@@ -25,7 +21,7 @@ steps:
 
   - task: NodeTool@0
     inputs:
-      versionSpec: "12.13.0"
+      versionSpec: '10.15.1'
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
     inputs:
@@ -46,7 +42,7 @@ steps:
       password $(github-distro-mixin-password)
       EOF
 
-      git config user.email "sqltools@service.microsoft.com"
+      git config user.email "andresse@microsoft.com"
       git config user.name "AzureDataStudio"
     displayName: Prepare tooling
 
@@ -58,7 +54,6 @@ steps:
     displayName: Merge distro
 
   - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    displayName: Restore Cache - Node Modules
     inputs:
       keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
       targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
@@ -73,7 +68,6 @@ steps:
     condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
   - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    displayName: Save Cache - Node Modules
     inputs:
       keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
       targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
@@ -94,7 +88,8 @@ steps:
   - script: |
       set -e
       yarn gulp vscode-linux-x64-min-ci
-      yarn gulp vscode-web-min-ci
+      yarn gulp vscode-reh-linux-x64-min-ci
+      yarn gulp vscode-reh-web-linux-x64-min-ci
     displayName: Build
     env:
       VSCODE_MIXIN_PASSWORD: $(github-distro-mixin-password)
@@ -131,16 +126,14 @@ steps:
     displayName: Run integration tests (Electron)
     condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
-  - ${{each extension in parameters.extensionsToUnitTest}}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      APP_ROOT=$(agent.builddirectory)/azuredatastudio-linux-x64
-        APP_ROOT=$(agent.builddirectory)/azuredatastudio-linux-x64
+      APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
-        APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
+      INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
-        export INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
+      DISPLAY=:10 ./scripts/test-extensions-unit.sh
-        export NO_CLEANUP=1
+    displayName: 'Run Stable Extension Unit Tests'
-        DISPLAY=:10 node ./scripts/test-extensions-unit.js ${{ extension }}
+    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
-      displayName: 'Run ${{ extension }} Stable Extension Unit Tests'
-      condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
   - script: |
       set -e
@@ -152,21 +145,6 @@ steps:
     continueOnError: true
     condition: and(succeeded(), eq(variables['RUN_UNSTABLE_TESTS'], 'true'))
 
-  - bash: |
-      set -e
-      mkdir -p $(Build.ArtifactStagingDirectory)/logs/linux-x64
-      cd /tmp
-      for folder in adsuser*/
-      do
-      folder=${folder%/}
-      # Only archive directories we want for debugging purposes
-      tar -czvf $(Build.ArtifactStagingDirectory)/logs/linux-x64/$folder.tar.gz $folder/User $folder/logs
-      done
-
-    displayName: Archive Logs
-    continueOnError: true
-    condition: succeededOrFailed()
-
   - script: |
       set -e
       yarn gulp vscode-linux-x64-build-deb
@@ -177,57 +155,17 @@ steps:
       yarn gulp vscode-linux-x64-build-rpm
     displayName: Build Rpm
 
-  - 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
-    inputs:
-      ConnectedServiceName: 'Code Signing'
-      FolderPath: '$(Build.SourcesDirectory)/.build'
-      Pattern: 'extensions/*.vsix'
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-          {
-            "keyCode": "CP-233016",
-            "operationSetCode": "OpcSign",
-            "parameters": [
-              {
-                "parameterName": "FileDigest",
-                "parameterValue": "/fd \"SHA256\""
-              }
-            ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          },
-          {
-            "keyCode": "CP-233016",
-            "operationSetCode": "OpcVerify",
-            "parameters": [],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          }
-        ]
-      SessionTimeout: 120
-    displayName: 'Signing Extensions'
-    condition: and(succeeded(), eq(variables['signed'], true))
-
   - script: |
       set -e
       ./build/azure-pipelines/linux/createDrop.sh
     displayName: Create Drop
 
-  - script: |
+  - task: CopyFiles@2
-      set -e
+    displayName: 'Copy Extension Unit Test Coverage Files to: $(Build.ArtifactStagingDirectory)'
-      shopt -s globstar
+    inputs:
-      mkdir -p $(Build.ArtifactStagingDirectory)/test-results/coverage
+      SourceFolder: '$(Build.SourcesDirectory)/extensions'
-      cp --parents -r $(Build.SourcesDirectory)/extensions/*/coverage/** $(Build.ArtifactStagingDirectory)/test-results/coverage
+      Contents: '*/coverage/**'
-    displayName: Copy Coverage
+      TargetFolder: '$(Build.ArtifactStagingDirectory)/test-results/coverage'
-    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
   - task: PublishTestResults@2
     displayName: 'Publish Test Results test-results.xml'
@@ -235,11 +173,10 @@ steps:
       testResultsFiles: '*.xml'
       searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
     continueOnError: true
-    condition: and(succeededOrFailed(), eq(variables['RUN_TESTS'], 'true'))
+    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
   - task: PublishBuildArtifacts@1
     displayName: 'Publish Artifact: drop'
-    condition: succeededOrFailed()
 
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'

build/azure-pipelines/mixin.js

@@ -12,8 +12,6 @@ const es = require('event-stream');
 const vfs = require('vinyl-fs');
 const fancyLog = require('fancy-log');
 const ansiColors = require('ansi-colors');
-const fs = require('fs');
-const path = require('path');
 
 function main() {
 	const quality = process.env['VSCODE_QUALITY'];
@@ -23,7 +21,7 @@ function main() {
 		return;
 	}
 
-	const productJsonFilter = filter(f => f.relative === 'product.json', { restore: true });
+	const productJsonFilter = filter('**/product.json', { restore: true });
 
 	fancyLog(ansiColors.blue('[mixin]'), `Mixing in sources:`);
 	return vfs
@@ -31,32 +29,7 @@ function main() {
 		.pipe(filter(f => !f.isDirectory()))
 		.pipe(productJsonFilter)
 		.pipe(buffer())
-		.pipe(json(o => {
+		.pipe(json(o => Object.assign({}, require('../../product.json'), o)))
-			const ossProduct = JSON.parse(fs.readFileSync(path.join(__dirname, '..', '..', 'product.json'), 'utf8'));
-			let builtInExtensions = ossProduct.builtInExtensions;
-
-			if (Array.isArray(o.builtInExtensions)) {
-				fancyLog(ansiColors.blue('[mixin]'), 'Overwriting built-in extensions:', o.builtInExtensions.map(e => e.name));
-
-				builtInExtensions = o.builtInExtensions;
-			} else if (o.builtInExtensions) {
-				const include = o.builtInExtensions['include'] || [];
-				const exclude = o.builtInExtensions['exclude'] || [];
-
-				fancyLog(ansiColors.blue('[mixin]'), 'OSS built-in extensions:', builtInExtensions.map(e => e.name));
-				fancyLog(ansiColors.blue('[mixin]'), 'Including built-in extensions:', include.map(e => e.name));
-				fancyLog(ansiColors.blue('[mixin]'), 'Excluding built-in extensions:', exclude);
-
-				builtInExtensions = builtInExtensions.filter(ext => !include.find(e => e.name === ext.name) && !exclude.find(name => name === ext.name));
-				builtInExtensions = [...builtInExtensions, ...include];
-
-				fancyLog(ansiColors.blue('[mixin]'), 'Final built-in extensions:', builtInExtensions.map(e => e.name));
-			} else {
-				fancyLog(ansiColors.blue('[mixin]'), 'Inheriting OSS built-in extensions', builtInExtensions.map(e => e.name));
-			}
-
-			return { ...ossProduct, ...o, builtInExtensions };
-		}))
 		.pipe(productJsonFilter.restore)
 		.pipe(es.mapSync(function (f) {
 			fancyLog(ansiColors.blue('[mixin]'), f.relative, ansiColors.green('✔︎'));

build/azure-pipelines/product-build.yml

@@ -1,202 +1,152 @@
+resources:
+  containers:
+  - container: vscode-x64
+    image: vscodehub.azurecr.io/vscode-linux-build-agent:x64
+    endpoint: VSCodeHub
+  - container: snapcraft
+    image: snapcore/snapcraft:stable
+
+jobs:
+- job: Compile
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  container: vscode-x64
+  steps:
+  - template: product-compile.yml
+
+- job: Windows
+  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
+  pool:
+    vmImage: VS2017-Win2016
+  variables:
+    VSCODE_ARCH: x64
+  dependsOn:
+  - Compile
+  steps:
+  - template: win32/product-build-win32.yml
+
+- job: Windows32
+  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_WIN32_32BIT'], 'true'))
+  pool:
+    vmImage: VS2017-Win2016
+  variables:
+    VSCODE_ARCH: ia32
+  dependsOn:
+  - Compile
+  steps:
+  - template: win32/product-build-win32.yml
+
+- job: Linux
+  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  container: vscode-x64
+  dependsOn:
+  - Compile
+  steps:
+  - template: linux/product-build-linux.yml
+
+- job: LinuxSnap
+  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  container: snapcraft
+  dependsOn: Linux
+  steps:
+  - template: linux/snap-build-linux.yml
+
+- job: LinuxArmhf
+  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX_ARMHF'], 'true'))
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  variables:
+    VSCODE_ARCH: armhf
+  dependsOn:
+  - Compile
+  steps:
+  - template: linux/product-build-linux-multiarch.yml
+
+- job: LinuxArm64
+  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX_ARM64'], 'true'))
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  variables:
+    VSCODE_ARCH: arm64
+  dependsOn:
+  - Compile
+  steps:
+  - template: linux/product-build-linux-multiarch.yml
+
+- job: LinuxAlpine
+  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX_ALPINE'], 'true'))
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  variables:
+    VSCODE_ARCH: alpine
+  dependsOn:
+  - Compile
+  steps:
+  - template: linux/product-build-linux-multiarch.yml
+
+- job: LinuxWeb
+  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_WEB'], 'true'))
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  variables:
+    VSCODE_ARCH: x64
+  dependsOn:
+  - Compile
+  steps:
+  - template: web/product-build-web.yml
+
+- job: macOS
+  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_MACOS'], 'true'))
+  pool:
+    vmImage: macOS-latest
+  dependsOn:
+  - Compile
+  steps:
+  - template: darwin/product-build-darwin.yml
+
+- job: Release
+  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), or(eq(variables['VSCODE_RELEASE'], 'true'), and(or(eq(variables['VSCODE_QUALITY'], 'insider'), eq(variables['VSCODE_QUALITY'], 'exploration')), eq(variables['Build.Reason'], 'Schedule'))))
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  dependsOn:
+  - Windows
+  - Windows32
+  - Linux
+  - LinuxSnap
+  - LinuxArmhf
+  - LinuxArm64
+  - LinuxAlpine
+  - macOS
+  steps:
+  - template: release.yml
+
+- job: Mooncake
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  condition: and(succeededOrFailed(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'))
+  dependsOn:
+  - Windows
+  - Windows32
+  - Linux
+  - LinuxSnap
+  - LinuxArmhf
+  - LinuxArm64
+  - LinuxAlpine
+  - LinuxWeb
+  - macOS
+  steps:
+  - template: sync-mooncake.yml
+
 trigger: none
 pr: none
 
 schedules:
-  - cron: "0 5 * * Mon-Fri"
+- cron: "0 5 * * Mon-Fri"
-    displayName: Mon-Fri at 7:00
+  displayName: Mon-Fri at 7:00
-    branches:
+  branches:
-      include:
+    include:
-        - master
+    - master
-
-resources:
-  containers:
-    - container: vscode-x64
-      image: vscodehub.azurecr.io/vscode-linux-build-agent:x64
-      endpoint: VSCodeHub
-    - container: vscode-arm64
-      image: vscodehub.azurecr.io/vscode-linux-build-agent:stretch-arm64
-      endpoint: VSCodeHub
-    - container: vscode-armhf
-      image: vscodehub.azurecr.io/vscode-linux-build-agent:stretch-armhf
-      endpoint: VSCodeHub
-    - container: snapcraft
-      image: snapcore/snapcraft:stable
-
-stages:
-  - stage: Compile
-    jobs:
-      - job: Compile
-        pool:
-          vmImage: "Ubuntu-16.04"
-        container: vscode-x64
-        variables:
-          VSCODE_ARCH: x64
-        steps:
-          - template: product-compile.yml
-
-  - stage: Windows
-    dependsOn:
-      - Compile
-    condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'))
-    pool:
-      vmImage: VS2017-Win2016
-    jobs:
-      - job: Windows
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
-        timeoutInMinutes: 90
-        variables:
-          VSCODE_ARCH: x64
-        steps:
-          - template: win32/product-build-win32.yml
-
-      - job: Windows32
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32_32BIT'], 'true'))
-        timeoutInMinutes: 90
-        variables:
-          VSCODE_ARCH: ia32
-        steps:
-          - template: win32/product-build-win32.yml
-
-      - job: WindowsARM64
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32_ARM64'], 'true'))
-        timeoutInMinutes: 90
-        variables:
-          VSCODE_ARCH: arm64
-        steps:
-          - template: win32/product-build-win32.yml
-
-  - stage: Linux
-    dependsOn:
-      - Compile
-    condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'))
-    pool:
-      vmImage: "Ubuntu-16.04"
-    jobs:
-      - job: Linux
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
-        container: vscode-x64
-        variables:
-          VSCODE_ARCH: x64
-          NPM_ARCH: x64
-        steps:
-          - template: linux/product-build-linux.yml
-
-      - job: LinuxSnap
-        dependsOn:
-          - Linux
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
-        container: snapcraft
-        variables:
-          VSCODE_ARCH: x64
-        steps:
-          - template: linux/snap-build-linux.yml
-
-      - job: LinuxArmhf
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX_ARMHF'], 'true'))
-        container: vscode-armhf
-        variables:
-          VSCODE_ARCH: armhf
-          NPM_ARCH: armv7l
-        steps:
-          - template: linux/product-build-linux.yml
-
-      - job: LinuxSnapArmhf
-        dependsOn:
-          - LinuxArmhf
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX_ARMHF'], 'true'))
-        container: snapcraft
-        variables:
-          VSCODE_ARCH: armhf
-        steps:
-          - template: linux/snap-build-linux.yml
-
-      - job: LinuxArm64
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX_ARM64'], 'true'))
-        container: vscode-arm64
-        variables:
-          VSCODE_ARCH: arm64
-          NPM_ARCH: arm64
-        steps:
-          - template: linux/product-build-linux.yml
-
-      - job: LinuxSnapArm64
-        dependsOn:
-          - LinuxArm64
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX_ARM64'], 'true'))
-        container: snapcraft
-        variables:
-          VSCODE_ARCH: arm64
-        steps:
-          - template: linux/snap-build-linux.yml
-
-      - job: LinuxAlpine
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX_ALPINE'], 'true'))
-        steps:
-          - template: linux/product-build-alpine.yml
-
-      - job: LinuxWeb
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_WEB'], 'true'))
-        variables:
-          VSCODE_ARCH: x64
-        steps:
-          - template: web/product-build-web.yml
-
-  - stage: macOS
-    dependsOn:
-      - Compile
-    condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'))
-    pool:
-      vmImage: macOS-latest
-    jobs:
-      - job: macOS
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_MACOS'], 'true'))
-        timeoutInMinutes: 90
-        variables:
-          VSCODE_ARCH: x64
-        steps:
-          - template: darwin/product-build-darwin.yml
-
-  - stage: macOSARM64
-    dependsOn:
-      - Compile
-    condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'))
-    pool:
-      vmImage: macOS-latest
-    jobs:
-      - job: macOSARM64
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_MACOS_ARM64'], 'true'))
-        timeoutInMinutes: 90
-        variables:
-          VSCODE_ARCH: arm64
-        steps:
-          - template: darwin/product-build-darwin.yml
-
-  - stage: Mooncake
-    dependsOn:
-      - Windows
-      - Linux
-      - macOS
-      - macOSARM64
-    condition: and(succeededOrFailed(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'))
-    pool:
-      vmImage: "Ubuntu-16.04"
-    jobs:
-      - job: SyncMooncake
-        displayName: Sync Mooncake
-        steps:
-          - template: sync-mooncake.yml
-
-  - stage: Publish
-    dependsOn:
-      - Windows
-      - Linux
-      - macOS
-      - macOSARM64
-    condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), or(eq(variables['VSCODE_RELEASE'], 'true'), and(or(eq(variables['VSCODE_QUALITY'], 'insider'), eq(variables['VSCODE_QUALITY'], 'exploration')), eq(variables['Build.Reason'], 'Schedule'))))
-    pool:
-      vmImage: "Ubuntu-16.04"
-    jobs:
-      - job: BuildService
-        displayName: Build Service
-        steps:
-          - template: release.yml

build/azure-pipelines/product-compile.yml

@@ -1,161 +1,165 @@
 steps:
-  - script: |
+- script: |
-      mkdir -p .build
+    mkdir -p .build
-      echo -n $BUILD_SOURCEVERSION > .build/commit
+    echo -n $BUILD_SOURCEVERSION > .build/commit
-      echo -n $VSCODE_QUALITY > .build/quality
+    echo -n $VSCODE_QUALITY > .build/quality
-      echo -n $ENABLE_TERRAPIN > .build/terrapin
+  displayName: Prepare cache flag
-    displayName: Prepare compilation cache flag
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    inputs:
+  inputs:
-      keyfile: "build/.cachesalt, .build/commit, .build/quality, .build/terrapin"
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
-      targetfolder: ".build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min"
+    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
-      vstsFeed: "npm-vscode"
+    vstsFeed: 'npm-vscode'
-      platformIndependent: true
+    platformIndependent: true
-      alias: "Compilation"
+    alias: 'Compilation'
-      dryRun: true
+    dryRun: true
 
-  - task: NodeTool@0
+- task: NodeTool@0
-    inputs:
+  inputs:
-      versionSpec: "12.14.1"
+    versionSpec: "12.13.0"
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
+  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
+  inputs:
-      versionSpec: "1.x"
+    versionSpec: "1.x"
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
+  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
-  - task: AzureKeyVault@1
+- task: AzureKeyVault@1
-    displayName: "Azure Key Vault: Get Secrets"
+  displayName: 'Azure Key Vault: Get Secrets'
-    inputs:
+  inputs:
-      azureSubscription: "vscode-builds-subscription"
+    azureSubscription: 'vscode-builds-subscription'
-      KeyVaultName: vscode
+    KeyVaultName: vscode
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
+  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      cat << EOF > ~/.netrc
+    cat << EOF > ~/.netrc
-      machine github.com
+    machine github.com
-      login vscode
+    login vscode
-      password $(github-distro-mixin-password)
+    password $(github-distro-mixin-password)
-      EOF
+    EOF
 
-      git config user.email "vscode@microsoft.com"
+    git config user.email "vscode@microsoft.com"
-      git config user.name "VSCode"
+    git config user.name "VSCode"
-    displayName: Prepare tooling
+  displayName: Prepare tooling
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
+  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
+    git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
-      git fetch distro
+    git fetch distro
-      git merge $(node -p "require('./package.json').distro")
+    git merge $(node -p "require('./package.json').distro")
-    displayName: Merge distro
+  displayName: Merge distro
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
+  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
-  - script: |
+- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-      npx https://aka.ms/enablesecurefeed standAlone
+  inputs:
-    displayName: Switch to Terrapin packages
+    keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    timeoutInMinutes: 5
+    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
+    vstsFeed: 'npm-vscode'
+  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
-  - script: |
+- script: |
-      echo -n $(VSCODE_ARCH) > .build/arch
+    set -e
-    displayName: Prepare yarn cache flags
+    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
+  displayName: Install dependencies
+  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), ne(variables['CacheRestored'], 'true'))
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    inputs:
+  inputs:
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
+    keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
+    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-      vstsFeed: "npm-vscode"
+    vstsFeed: 'npm-vscode'
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
+  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), ne(variables['CacheRestored'], 'true'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      export CHILD_CONCURRENCY="1"
+    yarn generate-github-config
-      for i in {1..3}; do # try 3 times, for Terrapin
+  displayName: Generate GitHub config
-        yarn --frozen-lockfile && break
+  condition: succeeded()
-        if [ $i -eq 3 ]; then
+  env:
-          echo "Yarn failed too many times" >&2
+    OSS_GITHUB_ID: "a5d3c261b032765a78de"
-          exit 1
+    OSS_GITHUB_SECRET: $(oss-github-client-secret)
-        fi
+    INSIDERS_GITHUB_ID: "31f02627809389d9f111"
-        echo "Yarn failed $i, trying again..."
+    INSIDERS_GITHUB_SECRET: $(insiders-github-client-secret)
-      done
+    STABLE_GITHUB_ID: "baa8a44b5e861d918709"
-    displayName: Install dependencies
+    STABLE_GITHUB_SECRET: $(stable-github-client-secret)
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), ne(variables['CacheRestored'], 'true'))
+    EXPLORATION_GITHUB_ID: "94e8376d3a90429aeaea"
+    EXPLORATION_GITHUB_SECRET: $(exploration-github-client-secret)
+    VSO_GITHUB_ID: "3d4be8f37a0325b5817d"
+    VSO_GITHUB_SECRET: $(vso-github-client-secret)
+    VSO_PPE_GITHUB_ID: "eabf35024dc2e891a492"
+    VSO_PPE_GITHUB_SECRET: $(vso-ppe-github-client-secret)
+    VSO_DEV_GITHUB_ID: "84383ebd8a7c5f5efc5c"
+    VSO_DEV_GITHUB_SECRET: $(vso-dev-github-client-secret)
+    GITHUB_APP_ID: "Iv1.ae51e546bef24ff1"
+    GITHUB_APP_SECRET: $(github-app-client-secret)
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+- script: |
-    inputs:
+    set -e
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
+    yarn postinstall
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
+  displayName: Run postinstall scripts
-      vstsFeed: "npm-vscode"
+  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), eq(variables['CacheRestored'], 'true'))
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), ne(variables['CacheRestored'], 'true'))
 
-  - script: |
+# Mixin must run before optimize, because the CSS loader will
-      set -e
+# inline small SVGs
-      yarn postinstall
+- script: |
-    displayName: Run postinstall scripts
+    set -e
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), eq(variables['CacheRestored'], 'true'))
+    node build/azure-pipelines/mixin
+  displayName: Mix in quality
+  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
-  # Mixin must run before optimize, because the CSS loader will
+- script: |
-  # inline small SVGs
+    set -e
-  - script: |
+    yarn gulp hygiene
-      set -e
+    yarn monaco-compile-check
-      node build/azure-pipelines/mixin
+    yarn valid-layers-check
-    displayName: Mix in quality
+  displayName: Run hygiene, monaco compile & valid layers checks
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
+  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
+- script: |
-      set -e
+    set -
-      yarn gulp hygiene
+    ./build/azure-pipelines/common/extract-telemetry.sh
-      yarn monaco-compile-check
+  displayName: Extract Telemetry
-      yarn valid-layers-check
+  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
-    displayName: Run hygiene, monaco compile & valid layers checks
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
+- script: |
-      set -
+    set -e
-      ./build/azure-pipelines/common/extract-telemetry.sh
+    AZURE_WEBVIEW_STORAGE_ACCESS_KEY="$(vscode-webview-storage-key)" \
-    displayName: Extract Telemetry
+    ./build/azure-pipelines/common/publish-webview.sh
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
+  displayName: Publish Webview
+  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      AZURE_WEBVIEW_STORAGE_ACCESS_KEY="$(vscode-webview-storage-key)" \
+    yarn gulp compile-build
-      ./build/azure-pipelines/common/publish-webview.sh
+    yarn gulp compile-extensions-build
-    displayName: Publish Webview
+    yarn gulp minify-vscode
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
+    yarn gulp minify-vscode-reh
+    yarn gulp minify-vscode-reh-web
+  displayName: Compile
+  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      yarn gulp compile-build
+    AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
-      yarn gulp compile-extensions-build
+      node build/azure-pipelines/upload-sourcemaps
-      yarn gulp minify-vscode
+  displayName: Upload sourcemaps
-      yarn gulp vscode-reh-linux-x64-min
+  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
-      yarn gulp vscode-reh-web-linux-x64-min
-    displayName: Compile
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
+    VERSION=`node -p "require(\"./package.json\").version"`
-        node build/azure-pipelines/upload-sourcemaps
+    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-    displayName: Upload sourcemaps
+      node build/azure-pipelines/common/createBuild.js $VERSION
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
+  displayName: Create build
+  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
-  - script: |
+- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-      set -e
+  inputs:
-      VERSION=`node -p "require(\"./package.json\").version"`
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
-      AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
+    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
-        node build/azure-pipelines/common/createBuild.js $VERSION
+    vstsFeed: 'npm-vscode'
-    displayName: Create build
+    platformIndependent: true
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
+    alias: 'Compilation'
-
+  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    inputs:
-      keyfile: "build/.cachesalt, .build/commit, .build/quality, .build/terrapin"
-      targetfolder: ".build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min"
-      vstsFeed: "npm-vscode"
-      platformIndependent: true
-      alias: "Compilation"
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))

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

@@ -2,82 +2,82 @@
 
 trigger:
   branches:
-    include: ["refs/tags/*"]
+    include: ['refs/tags/*']
 
 pr: none
 
 steps:
-  - task: NodeTool@0
+- task: NodeTool@0
-    inputs:
+  inputs:
-      versionSpec: "12.14.1"
+    versionSpec: "12.13.0"
 
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
+  inputs:
-      versionSpec: "1.x"
+    versionSpec: "1.x"
 
-  - bash: |
+- bash: |
-      TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
+    TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
-      CHANNEL="G1C14HJ2F"
+    CHANNEL="G1C14HJ2F"
 
-      if [ "$TAG_VERSION" == "1.999.0" ]; then
+    if [ "$TAG_VERSION" == "1.999.0" ]; then
-        MESSAGE="<!here>. Someone pushed 1.999.0 tag. Please delete it ASAP from remote and local."
+      MESSAGE="<!here>. Someone pushed 1.999.0 tag. Please delete it ASAP from remote and local."
-
-        curl -X POST -H "Authorization: Bearer $(SLACK_TOKEN)" \
-        -H 'Content-type: application/json; charset=utf-8' \
-        --data '{"channel":"'"$CHANNEL"'", "link_names": true, "text":"'"$MESSAGE"'"}' \
-        https://slack.com/api/chat.postMessage
-
-        exit 1
-      fi
-    displayName: Check 1.999.0 tag
-
-  - bash: |
-      # Install build dependencies
-      (cd build && yarn)
-      node build/azure-pipelines/publish-types/check-version.js
-    displayName: Check version
-
-  - bash: |
-      git config --global user.email "vscode@microsoft.com"
-      git config --global user.name "VSCode"
-
-      git clone https://$(GITHUB_TOKEN)@github.com/DefinitelyTyped/DefinitelyTyped.git --depth=1
-      node build/azure-pipelines/publish-types/update-types.js
-
-      TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
-
-      cd DefinitelyTyped
-
-      git diff --color | cat
-      git add -A
-      git status
-      git checkout -b "vscode-types-$TAG_VERSION"
-      git commit -m "VS Code $TAG_VERSION Extension API"
-      git push origin "vscode-types-$TAG_VERSION"
-
-    displayName: Push update to DefinitelyTyped
-
-  - bash: |
-      TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
-      CHANNEL="G1C14HJ2F"
-
-      MESSAGE="DefinitelyTyped/DefinitelyTyped#vscode-types-$TAG_VERSION created. Endgame master, please open this link, examine changes and create a PR:"
-      LINK="https://github.com/DefinitelyTyped/DefinitelyTyped/compare/vscode-types-$TAG_VERSION?quick_pull=1&body=Updating%20VS%20Code%20Extension%20API.%20See%20https%3A%2F%2Fgithub.com%2Fmicrosoft%2Fvscode%2Fissues%2F70175%20for%20details."
-      MESSAGE2="[@eamodio, @jrieken, @kmaetzel, @egamma]. Please review and merge PR to publish @types/vscode."
 
       curl -X POST -H "Authorization: Bearer $(SLACK_TOKEN)" \
       -H 'Content-type: application/json; charset=utf-8' \
       --data '{"channel":"'"$CHANNEL"'", "link_names": true, "text":"'"$MESSAGE"'"}' \
       https://slack.com/api/chat.postMessage
 
-      curl -X POST -H "Authorization: Bearer $(SLACK_TOKEN)" \
+      exit 1
-      -H 'Content-type: application/json; charset=utf-8' \
+    fi
-      --data '{"channel":"'"$CHANNEL"'", "link_names": true, "text":"'"$LINK"'"}' \
+  displayName: Check 1.999.0 tag
-      https://slack.com/api/chat.postMessage
 
-      curl -X POST -H "Authorization: Bearer $(SLACK_TOKEN)" \
+- bash: |
-      -H 'Content-type: application/json; charset=utf-8' \
+    # Install build dependencies
-      --data '{"channel":"'"$CHANNEL"'", "link_names": true, "text":"'"$MESSAGE2"'"}' \
+    (cd build && yarn)
-      https://slack.com/api/chat.postMessage
+    node build/azure-pipelines/publish-types/check-version.js
+  displayName: Check version
 
-    displayName: Send message on Slack
+- bash: |
+    git config --global user.email "vscode@microsoft.com"
+    git config --global user.name "VSCode"
+
+    git clone https://$(GITHUB_TOKEN)@github.com/DefinitelyTyped/DefinitelyTyped.git --depth=1
+    node build/azure-pipelines/publish-types/update-types.js
+
+    TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
+
+    cd DefinitelyTyped
+
+    git diff --color | cat
+    git add -A
+    git status
+    git checkout -b "vscode-types-$TAG_VERSION"
+    git commit -m "VS Code $TAG_VERSION Extension API"
+    git push origin "vscode-types-$TAG_VERSION"
+
+  displayName: Push update to DefinitelyTyped
+
+- bash: |
+    TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
+    CHANNEL="G1C14HJ2F"
+
+    MESSAGE="DefinitelyTyped/DefinitelyTyped#vscode-types-$TAG_VERSION created. Endgame master, please open this link, examine changes and create a PR:"
+    LINK="https://github.com/DefinitelyTyped/DefinitelyTyped/compare/vscode-types-$TAG_VERSION?quick_pull=1&body=Updating%20VS%20Code%20Extension%20API.%20See%20https%3A%2F%2Fgithub.com%2Fmicrosoft%2Fvscode%2Fissues%2F70175%20for%20details."
+    MESSAGE2="[@eamodio, @jrieken, @kmaetzel, @egamma]. Please review and merge PR to publish @types/vscode."
+
+    curl -X POST -H "Authorization: Bearer $(SLACK_TOKEN)" \
+    -H 'Content-type: application/json; charset=utf-8' \
+    --data '{"channel":"'"$CHANNEL"'", "link_names": true, "text":"'"$MESSAGE"'"}' \
+    https://slack.com/api/chat.postMessage
+
+    curl -X POST -H "Authorization: Bearer $(SLACK_TOKEN)" \
+    -H 'Content-type: application/json; charset=utf-8' \
+    --data '{"channel":"'"$CHANNEL"'", "link_names": true, "text":"'"$LINK"'"}' \
+    https://slack.com/api/chat.postMessage
+
+    curl -X POST -H "Authorization: Bearer $(SLACK_TOKEN)" \
+    -H 'Content-type: application/json; charset=utf-8' \
+    --data '{"channel":"'"$CHANNEL"'", "link_names": true, "text":"'"$MESSAGE2"'"}' \
+    https://slack.com/api/chat.postMessage
+
+  displayName: Send message on Slack

build/azure-pipelines/publish-types/update-types.ts

@@ -36,18 +36,6 @@ function updateDTSFile(outPath: string, tag: string) {
 	fs.writeFileSync(outPath, newContent);
 }
 
-function repeat(str: string, times: number): string {
-	const result = new Array(times);
-	for (let i = 0; i < times; i++) {
-		result[i] = str;
-	}
-	return result.join('');
-}
-
-function convertTabsToSpaces(str: string): string {
-	return str.replace(/\t/gm, value => repeat('    ', value.length));
-}
-
 function getNewFileContent(content: string, tag: string) {
 	const oldheader = [
 		`/*---------------------------------------------------------------------------------------------`,
@@ -56,7 +44,7 @@ function getNewFileContent(content: string, tag: string) {
 		` *--------------------------------------------------------------------------------------------*/`
 	].join('\n');
 
-	return convertTabsToSpaces(getNewFileHeader(tag) + content.slice(oldheader.length));
+	return getNewFileHeader(tag) + content.slice(oldheader.length);
 }
 
 function getNewFileHeader(tag: string) {

build/azure-pipelines/release.yml

@@ -1,22 +1,22 @@
 steps:
-  - task: NodeTool@0
+- task: NodeTool@0
-    inputs:
+  inputs:
-      versionSpec: "10.x"
+    versionSpec: "10.x"
 
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
+  inputs:
-      versionSpec: "1.x"
+    versionSpec: "1.x"
 
-  - task: AzureKeyVault@1
+- task: AzureKeyVault@1
-    displayName: "Azure Key Vault: Get Secrets"
+  displayName: 'Azure Key Vault: Get Secrets'
-    inputs:
+  inputs:
-      azureSubscription: "vscode-builds-subscription"
+    azureSubscription: 'vscode-builds-subscription'
-      KeyVaultName: vscode
+    KeyVaultName: vscode
 
-  - script: |
+- script: |
-      set -e
+    set -e
 
-      (cd build ; yarn)
+    (cd build ; yarn)
 
-      AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
+    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-      node build/azure-pipelines/common/releaseBuild.js
+    node build/azure-pipelines/common/releaseBuild.js

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

@@ -1,7 +1,7 @@
 resources:
   containers:
   - container: linux-x64
-    image: sqltoolscontainers.azurecr.io/linux-build-agent:2
+    image: sqltoolscontainers.azurecr.io/linux-build-agent:1
     endpoint: ContainerRegistry
 
 jobs:
@@ -17,7 +17,7 @@ jobs:
   - template: sql-product-compile.yml
 
 - job: macOS
-  condition: and(succeeded(), eq(variables['VSCODE_BUILD_MACOS'], 'true'), ne(variables['VSCODE_QUALITY'], 'saw'))
+  condition: and(succeeded(), eq(variables['VSCODE_BUILD_MACOS'], 'true'))
   pool:
     vmImage: macOS-latest
   dependsOn:
@@ -26,16 +26,6 @@ jobs:
   - template: darwin/sql-product-build-darwin.yml
   timeoutInMinutes: 180
 
-- job: macOS_Signing
-  condition: and(succeeded(), eq(variables['VSCODE_BUILD_MACOS'], 'true'), eq(variables['signed'], true), ne(variables['VSCODE_QUALITY'], 'saw'))
-  pool:
-    vmImage: macOS-latest
-  dependsOn:
-  - macOS
-  steps:
-  - template: darwin/sql-product-build-darwin-signing.yml
-  timeoutInMinutes: 60
-
 - job: Linux
   condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
   pool:
@@ -45,32 +35,17 @@ jobs:
   - Compile
   steps:
   - template: linux/sql-product-build-linux.yml
-    parameters:
-      # extensionsToUnitTest: ["admin-tool-ext-win", "agent", "azdata", "azurecore", "cms", "dacpac", "import", "schema-compare", "notebook", "resource-deployment", "machine-learning", "sql-database-projects", "data-workspace"]
-      extensionsToUnitTest: ["admin-tool-ext-win", "agent", "azdata", "azurecore", "cms", "dacpac", "import", "schema-compare", "resource-deployment", "machine-learning", "sql-database-projects", "data-workspace"]
   timeoutInMinutes: 70
 
-- job: LinuxWeb
+- job: Docker
-  condition: and(succeeded(), eq(variables['VSCODE_BUILD_WEB'], 'true'), ne(variables['VSCODE_QUALITY'], 'saw'))
+  condition: and(succeeded(), eq(variables['VSCODE_BUILD_DOCKER'], 'true'))
   pool:
     vmImage: 'Ubuntu-16.04'
   container: linux-x64
-  variables:
-    VSCODE_ARCH: x64
   dependsOn:
-  - Compile
+  - Linux
   steps:
-  - template: web/sql-product-build-web.yml
+  - template: docker/sql-product-build-docker.yml
-
-# - job: Docker
-#   condition: and(succeeded(), eq(variables['VSCODE_BUILD_DOCKER'], 'true'))
-#   pool:
-#     vmImage: 'Ubuntu-16.04'
-#   container: linux-x64
-#   dependsOn:
-#   - Linux
-#   steps:
-#   - template: docker/sql-product-build-docker.yml
 
 - job: Windows
   condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
@@ -99,13 +74,18 @@ jobs:
   dependsOn:
   - macOS
   - Linux
-  # - Docker
+  - Docker
   - Windows
   - Windows_Test
-  - LinuxWeb
-  - macOS_Signing
   steps:
   - template: sql-release.yml
 
 trigger: none
 pr: none
+
+schedules:
+- cron: "0 5 * * Mon-Fri"
+  displayName: Mon-Fri at 7:00
+  branches:
+    include:
+    - master

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

@@ -6,7 +6,6 @@ steps:
   displayName: Prepare cache flag
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  displayName: Restore Cache - Compiled Files
   inputs:
     keyfile: 'build/.cachesalt, .build/commit, .build/quality'
     targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
@@ -16,7 +15,7 @@ steps:
 
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.13.0"
+    versionSpec: "10.15.1"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
   inputs:
@@ -37,7 +36,7 @@ steps:
     password $(github-distro-mixin-password)
     EOF
 
-    git config user.email "sqltools@service.microsoft.com"
+    git config user.email "andresse@microsoft.com"
     git config user.name "AzureDataStudio"
   displayName: Prepare tooling
   condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
@@ -51,7 +50,6 @@ steps:
   condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  displayName: Restore Cache - Node Modules
   inputs:
     keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
     targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
@@ -64,7 +62,6 @@ steps:
   condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-  displayName: Save Cache - Node Modules
   inputs:
     keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
     targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
@@ -99,19 +96,11 @@ steps:
     yarn gulp compile-build
     yarn gulp compile-extensions-build
     yarn gulp minify-vscode
-    yarn gulp vscode-reh-linux-x64-min
+    yarn gulp minify-vscode-reh
-    yarn gulp vscode-reh-web-linux-x64-min
+    yarn gulp minify-vscode-reh-web
   displayName: Compile
   condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
 
-- script: |
-    set -e
-    AZURE_STORAGE_ACCOUNT="$(sourcemap-storage-account)" \
-    AZURE_STORAGE_ACCESS_KEY="$(sourcemap-storage-key)" \
-      node build/azure-pipelines/upload-sourcemaps
-  displayName: Upload sourcemaps
-  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
-
 - script: |
     set -e
 
@@ -126,7 +115,6 @@ steps:
   displayName: 'Publish Artifact: drop'
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-  displayName: Save Cache - Compiled Files
   inputs:
     keyfile: 'build/.cachesalt, .build/commit, .build/quality'
     targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'

build/azure-pipelines/sync-mooncake.yml

@@ -1,24 +1,24 @@
 steps:
-  - task: NodeTool@0
+- task: NodeTool@0
-    inputs:
+  inputs:
-      versionSpec: "12.14.1"
+    versionSpec: "12.13.0"
 
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
+  inputs:
-      versionSpec: "1.x"
+    versionSpec: "1.x"
 
-  - task: AzureKeyVault@1
+- task: AzureKeyVault@1
-    displayName: "Azure Key Vault: Get Secrets"
+  displayName: 'Azure Key Vault: Get Secrets'
-    inputs:
+  inputs:
-      azureSubscription: "vscode-builds-subscription"
+    azureSubscription: 'vscode-builds-subscription'
-      KeyVaultName: vscode
+    KeyVaultName: vscode
 
-  - script: |
+- script: |
-      set -e
+    set -e
 
-      (cd build ; yarn)
+    (cd build ; yarn)
 
-      AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
+    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-      AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
+    AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-      MOONCAKE_STORAGE_ACCESS_KEY="$(vscode-mooncake-storage-key)" \
+    MOONCAKE_STORAGE_ACCESS_KEY="$(vscode-mooncake-storage-key)" \
-      node build/azure-pipelines/common/sync-mooncake.js "$VSCODE_QUALITY"
+    node build/azure-pipelines/common/sync-mooncake.js "$VSCODE_QUALITY"

build/azure-pipelines/upload-cdn.js

@@ -1,35 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
-const es = require("event-stream");
-const vfs = require("vinyl-fs");
-const util = require("../lib/util");
-const filter = require("gulp-filter");
-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 vfs.src('**', { cwd: '../vscode-web', base: '../vscode-web', dot: true })
-        .pipe(filter(f => !f.isDirectory()))
-        .pipe(gzip({ append: false }))
-        .pipe(es.through(function (data) {
-        console.log('Uploading CDN file:', data.relative); // debug
-        this.emit('data', data);
-    }))
-        .pipe(azure.upload({
-        account: process.env.AZURE_STORAGE_ACCOUNT,
-        key: process.env.AZURE_STORAGE_ACCESS_KEY,
-        container: process.env.VSCODE_QUALITY,
-        prefix: commit + '/',
-        contentSettings: {
-            contentEncoding: 'gzip',
-            cacheControl: 'max-age=31536000, public'
-        }
-    }));
-}
-main();

build/azure-pipelines/upload-cdn.ts

@@ -1,40 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as path from 'path';
-import * as es from 'event-stream';
-import * as Vinyl from 'vinyl';
-import * as vfs from 'vinyl-fs';
-import * as util from '../lib/util';
-import * as filter from 'gulp-filter';
-import * as gzip from 'gulp-gzip';
-const azure = require('gulp-azure-storage');
-
-const root = path.dirname(path.dirname(__dirname));
-const commit = util.getVersion(root);
-
-function main() {
-	return vfs.src('**', { cwd: '../vscode-web', base: '../vscode-web', dot: true })
-		.pipe(filter(f => !f.isDirectory()))
-		.pipe(gzip({ append: false }))
-		.pipe(es.through(function (data: Vinyl) {
-			console.log('Uploading CDN file:', data.relative); // debug
-			this.emit('data', data);
-		}))
-		.pipe(azure.upload({
-			account: process.env.AZURE_STORAGE_ACCOUNT,
-			key: process.env.AZURE_STORAGE_ACCESS_KEY,
-			container: process.env.VSCODE_QUALITY,
-			prefix: commit + '/',
-			contentSettings: {
-				contentEncoding: 'gzip',
-				cacheControl: 'max-age=31536000, public'
-			}
-		}));
-}
-
-main();

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

@@ -1,132 +1,106 @@
 steps:
-  - script: |
+- script: |
-      mkdir -p .build
+    mkdir -p .build
-      echo -n $BUILD_SOURCEVERSION > .build/commit
+    echo -n $BUILD_SOURCEVERSION > .build/commit
-      echo -n $VSCODE_QUALITY > .build/quality
+    echo -n $VSCODE_QUALITY > .build/quality
-      echo -n $ENABLE_TERRAPIN > .build/terrapin
+  displayName: Prepare cache flag
-    displayName: Prepare compilation cache flag
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    inputs:
+  inputs:
-      keyfile: "build/.cachesalt, .build/commit, .build/quality, .build/terrapin"
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
-      targetfolder: ".build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min"
+    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
-      vstsFeed: "npm-vscode"
+    vstsFeed: 'npm-vscode'
-      platformIndependent: true
+    platformIndependent: true
-      alias: "Compilation"
+    alias: 'Compilation'
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      exit 1
+    exit 1
-    displayName: Check RestoreCache
+  displayName: Check RestoreCache
-    condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
+  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
 
-  - task: NodeTool@0
+- task: NodeTool@0
-    inputs:
+  inputs:
-      versionSpec: "12.14.1"
+    versionSpec: "12.13.0"
 
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
+  inputs:
-      versionSpec: "1.x"
+    versionSpec: "1.x"
 
-  - task: AzureKeyVault@1
+- task: AzureKeyVault@1
-    displayName: "Azure Key Vault: Get Secrets"
+  displayName: 'Azure Key Vault: Get Secrets'
-    inputs:
+  inputs:
-      azureSubscription: "vscode-builds-subscription"
+    azureSubscription: 'vscode-builds-subscription'
-      KeyVaultName: vscode
+    KeyVaultName: vscode
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      cat << EOF > ~/.netrc
+    cat << EOF > ~/.netrc
-      machine github.com
+    machine github.com
-      login vscode
+    login vscode
-      password $(github-distro-mixin-password)
+    password $(github-distro-mixin-password)
-      EOF
+    EOF
 
-      git config user.email "vscode@microsoft.com"
+    git config user.email "vscode@microsoft.com"
-      git config user.name "VSCode"
+    git config user.name "VSCode"
-    displayName: Prepare tooling
+  displayName: Prepare tooling
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
+    git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
-      git fetch distro
+    git fetch distro
-      git merge $(node -p "require('./package.json').distro")
+    git merge $(node -p "require('./package.json').distro")
-    displayName: Merge distro
+  displayName: Merge distro
 
-  - script: |
+# - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-      npx https://aka.ms/enablesecurefeed standAlone
+#   inputs:
-    displayName: Switch to Terrapin packages
+#     keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    timeoutInMinutes: 5
+#     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true'))
+#     vstsFeed: 'npm-vscode'
 
-  - script: |
+- script: |
-      echo -n "web" > .build/arch
+    set -e
-    displayName: Prepare yarn cache flag
+    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
+  displayName: Install dependencies
+  # condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+# - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    inputs:
+#   inputs:
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
+#     keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
+#     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-      vstsFeed: "npm-vscode"
+#     vstsFeed: 'npm-vscode'
+#   condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-  - script: |
+# - script: |
-      set -e
+#     set -e
-      export CHILD_CONCURRENCY="1"
+#     yarn postinstall
-      for i in {1..3}; do # try 3 times, for Terrapin
+#   displayName: Run postinstall scripts
-        yarn --frozen-lockfile && break
+#   condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
-          exit 1
-        fi
-        echo "Yarn failed $i, trying again..."
-      done
-    displayName: Install dependencies
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+- script: |
-    inputs:
+    set -e
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
+    node build/azure-pipelines/mixin
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
+  displayName: Mix in quality
-      vstsFeed: "npm-vscode"
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      yarn postinstall
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-    displayName: Run postinstall scripts
+      yarn gulp vscode-web-min-ci
-    condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
+  displayName: Build
 
-  - script: |
+  # upload only the workbench.web.api.js source maps because
-      set -e
+  # we just compiled these bits in the previous step and the
-      node build/azure-pipelines/mixin
+  # general task to upload source maps has already been run
-    displayName: Mix in quality
+- script: |
+    set -e
+    AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
+      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: |
+- script: |
-      set -e
+    set -e
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-        yarn gulp vscode-web-min-ci
+    AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-    displayName: Build
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-
+    ./build/azure-pipelines/web/publish.sh
-  - script: |
+  displayName: Publish
-      set -e
-      AZURE_STORAGE_ACCOUNT="$(web-storage-account)" \
-      AZURE_STORAGE_ACCESS_KEY="$(web-storage-key)" \
-        node build/azure-pipelines/upload-cdn.js
-    displayName: Upload to CDN
-
-    # upload only the workbench.web.api.js source maps because
-    # we just compiled these bits in the previous step and the
-    # general task to upload source maps has already been run
-  - script: |
-      set -e
-      AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
-        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_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-      AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      ./build/azure-pipelines/web/publish.sh
-    displayName: Publish

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

@@ -1,111 +0,0 @@
-steps:
-- script: |
-    mkdir -p .build
-    echo -n $BUILD_SOURCEVERSION > .build/commit
-    echo -n $VSCODE_QUALITY > .build/quality
-  displayName: Prepare cache flag
-
-- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  displayName: Restore Cache - Compiled Files
-  inputs:
-    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
-    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
-    vstsFeed: 'BuildCache'
-    platformIndependent: true
-    alias: 'Compilation'
-
-- script: |
-    set -e
-    exit 1
-  displayName: Check RestoreCache
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
-- task: NodeTool@0
-  inputs:
-    versionSpec: "12.13.0"
-
-- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
-  inputs:
-    versionSpec: "1.x"
-
-- task: AzureKeyVault@1
-  displayName: 'Azure Key Vault: Get Secrets'
-  inputs:
-    azureSubscription: 'ClientToolsInfra_670062 (88d5392f-a34f-4769-b405-f597fc533613)'
-    KeyVaultName: ado-secrets
-    SecretsFilter: 'github-distro-mixin-password'
-
-- script: |
-    set -e
-    cat << EOF > ~/.netrc
-    machine github.com
-    login azuredatastudio
-    password $(github-distro-mixin-password)
-    EOF
-
-    git config user.email "sqltools@service.microsoft.com"
-    git config user.name "AzureDataStudio"
-  displayName: Prepare tooling
-
-- script: |
-    set -e
-    git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
-    git fetch distro
-    git merge $(node -p "require('./package.json').distro")
-  displayName: Merge distro
-
-# - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-#   displayName: Restore Cache - Node Modules
-#   inputs:
-#     keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-#     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-#     vstsFeed: 'npm-vscode'
-
-- script: |
-    set -e
-    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
-  displayName: Install dependencies
-  # condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
-# - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-#   displayName: Save Cache - Node Modules
-#   inputs:
-#     keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-#     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-#     vstsFeed: 'npm-vscode'
-#   condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
-# - script: |
-#     set -e
-#     yarn postinstall
-#   displayName: Run postinstall scripts
-#   condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
-
-- script: |
-    set -e
-    node build/azure-pipelines/mixin
-  displayName: Mix in quality
-
-- script: |
-    set -e
-    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-web-min-ci
-  displayName: Build
-
-  # upload only the workbench.web.api.js source maps because
-  # we just compiled these bits in the previous step and the
-  # general task to upload source maps has already been run
-- script: |
-    set -e
-    AZURE_STORAGE_ACCOUNT="$(sourcemap-storage-account)" \
-    AZURE_STORAGE_ACCESS_KEY="$(sourcemap-storage-key)" \
-      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_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-#     AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-#     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-#     ./build/azure-pipelines/web/publish.sh
-#   displayName: Publish