Fix not being able to type in code cell after switching from text (#17590) (#17592)

* Fix not being able to type in code cell after switching from text

* comment

Co-authored-by: Charles Gagnon <chgagnon@microsoft.com>

.config/CredScanSuppressions.json

@@ -16,6 +16,10 @@
         {
           "file": ".devcontainer\\devcontainer.json",
           "_justification": "Local development environment - not used in production"
+        },
+        {
+          "file": "extensions\\asde-deployment\\notebooks\\edge\\deploy-sql-edge-remote.ipynb",
+          "_justification": "Deployment Notebook - usernames/passwords are entered by user"
         }
     ]
 }

.devcontainer/Dockerfile

@@ -1,122 +0,0 @@
-#-------------------------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
-#-------------------------------------------------------------------------------------------------------------
-
-FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-12
-
-ARG TARGET_DISPLAY=":1"
-
-# VNC options
-ARG MAX_VNC_RESOLUTION=1920x1080x16
-ARG TARGET_VNC_RESOLUTION=1920x1080
-ARG TARGET_VNC_DPI=72
-ARG TARGET_VNC_PORT=5901
-ARG VNC_PASSWORD="vscode"
-
-# noVNC (VNC web client) options
-ARG INSTALL_NOVNC="true"
-ARG NOVNC_VERSION=1.1.0
-ARG TARGET_NOVNC_PORT=6080
-ARG WEBSOCKETIFY_VERSION=0.9.0
-
-# Firefox is useful for testing things like browser launch events, but optional
-ARG INSTALL_FIREFOX="false"
-
-# Expected non-root username from base image
-ARG USERNAME=node
-
-# Core environment variables for X11, VNC, and fluxbox
-ENV DBUS_SESSION_BUS_ADDRESS="autolaunch:" \
-	MAX_VNC_RESOLUTION="${MAX_VNC_RESOLUTION}" \
-	VNC_RESOLUTION="${TARGET_VNC_RESOLUTION}" \
-	VNC_DPI="${TARGET_VNC_DPI}" \
-	VNC_PORT="${TARGET_VNC_PORT}" \
-	NOVNC_PORT="${TARGET_NOVNC_PORT}" \
-	DISPLAY="${TARGET_DISPLAY}" \
-	LANG="en_US.UTF-8" \
-	LANGUAGE="en_US.UTF-8" \
-	VISUAL="nano" \
-	EDITOR="nano"
-
-# Configure apt and install packages
-RUN apt-get update \
-	&& export DEBIAN_FRONTEND=noninteractive \
-	#
-	# Install the Cascadia Code fonts - https://github.com/microsoft/cascadia-code
-	&& curl -sSL https://github.com/microsoft/cascadia-code/releases/download/v2004.30/CascadiaCode_2004.30.zip -o /tmp/cascadia-fonts.zip \
-	&& unzip /tmp/cascadia-fonts.zip -d /tmp/cascadia-fonts \
-	&& mkdir -p /usr/share/fonts/truetype/cascadia \
-	&& mv /tmp/cascadia-fonts/ttf/* /usr/share/fonts/truetype/cascadia/ \
-	&& rm -rf /tmp/cascadia-fonts.zip /tmp/cascadia-fonts \
-	#
-	# Install X11, fluxbox and VS Code dependencies
-	&& apt-get -y install --no-install-recommends \
-		xvfb \
-		x11vnc \
-		fluxbox \
-		dbus-x11 \
-		x11-utils \
-		x11-xserver-utils \
-		xdg-utils \
-		fbautostart \
-		xterm \
-		eterm \
-		gnome-terminal \
-		gnome-keyring \
-		seahorse \
-		nautilus \
-		libx11-dev \
-		libxkbfile-dev \
-		libsecret-1-dev \
-		libnotify4 \
-		libnss3 \
-		libxss1 \
-		libasound2 \
-		libgbm1 \
-		xfonts-base \
-		xfonts-terminus \
-		fonts-noto \
-		fonts-wqy-microhei \
-		fonts-droid-fallback \
-		vim-tiny \
-		nano \
-	#
-	# [Optional] Install noVNC
-	&& if [ "${INSTALL_NOVNC}" = "true" ]; then \
-		mkdir -p /usr/local/novnc \
-		&& curl -sSL https://github.com/novnc/noVNC/archive/v${NOVNC_VERSION}.zip -o /tmp/novnc-install.zip \
-		&& unzip /tmp/novnc-install.zip -d /usr/local/novnc \
-		&& cp /usr/local/novnc/noVNC-${NOVNC_VERSION}/vnc_lite.html /usr/local/novnc/noVNC-${NOVNC_VERSION}/index.html \
-		&& rm /tmp/novnc-install.zip \
-		&& curl -sSL https://github.com/novnc/websockify/archive/v${WEBSOCKETIFY_VERSION}.zip -o /tmp/websockify-install.zip \
-		&& unzip /tmp/websockify-install.zip -d /usr/local/novnc \
-		&& apt-get -y install --no-install-recommends python-numpy \
-		&& ln -s /usr/local/novnc/websockify-${WEBSOCKETIFY_VERSION} /usr/local/novnc/noVNC-${NOVNC_VERSION}/utils/websockify \
-		&& rm /tmp/websockify-install.zip; \
-	fi \
-	#
-	# [Optional] Install Firefox
-	&& if [ "${INSTALL_FIREFOX}" = "true" ]; then \
-		apt-get -y install --no-install-recommends firefox-esr; \
-	fi \
-	#
-	# Clean up
-	&& apt-get autoremove -y \
-	&& apt-get clean -y \
-	&& rm -rf /var/lib/apt/lists/*
-
-COPY bin/init-dev-container.sh /usr/local/share/
-COPY bin/set-resolution /usr/local/bin/
-COPY fluxbox/* /root/.fluxbox/
-COPY fluxbox/* /home/${USERNAME}/.fluxbox/
-
-# Update privs, owners of config files
-RUN mkdir -p /var/run/dbus /root/.vnc /home/${USERNAME}/.vnc \
-	&& touch /root/.Xmodmap /home/${USERNAME}/.Xmodmap \
-	&& echo "${VNC_PASSWORD}" | tee /root/.vnc/passwd > /home/${USERNAME}/.vnc/passwd \
-	&& chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.Xmodmap /home/${USERNAME}/.fluxbox /home/${USERNAME}/.vnc \
-	&& chmod +x /usr/local/share/init-dev-container.sh /usr/local/bin/set-resolution
-
-ENTRYPOINT ["/usr/local/share/init-dev-container.sh"]
-CMD ["sleep", "infinity"]

.devcontainer/README.md

@@ -1,14 +1,14 @@
 # Code - OSS Development Container
 
-This repository includes configuration for a development container for working with Code - OSS in an isolated local container or using [Visual Studio Codespaces](https://aka.ms/vso).
+This repository includes configuration for a development container for working with Code - OSS in a 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. [Chicken](https://sourceforge.net/projects/chicken/) is a good macOS alternative.
+> **Tip:** The default VNC password is `vscode`. The VNC server runs on port `5901` and a web client is available on port `6080`.
 
 ## 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**.
+2. **Important**: Docker needs at least **4 Cores and 6 GB of RAM (8 GB recommended)** to run a full build. If you are on macOS, or are using the old Hyper-V engine for Windows, update these values for Docker Desktop by right-clicking on the Docker status bar item and 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.
 
@@ -16,56 +16,75 @@ This repository includes configuration for a development container for working w
 
     ![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.
+    > **Note:** 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...**.
+4. Press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd> and select **Remote-Containers: Clone Repository in Container Volume...**.
 
-    > **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.
+    > **Tip:** While you can use your local source tree instead, operations like `yarn install` can be slow on macOS or when using the Hyper-V engine on Windows. We recommend the "clone repository in container" 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.
+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.
+Anything you start in VS Code, or the integrated terminal, will appear here.
 
 Next: **[Try it out!](#try-it)**
 
-## Quick start - Codespaces
+## Quick start - GitHub Codespaces
 
->Note that the Codespaces browser-based editor cannot currently access the desktop environment in this container (due to a [missing feature](https://github.com/MicrosoftDocs/vsonline/issues/117)). We recommend using Visual Studio Code from the desktop to connect instead in the near term.
+1. From the [microsoft/vscode GitHub repository](https://github.com/microsoft/vscode), click on the **Code** dropdown, select **Open with Codespaces**, and then click on **New codespace**. If prompted, select the **Standard** machine size (which is also the default).
 
-1. Install [Visual Studio Code Stable](https://code.visualstudio.com/) or [Insiders](https://code.visualstudio.com/insiders/) and the [Visual Studio Codespaces](https://aka.ms/vscs-ext-vscode) extension.
+   > **Note:** You will not see these options within GitHub if you are not in the Codespaces beta.
 
-    ![Image of VS Codespaces extension](https://microsoft.github.io/vscode-remote-release/images/codespaces-extn.png)
+2. After the codespace is up and running in your browser, press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd> and select **Ports: Focus on Ports View**.
 
-    > Note that the Visual Studio Codespaces extension requires the Visual Studio Code distribution of Code - OSS.
+3. You should see **VNC web client (6080)** under in the list of ports. Select the line and click on the globe icon to open it in a browser tab.
 
-2. Sign in by pressing <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> and selecting **Codespaces: Sign In**. You may also need to use the **Codespaces: Create Plan** if you do not have a plan. See the [Codespaces docs](https://aka.ms/vso-docs/vscode) for details.
+    > **Tip:** If you do not see the port, <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd>, select **Forward a Port** and enter port `6080`.
 
-3. Press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> and select **Codespaces: Create New Codespace**.
+4. In the new tab, you should see noVNC. Click **Connect** and enter `vscode` as the password.
 
-4. Use default settings (which should include **Standard** 4 core, 8 GB RAM Codespace), select a plan, and then enter the repository URL `https://github.com/microsoft/vscode` (or a branch or PR URL) in the input box when prompted.
+Anything you start in VS Code, or the integrated terminal, will appear here.
 
-5. 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.
+Next: **[Try it out!](#try-it)**
 
-6. Anything you start in VS Code or the integrated terminal will appear here.
+### Using VS Code with GitHub Codespaces
+
+You may see improved VNC responsiveness when accessing a codespace from VS Code client since you can use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/). Here's how to do it.
+
+1.  Install [Visual Studio Code Stable](https://code.visualstudio.com/) or [Insiders](https://code.visualstudio.com/insiders/) and the the [GitHub Codespaces extension](https://marketplace.visualstudio.com/items?itemName=GitHub.codespaces).
+
+	> **Note:** The GitHub Codespaces extension requires the Visual Studio Code distribution of Code - OSS.
+
+2. After the VS Code is up and running, press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd>, choose **Codespaces: Create New Codespace**, and use the following settings:
+    - `microsoft/vscode` for the repository.
+	- Select any branch (e.g. **main**) - you select a different one later.
+	- Choose **Standard** (4-core, 8GB) as the size.
+
+4. After you have connected to the codespace, you can use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password.
+
+    > **Tip:** You may also need change your VNC client's **Picture Quaility** setting to **High** to get a full color desktop.
+
+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`.
+> **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:
+1. In your local VS Code client, open a terminal (<kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>\`</kbd>) and type the following commands:
 
     ```bash
     yarn install
     bash scripts/code.sh
     ```
 
-2. After the build is complete, 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.
+2. After the build is complete, open a web browser or a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to the desktop environment as described in the quick start and enter `vscode` as the password.
 
 3. You should now see Code - OSS!
 
@@ -73,7 +92,7 @@ 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>).
+2. Go to your local VS Code client, and use the **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.
 

.devcontainer/bin/init-dev-container.sh

@@ -1,91 +0,0 @@
-#!/bin/bash
-
-NONROOT_USER=node
-LOG=/tmp/container-init.log
-
-# Execute the command it not already running
-startInBackgroundIfNotRunning()
-{
-	log "Starting $1."
-	echo -e "\n** $(date) **" | sudoIf tee -a /tmp/$1.log > /dev/null
-	if ! pidof $1 > /dev/null; then
-		keepRunningInBackground "$@"
-		while ! pidof $1 > /dev/null; do
-			sleep 1
-		done
-		log "$1 started."
-	else
-		echo "$1 is already running." | sudoIf tee -a /tmp/$1.log > /dev/null
-		log "$1 is already running."
-	fi
-}
-
-# Keep command running in background
-keepRunningInBackground()
-{
-	($2 sh -c "while :; do echo [\$(date)] Process started.; $3; echo [\$(date)] Process exited!; sleep 5; done 2>&1" | sudoIf tee -a /tmp/$1.log > /dev/null & echo "$!" | sudoIf tee /tmp/$1.pid > /dev/null)
-}
-
-# Use sudo to run as root when required
-sudoIf()
-{
-    if [ "$(id -u)" -ne 0 ]; then
-        sudo "$@"
-    else
-        "$@"
-    fi
-}
-
-# Use sudo to run as non-root user if not already running
-sudoUserIf()
-{
-    if [ "$(id -u)" -eq 0 ]; then
-        sudo -u ${NONROOT_USER} "$@"
-    else
-        "$@"
-    fi
-}
-
-# Log messages
-log()
-{
-    echo -e "[$(date)] $@" | sudoIf tee -a $LOG > /dev/null
-}
-
-log "** SCRIPT START **"
-
-# Start dbus.
-log 'Running "/etc/init.d/dbus start".'
-if [ -f "/var/run/dbus/pid" ] && ! pidof dbus-daemon  > /dev/null; then
-	sudoIf rm -f /var/run/dbus/pid
-fi
-sudoIf /etc/init.d/dbus start 2>&1 | sudoIf tee -a /tmp/dbus-daemon-system.log > /dev/null
-while ! pidof dbus-daemon > /dev/null; do
-	sleep 1
-done
-
-# Set up Xvfb.
-startInBackgroundIfNotRunning "Xvfb" sudoIf "Xvfb ${DISPLAY:-:1} +extension RANDR -screen 0 ${MAX_VNC_RESOLUTION:-1920x1080x16}"
-
-# Start fluxbox as a light weight window manager.
-startInBackgroundIfNotRunning "fluxbox" sudoUserIf "dbus-launch startfluxbox"
-
-# Start x11vnc
-startInBackgroundIfNotRunning "x11vnc" sudoIf "x11vnc -display ${DISPLAY:-:1} -rfbport ${VNC_PORT:-5901} -localhost -no6 -xkb -shared -forever -passwdfile $HOME/.vnc/passwd"
-
-# Set resolution
-/usr/local/bin/set-resolution ${VNC_RESOLUTION:-1280x720} ${VNC_DPI:-72}
-
-
-# Spin up noVNC if installed and not runnning.
-if [ -d "/usr/local/novnc" ] && [ "$(ps -ef | grep /usr/local/novnc/noVNC*/utils/launch.sh | grep -v grep)" = "" ]; then
-	keepRunningInBackground "noVNC" sudoIf "/usr/local/novnc/noVNC*/utils/launch.sh --listen ${NOVNC_PORT:-6080} --vnc localhost:${VNC_PORT:-5901}"
-	log "noVNC started."
-else
-	log "noVNC is already running or not installed."
-fi
-
-# Run whatever was passed in
-log "Executing \"$@\"."
-"$@"
-log "** SCRIPT EXIT **"

.devcontainer/bin/set-resolution

@@ -1,25 +0,0 @@
-#!/bin/bash
-RESOLUTION=${1:-${VNC_RESOLUTION:-1920x1080}}
-DPI=${2:-${VNC_DPI:-72}}
-if [ -z "$1" ]; then
-	echo -e "**Current Settings **\n"
-	xrandr
-	echo -n -e "\nEnter new resolution (WIDTHxHEIGHT, blank for ${RESOLUTION}, Ctrl+C to abort).\n> "
-	read NEW_RES
-	if [ "${NEW_RES}" != "" ]; then
-		RESOLUTION=${NEW_RES}
-	fi
-	if [ -z "$2" ]; then
-		echo -n -e "\nEnter new DPI (blank for ${DPI}, Ctrl+C to abort).\n> "
-		read NEW_DPI
-		if [ "${NEW_DPI}" != "" ]; then
-			DPI=${NEW_DPI}
-		fi
-	fi
-fi
-
-xrandr --fb ${RESOLUTION} --dpi ${DPI} > /dev/null 2>&1
-
-echo -e "\n**New Settings **\n"
-xrandr
-echo

.devcontainer/cache/.gitignore

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

.devcontainer/cache/before-cache.sh

@@ -0,0 +1,15 @@
+#!/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

@@ -0,0 +1,28 @@
+#!/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:-"main"}"
+
+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

@@ -0,0 +1,21 @@
+#!/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

@@ -0,0 +1,14 @@
+# 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

@@ -0,0 +1,23 @@
+#!/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,45 +1,36 @@
 {
 	"name": "Code - OSS",
-	"build": {
-		"dockerfile": "Dockerfile",
-		"args": {
-			"MAX_VNC_RESOLUTION": "1920x1080x16",
-			"TARGET_VNC_RESOLUTION": "1280x768",
-			"TARGET_VNC_PORT": "5901",
-			"TARGET_NOVNC_PORT": "6080",
-			"VNC_PASSWORD": "vscode",
-			"INSTALL_FIREFOX": "true"
-		}
-	},
+
+	// 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-main",
 	"overrideCommand": false,
-	"runArgs": [
-		"--init",
-		// seccomp=unconfined is required for Chrome sandboxing
-		"--security-opt", "seccomp=unconfined"
-	],
+	"runArgs": [ "--init", "--security-opt", "seccomp=unconfined"],
 
 	"settings": {
-		// zsh is also available
-		"terminal.integrated.shell.linux": "/bin/bash",
 		"resmon.show.battery": false,
-		"resmon.show.cpufreq": false,
-		"remote.extensionKind": {
-			"ms-vscode.js-debug-nightly": "workspace",
-			"msjsdiag.debugger-for-chrome": "workspace"
-		},
-		"debug.chrome.useV3": true
+		"resmon.show.cpufreq": false
 	},
 
-	// noVNC, VNC ports
+	// noVNC, VNC
 	"forwardPorts": [6080, 5901],
+	"portsAttributes": {
+		"6080": {
+			"label": "VNC web client (noVNC)",
+			"onAutoForward": "silent"
+		},
+		"5901": {
+			"label": "VNC TCP port",
+			"onAutoForward": "silent"
+		}
+	},
 
 	"extensions": [
 		"dbaeumer.vscode-eslint",
-		"EditorConfig.EditorConfig",
-		"msjsdiag.debugger-for-chrome",
-		"mutantdino.resourcemonitor",
-		"GitHub.vscode-pull-request-github"
+		"mutantdino.resourcemonitor"
 	],
 
+	// Optionally loads a cached yarn install for the repo
+	"postCreateCommand": ".devcontainer/cache/restore-diff.sh",
+
 	"remoteUser": "node"
 }

.devcontainer/fluxbox/apps

@@ -1,9 +0,0 @@
-[app] (name=code-oss-dev)
-  [Position]	(CENTER)	{0 0}
-	[Maximized]	{yes}
-  [Dimensions]	{100% 100%}
-[end]
-[transient] (role=GtkFileChooserDialog)
-  [Position]	(CENTER)	{0 0}
-  [Dimensions]	{70% 70%}
-[end]

.devcontainer/fluxbox/init

@@ -1,9 +0,0 @@
-session.menuFile:	~/.fluxbox/menu
-session.keyFile: ~/.fluxbox/keys
-session.styleFile: /usr/share/fluxbox/styles//Squared_for_Debian
-session.configVersion:	13
-session.screen0.workspaces: 1
-session.screen0.workspacewarping: false
-session.screen0.toolbar.widthPercent: 100
-session.screen0.strftimeFormat: %d %b, %a %02k:%M:%S
-session.screen0.toolbar.tools: prevworkspace, workspacename, nextworkspace, clock, prevwindow, nextwindow, iconbar, systemtray

.devcontainer/fluxbox/menu

@@ -1,16 +0,0 @@
-[begin] (  Code - OSS Development Container  )
-	[exec] (File Manager) { nautilus ~ } <>
-	[exec] (Terminal) {/usr/bin/gnome-terminal --working-directory=~ } <>
-	[exec] (Start Code - OSS) { x-terminal-emulator -T "Code - OSS Build" -e bash /workspaces/vscode*/scripts/code.sh } <>
-	[submenu] (System >) {}
-		[exec] (Set Resolution) { x-terminal-emulator -T "Set Resolution" -e bash /usr/local/bin/set-resolution } <>
-		[exec] (Passwords and Keys) { seahorse } <>
-		[exec] (Top) { x-terminal-emulator -T "Top" -e /usr/bin/top } <>
-		[exec] (Editres) {editres} <>
-		[exec] (Xfontsel) {xfontsel} <>
-		[exec] (Xkill) {xkill} <>
-		[exec] (Xrefresh) {xrefresh} <>
-	[end]
-	[config] (Configuration >)
-	[workspaces] (Workspaces >)
-[end]

.devcontainer/prepare.sh

@@ -0,0 +1,10 @@
+#!/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,12 +5,16 @@
 **/vs/loader.js
 **/insane/**
 **/marked/**
-**/markjs/**
+**/semver/**
 **/test/**/*.js
 **/node_modules/**
 **/vscode-api-tests/testWorkspace/**
 **/vscode-api-tests/testWorkspace2/**
 **/extensions/**/out/**
 **/extensions/**/build/**
+**/big-data-cluster/src/bigDataCluster/controller/apiGenerated.ts
+**/big-data-cluster/src/bigDataCluster/controller/clusterApiGenerated2.ts
 **/extensions/markdown-language-features/media/**
+**/extensions/markdown-language-features/notebook-out/**
 **/extensions/typescript-basics/test/colorize-fixtures/**
+**/extensions/**/dist/**

.eslintrc.sql.ts.json

@@ -10,6 +10,7 @@
 		"jsdoc"
 	],
 	"rules": {
+		"no-cond-assign": 2,
 		"@typescript-eslint/no-floating-promises": [
 			"error",
 			{

.github/CODEOWNERS

@@ -2,10 +2,19 @@
 # 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
 
-/src/sql/*.d.ts @alanrenmsft @Charles-Gagnon @ranasaria
-/extensions/resource-deployment/ @ranasaria
-/extensions/arc/ @ranasaria
-/extensions/azdata/ @ranasaria
+/extensions/admin-tool-ext-win @Charles-Gagnon
+/extensions/arc/ @Charles-Gagnon @swells @candiceye
+/extensions/azcli/ @Charles-Gagnon @swells @candiceye
+/extensions/big-data-cluster/ @Charles-Gagnon
 /extensions/dacpac/ @kisantia
+/extensions/notebook @azure-data-studio-notebook-devs
+/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
+/src/sql/workbench/browser/modelComponents @Charles-Gagnon @alanrenmsft
+/src/sql/workbench/api @Charles-Gagnon @alanrenmsft
+/src/sql/**/notebook @azure-data-studio-notebook-devs

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,12 +8,18 @@ assignees: ''
 ---
 <!-- ⚠️⚠️ Do Not Delete This! bug_report_template ⚠️⚠️ -->
 <!-- Please read our Rules of Conduct: https://opensource.microsoft.com/codeofconduct/ -->
-<!-- Please search existing issues to avoid creating duplicates. -->
-<!-- Also please test using the latest insiders build to make sure your issue has not already been fixed. -->
-
-<!-- Use Help > Report Issue to prefill these. -->
+<!-- 🔎 Search existing issues to avoid creating duplicates. -->
+<!-- 🧪 Test using the latest Insiders build to see if your issue has already been fixed: https://github.com/Microsoft/azuredatastudio#try-out-the-latest-insiders-build-from-main -->
+<!-- 💡 Instead of creating your report here, use 'Report Issue' from the 'Help' menu in Azure Data Studio to pre-fill useful information. -->
 - Azure Data Studio Version:
+- OS Version:
 
 Steps to Reproduce:
 
 1.
+2.
+
+<!-- 🔧 Launch with `azuredatastudio --disable-extensions` to check. -->
+Does this issue occur when all extensions are disabled?: Yes/No
+
+<!-- 📣 Issues caused by an extension need to be reported directly to the extension publisher. The 'Help > Report Issue' dialog can assist with this. -->

.github/commands.yml

@@ -1,11 +1,12 @@
 {
   perform: true,
-  commands: [
-    {
-      type: 'label',
-      name: 'Needs Logs',
-      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"
-    }
-  ]
+  commands:
+    [
+      {
+        type: "label",
+        name: "Needs Logs",
+        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",
+      },
+    ],
 }

.github/copycat.yml

@@ -1,5 +0,0 @@
-{
-	perform: false,
-	target_owner: 'anthonydresser',
-	target_repo: 'testissues'
-}

.github/label-actions.yml

@@ -1,2 +1,36 @@
+# actions for Needs Logs label
 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.\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 zip up this folder and attach it to the issue."
+  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."
+
+# actions for Out of Scope label
+Out of Scope:
+  comment: "Thank you for opening this suggestion!  This enhancement is not planned in our
+medium-term roadmap.  The issue is being closed to reduce active issues to focus on
+enhancements that are being considered for an upcoming release.  We will review closed issues
+with the 'Out of Scope' label when doing long-term planning."
+  close: true

.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,7 +1,10 @@
 {
-	"label-to-subscribe-to": [
-		"list of usernames to subscribe",
-		"such as:",
-		"JacksonKearl"
+	"notebook": [
+		"claudiaregio",
+		"rchiodo",
+		"greazer",
+		"donjayamanne",
+		"jilljac",
+		"IanMatthewHuff"
 	]
 }

.github/workflows/ci.yml

@@ -11,161 +11,306 @@ on:
       - release/*
 
 jobs:
-  linux:
-    runs-on: ubuntu-latest
-    env:
-      CHILD_CONCURRENCY: "1"
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-    - uses: actions/checkout@v2.2.0
-    # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
-    - run: |
-        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 cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
-        sudo chmod +x /etc/init.d/xvfb
-        sudo update-rc.d xvfb defaults
-        sudo service xvfb start
-      name: Setup Build Environment
-    - uses: actions/setup-node@v1
-      with:
-        node-version: 10
-    # TODO: cache node modules
-    # Increase timeout to get around latency issues when fetching certain packages
-    - run: |
-        yarn config set network-timeout 300000
-        yarn --frozen-lockfile
-      name: Install Dependencies
-    - run: yarn electron x64
-      name: Download Electron
-    - run: yarn gulp hygiene
-      name: Run Hygiene Checks
-    - run: yarn strict-vscode # {{SQL CARBON EDIT}} add step
-      name: Run Strict Compile Options
-    # - run: yarn monaco-compile-check {{SQL CARBON EDIT}} remove step
-    #   name: Run Monaco Editor Checks
-    - run: yarn valid-layers-check
-      name: Run Valid Layers Checks
-    - run: yarn compile
-      name: Compile Sources
-    # - run: yarn download-builtin-extensions {{SQL CARBON EDIT}} remove step
-    #   name: Download Built-in Extensions
-    - run: DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests" --coverage --runGlob "**/sql/**/*.test.js"
-      name: Run Unit Tests (Electron)
-    - run: DISPLAY=:10 ./scripts/test-extensions-unit.sh
-      name: Run Extension Unit Tests (Electron)
-      # {{SQL CARBON EDIT}} Add coveralls. We merge first to get around issue where parallel builds weren't being combined correctly
-    - run: node test/combineCoverage
-      name: Combine code coverage files
-    - name: Upload Code Coverage
-      uses: coverallsapp/github-action@v1.1.1
-      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
-    #   name: Run Unit Tests (Browser)
-    # - run: DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests" {{SQL CARBON EDIT}} remove step
-    #   name: Run Integration Tests (Electron)
-
   windows:
-    runs-on: windows-2016
+      name: Windows
+      runs-on: windows-latest
+      timeout-minutes: 30
+      env:
+        CHILD_CONCURRENCY: "1"
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      steps:
+        - uses: actions/checkout@v2.2.0
+
+        - uses: actions/setup-node@v2
+          with:
+            node-version: 12
+
+        - uses: actions/setup-python@v2
+          with:
+            python-version: "2.x"
+
+        # {{SQL CARBON EDIT}} Skip caching for now
+        # - name: Compute node modules cache key
+        #   id: nodeModulesCacheKey
+        #   run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
+        # - name: Cache node_modules archive
+        #   id: cacheNodeModules
+        #   uses: actions/cache@v2
+        #   with:
+        #     path: ".build/node_modules_cache"
+        #     key: "${{ runner.os }}-cacheNodeModulesArchive-${{ steps.nodeModulesCacheKey.outputs.value }}"
+        # - name: Extract node_modules archive
+        #   if: ${{ steps.cacheNodeModules.outputs.cache-hit == 'true' }}
+        #   run: 7z.exe x .build/node_modules_cache/cache.7z -aos
+        # - name: Get yarn cache directory path
+        #   id: yarnCacheDirPath
+        #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        #   run: echo "::set-output name=dir::$(yarn cache dir)"
+        # - name: Cache yarn directory
+        #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        #   uses: actions/cache@v2
+        #   with:
+        #     path: ${{ steps.yarnCacheDirPath.outputs.dir }}
+        #     key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+        #     restore-keys: ${{ runner.os }}-yarnCacheDir-
+
+        - name: Execute yarn
+          # if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} {{SQL CARBON EDIT}} Skipping caching for now
+          env:
+            PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+            ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+          run: yarn --frozen-lockfile --network-timeout 180000
+        # - name: Create node_modules archive {{SQL CARBON EDIT}} Skip caching for now
+        #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        #   run: |
+        #     mkdir -Force .build
+        #     node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+        #     mkdir -Force .build/node_modules_cache
+        #     7z.exe a .build/node_modules_cache/cache.7z -mx3 `@.build/node_modules_list.txt
+
+        - name: Compile and Download
+          run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" # {{SQL CARBON EDIT}} Remove unused options playwright-install download-builtin-extensions
+
+        - name: Run Unit Tests (Electron)
+          run: .\scripts\test.bat
+
+        # - name: Run Unit Tests (Browser) {{SQL CARBON EDIT}} disable for now
+        #   run: yarn test-browser --browser chromium
+
+        # - name: Run Integration Tests (Electron) {{SQL CARBON EDIT}} disable for now
+        #   run: .\scripts\test-integration.bat
+
+  linux:
+    name: Linux
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
     env:
-      CHILD_CONCURRENCY: "1"
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-    - uses: actions/checkout@v2.2.0
-    - uses: actions/setup-node@v1
-      with:
-        node-version: 10
-    - uses: actions/setup-python@v1
-      with:
-        python-version: '2.x'
-    # Increase timeout to get around latency issues when fetching certain packages
-    - run: |
-        yarn config set network-timeout 300000
-        yarn --frozen-lockfile
-      name: Install Dependencies
-    - run: yarn electron
-      name: Download Electron
-    - run: yarn gulp hygiene
-      name: Run Hygiene Checks
-    - run: yarn strict-vscode # {{SQL CARBON EDIT}} add step
-      name: Run Strict Compile Options
-    # - run: yarn monaco-compile-check {{SQL CARBON EDIT}} remove step
-    #   name: Run Monaco Editor Checks
-    - run: yarn valid-layers-check
-      name: Run Valid Layers Checks
-    - run: yarn compile
-      name: Compile Sources
-    # - run: yarn download-builtin-extensions {{SQL CARBON EDIT}} remove step
-    #   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
-    #   name: Run Integration Tests (Electron)
+      - uses: actions/checkout@v2.2.0
+
+      # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
+      - name: Setup Build Environment
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libgbm1 libkrb5-dev # {{SQL CARBON EDIT}} add kerberos dep
+          sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
+          sudo chmod +x /etc/init.d/xvfb
+          sudo update-rc.d xvfb defaults
+          sudo service xvfb start
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 12
+      # {{SQL CARBON EDIT}} Skip caching for now
+      # - name: Compute node modules cache key
+      #   id: nodeModulesCacheKey
+      #   run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
+      # - name: Cache node modules
+      #   id: cacheNodeModules
+      #   uses: actions/cache@v2
+      #   with:
+      #     path: "**/node_modules"
+      #     key: ${{ runner.os }}-cacheNodeModules13-${{ steps.nodeModulesCacheKey.outputs.value }}
+      #     restore-keys: ${{ runner.os }}-cacheNodeModules13-
+      # - name: Get yarn cache directory path
+      #   id: yarnCacheDirPath
+      #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+      #   run: echo "::set-output name=dir::$(yarn cache dir)"
+      # - name: Cache yarn directory
+      #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+      #   uses: actions/cache@v2
+      #   with:
+      #     path: ${{ steps.yarnCacheDirPath.outputs.dir }}
+      #     key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+      #     restore-keys: ${{ runner.os }}-yarnCacheDir-
+      - name: Execute yarn
+        # if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} {{SQL CARBON EDIT}} Skip caching for now
+        env:
+          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+        run: yarn --frozen-lockfile --network-timeout 180000
+
+      - name: Compile and Download
+        run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
+
+      - name: Run Unit Tests (Electron)
+        id: electron-unit-tests
+        run: DISPLAY=:10 ./scripts/test.sh --coverage --runGlob "**/sql/**/*.test.js" # {{SQL CARBON EDIT}} Run only our tests with coverage
+
+      - name: Run Extension Unit Tests (Electron)
+        id: electron-extension-unit-tests
+        run: DISPLAY=:10 ./scripts/test-extensions-unit.sh
+
+      # {{SQL CARBON EDIT}} Add coveralls. We merge first to get around issue where parallel builds weren't being combined correctly
+      - name: Combine code coverage files
+        run: node test/combineCoverage
+      - name: Upload Code Coverage
+        uses: coverallsapp/github-action@v1.1.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: "test/coverage/lcov.info"
+
+      # - name: Run Unit Tests (Browser) {{SQL CARBON EDIT}} Skip for now
+      #   id: browser-unit-tests
+      #   run: DISPLAY=:10 yarn test-browser --browser chromium
+
+      # - name: Run Integration Tests (Electron) {{SQL CARBON EDIT}} Skip for now
+      #   id: electron-integration-tests
+      #   run: DISPLAY=:10 ./scripts/test-integration.sh
 
   darwin:
+    name: macOS
     runs-on: macos-latest
+    timeout-minutes: 30
     env:
-      CHILD_CONCURRENCY: "1"
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-    - uses: actions/checkout@v2.2.0
-    - uses: actions/setup-node@v1
-      with:
-        node-version: 10
-    # Increase timeout to get around latency issues when fetching certain packages
-    - run: |
-        yarn config set network-timeout 300000
-        yarn --frozen-lockfile
-      name: Install Dependencies
-    - run: yarn electron x64
-      name: Download Electron
-    - run: yarn gulp hygiene
-      name: Run Hygiene Checks
-    - run: yarn strict-vscode # {{SQL CARBON EDIT}} add step
-      name: Run Strict Compile Options
-    # - run: yarn monaco-compile-check {{SQL CARBON EDIT}} remove step
-    #   name: Run Monaco Editor Checks
-    - run: yarn valid-layers-check
-      name: Run Valid Layers Checks
-    - run: yarn compile
-      name: Compile Sources
-    # - run: yarn download-builtin-extensions {{SQL CARBON EDIT}} remove step
-    #   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"
-  #     name: Run Integration Tests (Electron)
+      - uses: actions/checkout@v2.2.0
 
-  # monaco:
-  #   runs-on: ubuntu-latest
-  #   env:
-  #     CHILD_CONCURRENCY: "1"
-  #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  #   steps:
-  #   - uses: actions/checkout@v2.2.0
-  #   # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
-  #   - run: |
-  #       sudo apt-get update
-  #       sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libgbm1
-  #       sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
-  #       sudo chmod +x /etc/init.d/xvfb
-  #       sudo update-rc.d xvfb defaults
-  #       sudo service xvfb start
-  #     name: Setup Build Environment
-  #   - uses: actions/setup-node@v1
-  #     with:
-  #       node-version: 10
-  #   - run: yarn --frozen-lockfile
-  #     name: Install Dependencies
-  #   - run: yarn monaco-compile-check
-  #     name: Run Monaco Editor Checks
-  #   - run: yarn gulp editor-esm-bundle
-  #     name: Editor Distro & ESM Bundle
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 12
+
+      # {{SQL CARBON EDIT}} Skip caching for now
+      # - name: Compute node modules cache key
+      #   id: nodeModulesCacheKey
+      #   run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
+      # - name: Cache node modules
+      #   id: cacheNodeModules
+      #   uses: actions/cache@v2
+      #   with:
+      #     path: "**/node_modules"
+      #     key: ${{ runner.os }}-cacheNodeModules13-${{ steps.nodeModulesCacheKey.outputs.value }}
+      #     restore-keys: ${{ runner.os }}-cacheNodeModules13-
+      # - name: Get yarn cache directory path
+      #   id: yarnCacheDirPath
+      #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+      #   run: echo "::set-output name=dir::$(yarn cache dir)"
+      # - name: Cache yarn directory
+      #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+      #   uses: actions/cache@v2
+      #   with:
+      #     path: ${{ steps.yarnCacheDirPath.outputs.dir }}
+      #     key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+      #     restore-keys: ${{ runner.os }}-yarnCacheDir-
+      - name: Execute yarn
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        env:
+          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+        run: yarn --frozen-lockfile --network-timeout 180000
+
+      - name: Compile and Download
+        run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
+
+      # This is required for keytar unittests, otherwise we hit
+      # https://github.com/atom/node-keytar/issues/76
+      - name: Create temporary keychain
+        run: |
+          security create-keychain -p pwd $RUNNER_TEMP/buildagent.keychain
+          security default-keychain -s $RUNNER_TEMP/buildagent.keychain
+          security unlock-keychain -p pwd $RUNNER_TEMP/buildagent.keychain
+
+      - name: Run Unit Tests (Electron)
+        run: DISPLAY=:10 ./scripts/test.sh
+
+      # - name: Run Unit Tests (Browser) {{SQL CARBON EDIT}} Skip for now
+      #   run: DISPLAY=:10 yarn test-browser --browser chromium
+
+      # - name: Run Integration Tests (Electron) {{SQL CARBON EDIT}} Skip for now
+      #   run: DISPLAY=:10 ./scripts/test-integration.sh
+
+  hygiene:
+    name: Hygiene and Layering
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 12
+
+      - name: Compute node modules cache key
+        id: nodeModulesCacheKey
+        run: echo "::set-output name=value::$(node build/azure-pipelines/common/sql-computeNodeModulesCacheKey.js)"
+      - name: Cache node modules
+        id: cacheNodeModules
+        uses: actions/cache@v2
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.os }}-cacheNodeModules13-${{ steps.nodeModulesCacheKey.outputs.value }}
+      - name: Get yarn cache directory path
+        id: yarnCacheDirPath
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+      - name: Cache yarn directory
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
+          key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+          restore-keys: ${{ runner.os }}-yarnCacheDir-
+      - name: Setup Build Environment # {{SQL CARBON EDIT}} Add step to install required packages if we need to run yarn
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libkrb5-dev
+      - name: Execute yarn
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        env:
+          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+        run: yarn --frozen-lockfile --network-timeout 180000
+
+      - name: Run Hygiene Checks
+        run: yarn gulp hygiene
+
+      - name: Run Valid Layers Checks
+        run: yarn valid-layers-check
+
+      - name: Run Strict Compile Options # {{SQL CARBON EDIT}} add step
+        run: yarn strict-vscode
+
+      # - name: Run Monaco Editor Checks {{SQL CARBON EDIT}} Remove Monaco checks
+      #   run: yarn monaco-compile-check
+
+      - name: Compile /build/
+        run: yarn --cwd build compile
+
+      - name: Run Trusted Types Checks
+        run: yarn tsec-compile-check
+
+      # - name: Editor Distro & ESM Bundle {{SQL CARBON EDIT}} Remove Monaco checks
+      #   run: yarn gulp editor-esm-bundle
+
+      # - name: Typings validation prep {{SQL CARBON EDIT}} Remove Monaco checks
+      #   run: |
+      #     mkdir typings-test
+
+      # - name: Typings validation {{SQL CARBON EDIT}} Remove Monaco checks
+      #   working-directory: ./typings-test
+      #   run: |
+      #     yarn init -yp
+      #     ../node_modules/.bin/tsc --init
+      #     echo "import '../out-monaco-editor-core';" > a.ts
+      #     ../node_modules/.bin/tsc --noEmit
+
+      # - name: Webpack Editor {{SQL CARBON EDIT}} Remove Monaco checks
+      #   working-directory: ./test/monaco
+      #   run: yarn run bundle
+
+      # - name: Compile Editor Tests {{SQL CARBON EDIT}} Remove Monaco checks
+      #   working-directory: ./test/monaco
+      #   run: yarn run compile
+
+      # - name: Download Playwright {{SQL CARBON EDIT}} Remove Monaco checks
+      #   run: yarn playwright-install
+
+      # - name: Run Editor Tests {{SQL CARBON EDIT}} Remove Monaco checks
+      #   timeout-minutes: 5
+      #   working-directory: ./test/monaco
+      #   run: yarn test

.github/workflows/codeql.yml

@@ -1,46 +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: v35
-          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: v35
-          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/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: v35
-      - 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

@@ -1,24 +0,0 @@
-name: On Issue Open
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v2.2.0
-        with:
-          repository: 'microsoft/azuredatastudio'
-          ref: main
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions/build/actions
-
-      - name: Run CopyCat
-        uses: ./actions/build/actions/copycat
-        with:
-          token: ${{secrets.TRIAGE_PAT}}
-          owner: anthonydresser
-          repo: testissues

.gitignore

@@ -5,26 +5,8 @@ Thumbs.db
 node_modules/
 .build/
 extensions/**/dist/
-out/
-out-build/
-out-editor/
-out-editor-src/
-out-editor-build/
-out-editor-esm/
-out-editor-esm-bundle/
-out-editor-min/
-out-monaco-editor-core/
-out-vscode/
-out-vscode-min/
-out-vscode-reh/
-out-vscode-reh-min/
-out-vscode-reh-pkg/
-out-vscode-reh-web/
-out-vscode-reh-web-min/
-out-vscode-reh-web-pkg/
-out-vscode-web/
-out-vscode-web-min/
-out-vscode-web-pkg/
+/out*/
+/extensions/**/out/
 src/vs/server
 resources/server
 build/node_modules

.lgtm/javascript-queries/promises.ql

@@ -1,33 +0,0 @@
-/**
- * @name No floating promises
- * @kind problem
- * @problem.severity error
- * @id js/experimental/floating-promise
- */
-import javascript
-
-private predicate isEscapingPromise(PromiseDefinition promise) {
-  exists (DataFlow::Node escape | promise.flowsTo(escape) |
-    escape = any(DataFlow::InvokeNode invk).getAnArgument()
-    or
-    escape = any(DataFlow::FunctionNode fun).getAReturn()
-    or
-    escape = any(ThrowStmt t).getExpr().flow()
-    or
-    escape = any(GlobalVariable v).getAnAssignedExpr().flow()
-    or
-    escape = any(DataFlow::PropWrite write).getRhs()
-    or
-    exists(WithStmt with, Assignment assign |
-      with.mayAffect(assign.getLhs()) and
-      assign.getRhs().flow() = escape
-    )
-  )
-}
-
-from PromiseDefinition promise
-where
-  not exists(promise.getAMethodCall(any(string m | m = "then" or m = "catch" or m = "finally"))) and
-  not exists (AwaitExpr e | promise.flowsTo(e.getOperand().flow())) and
-  not isEscapingPromise(promise)
-select promise, "This promise appears to be a floating promise"

.nvmrc

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

.vscode/extensions.json

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

.vscode/launch.json

@@ -4,80 +4,25 @@
 		{
 			"type": "node",
 			"request": "launch",
-			"name": "Gulp Build",
-			"program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
-			"stopOnEntry": true,
-			"args": [
-				"hygiene"
-			]
-		},
-		{
-			"type": "node",
-			"request": "attach",
-			"restart": true,
-			"name": "Attach to Extension Host",
-			"timeout": 30000,
-			"port": 5870,
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js",
-				"${workspaceFolder}/extensions/*/out/**/*.js"
-			]
-		},
-		{
-			"type": "pwa-chrome",
-			"request": "attach",
-			"name": "Attach to Shared Process",
-			"timeout": 30000,
-			"port": 9222,
-			"urlFilter": "*sharedProcess.html*",
-			"presentation": {
-				"hidden": true
-			}
-		},
-		{
-			"type": "node",
-			"request": "attach",
-			"name": "Attach to Search Process",
-			"port": 5876,
+			"name": "Launch Azure Data Studio",
+			"runtimeExecutable": "${workspaceFolder}/scripts/sql.sh",
+			"windows": {
+				"runtimeExecutable": "${workspaceFolder}/scripts/sql.bat",
+			},
+			"runtimeArgs": [
+				"--no-cached-data"
+			],
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			],
 			"presentation": {
-				"hidden": true,
+				"group": "0_ads"
 			}
 		},
-		{
-			"type": "node",
-			"request": "attach",
-			"name": "Attach to CLI Process",
-			"port": 5874,
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			]
-		},
-		{
-			"type": "node",
-			"request": "attach",
-			"name": "Attach to Main Process",
-			"timeout": 30000,
-			"port": 5875,
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"hidden": true,
-			}
-		},
-		{
-			"type": "chrome",
-			"request": "attach",
-			"name": "Attach to azuredatastudio",
-			"port": 9222
-		},
 		{
 			"type": "pwa-chrome",
 			"request": "launch",
-			"name": "Launch azuredatastudio",
+			"name": "Launch ADS & Debug Renderer",
 			"windows": {
 				"runtimeExecutable": "${workspaceFolder}/scripts/sql.bat"
 			},
@@ -88,7 +33,7 @@
 				"runtimeExecutable": "${workspaceFolder}/scripts/sql.sh"
 			},
 			"port": 9222,
-			"timeout": 20000,
+			"timeout": 30000,
 			"env": {
 				"VSCODE_EXTHOST_WILL_SEND_SOCKET": null,
 				"VSCODE_SKIP_PRELAUNCH": "1"
@@ -109,93 +54,88 @@
 				"${workspaceFolder}/out/**/*.js"
 			],
 			"browserLaunchLocation": "workspace",
-			"preLaunchTask": "Ensure Prelaunch Dependencies",
+			"presentation": {
+				"group": "1_debug",
+				"order": 2
+			}
 		},
 		{
 			"type": "node",
-			"request": "launch",
-			"name": "Launch ADS (Web) (TBD)",
-			"program": "${workspaceFolder}/resources/web/code-web.js",
+			"request": "attach",
+			"restart": true,
+			"name": "Attach to Extension Host",
+			"timeout": 30000,
+			"port": 5870,
+			"outFiles": [
+				"${workspaceFolder}/out/**/*.js",
+				"${workspaceFolder}/extensions/*/out/**/*.js"
+			],
 			"presentation": {
-				"group": "0_vscode",
+				"group": "2_attach"
+			}
+		},
+		{
+			"type": "pwa-chrome",
+			"request": "attach",
+			"name": "Attach to Shared Process",
+			"timeout": 30000,
+			"port": 9222,
+			"urlFilter": "*sharedProcess.html*",
+			"presentation": {
+				"group": "2_attach"
+			}
+		},
+		{
+			"type": "node",
+			"request": "attach",
+			"name": "Attach to Main Process",
+			"timeout": 30000,
+			"port": 5875,
+			"outFiles": [
+				"${workspaceFolder}/out/**/*.js"
+			],
+			"presentation": {
+				"group": "2_attach"
+			}
+		},
+		{
+			"type": "pwa-chrome",
+			"request": "attach",
+			"name": "Attach to Renderer",
+			"browserAttachLocation": "workspace",
+			"port": 9222,
+			"timeout": 30000,
+			"trace": true,
+			"outFiles": [
+				"${workspaceFolder}/out/**/*.js"
+			],
+			"resolveSourceMapLocations": [
+				"${workspaceFolder}/out/**/*.js"
+			],
+			"perScriptSourcemaps": "yes",
+			"presentation": {
+				"group": "2_attach",
 				"order": 2
 			}
 		},
 		{
 			"type": "node",
 			"request": "launch",
-			"name": "Main Process",
-			"runtimeExecutable": "${workspaceFolder}/scripts/code.sh",
-			"windows": {
-				"runtimeExecutable": "${workspaceFolder}/scripts/code.bat",
-			},
-			"runtimeArgs": [
-				"--no-cached-data"
-			],
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"group": "1_vscode",
-				"order": 1
-			}
-		},
-		{
-			"type": "chrome",
-			"request": "launch",
-			"name": "Launch ADS (Web, Chrome) (TBD)",
-			"url": "http://localhost:8080",
-			"preLaunchTask": "Run web",
-			"presentation": {
-				"group": "0_vscode",
-				"order": 3
-			}
-		},
-		{
-			"type": "pwa-msedge",
-			"request": "launch",
-			"name": "VS Code (Web, Edge)",
-			"url": "http://localhost:8080",
-			"pauseForSourceMap": false,
-			"preLaunchTask": "Run web",
-			"presentation": {
-				"group": "0_vscode",
-				"order": 3
-			}
-		},
-		{
-			"type": "node",
-			"request": "launch",
-			"name": "Git Unit Tests",
-			"program": "${workspaceFolder}/extensions/git/node_modules/mocha/bin/_mocha",
-			"stopOnEntry": false,
-			"cwd": "${workspaceFolder}/extensions/git",
-			"outFiles": [
-				"${workspaceFolder}/extensions/git/out/**/*.js"
-			],
-			"presentation": {
-				"group": "5_tests",
-				"order": 10
-			}
-		},
-		{
-			"type": "node",
-			"request": "launch",
-			"name": "Launch Smoke Test",
+			"name": "Run Smoke Tests",
 			"program": "${workspaceFolder}/test/smoke/test/index.js",
 			"cwd": "${workspaceFolder}/test/smoke",
 			"env": {
 				"BUILD_ARTIFACTSTAGINGDIRECTORY": "${workspaceFolder}"
 			},
 			"presentation": {
-				"group": "5_tests",
-				"order": 8
+				"group": "3_tests",
+				"order": 5
 			}
 		},
 		{
-			"type": "node",
+			"type": "pwa-node",
 			"request": "launch",
-			"name": "Run Unit Tests",
+			"name": "Run Core Unit Tests",
 			"program": "${workspaceFolder}/test/unit/electron/index.js",
 			"runtimeExecutable": "${workspaceFolder}/.build/electron/Azure Data Studio.app/Contents/MacOS/Electron",
 			"windows": {
@@ -212,11 +152,48 @@
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			],
+			"cascadeTerminateToConfigurations": [
+				"Attach to Renderer"
+			],
 			"env": {
 				"MOCHA_COLORS": "true"
 			},
 			"presentation": {
-				"hidden": true
+				"group": "3_tests",
+				"order": 1
+			}
+		},
+		{
+			"type": "pwa-node",
+			"request": "launch",
+			"name": "Run Core Unit Tests (Current File)",
+			"program": "${workspaceFolder}/test/unit/electron/index.js",
+			"runtimeExecutable": "${workspaceFolder}/.build/electron/Azure Data Studio.app/Contents/MacOS/Electron",
+			"windows": {
+				"runtimeExecutable": "${workspaceFolder}/.build/electron/azuredatastudio.exe"
+			},
+			"linux": {
+				"runtimeExecutable": "${workspaceFolder}/.build/electron/azuredatastudio"
+			},
+			"cascadeTerminateToConfigurations": [
+				"Attach to Renderer"
+			],
+			"outputCapture": "std",
+			"args": [
+				"--remote-debugging-port=9222",
+				"--run",
+				"${relativeFile}"
+			],
+			"cwd": "${workspaceFolder}",
+			"outFiles": [
+				"${workspaceFolder}/out/**/*.js"
+			],
+			"env": {
+				"MOCHA_COLORS": "true"
+			},
+			"presentation": {
+				"group": "3_tests",
+				"order": 2
 			}
 		},
 		{
@@ -233,7 +210,11 @@
 				"runtimeExecutable": "${workspaceFolder}/scripts/test-extensions-unit.sh"
 			},
 			"webRoot": "${workspaceFolder}",
-			"timeout": 45000
+			"timeout": 45000,
+			"presentation": {
+				"group": "3_tests",
+				"order": 3
+			}
 		},
 		{
 			"type": "chrome",
@@ -249,71 +230,139 @@
 				"runtimeExecutable": "${workspaceFolder}/scripts/sql-test-integration.sh"
 			},
 			"webRoot": "${workspaceFolder}",
-			"timeout": 45000
+			"timeout": 45000,
+			"presentation": {
+				"group": "3_tests",
+				"order": 4
+			}
 		},
+		{
+			"type": "node",
+			"request": "launch",
+			"name": "Launch Azure Data Studio (Web) (TBD)",
+			"program": "${workspaceFolder}/resources/web/code-web.js",
+			"presentation": {
+				"group": "4_web"
+			}
+		},
+		{
+			"type": "pwa-chrome",
+			"request": "launch",
+			"outFiles": [],
+			"perScriptSourcemaps": "yes",
+			"name": "Launch Azure Data Studio (Web, Chrome)",
+			"url": "http://localhost:8080",
+			"preLaunchTask": "Run web",
+			"presentation": {
+				"group": "4_web"
+			}
+		},
+		{
+			"type": "pwa-msedge",
+			"request": "launch",
+			"outFiles": [],
+			"perScriptSourcemaps": "yes",
+			"name": "Launch Azure Data Studio (Web, Edge)",
+			"url": "http://localhost:8080",
+			"pauseForSourceMap": false,
+			"preLaunchTask": "Run web",
+			"presentation": {
+				"group": "4_web"
+			}
+		}
 	],
 	"compounds": [
 		{
-			"name": "Debug Unit Tests",
+			"name": "Launch ADS & Debug Renderer and Extension Host",
 			"configurations": [
-				"Attach to azuredatastudio",
-				"Run Unit Tests"
-			]
+				"Launch ADS & Debug Renderer",
+				"Attach to Extension Host"
+			],
+			"presentation": {
+				"group": "1_debug",
+				"order": 1
+			}
+		},
+		{
+			"name": "Launch ADS & Debug Extension Host",
+			"configurations": [
+				"Launch Azure Data Studio",
+				"Attach to Extension Host"
+			],
+			"presentation": {
+				"group": "1_debug",
+				"order": 3
+			}
+		},
+		{
+			"name": "Launch ADS & Debug Main, Renderer and Extension Host",
+			"configurations": [
+				"Launch ADS & Debug Renderer",
+				"Attach to Main Process",
+				"Attach to Extension Host"
+			],
+			"presentation": {
+				"group": "1_debug",
+				"order": 4
+			}
+		},
+		{
+			"name": "Launch ADS & Debug All",
+			"stopAll": true,
+			"configurations": [
+				"Launch Azure Data Studio",
+				"Attach to Main Process",
+				"Attach to Extension Host",
+				"Attach to Shared Process",
+				"Attach to Renderer"
+			],
+			"preLaunchTask": "Ensure Prelaunch Dependencies",
+			"presentation": {
+				"group": "1_debug",
+				"order": 5
+			}
+		},
+		{
+			"name": "Attach to Renderer and Extension Host",
+			"configurations": [
+				"Attach to Renderer",
+				"Attach to Extension Host"
+			],
+			"presentation": {
+				"group": "2_attach",
+				"order": 1
+			}
+		},
+		{
+			"name": "Debug Core Unit Tests",
+			"configurations": [
+				"Attach to Renderer",
+				"Run Core Unit Tests"
+			],
+			"presentation": {
+				"group": "3_tests",
+				"order": 6
+			}
 		},
 		{
 			"name": "Debug Extension Unit Tests",
 			"configurations": [
 				"Attach to Extension Host",
 				"Run Extension Unit Tests"
-			]
-		},
-		{
-			"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
+				"group": "3_tests"
 			}
 		},
 		{
-			"name": "Debug azuredatastudio Main, Renderer & Extension Host",
+			"name": "Debug Core Unit Tests (Current File)",
 			"configurations": [
-				"Launch azuredatastudio",
-				"Attach to Main Process",
-				"Attach to Extension Host"
+				"Attach to Renderer",
+				"Run Core Unit Tests (Current File)"
 			],
 			"presentation": {
-				"group": "1_vscode",
-				"order": 3
-			}
-		},
-		{
-			"name": "Debug Renderer and Extension Host processes",
-			"configurations": [
-				"Launch azuredatastudio",
-				"Attach to Extension Host"
-			],
-			"presentation": {
-				"group": "1_vscode",
-				"order": 2
-			}
-		},
-		{
-			"name": "Attach Renderer and Extension Host",
-			"configurations": [
-				"Attach to azuredatastudio",
-				"Attach to Extension Host"
-			],
-			"presentation": {
-				"group": "1_vscode",
-				"order": 2
+				"group": "3_tests",
+				"order": 8
 			}
 		}
 	]

.vscode/notebooks/api.github-issues

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

.vscode/notebooks/endgame.github-issues

@@ -0,0 +1,107 @@
+[
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "#### Macros"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-remotehub\n\n$MILESTONE=milestone:\"May 2021\""
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "# Preparation"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Open Pull Requests on the Milestone"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE is:pr is:open"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Open Issues on the Milestone"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE is:issue is:open -label:iteration-plan -label:endgame-plan -label:testplan-item"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Feature Requests Missing Labels"
+  },
+  {
+    "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"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "# Testing"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Test Plan Items"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE is:issue is:open label:testplan-item"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Verification Needed"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE is:issue is:closed label:feature-request label:verification-needed -label:verified"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "# Verification"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Verifiable Fixes"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE is:issue is:closed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -label:z-author-verified -label:unreleased"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Unreleased Fixes"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE is:issue is:closed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -label:z-author-verified label:unreleased"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "# Candidates"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE is:open label:candidate"
+  }
+]

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

@@ -0,0 +1,770 @@
+[
+  {
+    "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",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "repo:microsoft/vscode-pull-request-github is:issue closed:>$since",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "repo:microsoft/vscode-test is:issue created:>$since",
+    "editable": true
+  },
+  {
+    "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

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

.vscode/notebooks/inbox.github-issues

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

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

@@ -0,0 +1,182 @@
+[
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "#### Macros"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remotehub\n\n$MILESTONE=milestone:\"May 2021\"\n\n$MINE=assignee:@me"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "# Preparation"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Open Pull Requests on the Milestone"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE $MINE is:pr is:open"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Open Issues on the Milestone"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE $MINE is:issue is:open -label:iteration-plan -label:endgame-plan -label:testplan-item"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Feature Requests Missing Labels"
+  },
+  {
+    "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"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Test Plan Items"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE is:issue is:open author:@me label:testplan-item"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Verification Needed"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE $MINE is:issue is:closed label:feature-request label:verification-needed"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "# Testing"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Test Plan Items"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE $MINE is:issue is:open label:testplan-item"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Verification Needed"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed -assignee:@me -label:verified -label:z-author-verified label:feature-request label:verification-needed"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "# Fixing"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Open Issues"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE $MINE is:issue is:open -label:endgame-plan -label:testplan-item -label:iteration-plan"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Open Bugs"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE $MINE is:issue is:open label:bug"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "# Verification"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## My Issues (verification-steps-needed)"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE $MINE is:issue label:bug label:verification-steps-needed"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## My Issues (verification-found)"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE $MINE is:issue label:bug label:verification-found"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Issues filed by me"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed author:@me sort:updated-asc label:bug -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Issues filed from outside team"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed sort:updated-asc label:bug -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:bamurtaugh -author:bpasero -author:btholt -author:chrisdias -author:chrmarti -author:Chuxel -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:eamodio -author:egamma -author:fiveisprime -author:gregvanl -author:isidorn -author:ItalyPaleAle -author:JacksonKearl -author:joaomoreno -author:jrieken -author:kieferrm -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:ornellaalt -author:orta -author:rebornix -author:RMacfarlane -author:roblourens -author:rzhao271 -author:sana-ajani -author:sandy081 -author:sbatten -author:stevencl -author:Tyriar -author:weinand -author:TylerLeonhardt -author:lramos15 -author:hediet"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Issues filed by others"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed -author:@me sort:updated-asc label:bug -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "# Release Notes"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "repo:microsoft/vscode $MILESTONE $MINE is:issue is:closed label:feature-request -label:on-release-notes"
+  }
+]

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

@@ -2,97 +2,99 @@
   {
     "kind": 1,
     "language": "markdown",
-    "value": "##### `Config`: This should be changed every month/milestone",
-    "editable": true
+    "value": "##### `Config`: This should be changed every month/milestone"
   },
   {
     "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\n\n// current milestone name\n$milestone=milestone:\"September 2020\"",
-    "editable": true
+    "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:\"June 2021\""
   },
   {
     "kind": 1,
-    "language": "github-issues",
-    "value": "## Milestone Work",
-    "editable": true
+    "language": "markdown",
+    "value": "## Milestone Work"
   },
   {
     "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
+    "value": "## Bugs, Debt, Features..."
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "#### Debt & Engineering",
-    "editable": true
+    "value": "#### My Bugs"
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos assignee:@me is:open label:debt OR $repos assignee:@me is:open label:engineering",
-    "editable": true
+    "value": "$repos assignee:@me is:open label:bug"
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "#### Performance 🐌 🔜 🏎",
-    "editable": true
+    "value": "#### Debt & Engineering"
   },
   {
     "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
+    "value": "$repos assignee:@me is:open label:debt OR $repos assignee:@me is:open label:engineering"
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "#### Feature Requests",
-    "editable": true
+    "value": "#### Performance 🐌 🔜 🏎"
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos assignee:@me is:open label:feature-request milestone:Backlog sort:reactions-+1-desc",
-    "editable": true
+    "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"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "#### Feature Requests"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repos assignee:@me is:open label:feature-request milestone:Backlog sort:reactions-+1-desc"
   },
   {
     "kind": 2,
     "language": "github-issues",
     "value": "$repos assignee:@me is:open milestone:\"Backlog Candidates\"",
-    "editable": false
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "#### Not Actionable",
-    "editable": true
+    "value": "### Personal Inbox\n"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "\n#### Missing Type label"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repos assignee:@me is:open type:issue -label:bug -label:\"needs more info\" -label:feature-request -label:under-discussion -label:debt -label:plan-item -label:upstream"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "#### Not Actionable"
   },
   {
     "kind": 2,
     "language": "github-issues",
     "value": "$repos assignee:@me is:open label:\"needs more info\"",
-    "editable": false
+    "editable": true
   }
 ]

.vscode/notebooks/papercuts.github-issues

@@ -0,0 +1,44 @@
+[
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Papercuts\n\nThis notebook serves as an ongoing collection of papercut issues that we encounter while dogfooding. With that in mind only promote issues that really turn you off, e.g. issues that make you want to stop using VS Code or its extensions. To mark an issue (bug, feature-request, etc.) as papercut add the labels: `papercut :drop_of_blood:`",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## All Papercuts\n\nThese are all papercut issues that we encounter while dogfooding vscode or extensions that we author.",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "repo:microsoft/vscode is:open -label:notebook label:\"papercut :drop_of_blood:\"",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Native Notebook",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "repo:microsoft/vscode is:open label:notebook label:\"papercut :drop_of_blood:\"",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "### My Papercuts",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "repo:microsoft/vscode is:open assignee:@me label:\"papercut :drop_of_blood:\"",
+    "editable": true
+  }
+]

.vscode/notebooks/verification.github-issues

@@ -14,7 +14,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks \n$milestone=milestone:\"September 2020\"",
+    "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks \n$milestone=milestone:\"March 2021\"",
     "editable": true
   },
   {
@@ -38,7 +38,7 @@
   {
     "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:misolori -author:mjbvz -author:rebornix -author:RMacfarlane -author:roblourens -author:sana-ajani -author:sandy081 -author:sbatten -author:Tyriar -author:weinand",
+    "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 -author:rzhao271 -author:kieferrm -author:TylerLeonhardt -author:bamurtaugh",
     "editable": false
   },
   {

.vscode/searches/TrustedTypes.code-search

@@ -1,54 +1,37 @@
 # Query: .innerHTML = 
 # Flags: CaseSensitive WordMatch
 # Including: src/vs/**/*.{t,j}s
-# Excluding: *.test.ts
+# Excluding: *.test.ts, **/test/**
 # ContextLines: 3
 
-22 results - 14 files
+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:
-  161  				const strValue = values[0];
-  162  				const span = element.querySelector(`div[data-code="${id}"]`);
-  163  				if (span) {
-  164: 					span.innerHTML = strValue;
-  165  				}
-  166  			}).catch(err => {
-  167  				// ignore
+  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
 
-  243  		return true;
-  244  	}
-  245  
-  246: 	element.innerHTML = insane(renderedMarkdown, {
-  247  		allowedSchemes,
-  248  		// allowedTags should included everything that markdown renders to.
-  249  		// Since we have our own sanitize function for marked, it's possible we missed some tag so let insane make sure.
-
-src/vs/base/browser/ui/contextview/contextview.ts:
-  157  				this.shadowRootHostElement = DOM.$('.shadow-root-host');
-  158  				this.container.appendChild(this.shadowRootHostElement);
-  159  				this.shadowRoot = this.shadowRootHostElement.attachShadow({ mode: 'open' });
-  160: 				this.shadowRoot.innerHTML = `
-  161  					<style>
-  162  						${SHADOW_ROOT_CSS}
-  163  					</style>
-
-src/vs/code/electron-sandbox/issue/issueReporterMain.ts:
-  57  	const platformClass = platform.isWindows ? 'windows' : platform.isLinux ? 'linux' : 'mac';
-  58  	addClass(document.body, platformClass); // used by our fonts
-  59  
-  60: 	document.body.innerHTML = BaseHtml();
-  61  	const issueReporter = new IssueReporter(configuration);
-  62  	issueReporter.render();
-  63  	document.body.style.display = 'block';
-
-src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts:
-  320  			content.push(`.highest { color: ${styles.highlightForeground}; }`);
-  321  		}
-  322  
-  323: 		styleTag.innerHTML = content.join('\n');
-  324  		if (document.head) {
-  325  			document.head.appendChild(styleTag);
-  326  		}
+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];
@@ -60,21 +43,21 @@ src/vs/editor/browser/view/domLineBreaksComputer.ts:
   113  	containerDomNode.style.top = '10000';
 
 src/vs/editor/browser/view/viewLayer.ts:
-  507  	private _finishRenderingNewLines(ctx: IRendererContext<T>, domNodeIsEmpty: boolean, newLinesHTML: string, wasNew: boolean[]): void {
-  508  		const lastChild = <HTMLElement>this.domNode.lastChild;
-  509  		if (domNodeIsEmpty || !lastChild) {
-  510: 			this.domNode.innerHTML = newLinesHTML;
-  511  		} else {
-  512  			lastChild.insertAdjacentHTML('afterend', newLinesHTML);
-  513  		}
+  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  		}
 
-  525  	private _finishRenderingInvalidLines(ctx: IRendererContext<T>, invalidLinesHTML: string, wasInvalid: boolean[]): void {
-  526  		const hugeDomNode = document.createElement('div');
-  527  
-  528: 		hugeDomNode.innerHTML = invalidLinesHTML;
-  529  
-  530  		for (let i = 0; i < ctx.linesLength; i++) {
-  531  			const line = ctx.lines[i];
+  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  
@@ -99,64 +82,14 @@ src/vs/editor/standalone/browser/colorizer.ts:
   45  		return this.colorize(modeService, text || '', mimeType, options).then(render, (err) => console.error(err));
   46  	}
 
-src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts:
-  212  		if (!this._globalStyleElement) {
-  213  			this._globalStyleElement = dom.createStyleSheet();
-  214  			this._globalStyleElement.className = 'monaco-colors';
-  215: 			this._globalStyleElement.innerHTML = this._css;
-  216  			this._styleElements.push(this._globalStyleElement);
-  217  		}
-  218  		return Disposable.None;
-
-  221  	private _registerShadowDomContainer(domNode: HTMLElement): IDisposable {
-  222  		const styleElement = dom.createStyleSheet(domNode);
-  223  		styleElement.className = 'monaco-colors';
-  224: 		styleElement.innerHTML = this._css;
-  225  		this._styleElements.push(styleElement);
-  226  		return {
-  227  			dispose: () => {
-
-  291  		ruleCollector.addRule(generateTokensCSSForColorMap(colorMap));
-  292  
-  293  		this._css = cssRules.join('\n');
-  294: 		this._styleElements.forEach(styleElement => styleElement.innerHTML = this._css);
-  295  
-  296  		TokenizationRegistry.setColorMap(colorMap);
-  297  		this._onColorThemeChange.fire(theme);
-
-src/vs/editor/test/browser/controller/imeTester.ts:
-  55  			let content = this._model.getModelLineContent(i);
-  56  			r += content + '<br/>';
-  57  		}
-  58: 		output.innerHTML = r;
-  59  	}
-  60  }
-  61  
-
-  69  	let title = document.createElement('div');
-  70  	title.className = 'title';
-  71  
-  72: 	title.innerHTML = description + '. Type <strong>' + inputStr + '</strong>';
-  73  	container.appendChild(title);
-  74  
-  75  	let startBtn = document.createElement('button');
-
 src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts:
-  454  
-  455  	private getMarkdownDragImage(templateData: MarkdownCellRenderTemplate): HTMLElement {
-  456  		const dragImageContainer = DOM.$('.cell-drag-image.monaco-list-row.focused.markdown-cell-row');
-  457: 		dragImageContainer.innerHTML = templateData.container.outerHTML;
-  458  
-  459  		// Remove all rendered content nodes after the
-  460  		const markdownContent = dragImageContainer.querySelector('.cell.markdown')!;
-
-  611  			return null;
-  612  		}
-  613  
-  614: 		editorContainer.innerHTML = richEditorText;
-  615  
-  616  		return dragImageContainer;
-  617  	}
+  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);
@@ -165,30 +98,4 @@ src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts:
   378: 						outputNode.innerHTML = content.htmlContent;
   379  						cellOutputContainer.appendChild(outputNode);
   380  						domEval(outputNode);
-  381  					} else {
-
-src/vs/workbench/contrib/webview/browser/pre/main.js:
-  386  			// apply default styles
-  387  			const defaultStyles = newDocument.createElement('style');
-  388  			defaultStyles.id = '_defaultStyles';
-  389: 			defaultStyles.innerHTML = defaultCssRules;
-  390  			newDocument.head.prepend(defaultStyles);
-  391  
-  392  			applyStyles(newDocument, newDocument.body);
-
-src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughPart.ts:
-  281  
-  282  				const content = model.main.textEditorModel.getValue(EndOfLinePreference.LF);
-  283  				if (!strings.endsWith(input.resource.path, '.md')) {
-  284: 					this.content.innerHTML = content;
-  285  					this.updateSizeClasses();
-  286  					this.decorateContent();
-  287  					this.contentDisposables.push(this.keybindingService.onDidUpdateKeybindings(() => this.decorateContent()));
-
-  303  				const innerContent = document.createElement('div');
-  304  				innerContent.classList.add('walkThroughContent'); // only for markdown files
-  305  				const markdown = this.expandMacros(content);
-  306: 				innerContent.innerHTML = marked(markdown, { renderer });
-  307  				this.content.appendChild(innerContent);
-  308  
-  309  				model.snippets.forEach((snippet, i) => {
+  381  					} else if (preloadErrs.some(e => !!e)) {

.vscode/searches/es6.code-search

@@ -1,61 +0,0 @@
-# Query: @deprecated ES6
-# Flags: CaseSensitive WordMatch
-# ContextLines: 2
-
-12 results - 4 files
-
-src/vs/base/browser/dom.ts:
-  83  };
-  84  
-  85: /** @deprecated ES6 - use classList*/
-  86  export const hasClass: (node: HTMLElement | SVGElement, className: string) => boolean = _classList.hasClass.bind(_classList);
-  87: /** @deprecated ES6 - use classList*/
-  88  export const addClass: (node: HTMLElement | SVGElement, className: string) => void = _classList.addClass.bind(_classList);
-  89: /** @deprecated ES6 - use classList*/
-  90  export const addClasses: (node: HTMLElement | SVGElement, ...classNames: string[]) => void = _classList.addClasses.bind(_classList);
-  91: /** @deprecated ES6 - use classList*/
-  92  export const removeClass: (node: HTMLElement | SVGElement, className: string) => void = _classList.removeClass.bind(_classList);
-  93: /** @deprecated ES6 - use classList*/
-  94  export const removeClasses: (node: HTMLElement | SVGElement, ...classNames: string[]) => void = _classList.removeClasses.bind(_classList);
-  95: /** @deprecated ES6 - use classList*/
-  96  export const toggleClass: (node: HTMLElement | SVGElement, className: string, shouldHaveIt?: boolean) => void = _classList.toggleClass.bind(_classList);
-  97  
-
-src/vs/base/common/arrays.ts:
-  401  
-  402  /**
-  403:  * @deprecated ES6: use `Array.find`
-  404   */
-  405  export function first<T>(array: ReadonlyArray<T>, fn: (item: T) => boolean, notFoundValue: T): T;
-
-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 {
-
-  857  
-  858  /**
-  859:  * @deprecated ES6
-  860   */
-  861  export function repeat(s: string, count: number): string {

.vscode/settings.json

@@ -73,8 +73,13 @@
 	},
 	"gulp.autoDetect": "off",
 	"files.insertFinalNewline": true,
+	"[plaintext]": {
+		"files.insertFinalNewline": false,
+	},
 	"[typescript]": {
 		"editor.defaultFormatter": "vscode.typescript-language-features"
 	},
-	"typescript.tsc.autoDetect": "off"
+	"typescript.tsc.autoDetect": "off",
+	"notebook.experimental.useMarkdownRenderer": true,
+	"testing.autoRun.mode": "rerun",
 }

.vscode/tasks.json

@@ -4,10 +4,11 @@
 		{
 			"type": "npm",
 			"script": "watch-clientd",
-			"label": "Build VS Code Core",
+			"label": "Core - Build",
 			"isBackground": true,
 			"presentation": {
-				"reveal": "never"
+				"reveal": "never",
+				"group": "buildWatchers"
 			},
 			"problemMatcher": {
 				"owner": "typescript",
@@ -30,10 +31,11 @@
 		{
 			"type": "npm",
 			"script": "watch-extensionsd",
-			"label": "Build VS Code Extensions",
+			"label": "Ext - Build",
 			"isBackground": true,
 			"presentation": {
-				"reveal": "never"
+				"reveal": "never",
+				"group": "buildWatchers"
 			},
 			"problemMatcher": {
 				"owner": "typescript",
@@ -54,43 +56,49 @@
 			}
 		},
 		{
-			"label": "Build VS Code",
+			"label": "VS Code - Build",
 			"dependsOn": [
-				"Build VS Code Core",
-				"Build VS Code Extensions"
+				"Core - Build",
+				"Ext - Build"
 			],
 			"group": {
 				"kind": "build",
 				"isDefault": true
-			}
+			},
+			"problemMatcher": []
 		},
 		{
 			"type": "npm",
 			"script": "kill-watch-clientd",
-			"label": "Kill Build VS Code Core",
+			"label": "Kill Core - Build",
 			"group": "build",
 			"presentation": {
-				"reveal": "never"
+				"reveal": "never",
+				"group": "buildKillers",
+				"close": true
 			},
 			"problemMatcher": "$tsc"
 		},
 		{
 			"type": "npm",
 			"script": "kill-watch-extensionsd",
-			"label": "Kill Build VS Code Extensions",
+			"label": "Kill Ext - Build",
 			"group": "build",
 			"presentation": {
-				"reveal": "never"
+				"reveal": "never",
+				"group": "buildKillers",
+				"close": true
 			},
 			"problemMatcher": "$tsc"
 		},
 		{
-			"label": "Kill Build VS Code",
+			"label": "Kill VS Code - Build",
 			"dependsOn": [
-				"Kill Build VS Code Core",
-				"Kill Build VS Code Extensions"
+				"Kill Core - Build",
+				"Kill Ext - Build"
 			],
-			"group": "build"
+			"group": "build",
+			"problemMatcher": []
 		},
 		{
 			"type": "npm",
@@ -109,7 +117,7 @@
 		{
 			"type": "npm",
 			"script": "watch-webd",
-			"label": "Build Web Extensions",
+			"label": "Web Ext - Build",
 			"group": "build",
 			"isBackground": true,
 			"presentation": {
@@ -136,7 +144,7 @@
 		{
 			"type": "npm",
 			"script": "kill-watch-webd",
-			"label": "Kill Build Web Extensions",
+			"label": "Kill Web Ext - Build",
 			"group": "build",
 			"presentation": {
 				"reveal": "never"
@@ -206,7 +214,8 @@
 			"command": "node build/lib/preLaunch.js",
 			"label": "Ensure Prelaunch Dependencies",
 			"presentation": {
-				"reveal": "silent"
+				"reveal": "silent",
+				"close": true
 			}
 		},
 		{
@@ -217,7 +226,7 @@
 					"base": "$tsc",
 					"applyTo": "allDocuments",
 					"owner": "tsec"
-				},
+				}
 			],
 			"group": "build",
 			"label": "npm: tsec-compile-check",

.yarnrc

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

CHANGELOG.md

@@ -1,5 +1,125 @@
 # Change Log
 
+## Version 1.32.0
+* Release date: August 18, 2021
+* Release status: General Availability
+* Extension Updates:
+    * Arc/Az CLI extensions - Azure Arc extension now uses Azure CLI instead of Azure Data CLI for deploying and interacting with Azure Arc 
+       instances    
+    *  Langpacks
+    *  SQL Database Projects
+    *  Azure Monitor
+    *  Machine Learning
+
+## Version 1.31.1
+* Release date: July 29, 2021
+* Release status: General Availability
+## Hotfix Release
+- Fix for [#16436 Database Connection Toolbar Missing](https://github.com/microsoft/azuredatastudio/issues/16436)
+
+## Version 1.31.0
+* Release date: July 21, 2021
+* Release status: General Availability
+* New Notebook Features:
+    * WYSIWYG link improvements
+* Extension Updates:
+    * Import
+    * SandDance
+    * SQL Database Projects
+* Bug Fixes
+  * Accessibility bug fixes
+
+## Version 1.30.0
+* Release date: June 17, 2021
+* Release status: General Availability
+* New Notebook Features:
+    * Show book's notebook TOC title in pinned notebooks view
+    * Add new book icon
+    * Update Python to 3.8.10
+* Query Editor Features:
+    * Added filtering/sorting feature for query result grid in query editor and notebook, the feature can be invoked from the column headers. Note that this feature is only           available when you enable the preview features
+    * Added a status bar item to show summary of the selected cells if there are multiple numeric values
+* Extension Updates:
+    * SQL Database Projects
+    * Machine Learning
+* Bug Fixes
+  * Fix WYSIWYG Table cell adding new line in table cell
+
+## Version 1.29.0
+* Release date: May 19, 2021
+* Release status: General Availability
+* New Notebook Features:
+    * Added runs with a parameters option.
+* Extension Updates:
+    * SQL Database Projects
+    * Schema Compare
+* Bug Fixes
+
+## Version 1.28.0
+* Release date: April 16, 2021
+* Release status: General Availability
+* New Notebook Features:
+    * Added Add Notebook and Remove Notebook commands
+* Extension Updates:
+    * SQL Database Projects
+    * Schema Compare
+* Bug Fixes
+
+## Version 1.27.0
+* Release date: March 17, 2021
+* Release status: General Availability
+* New Notebook Features:
+    * Added create book dialog
+* Extension Updates:
+    * Import
+    * Dacpac
+    * Machine Learning
+    * SQL Assessment
+    * Arc
+    * SQL Database Projects
+    * ASDE Deployment
+* Bug Fixes
+
+## Version 1.26.1
+* Release date: February 25, 2021
+* Release status: General Availability
+* Fixes https://github.com/microsoft/azuredatastudio/issues/14382
+
+## Version 1.26.0
+* Release date: February 22, 2021
+* Release status: General Availability
+* Added edit Jupyter book UI support
+* Improved Jupyter server start-up time by 50% on windows
+* Extension Updates:
+    * Azure Arc
+        * PG dashboard enhancements
+        * Multi-controller support
+        * MIAA Dashboard will no longer prompt for SQL Server connection immediately upon opening
+    * Azure Data CLI
+    * Kusto
+    * Machine Learning
+    * Profiler
+    * Server Reports
+    * Schema Compare
+    * SQL Server Dacpac
+    * SQL Database Projects
+* Bug Fixes
+
+## Version 1.25.3
+* Release date: February 10, 2021
+* Release status: General Availability
+* Update Electron to 9.4.3 to incorporate critical upstream fixes
+
+## 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
@@ -512,7 +632,7 @@ The May release is focused on stabilization and bug fixes leading up to the Buil
 
 * Announcing **Redgate SQL Search** extension available in Extension Manager
 * Community Localization available for 10 languages: **German, Spanish, French, Italian, Japanese, Korean, Portuguese, Russian, Simplified Chinese and Traditional Chinese!**
-* Reduced telemetry collection, improved [opt-out](https://github.com/Microsoft/azuredatastudio/wiki/How-to-Disable-Telemetry-Reporting) experience and in-product links to [Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement)
+* Reduced telemetry collection, improved [opt-out](https://github.com/Microsoft/azuredatastudio/wiki/How-to-Disable-Telemetry-Reporting) experience and in-product links to [Privacy Statement](https://privacy.microsoft.com/privacystatement)
 * Extension Manager has improved Marketplace experience to easily discover community extensions
 * SQL Agent extension Jobs and Job History view improvement
 * Updates for **whoisactive** and **Server Reports** extensions

README.md

@@ -65,7 +65,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
 Azure Data Studio is localized into 10 languages: French, Italian, German, Spanish, Simplified Chinese, Traditional Chinese, Japanese, Korean, Russian, and Portuguese (Brazil). The language packs are available in the Extension Manager marketplace. Simply, search for the specific language using the extension marketplace and install. Once you install the selected language, Azure Data Studio will prompt you to restart with the new language.
 
 ## Privacy Statement
-The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement) describes the privacy statement of this software.
+The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.microsoft.com/privacystatement) describes the privacy statement of this software.
 
 ## Contributions and "Thank You"
 We would like to thank all our users who raised issues, and in particular the following users who helped contribute fixes:
@@ -131,10 +131,10 @@ Copyright (c) Microsoft Corporation. All rights reserved.
 
 Licensed under the [Source EULA](LICENSE.txt).
 
-[win-user]: https://go.microsoft.com/fwlink/?linkid=2150927
-[win-system]: https://go.microsoft.com/fwlink/?linkid=2150928
-[win-zip]: https://go.microsoft.com/fwlink/?linkid=2151312
-[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2151311
-[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2151508
-[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2151407
-[linux-deb]: https://go.microsoft.com/fwlink/?linkid=2151506
+[win-user]: https://go.microsoft.com/fwlink/?linkid=2170400
+[win-system]: https://go.microsoft.com/fwlink/?linkid=2170401
+[win-zip]: https://go.microsoft.com/fwlink/?linkid=2170402
+[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2169955
+[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2170045
+[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2170403
+[linux-deb]: https://go.microsoft.com/fwlink/?linkid=2169956

SECURITY.md

@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.5 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://docs.microsoft.com/en-us/previous-versions/tn-archive/cc751383(v=technet.10)), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report).
+
+If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://www.microsoft.com/en-us/msrc/pgp-key-msrc).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc).
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://microsoft.com/msrc/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://www.microsoft.com/en-us/msrc/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

ThirdPartyNotices.txt

@@ -12,7 +12,7 @@ expressly granted herein, whether by implication, estoppel or otherwise.
     angular2-grid: https://github.com/BTMorton/angular2-grid
     angular2-slickgrid: https://github.com/Microsoft/angular2-slickgrid
     applicationinsights: https://github.com/Microsoft/ApplicationInsights-node.js
-		axios: https://github.com/axios/axios
+    axios: https://github.com/axios/axios
     bootstrap: https://github.com/twbs/bootstrap
     chart.js: https://github.com/Timer/chartjs
     chokidar: https://github.com/paulmillr/chokidar
@@ -29,6 +29,7 @@ expressly granted herein, whether by implication, estoppel or otherwise.
     gc-signals: https://github.com/Microsoft/node-gc-signals
     getmac: https://github.com/bevry/getmac
     graceful-fs: https://github.com/isaacs/node-graceful-fs
+    gridstack: https://github.com/gridstack/gridstack.js
     html-query-plan: https://github.com/JustinPealing/html-query-plan
     http-proxy-agent: https://github.com/TooTallNate/node-https-proxy-agent
     https-proxy-agent: https://github.com/TooTallNate/node-https-proxy-agent
@@ -39,7 +40,7 @@ expressly granted herein, whether by implication, estoppel or otherwise.
     jschardet: https://github.com/aadsm/jschardet
     jupyter-powershell: https://github.com/vors/jupyter-powershell
     JupyterLab: https://github.com/jupyterlab/jupyterlab
-		keytar: https://github.com/atom/node-keytar
+    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
@@ -54,7 +55,8 @@ expressly granted herein, whether by implication, estoppel or otherwise.
     primeng: https://github.com/primefaces/primeng
     process-nextick-args: https://github.com/calvinmetcalf/process-nextick-args
     pty.js: https://github.com/chjj/pty.js
-		qs: https://github.com/ljharb/qs
+    pyzmq: https://github.com/zeromq/pyzmq
+    qs: https://github.com/ljharb/qs
     reflect-metadata: https://github.com/rbuckton/reflect-metadata
     request: https://github.com/request/request
     rxjs: https://github.com/ReactiveX/RxJS
@@ -84,6 +86,125 @@ expressly granted herein, whether by implication, estoppel or otherwise.
 
     Microsoft PROSE SDK: https://microsoft.github.io/prose
 
+    atom/language-clojure version 0.22.7 (https://github.com/atom/language-clojure)
+    atom/language-coffee-script version 0.49.3 (https://github.com/atom/language-coffee-script)
+    atom/language-css version 0.44.4 (https://github.com/atom/language-css)
+    atom/language-java version 0.32.1 (https://github.com/atom/language-java)
+    atom/language-sass version 0.62.1 (https://github.com/atom/language-sass)
+    atom/language-shellscript version 0.26.0 (https://github.com/atom/language-shellscript)
+    atom/language-xml version 0.35.2 (https://github.com/atom/language-xml)
+    better-go-syntax version 1.0.0 (https://github.com/jeff-hykin/better-go-syntax/ )
+    Colorsublime-Themes version 0.1.0 (https://github.com/Colorsublime/Colorsublime-Themes)
+    daaain/Handlebars version 1.8.0 (https://github.com/daaain/Handlebars)
+    dart-lang/dart-syntax-highlight (https://github.com/dart-lang/dart-syntax-highlight)
+    davidrios/pug-tmbundle (https://github.com/davidrios/pug-tmbundle)
+    definitelytyped (https://github.com/DefinitelyTyped/DefinitelyTyped)
+    demyte/language-cshtml version 0.3.0 (https://github.com/demyte/language-cshtml)
+    Document Object Model version 4.0.0 (https://www.w3.org/DOM/)
+    dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage)
+    expand-abbreviation version 0.5.8 (https://github.com/emmetio/expand-abbreviation)
+    fadeevab/make.tmbundle (https://github.com/fadeevab/make.tmbundle)
+    freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift)
+    HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
+    Ikuyadeu/vscode-R version 1.3.0 (https://github.com/Ikuyadeu/vscode-R)
+    insane version 2.6.2 (https://github.com/bevacqua/insane)
+    Ionic documentation version 1.2.4 (https://github.com/ionic-team/ionic-site)
+    ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
+    jeff-hykin/cpp-textmate-grammar version 1.12.11 (https://github.com/jeff-hykin/cpp-textmate-grammar)
+    jeff-hykin/cpp-textmate-grammar version 1.15.5 (https://github.com/jeff-hykin/cpp-textmate-grammar)
+    js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify)
+    JuliaEditorSupport/atom-language-julia version 0.21.0 (https://github.com/JuliaEditorSupport/atom-language-julia)
+    Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
+    language-docker (https://github.com/moby/moby)
+    language-less version 0.34.2 (https://github.com/atom/language-less)
+    language-php version 0.46.2 (https://github.com/atom/language-php)
+    MagicStack/MagicPython version 1.1.1 (https://github.com/MagicStack/MagicPython)
+    marked version 1.1.0 (https://github.com/markedjs/marked)
+    mdn-data version 1.1.12 (https://github.com/mdn/data)
+    microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/microsoft/TypeScript-TmLanguage)
+    microsoft/vscode-JSON.tmLanguage (https://github.com/microsoft/vscode-JSON.tmLanguage)
+    microsoft/vscode-markdown-tm-grammar version 1.0.0 (https://github.com/microsoft/vscode-markdown-tm-grammar)
+    microsoft/vscode-mssql version 1.9.0 (https://github.com/microsoft/vscode-mssql)
+    mmims/language-batchfile version 0.7.6 (https://github.com/mmims/language-batchfile)
+    NVIDIA/cuda-cpp-grammar (https://github.com/NVIDIA/cuda-cpp-grammar)
+    PowerShell/EditorSyntax version 1.0.0 (https://github.com/PowerShell/EditorSyntax)
+    rust-syntax version 0.4.3 (https://github.com/dustypomerleau/rust-syntax)
+    seti-ui version 0.1.0 (https://github.com/jesseweed/seti-ui)
+    shaders-tmLanguage version 0.1.0 (https://github.com/tgjones/shaders-tmLanguage)
+    textmate/asp.vb.net.tmbundle (https://github.com/textmate/asp.vb.net.tmbundle)
+    textmate/c.tmbundle (https://github.com/textmate/c.tmbundle)
+    textmate/diff.tmbundle (https://github.com/textmate/diff.tmbundle)
+    textmate/git.tmbundle (https://github.com/textmate/git.tmbundle)
+    textmate/groovy.tmbundle (https://github.com/textmate/groovy.tmbundle)
+    textmate/html.tmbundle (https://github.com/textmate/html.tmbundle)
+    textmate/ini.tmbundle (https://github.com/textmate/ini.tmbundle)
+    textmate/javascript.tmbundle (https://github.com/textmate/javascript.tmbundle)
+    textmate/lua.tmbundle (https://github.com/textmate/lua.tmbundle)
+    textmate/markdown.tmbundle (https://github.com/textmate/markdown.tmbundle)
+    textmate/perl.tmbundle (https://github.com/textmate/perl.tmbundle)
+    textmate/ruby.tmbundle (https://github.com/textmate/ruby.tmbundle)
+    textmate/yaml.tmbundle (https://github.com/textmate/yaml.tmbundle)
+    TypeScript-TmLanguage version 0.1.8 (https://github.com/microsoft/TypeScript-TmLanguage)
+    TypeScript-TmLanguage version 1.0.0 (https://github.com/microsoft/TypeScript-TmLanguage)
+    Unicode version 12.0.0 (https://home.unicode.org/)
+    vscode-codicons version 0.0.14 (https://github.com/microsoft/vscode-codicons)
+    vscode-logfile-highlighter version 2.11.0 (https://github.com/emilast/vscode-logfile-highlighter)
+    vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift)
+    Web Background Synchronization (https://github.com/WICG/background-sync)
+
+
+%% atom/language-clojure NOTICES AND INFORMATION BEGIN HERE
+=========================================
+Copyright (c) 2014 GitHub Inc.
+
+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.
+
+
+This package was derived from a TextMate bundle located at
+https://github.com/mmcgrana/textmate-clojure and distributed under the
+following license, located in `LICENSE.md`:
+
+The MIT License (MIT)
+
+Copyright (c) 2010- Mark McGranaghan
+
+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 atom/language-clojure NOTICES AND INFORMATION
+
 %% angular NOTICES AND INFORMATION BEGIN HERE
 
 Copyright (c) 2014-2017 Google, Inc. http://angular.io
@@ -492,6 +613,32 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 =========================================
 END OF graceful-fs NOTICES AND INFORMATION
 
+%% gridstack NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright (c) 2014-2020  Alain Dumesny, Dylan Weiss, Pavel Reznikov
+
+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 gridstack NOTICES AND INFORMATION
+
 %% html-query-plan NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
@@ -532,6 +679,63 @@ THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 =========================================
 END OF http-proxy-agent NOTICES AND INFORMATION
 
+%% dart-lang/dart-syntax-highlight NOTICES AND INFORMATION BEGIN HERE
+=========================================
+Copyright 2020, the Dart project authors.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+    * Neither the name of Google LLC nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+=========================================
+END OF dart-lang/dart-syntax-highlight NOTICES AND INFORMATION
+
+%% davidrios/pug-tmbundle NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright (c) 2016 David Rios
+
+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 davidrios/pug-tmbundle NOTICES AND INFORMATION
+
 %% iconv-lite NOTICES AND INFORMATION BEGIN HERE
 =========================================
 Copyright (c) 2011 Alexander Shtuchkin
@@ -1458,6 +1662,61 @@ THE SOFTWARE.
 =========================================
 END OF node-pty NOTICES AND INFORMATION
 
+%% JuliaEditorSupport/atom-language-julia NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The atom-language-julia package is licensed under the MIT "Expat" License:
+
+> Copyright (c) 2015
+>
+> 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 JuliaEditorSupport/atom-language-julia NOTICES AND INFORMATION
+
+%% Jxck/assert NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright (c) 2011 Jxck
+
+Originally from node.js (http://nodejs.org)
+Copyright Joyent, Inc.
+
+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 Jxck/assert NOTICES AND INFORMATION
+
 %% nsfw NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
@@ -1526,30 +1785,6 @@ 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
@@ -1572,6 +1807,40 @@ THE SOFTWARE.
 =========================================
 END OF pty.js NOTICES AND INFORMATION
 
+%% PyZMQ NOTICES AND INFORMATION BEGIN HERE
+=========================================
+Copyright (c) 2009-2012, Brian Granger, Min Ragan-Kelley
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+Neither the name of PyZMQ nor the names of its contributors may be used to
+endorse or promote products derived from this software without specific prior
+written permission.
+
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+=========================================
+END OF pyzmq NOTICES AND INFORMATION
+
 %% reflect-metadata NOTICES AND INFORMATION BEGIN HERE
 =========================================
 Apache License

build/.cachesalt

@@ -1 +1 @@
-2020-04-29T05:20:58.491Z
+2021-08-23T03:52:18.011Z

build/.gitattributes

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

build/.moduleignore

@@ -0,0 +1,173 @@
+# cleanup rules for node modules, .gitignore style
+
+# native node modules
+
+nan/**
+*/node_modules/nan/**
+
+fsevents/binding.gyp
+fsevents/fsevents.cc
+fsevents/build/**
+fsevents/src/**
+fsevents/test/**
+!fsevents/**/*.node
+
+vscode-sqlite3/binding.gyp
+vscode-sqlite3/benchmark/**
+vscode-sqlite3/cloudformation/**
+vscode-sqlite3/deps/**
+vscode-sqlite3/test/**
+vscode-sqlite3/build/**
+vscode-sqlite3/src/**
+!vscode-sqlite3/build/Release/*.node
+
+windows-mutex/binding.gyp
+windows-mutex/build/**
+windows-mutex/src/**
+!windows-mutex/**/*.node
+
+native-keymap/binding.gyp
+native-keymap/build/**
+native-keymap/src/**
+native-keymap/deps/**
+!native-keymap/build/Release/*.node
+
+native-is-elevated/binding.gyp
+native-is-elevated/build/**
+native-is-elevated/src/**
+native-is-elevated/deps/**
+!native-is-elevated/build/Release/*.node
+
+native-watchdog/binding.gyp
+native-watchdog/build/**
+native-watchdog/src/**
+!native-watchdog/build/Release/*.node
+
+spdlog/binding.gyp
+spdlog/build/**
+spdlog/deps/**
+spdlog/src/**
+spdlog/test/**
+spdlog/*.yml
+!spdlog/build/Release/*.node
+
+jschardet/dist/**
+
+windows-foreground-love/binding.gyp
+windows-foreground-love/build/**
+windows-foreground-love/src/**
+!windows-foreground-love/**/*.node
+
+windows-process-tree/binding.gyp
+windows-process-tree/build/**
+windows-process-tree/src/**
+!windows-process-tree/**/*.node
+
+keytar/binding.gyp
+keytar/build/**
+keytar/src/**
+keytar/script/**
+keytar/node_modules/**
+!keytar/**/*.node
+
+node-pty/binding.gyp
+node-pty/build/**
+node-pty/src/**
+node-pty/tools/**
+node-pty/deps/**
+node-pty/scripts/**
+!node-pty/build/Release/*.exe
+!node-pty/build/Release/*.dll
+!node-pty/build/Release/*.node
+
+# START SQL Modules
+
+@angular/**/src/**
+@angular/**/testing/**
+
+angular2-grid/components/**
+angular2-grid/directives/**
+angular2-grid/interfaces/**
+angular2-grid/modules/**
+
+angular2-slickgrid/.vscode/**
+angular2-slickgrid/components/**
+angular2-slickgrid/examples/**
+
+jquery-ui/external/**
+jquery-ui/demos/**
+
+slickgrid/node_modules/**
+slickgrid/examples/**
+
+kerberos/build/**
+
+# END SQL Modules
+
+nsfw/binding.gyp
+nsfw/build/**
+nsfw/src/**
+nsfw/includes/**
+!nsfw/build/Release/*.node
+
+vsda/build/**
+vsda/ci/**
+vsda/src/**
+vsda/.gitignore
+vsda/binding.gyp
+vsda/README.md
+vsda/targets
+!vsda/build/Release/vsda.node
+
+vscode-encrypt/build/**
+vscode-encrypt/src/**
+vscode-encrypt/vendor/**
+vscode-encrypt/.gitignore
+vscode-encrypt/binding.gyp
+vscode-encrypt/README.md
+!vscode-encrypt/build/Release/vscode-encrypt-native.node
+
+vscode-windows-ca-certs/**/*
+!vscode-windows-ca-certs/package.json
+!vscode-windows-ca-certs/**/*.node
+
+node-addon-api/**/*
+
+# other node modules
+
+**/docs/**
+**/example/**
+**/examples/**
+**/test/**
+**/tests/**
+
+**/History.md
+**/CHANGELOG.md
+**/README.md
+**/readme.md
+**/readme.markdown
+
+**/*.ts
+!typescript/**/*.d.ts
+
+jschardet/dist/**
+
+es6-promise/lib/**
+
+vscode-textmate/webpack.config.js
+
+# {{SQL CARBON EDIT }} We need more than just zone-node.js
+# zone.js/dist/**
+# !zone.js/dist/zone-node.js
+
+# https://github.com/xtermjs/xterm.js/issues/3137
+xterm/src/**
+xterm/tsconfig.all.json
+
+# https://github.com/xtermjs/xterm.js/issues/3138
+xterm-addon-*/src/**
+xterm-addon-*/fixtures/**
+xterm-addon-*/out/**
+xterm-addon-*/out-test/**
+
+

build/.nativeignore

@@ -1,124 +0,0 @@
-# cleanup rules for native node modules, .gitignore style
-
-nan/**
-*/node_modules/nan/**
-
-fsevents/binding.gyp
-fsevents/fsevents.cc
-fsevents/build/**
-fsevents/src/**
-fsevents/test/**
-!fsevents/**/*.node
-
-vscode-sqlite3/binding.gyp
-vscode-sqlite3/benchmark/**
-vscode-sqlite3/cloudformation/**
-vscode-sqlite3/deps/**
-vscode-sqlite3/test/**
-vscode-sqlite3/build/**
-vscode-sqlite3/src/**
-!vscode-sqlite3/build/Release/*.node
-
-windows-mutex/binding.gyp
-windows-mutex/build/**
-windows-mutex/src/**
-!windows-mutex/**/*.node
-
-native-keymap/binding.gyp
-native-keymap/build/**
-native-keymap/src/**
-native-keymap/deps/**
-!native-keymap/build/Release/*.node
-
-native-is-elevated/binding.gyp
-native-is-elevated/build/**
-native-is-elevated/src/**
-native-is-elevated/deps/**
-!native-is-elevated/build/Release/*.node
-
-native-watchdog/binding.gyp
-native-watchdog/build/**
-native-watchdog/src/**
-!native-watchdog/build/Release/*.node
-
-spdlog/binding.gyp
-spdlog/build/**
-spdlog/deps/**
-spdlog/src/**
-spdlog/test/**
-!spdlog/build/Release/*.node
-
-jschardet/dist/**
-
-windows-foreground-love/binding.gyp
-windows-foreground-love/build/**
-windows-foreground-love/src/**
-!windows-foreground-love/**/*.node
-
-windows-process-tree/binding.gyp
-windows-process-tree/build/**
-windows-process-tree/src/**
-!windows-process-tree/**/*.node
-
-keytar/binding.gyp
-keytar/build/**
-keytar/src/**
-keytar/script/**
-keytar/node_modules/**
-!keytar/**/*.node
-
-node-pty/binding.gyp
-node-pty/build/**
-node-pty/src/**
-node-pty/tools/**
-node-pty/deps/**
-!node-pty/build/Release/*.exe
-!node-pty/build/Release/*.dll
-!node-pty/build/Release/*.node
-
-# START SQL Modules
-
-@angular/**/src/**
-@angular/**/testing/**
-
-angular2-grid/components/**
-angular2-grid/directives/**
-angular2-grid/interfaces/**
-angular2-grid/modules/**
-
-angular2-slickgrid/.vscode/**
-angular2-slickgrid/components/**
-angular2-slickgrid/examples/**
-
-jquery-ui/external/**
-jquery-ui/demos/**
-
-slickgrid/node_modules/**
-slickgrid/examples/**
-
-kerberos/build/**
-
-# END SQL Modules
-
-vscode-nsfw/binding.gyp
-vscode-nsfw/build/**
-vscode-nsfw/src/**
-vscode-nsfw/openpa/**
-vscode-nsfw/includes/**
-!vscode-nsfw/build/Release/*.node
-!vscode-nsfw/**/*.a
-
-vsda/build/**
-vsda/ci/**
-vsda/src/**
-vsda/.gitignore
-vsda/binding.gyp
-vsda/README.md
-vsda/targets
-!vsda/build/Release/vsda.node
-
-vscode-windows-ca-certs/**/*
-!vscode-windows-ca-certs/package.json
-!vscode-windows-ca-certs/**/*.node
-
-node-addon-api/**/*

build/.webignore

@@ -8,6 +8,10 @@
 **/LICENSE
 **/CONTRIBUTORS
 
+**/docs/**
+**/example/**
+**/examples/**
+
 jschardet/index.js
 jschardet/src/**
 jschardet/dist/jschardet.js

build/actions/copycat/action.yml

@@ -1,15 +0,0 @@
-name: Copycat
-description: Copy all new issues to a different repo
-inputs:
-  token:
-    description: GitHub token with issue, comment, and label read/write permissions to both repos
-    default: ${{ github.token }}
-  owner:
-    description: account/organization that owns the destination repo (the microsoft part of microsoft/vscode)
-    required: true
-  repo:
-    description: name of the destination repo (the vscode part of microsoft/vscode)
-    required: true
-runs:
-  using: 'node12'
-  main: 'index.js'

build/actions/copycat/copyCat.js

@@ -1,19 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-class CopyCat {
-    constructor(github, owner, repo) {
-        this.github = github;
-        this.owner = owner;
-        this.repo = repo;
-    }
-    async run() {
-        const issue = await this.github.getIssue();
-        console.log(`Mirroring issue \`${issue.title}\` to ${this.owner}/${this.repo}`);
-        await this.github.createIssue(this.owner, this.repo, issue.title, issue.body.replace(/@|#|issues/g, '-'));
-    }
-}
-exports.CopyCat = CopyCat;

build/actions/copycat/copyCat.ts

@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { GitHubIssue } from '../api/api'
-
-export class CopyCat {
-	constructor(private github: GitHubIssue, private owner: string, private repo: string) {}
-
-	async run() {
-		const issue = await this.github.getIssue()
-		console.log(`Mirroring issue \`${issue.title}\` to ${this.owner}/${this.repo}`)
-		await this.github.createIssue(
-			this.owner,
-			this.repo,
-			issue.title,
-			issue.body.replace(/@|#|issues/g, '-'),
-		)
-	}
-}

build/actions/copycat/index.js

@@ -1,21 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-const core = require("@actions/core");
-const github_1 = require("@actions/github");
-const octokit_1 = require("../api/octokit");
-const utils_1 = require("../utils/utils");
-const copyCat_1 = require("./copyCat");
-const token = utils_1.getRequiredInput('token');
-const main = async () => {
-    await new copyCat_1.CopyCat(new octokit_1.OctoKitIssue(token, github_1.context.repo, { number: github_1.context.issue.number }), utils_1.getRequiredInput('owner'), utils_1.getRequiredInput('repo')).run();
-};
-main()
-    .then(() => utils_1.logRateLimit(token))
-    .catch(async (error) => {
-    core.setFailed(error.message);
-    await utils_1.logErrorToIssue(error.message, true, token);
-});

build/actions/copycat/index.ts

@@ -1,27 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as core from '@actions/core'
-import { context } from '@actions/github'
-import { OctoKitIssue } from '../api/octokit'
-import { getRequiredInput, logErrorToIssue, logRateLimit } from '../utils/utils'
-import { CopyCat } from './copyCat'
-
-const token = getRequiredInput('token')
-
-const main = async () => {
-	await new CopyCat(
-		new OctoKitIssue(token, context.repo, { number: context.issue.number }),
-		getRequiredInput('owner'),
-		getRequiredInput('repo'),
-	).run()
-}
-
-main()
-	.then(() => logRateLimit(token))
-	.catch(async (error) => {
-		core.setFailed(error.message)
-		await logErrorToIssue(error.message, true, token)
-	})

build/actions/package.json

@@ -17,7 +17,7 @@
 	"dependencies": {
 		"@actions/core": "^1.2.6",
 		"@actions/github": "^2.1.1",
-		"axios": "^0.19.2",
+		"axios": "^0.21.4",
     "ts-node": "^8.6.2",
     "typescript": "^3.8.3"
 	}

build/actions/yarn.lock

@@ -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.19.2:
-  version "0.19.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
-  integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
+axios@^0.21.4:
+  version "0.21.4"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
+  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
   dependencies:
-    follow-redirects "1.5.10"
+    follow-redirects "^1.14.0"
 
 before-after-hook@^2.0.0:
   version "2.1.0"
@@ -177,13 +177,6 @@ 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"
@@ -214,12 +207,10 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-follow-redirects@1.5.10:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
-  integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
-  dependencies:
-    debug "=3.1.0"
+follow-redirects@^1.14.0:
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.3.tgz#6ada78118d8d24caee595595accdc0ac6abd022e"
+  integrity sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw==
 
 get-stream@^4.0.0:
   version "4.1.0"
@@ -275,11 +266,6 @@ 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"

build/azure-pipelines/common/.gitignore

@@ -1,2 +0,0 @@
-node_modules/
-*.js

build/azure-pipelines/common/computeNodeModulesCacheKey.js

@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 fs = require("fs");
+const path = require("path");
+const crypto = require("crypto");
+const { dirs } = require('../../npm/dirs');
+const ROOT = path.join(__dirname, '../../../');
+const shasum = crypto.createHash('sha1');
+shasum.update(fs.readFileSync(path.join(ROOT, 'build/.cachesalt')));
+shasum.update(fs.readFileSync(path.join(ROOT, '.yarnrc')));
+shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc')));
+// Add `yarn.lock` files
+for (let dir of dirs) {
+    const yarnLockPath = path.join(ROOT, dir, 'yarn.lock');
+    shasum.update(fs.readFileSync(yarnLockPath));
+}
+// Add any other command line arguments
+for (let i = 2; i < process.argv.length; i++) {
+    shasum.update(process.argv[i]);
+}
+process.stdout.write(shasum.digest('hex'));

build/azure-pipelines/common/computeNodeModulesCacheKey.ts

@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 fs from 'fs';
+import * as path from 'path';
+import * as crypto from 'crypto';
+const { dirs } = require('../../npm/dirs');
+
+const ROOT = path.join(__dirname, '../../../');
+
+const shasum = crypto.createHash('sha1');
+
+shasum.update(fs.readFileSync(path.join(ROOT, 'build/.cachesalt')));
+shasum.update(fs.readFileSync(path.join(ROOT, '.yarnrc')));
+shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc')));
+
+// Add `yarn.lock` files
+for (let dir of dirs) {
+	const yarnLockPath = path.join(ROOT, dir, 'yarn.lock');
+	shasum.update(fs.readFileSync(yarnLockPath));
+}
+
+// Add any other command line arguments
+for (let i = 2; i < process.argv.length; i++) {
+	shasum.update(process.argv[i]);
+}
+
+process.stdout.write(shasum.digest('hex'));

build/azure-pipelines/common/copyArtifacts.js

@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 vfs = require("vinyl-fs");
+const path = require("path");
+const es = require("event-stream");
+const fs = require("fs");
+const files = [
+    '.build/langpacks/**/*.vsix',
+    '.build/extensions/**/*.vsix',
+    '.build/win32-x64/**/*.{exe,zip}',
+    '.build/linux/sha256hashes.txt',
+    '.build/linux/deb/amd64/deb/*.deb',
+    '.build/linux/rpm/x86_64/*.rpm',
+    '.build/linux/server/*',
+    '.build/linux/archive/*',
+    '.build/docker/*',
+    '.build/darwin/*',
+    '.build/version.json' // version information
+];
+async function main() {
+    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, 
+            //Preserve intermediate directories after .build folder
+            file.path.substr(path.resolve('.build').length + 1));
+            fs.mkdirSync(path.dirname(filePath), { recursive: true });
+            fs.renameSync(file.path, filePath);
+        }));
+        stream.on('end', () => resolve());
+        stream.on('error', e => reject(e));
+    });
+}
+main().catch(err => {
+    console.error(err);
+    process.exit(1);
+});

build/azure-pipelines/common/copyArtifacts.ts

@@ -11,6 +11,7 @@ import * as es from 'event-stream';
 import * as fs from 'fs';
 
 const files = [
+	'.build/langpacks/**/*.vsix', // langpacks
 	'.build/extensions/**/*.vsix', // external extensions
 	'.build/win32-x64/**/*.{exe,zip}', // windows binaries
 	'.build/linux/sha256hashes.txt', // linux hashes
@@ -24,7 +25,7 @@ const files = [
 ];
 
 async function main() {
-	return new Promise((resolve, reject) => {
+	return new Promise<void>((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.js

@@ -0,0 +1,197 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 fs = require("fs");
+const url = require("url");
+const crypto = require("crypto");
+const azure = require("azure-storage");
+const mime = require("mime");
+const cosmos_1 = require("@azure/cosmos");
+const retry_1 = require("./retry");
+if (process.argv.length !== 8) {
+    console.error('Usage: node createAsset.js PRODUCT OS ARCH TYPE NAME FILE');
+    process.exit(-1);
+}
+// Contains all of the logic for mapping details to our actual product names in CosmosDB
+function getPlatform(product, os, arch, type) {
+    switch (os) {
+        case 'win32':
+            switch (product) {
+                case 'client':
+                    const asset = arch === 'ia32' ? 'win32' : `win32-${arch}`;
+                    switch (type) {
+                        case 'archive':
+                            return `${asset}-archive`;
+                        case 'setup':
+                            return asset;
+                        case 'user-setup':
+                            return `${asset}-user`;
+                        default:
+                            throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+                    }
+                case 'server':
+                    if (arch === 'arm64') {
+                        throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+                    }
+                    return arch === 'ia32' ? 'server-win32' : `server-win32-${arch}`;
+                case 'web':
+                    if (arch === 'arm64') {
+                        throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+                    }
+                    return arch === 'ia32' ? 'server-win32-web' : `server-win32-${arch}-web`;
+                default:
+                    throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+            }
+        case 'linux':
+            switch (type) {
+                case 'snap':
+                    return `linux-snap-${arch}`;
+                case 'archive-unsigned':
+                    switch (product) {
+                        case 'client':
+                            return `linux-${arch}`;
+                        case 'server':
+                            return `server-linux-${arch}`;
+                        case 'web':
+                            return arch === 'standalone' ? 'web-standalone' : `server-linux-${arch}-web`;
+                        default:
+                            throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+                    }
+                case 'deb-package':
+                    return `linux-deb-${arch}`;
+                case 'rpm-package':
+                    return `linux-rpm-${arch}`;
+                default:
+                    throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+            }
+        case 'darwin':
+            switch (product) {
+                case 'client':
+                    if (arch === 'x64') {
+                        return 'darwin';
+                    }
+                    return `darwin-${arch}`;
+                case 'server':
+                    return 'server-darwin';
+                case 'web':
+                    if (arch !== 'x64') {
+                        throw `What should the platform be?: ${product} ${os} ${arch} ${type}`;
+                    }
+                    return 'server-darwin-web';
+                default:
+                    throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+            }
+        default:
+            throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+    }
+}
+// Contains all of the logic for mapping types to our actual types in CosmosDB
+function getRealType(type) {
+    switch (type) {
+        case 'user-setup':
+            return 'setup';
+        case 'deb-package':
+        case 'rpm-package':
+            return 'package';
+        default:
+            return type;
+    }
+}
+function hashStream(hashName, stream) {
+    return new Promise((c, e) => {
+        const shasum = crypto.createHash(hashName);
+        stream
+            .on('data', shasum.update.bind(shasum))
+            .on('error', e)
+            .on('close', () => c(shasum.digest('hex')));
+    });
+}
+async function doesAssetExist(blobService, quality, blobName) {
+    const existsResult = await new Promise((c, e) => blobService.doesBlobExist(quality, blobName, (err, r) => err ? e(err) : c(r)));
+    return existsResult.exists;
+}
+async function uploadBlob(blobService, quality, blobName, filePath, fileName) {
+    const blobOptions = {
+        contentSettings: {
+            contentType: mime.lookup(filePath),
+            contentDisposition: `attachment; filename="${fileName}"`,
+            cacheControl: 'max-age=31536000, public'
+        }
+    };
+    await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, filePath, blobOptions, err => err ? e(err) : c()));
+}
+function getEnv(name) {
+    const result = process.env[name];
+    if (typeof result === 'undefined') {
+        throw new Error('Missing env: ' + name);
+    }
+    return result;
+}
+async function main() {
+    const [, , product, os, arch, unprocessedType, fileName, filePath] = process.argv;
+    // getPlatform needs the unprocessedType
+    const platform = getPlatform(product, os, arch, unprocessedType);
+    const type = getRealType(unprocessedType);
+    const quality = getEnv('VSCODE_QUALITY');
+    const commit = getEnv('BUILD_SOURCEVERSION');
+    console.log('Creating asset...');
+    const stat = await new Promise((c, e) => fs.stat(filePath, (err, stat) => err ? e(err) : c(stat)));
+    const size = stat.size;
+    console.log('Size:', size);
+    const stream = fs.createReadStream(filePath);
+    const [sha1hash, sha256hash] = await Promise.all([hashStream('sha1', stream), hashStream('sha256', stream)]);
+    console.log('SHA1:', sha1hash);
+    console.log('SHA256:', sha256hash);
+    const blobName = commit + '/' + fileName;
+    const storageAccount = process.env['AZURE_STORAGE_ACCOUNT_2'];
+    const blobService = azure.createBlobService(storageAccount, process.env['AZURE_STORAGE_ACCESS_KEY_2'])
+        .withFilter(new azure.ExponentialRetryPolicyFilter(20));
+    const blobExists = await doesAssetExist(blobService, quality, blobName);
+    if (blobExists) {
+        console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`);
+        return;
+    }
+    const mooncakeBlobService = azure.createBlobService(storageAccount, process.env['MOONCAKE_STORAGE_ACCESS_KEY'], `${storageAccount}.blob.core.chinacloudapi.cn`)
+        .withFilter(new azure.ExponentialRetryPolicyFilter(20));
+    // mooncake is fussy and far away, this is needed!
+    blobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
+    mooncakeBlobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
+    console.log('Uploading blobs to Azure storage and Mooncake Azure storage...');
+    await retry_1.retry(() => Promise.all([
+        uploadBlob(blobService, quality, blobName, filePath, fileName),
+        uploadBlob(mooncakeBlobService, quality, blobName, filePath, fileName)
+    ]));
+    console.log('Blobs successfully uploaded.');
+    // TODO: Understand if blobName and blobPath are the same and replace blobPath with blobName if so.
+    const assetUrl = `${process.env['AZURE_CDN_URL']}/${quality}/${blobName}`;
+    const blobPath = url.parse(assetUrl).path;
+    const mooncakeUrl = `${process.env['MOONCAKE_CDN_URL']}${blobPath}`;
+    const asset = {
+        platform,
+        type,
+        url: assetUrl,
+        hash: sha1hash,
+        mooncakeUrl,
+        sha256hash,
+        size
+    };
+    // Remove this if we ever need to rollback fast updates for windows
+    if (/win32/.test(platform)) {
+        asset.supportsFastUpdate = true;
+    }
+    console.log('Asset:', JSON.stringify(asset, null, '  '));
+    const client = new cosmos_1.CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT'], key: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
+    const scripts = client.database('builds').container(quality).scripts;
+    await retry_1.retry(() => scripts.storedProcedure('createAsset').execute('', [commit, asset, true]));
+    console.log(`  Done ✔️`);
+}
+main().then(() => {
+    console.log('Asset successfully created');
+    process.exit(0);
+}, err => {
+    console.error(err);
+    process.exit(1);
+});

build/azure-pipelines/common/createAsset.ts

@@ -6,11 +6,13 @@
 'use strict';
 
 import * as fs from 'fs';
+import * as url from 'url';
 import { Readable } from 'stream';
 import * as crypto from 'crypto';
 import * as azure from 'azure-storage';
 import * as mime from 'mime';
 import { CosmosClient } from '@azure/cosmos';
+import { retry } from './retry';
 
 interface Asset {
 	platform: string;
@@ -23,11 +25,98 @@ interface Asset {
 	supportsFastUpdate?: boolean;
 }
 
-if (process.argv.length !== 6) {
-	console.error('Usage: node createAsset.js PLATFORM TYPE NAME FILE');
+if (process.argv.length !== 8) {
+	console.error('Usage: node createAsset.js PRODUCT OS ARCH TYPE NAME FILE');
 	process.exit(-1);
 }
 
+// Contains all of the logic for mapping details to our actual product names in CosmosDB
+function getPlatform(product: string, os: string, arch: string, type: string): string {
+	switch (os) {
+		case 'win32':
+			switch (product) {
+				case 'client':
+					const asset = arch === 'ia32' ? 'win32' : `win32-${arch}`;
+					switch (type) {
+						case 'archive':
+							return `${asset}-archive`;
+						case 'setup':
+							return asset;
+						case 'user-setup':
+							return `${asset}-user`;
+						default:
+							throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+					}
+				case 'server':
+					if (arch === 'arm64') {
+						throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+					}
+					return arch === 'ia32' ? 'server-win32' : `server-win32-${arch}`;
+				case 'web':
+					if (arch === 'arm64') {
+						throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+					}
+					return arch === 'ia32' ? 'server-win32-web' : `server-win32-${arch}-web`;
+				default:
+					throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+			}
+		case 'linux':
+			switch (type) {
+				case 'snap':
+					return `linux-snap-${arch}`;
+				case 'archive-unsigned':
+					switch (product) {
+						case 'client':
+							return `linux-${arch}`;
+						case 'server':
+							return `server-linux-${arch}`;
+						case 'web':
+							return arch === 'standalone' ? 'web-standalone' : `server-linux-${arch}-web`;
+						default:
+							throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+					}
+				case 'deb-package':
+					return `linux-deb-${arch}`;
+				case 'rpm-package':
+					return `linux-rpm-${arch}`;
+				default:
+					throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+			}
+		case 'darwin':
+			switch (product) {
+				case 'client':
+					if (arch === 'x64') {
+						return 'darwin';
+					}
+					return `darwin-${arch}`;
+				case 'server':
+					return 'server-darwin';
+				case 'web':
+					if (arch !== 'x64') {
+						throw `What should the platform be?: ${product} ${os} ${arch} ${type}`;
+					}
+					return 'server-darwin-web';
+				default:
+					throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+			}
+		default:
+			throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+	}
+}
+
+// Contains all of the logic for mapping types to our actual types in CosmosDB
+function getRealType(type: string) {
+	switch (type) {
+		case 'user-setup':
+			return 'setup';
+		case 'deb-package':
+		case 'rpm-package':
+			return 'package';
+		default:
+			return type;
+	}
+}
+
 function hashStream(hashName: string, stream: Readable): Promise<string> {
 	return new Promise<string>((c, e) => {
 		const shasum = crypto.createHash(hashName);
@@ -67,7 +156,10 @@ function getEnv(name: string): string {
 }
 
 async function main(): Promise<void> {
-	const [, , platform, type, fileName, filePath] = process.argv;
+	const [, , product, os, arch, unprocessedType, fileName, filePath] = process.argv;
+	// getPlatform needs the unprocessedType
+	const platform = getPlatform(product, os, arch, unprocessedType);
+	const type = getRealType(unprocessedType);
 	const quality = getEnv('VSCODE_QUALITY');
 	const commit = getEnv('BUILD_SOURCEVERSION');
 
@@ -97,17 +189,33 @@ async function main(): Promise<void> {
 		return;
 	}
 
-	console.log('Uploading blobs to Azure storage...');
+	const mooncakeBlobService = azure.createBlobService(storageAccount, process.env['MOONCAKE_STORAGE_ACCESS_KEY']!, `${storageAccount}.blob.core.chinacloudapi.cn`)
+		.withFilter(new azure.ExponentialRetryPolicyFilter(20));
 
-	await uploadBlob(blobService, quality, blobName, filePath, fileName);
+	// mooncake is fussy and far away, this is needed!
+	blobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
+	mooncakeBlobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
+
+	console.log('Uploading blobs to Azure storage and Mooncake Azure storage...');
+
+	await retry(() => Promise.all([
+		uploadBlob(blobService, quality, blobName, filePath, fileName),
+		uploadBlob(mooncakeBlobService, quality, blobName, filePath, fileName)
+	]));
 
 	console.log('Blobs successfully uploaded.');
 
+	// TODO: Understand if blobName and blobPath are the same and replace blobPath with blobName if so.
+	const assetUrl = `${process.env['AZURE_CDN_URL']}/${quality}/${blobName}`;
+	const blobPath = url.parse(assetUrl).path;
+	const mooncakeUrl = `${process.env['MOONCAKE_CDN_URL']}${blobPath}`;
+
 	const asset: Asset = {
 		platform,
 		type,
-		url: `${process.env['AZURE_CDN_URL']}/${quality}/${blobName}`,
+		url: assetUrl,
 		hash: sha1hash,
+		mooncakeUrl,
 		sha256hash,
 		size
 	};
@@ -121,7 +229,9 @@ async function main(): Promise<void> {
 
 	const client = new CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT']!, key: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
 	const scripts = client.database('builds').container(quality).scripts;
-	await scripts.storedProcedure('createAsset').execute('', [commit, asset, true]);
+	await retry(() => scripts.storedProcedure('createAsset').execute('', [commit, asset, true]));
+
+	console.log(`  Done ✔️`);
 }
 
 main().then(() => {

build/azure-pipelines/common/createBuild.js

@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 cosmos_1 = require("@azure/cosmos");
+const retry_1 = require("./retry");
+if (process.argv.length !== 3) {
+    console.error('Usage: node createBuild.js VERSION');
+    process.exit(-1);
+}
+function getEnv(name) {
+    const result = process.env[name];
+    if (typeof result === 'undefined') {
+        throw new Error('Missing env: ' + name);
+    }
+    return result;
+}
+async function main() {
+    const [, , _version] = process.argv;
+    const quality = getEnv('VSCODE_QUALITY');
+    const commit = getEnv('BUILD_SOURCEVERSION');
+    const queuedBy = getEnv('BUILD_QUEUEDBY');
+    const sourceBranch = getEnv('BUILD_SOURCEBRANCH');
+    const version = _version + (quality === 'stable' ? '' : `-${quality}`);
+    console.log('Creating build...');
+    console.log('Quality:', quality);
+    console.log('Version:', version);
+    console.log('Commit:', commit);
+    const build = {
+        id: commit,
+        timestamp: (new Date()).getTime(),
+        version,
+        isReleased: false,
+        sourceBranch,
+        queuedBy,
+        assets: [],
+        updates: {}
+    };
+    const client = new cosmos_1.CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT'], key: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
+    const scripts = client.database('builds').container(quality).scripts;
+    await retry_1.retry(() => scripts.storedProcedure('createBuild').execute('', [Object.assign(Object.assign({}, build), { _partitionKey: '' })]));
+}
+main().then(() => {
+    console.log('Build successfully created');
+    process.exit(0);
+}, err => {
+    console.error(err);
+    process.exit(1);
+});

build/azure-pipelines/common/createBuild.ts

@@ -6,6 +6,7 @@
 'use strict';
 
 import { CosmosClient } from '@azure/cosmos';
+import { retry } from './retry';
 
 if (process.argv.length !== 3) {
 	console.error('Usage: node createBuild.js VERSION');
@@ -48,7 +49,7 @@ async function main(): Promise<void> {
 
 	const client = new CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT']!, key: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
 	const scripts = client.database('builds').container(quality).scripts;
-	await scripts.storedProcedure('createBuild').execute('', [{ ...build, _partitionKey: '' }]);
+	await retry(() => scripts.storedProcedure('createBuild').execute('', [{ ...build, _partitionKey: '' }]));
 }
 
 main().then(() => {

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

@@ -4,14 +4,14 @@ set -e
 cd $BUILD_STAGINGDIRECTORY
 mkdir extraction
 cd extraction
-git clone --depth 1 https://github.com/Microsoft/vscode-extension-telemetry.git
-git clone --depth 1 https://github.com/Microsoft/vscode-chrome-debug-core.git
-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
-node $BUILD_SOURCESDIRECTORY/build/node_modules/.bin/vscode-telemetry-extractor --config $BUILD_SOURCESDIRECTORY/build/azure-pipelines/common/telemetry-config.json -o .
+git clone --depth 1 https://github.com/microsoft/vscode-extension-telemetry.git
+git clone --depth 1 https://github.com/microsoft/vscode-chrome-debug-core.git
+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/node_modules/.bin/vscode-telemetry-extractor --sourceDir $BUILD_SOURCESDIRECTORY --excludedDir $BUILD_SOURCESDIRECTORY/extensions --outputDir . --applyEndpoints
+node $BUILD_SOURCESDIRECTORY/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

build/azure-pipelines/common/installPlaywright.js

@@ -0,0 +1,14 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
+const retry_1 = require("./retry");
+const { installBrowsersWithProgressBar } = require('playwright/lib/install/installer');
+const playwrightPath = path.dirname(require.resolve('playwright'));
+async function install() {
+    await retry_1.retry(() => installBrowsersWithProgressBar(playwrightPath));
+}
+install();

build/azure-pipelines/common/listNodeModules.js

@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 fs = require("fs");
+const path = require("path");
+if (process.argv.length !== 3) {
+    console.error('Usage: node listNodeModules.js OUTPUT_FILE');
+    process.exit(-1);
+}
+const ROOT = path.join(__dirname, '../../../');
+function findNodeModulesFiles(location, inNodeModules, result) {
+    const entries = fs.readdirSync(path.join(ROOT, location));
+    for (const entry of entries) {
+        const entryPath = `${location}/${entry}`;
+        if (/(^\/out)|(^\/src$)|(^\/.git$)|(^\/.build$)/.test(entryPath)) {
+            continue;
+        }
+        let stat;
+        try {
+            stat = fs.statSync(path.join(ROOT, entryPath));
+        }
+        catch (err) {
+            continue;
+        }
+        if (stat.isDirectory()) {
+            findNodeModulesFiles(entryPath, inNodeModules || (entry === 'node_modules'), result);
+        }
+        else {
+            if (inNodeModules) {
+                result.push(entryPath.substr(1));
+            }
+        }
+    }
+}
+const result = [];
+findNodeModulesFiles('', false, result);
+fs.writeFileSync(process.argv[2], result.join('\n') + '\n');

build/azure-pipelines/common/listNodeModules.ts

@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 fs from 'fs';
+import * as path from 'path';
+
+if (process.argv.length !== 3) {
+	console.error('Usage: node listNodeModules.js OUTPUT_FILE');
+	process.exit(-1);
+}
+
+const ROOT = path.join(__dirname, '../../../');
+
+function findNodeModulesFiles(location: string, inNodeModules: boolean, result: string[]) {
+	const entries = fs.readdirSync(path.join(ROOT, location));
+	for (const entry of entries) {
+		const entryPath = `${location}/${entry}`;
+
+		if (/(^\/out)|(^\/src$)|(^\/.git$)|(^\/.build$)/.test(entryPath)) {
+			continue;
+		}
+
+		let stat: fs.Stats;
+		try {
+			stat = fs.statSync(path.join(ROOT, entryPath));
+		} catch (err) {
+			continue;
+		}
+
+		if (stat.isDirectory()) {
+			findNodeModulesFiles(entryPath, inNodeModules || (entry === 'node_modules'), result);
+		} else {
+			if (inNodeModules) {
+				result.push(entryPath.substr(1));
+			}
+		}
+	}
+}
+
+const result: string[] = [];
+findNodeModulesFiles('', false, result);
+fs.writeFileSync(process.argv[2], result.join('\n') + '\n');

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

@@ -0,0 +1,71 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+const azure = require("azure-storage");
+const mime = require("mime");
+const minimist = require("minimist");
+const path_1 = require("path");
+const fileNames = [
+    'fake.html',
+    'host.js',
+    'index.html',
+    'main.js',
+    'service-worker.js'
+];
+async function assertContainer(blobService, container) {
+    await new Promise((c, e) => blobService.createContainerIfNotExists(container, { publicAccessLevel: 'blob' }, err => err ? e(err) : c()));
+}
+async function doesBlobExist(blobService, container, blobName) {
+    const existsResult = await new Promise((c, e) => blobService.doesBlobExist(container, blobName, (err, r) => err ? e(err) : c(r)));
+    return existsResult.exists;
+}
+async function uploadBlob(blobService, container, blobName, file) {
+    const blobOptions = {
+        contentSettings: {
+            contentType: mime.lookup(file),
+            cacheControl: 'max-age=31536000, public'
+        }
+    };
+    await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(container, blobName, file, blobOptions, err => err ? e(err) : c()));
+}
+async function publish(commit, files) {
+    console.log('Publishing...');
+    console.log('Commit:', commit);
+    const storageAccount = process.env['AZURE_WEBVIEW_STORAGE_ACCOUNT'];
+    const blobService = azure.createBlobService(storageAccount, process.env['AZURE_WEBVIEW_STORAGE_ACCESS_KEY'])
+        .withFilter(new azure.ExponentialRetryPolicyFilter(20));
+    await assertContainer(blobService, commit);
+    for (const file of files) {
+        const blobName = path_1.basename(file);
+        const blobExists = await doesBlobExist(blobService, commit, blobName);
+        if (blobExists) {
+            console.log(`Blob ${commit}, ${blobName} already exists, not publishing again.`);
+            continue;
+        }
+        console.log('Uploading blob to Azure storage...');
+        await uploadBlob(blobService, commit, blobName, file);
+    }
+    console.log('Blobs successfully uploaded.');
+}
+function main() {
+    const commit = process.env['BUILD_SOURCEVERSION'];
+    if (!commit) {
+        console.warn('Skipping publish due to missing BUILD_SOURCEVERSION');
+        return;
+    }
+    const opts = minimist(process.argv.slice(2));
+    const [directory] = opts._;
+    const files = fileNames.map(fileName => path_1.join(directory, fileName));
+    publish(commit, files).catch(err => {
+        console.error(err);
+        process.exit(1);
+    });
+}
+if (process.argv.length < 3) {
+    console.error('Usage: node publish.js <directory>');
+    process.exit(-1);
+}
+main();

build/azure-pipelines/common/publish.js

@@ -0,0 +1,224 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 fs = require("fs");
+const crypto = require("crypto");
+const azure = require("azure-storage");
+const mime = require("mime");
+const minimist = require("minimist");
+const documentdb_1 = require("documentdb");
+// {{SQL CARBON EDIT}}
+if (process.argv.length < 9) {
+    console.error('Usage: node publish.js <product_quality> <platform> <file_type> <file_name> <version> <is_update> <file> [commit_id]');
+    process.exit(-1);
+}
+function hashStream(hashName, stream) {
+    return new Promise((c, e) => {
+        const shasum = crypto.createHash(hashName);
+        stream
+            .on('data', shasum.update.bind(shasum))
+            .on('error', e)
+            .on('close', () => c(shasum.digest('hex')));
+    });
+}
+function createDefaultConfig(quality) {
+    return {
+        id: quality,
+        frozen: false
+    };
+}
+function getConfig(quality) {
+    console.log(`Getting config for quality ${quality}`);
+    const client = new documentdb_1.DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT'], { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
+    const collection = 'dbs/builds/colls/config';
+    const query = {
+        query: `SELECT TOP 1 * FROM c WHERE c.id = @quality`,
+        parameters: [
+            { name: '@quality', value: quality }
+        ]
+    };
+    return retry(() => new Promise((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]);
+        });
+    }));
+}
+function createOrUpdate(commit, quality, platform, type, release, asset, isUpdate) {
+    const client = new documentdb_1.DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT'], { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
+    const collection = 'dbs/builds/colls/' + quality;
+    const updateQuery = {
+        query: 'SELECT TOP 1 * FROM c WHERE c.id = @id',
+        parameters: [{ name: '@id', value: commit }]
+    };
+    let updateTries = 0;
+    function update() {
+        updateTries++;
+        return new Promise((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'));
+                }
+                const release = results[0];
+                release.assets = [
+                    ...release.assets.filter((a) => !(a.platform === platform && a.type === type)),
+                    asset
+                ];
+                if (isUpdate) {
+                    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);
+                    }
+                    console.log('Build successfully updated.');
+                    c();
+                });
+            });
+        });
+    }
+    return retry(() => new Promise((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);
+            }
+            console.log('Build successfully published.');
+            c();
+        });
+    }));
+}
+async function assertContainer(blobService, quality) {
+    await new Promise((c, e) => blobService.createContainerIfNotExists(quality, { publicAccessLevel: 'blob' }, err => err ? e(err) : c()));
+}
+async function doesAssetExist(blobService, quality, blobName) {
+    const existsResult = await new Promise((c, e) => blobService.doesBlobExist(quality, blobName, (err, r) => err ? e(err) : c(r)));
+    return existsResult.exists;
+}
+async function uploadBlob(blobService, quality, blobName, file) {
+    const blobOptions = {
+        contentSettings: {
+            contentType: mime.lookup(file),
+            cacheControl: 'max-age=31536000, public'
+        }
+    };
+    await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, file, blobOptions, err => err ? e(err) : c()));
+}
+async function publish(commit, quality, platform, type, name, version, _isUpdate, file, opts) {
+    const isUpdate = _isUpdate === 'true';
+    const queuedBy = process.env['BUILD_QUEUEDBY'];
+    const sourceBranch = process.env['BUILD_SOURCEBRANCH'];
+    console.log('Publishing...');
+    console.log('Quality:', quality);
+    console.log('Platform:', platform);
+    console.log('Type:', type);
+    console.log('Name:', name);
+    console.log('Version:', version);
+    console.log('Commit:', commit);
+    console.log('Is Update:', isUpdate);
+    console.log('File:', file);
+    const stat = await new Promise((c, e) => fs.stat(file, (err, stat) => err ? e(err) : c(stat)));
+    const size = stat.size;
+    console.log('Size:', size);
+    const stream = fs.createReadStream(file);
+    const [sha1hash, sha256hash] = await Promise.all([hashStream('sha1', stream), hashStream('sha256', stream)]);
+    console.log('SHA1:', sha1hash);
+    console.log('SHA256:', sha256hash);
+    const blobName = commit + '/' + name;
+    const storageAccount = process.env['AZURE_STORAGE_ACCOUNT_2'];
+    const blobService = azure.createBlobService(storageAccount, process.env['AZURE_STORAGE_ACCESS_KEY_2'])
+        .withFilter(new azure.ExponentialRetryPolicyFilter(20));
+    await assertContainer(blobService, quality);
+    const blobExists = await doesAssetExist(blobService, quality, blobName);
+    if (blobExists) {
+        console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`);
+        return;
+    }
+    console.log('Uploading blobs to Azure storage...');
+    await uploadBlob(blobService, quality, blobName, file);
+    console.log('Blobs successfully uploaded.');
+    const config = await getConfig(quality);
+    console.log('Quality config:', config);
+    const asset = {
+        platform: platform,
+        type: type,
+        url: `${process.env['AZURE_CDN_URL']}/${quality}/${blobName}`,
+        hash: sha1hash,
+        sha256hash,
+        size
+    };
+    // Remove this if we ever need to rollback fast updates for windows
+    if (/win32/.test(platform)) {
+        asset.supportsFastUpdate = true;
+    }
+    console.log('Asset:', JSON.stringify(asset, null, '  '));
+    // {{SQL CARBON EDIT}}
+    // Insiders: nightly build from main
+    const isReleased = (((quality === 'insider' && /^main$|^refs\/heads\/main$/.test(sourceBranch)) ||
+        (quality === 'rc1' && /^release\/|^refs\/heads\/release\//.test(sourceBranch))) &&
+        /Project Collection Service Accounts|Microsoft.VisualStudio.Services.TFS/.test(queuedBy));
+    const release = {
+        id: commit,
+        timestamp: (new Date()).getTime(),
+        version,
+        isReleased: isReleased,
+        sourceBranch,
+        queuedBy,
+        assets: [],
+        updates: {}
+    };
+    if (!opts['upload-only']) {
+        release.assets.push(asset);
+        if (isUpdate) {
+            release.updates[platform] = type;
+        }
+    }
+    await createOrUpdate(commit, quality, platform, type, release, asset, isUpdate);
+}
+const RETRY_TIMES = 10;
+async function retry(fn) {
+    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() {
+    const commit = process.env['BUILD_SOURCEVERSION'];
+    if (!commit) {
+        console.warn('Skipping publish due to missing BUILD_SOURCEVERSION');
+        return;
+    }
+    const opts = minimist(process.argv.slice(2), {
+        boolean: ['upload-only']
+    });
+    const [quality, platform, type, name, version, _isUpdate, file] = opts._;
+    publish(commit, quality, platform, type, name, version, _isUpdate, file, opts).catch(err => {
+        console.error(err);
+        process.exit(1);
+    });
+}
+main();

build/azure-pipelines/common/publish.ts

@@ -128,7 +128,7 @@ function createOrUpdate(commit: string, quality: string, platform: string, type:
 }
 
 async function assertContainer(blobService: azure.BlobService, quality: string): Promise<void> {
-	await new Promise((c, e) => blobService.createContainerIfNotExists(quality, { publicAccessLevel: 'blob' }, err => err ? e(err) : c()));
+	await new Promise<void>((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 +144,7 @@ async function uploadBlob(blobService: azure.BlobService, quality: string, blobN
 		}
 	};
 
-	await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, file, blobOptions, err => err ? e(err) : c()));
+	await new Promise<void>((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, file, blobOptions, err => err ? e(err) : c()));
 }
 
 interface PublishOptions {

build/azure-pipelines/common/release.js

@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 documentdb_1 = require("documentdb");
+function createDefaultConfig(quality) {
+    return {
+        id: quality,
+        frozen: false
+    };
+}
+function getConfig(quality) {
+    const client = new documentdb_1.DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT'], { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
+    const collection = 'dbs/builds/colls/config';
+    const query = {
+        query: `SELECT TOP 1 * FROM c WHERE c.id = @quality`,
+        parameters: [
+            { name: '@quality', value: quality }
+        ]
+    };
+    return new Promise((c, e) => {
+        client.queryDocuments(collection, query).toArray((err, results) => {
+            if (err && err.code !== 409) {
+                return e(err);
+            }
+            c(!results || results.length === 0 ? createDefaultConfig(quality) : results[0]);
+        });
+    });
+}
+function doRelease(commit, quality) {
+    const client = new documentdb_1.DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT'], { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
+    const collection = 'dbs/builds/colls/' + quality;
+    const query = {
+        query: 'SELECT TOP 1 * FROM c WHERE c.id = @id',
+        parameters: [{ name: '@id', value: commit }]
+    };
+    let updateTries = 0;
+    function update() {
+        updateTries++;
+        return new Promise((c, e) => {
+            client.queryDocuments(collection, query).toArray((err, results) => {
+                if (err) {
+                    return e(err);
+                }
+                if (results.length !== 1) {
+                    return e(new Error('No documents'));
+                }
+                const release = results[0];
+                release.isReleased = true;
+                client.replaceDocument(release._self, release, err => {
+                    if (err && err.code === 409 && updateTries < 5) {
+                        return c(update());
+                    }
+                    if (err) {
+                        return e(err);
+                    }
+                    console.log('Build successfully updated.');
+                    c();
+                });
+            });
+        });
+    }
+    return update();
+}
+async function release(commit, quality) {
+    const config = await getConfig(quality);
+    console.log('Quality config:', config);
+    if (config.frozen) {
+        console.log(`Skipping release because quality ${quality} is frozen.`);
+        return;
+    }
+    await doRelease(commit, quality);
+}
+function env(name) {
+    const result = process.env[name];
+    if (!result) {
+        throw new Error(`Skipping release due to missing env: ${name}`);
+    }
+    return result;
+}
+async function main() {
+    const commit = env('BUILD_SOURCEVERSION');
+    const quality = env('VSCODE_QUALITY');
+    await release(commit, quality);
+}
+main().catch(err => {
+    console.error(err);
+    process.exit(1);
+});

build/azure-pipelines/common/releaseBuild.js

@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 cosmos_1 = require("@azure/cosmos");
+const retry_1 = require("./retry");
+function getEnv(name) {
+    const result = process.env[name];
+    if (typeof result === 'undefined') {
+        throw new Error('Missing env: ' + name);
+    }
+    return result;
+}
+function createDefaultConfig(quality) {
+    return {
+        id: quality,
+        frozen: false
+    };
+}
+async function getConfig(client, quality) {
+    const query = `SELECT TOP 1 * FROM c WHERE c.id = "${quality}"`;
+    const res = await client.database('builds').container('config').items.query(query).fetchAll();
+    if (res.resources.length === 0) {
+        return createDefaultConfig(quality);
+    }
+    return res.resources[0];
+}
+async function main() {
+    const commit = getEnv('BUILD_SOURCEVERSION');
+    const quality = getEnv('VSCODE_QUALITY');
+    const client = new cosmos_1.CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT'], key: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
+    const config = await getConfig(client, quality);
+    console.log('Quality config:', config);
+    if (config.frozen) {
+        console.log(`Skipping release because quality ${quality} is frozen.`);
+        return;
+    }
+    console.log(`Releasing build ${commit}...`);
+    const scripts = client.database('builds').container(quality).scripts;
+    await retry_1.retry(() => scripts.storedProcedure('releaseBuild').execute('', [commit]));
+}
+main().then(() => {
+    console.log('Build successfully released');
+    process.exit(0);
+}, err => {
+    console.error(err);
+    process.exit(1);
+});

build/azure-pipelines/common/releaseBuild.ts

@@ -6,6 +6,7 @@
 'use strict';
 
 import { CosmosClient } from '@azure/cosmos';
+import { retry } from './retry';
 
 function getEnv(name: string): string {
 	const result = process.env[name];
@@ -58,7 +59,7 @@ async function main(): Promise<void> {
 	console.log(`Releasing build ${commit}...`);
 
 	const scripts = client.database('builds').container(quality).scripts;
-	await scripts.storedProcedure('releaseBuild').execute('', [commit]);
+	await retry(() => scripts.storedProcedure('releaseBuild').execute('', [commit]));
 }
 
 main().then(() => {

build/azure-pipelines/common/retry.js

@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 });
+exports.retry = void 0;
+async function retry(fn) {
+    for (let run = 1; run <= 10; run++) {
+        try {
+            return await fn();
+        }
+        catch (err) {
+            if (!/ECONNRESET/.test(err.message)) {
+                throw err;
+            }
+            const millis = (Math.random() * 200) + (50 * Math.pow(1.5, run));
+            console.log(`Failed with ECONNRESET, retrying in ${millis}ms...`);
+            // maximum delay is 10th retry: ~3 seconds
+            await new Promise(c => setTimeout(c, millis));
+        }
+    }
+    throw new Error('Retried too many times');
+}
+exports.retry = retry;

build/azure-pipelines/common/retry.ts

@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+export async function retry<T>(fn: () => Promise<T>): Promise<T> {
+	for (let run = 1; run <= 10; run++) {
+		try {
+			return await fn();
+		} catch (err) {
+			if (!/ECONNRESET/.test(err.message)) {
+				throw err;
+			}
+
+			const millis = (Math.random() * 200) + (50 * Math.pow(1.5, run));
+			console.log(`Failed with ECONNRESET, retrying in ${millis}ms...`);
+
+			// maximum delay is 10th retry: ~3 seconds
+			await new Promise(c => setTimeout(c, millis));
+		}
+	}
+
+	throw new Error('Retried too many times');
+}

build/azure-pipelines/common/sql-computeNodeModulesCacheKey.js

@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 fs = require("fs");
+const path = require("path");
+const crypto = require("crypto");
+const ROOT = path.join(__dirname, '../../../');
+function findFiles(location, pattern, result) {
+    const entries = fs.readdirSync(path.join(ROOT, location));
+    for (const entry of entries) {
+        const entryPath = `${location}/${entry}`;
+        let stat;
+        try {
+            stat = fs.statSync(path.join(ROOT, entryPath));
+        }
+        catch (err) {
+            continue;
+        }
+        if (stat.isDirectory()) {
+            findFiles(entryPath, pattern, result);
+        }
+        else {
+            if (stat.isFile() && entry.endsWith(pattern)) {
+                result.push(path.join(ROOT, entryPath));
+            }
+        }
+    }
+}
+const shasum = crypto.createHash('sha1');
+/**
+ * Creating a sha hash of all the files that can cause packages to change/redownload.
+ */
+shasum.update(fs.readFileSync(path.join(ROOT, 'build/.cachesalt')));
+shasum.update(fs.readFileSync(path.join(ROOT, '.yarnrc')));
+shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc')));
+// Adding all yarn.lock files into sha sum.
+const result = [];
+findFiles('', 'yarn.lock', result);
+result.forEach(f => shasum.update(fs.readFileSync(f)));
+// Add any other command line arguments
+for (let i = 2; i < process.argv.length; i++) {
+    shasum.update(process.argv[i]);
+}
+process.stdout.write(shasum.digest('hex'));

build/azure-pipelines/common/sql-computeNodeModulesCacheKey.ts

@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 fs from 'fs';
+import * as path from 'path';
+import * as crypto from 'crypto';
+
+const ROOT = path.join(__dirname, '../../../');
+
+function findFiles(location: string, pattern: string, result: string[]) {
+	const entries = fs.readdirSync(path.join(ROOT, location));
+
+	for (const entry of entries) {
+		const entryPath = `${location}/${entry}`;
+		let stat: fs.Stats;
+		try {
+			stat = fs.statSync(path.join(ROOT, entryPath));
+		} catch (err) {
+			continue;
+		}
+		if (stat.isDirectory()) {
+			findFiles(entryPath, pattern, result);
+		} else {
+			if (stat.isFile() && entry.endsWith(pattern)) {
+				result.push(path.join(ROOT, entryPath));
+			}
+		}
+	}
+}
+
+const shasum = crypto.createHash('sha1');
+
+/**
+ * Creating a sha hash of all the files that can cause packages to change/redownload.
+ */
+shasum.update(fs.readFileSync(path.join(ROOT, 'build/.cachesalt')));
+shasum.update(fs.readFileSync(path.join(ROOT, '.yarnrc')));
+shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc')));
+
+// Adding all yarn.lock files into sha sum.
+const result: string[] = [];
+findFiles('', 'yarn.lock', result);
+result.forEach(f => shasum.update(fs.readFileSync(f)));
+
+// Add any other command line arguments
+for (let i = 2; i < process.argv.length; i++) {
+	shasum.update(process.argv[i]);
+}
+
+process.stdout.write(shasum.digest('hex'));

build/azure-pipelines/common/sync-mooncake.ts

@@ -1,130 +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 url from 'url';
-import * as azure from 'azure-storage';
-import * as mime from 'mime';
-import { CosmosClient } from '@azure/cosmos';
-
-function log(...args: any[]) {
-	console.log(...[`[${new Date().toISOString()}]`, ...args]);
-}
-
-function error(...args: any[]) {
-	console.error(...[`[${new Date().toISOString()}]`, ...args]);
-}
-
-if (process.argv.length < 3) {
-	error('Usage: node sync-mooncake.js <quality>');
-	process.exit(-1);
-}
-
-interface Build {
-	assets: Asset[];
-}
-
-interface Asset {
-	platform: string;
-	type: string;
-	url: string;
-	mooncakeUrl: string;
-	hash: string;
-	sha256hash: string;
-	size: number;
-	supportsFastUpdate?: boolean;
-}
-
-async function sync(commit: string, quality: string): Promise<void> {
-	log(`Synchronizing Mooncake assets for ${quality}, ${commit}...`);
-
-	const client = new CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT']!, key: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
-	const container = client.database('builds').container(quality);
-
-	const query = `SELECT TOP 1 * FROM c WHERE c.id = "${commit}"`;
-	const res = await container.items.query<Build>(query, {}).fetchAll();
-
-	if (res.resources.length !== 1) {
-		throw new Error(`No builds found for ${commit}`);
-	}
-
-	const build = res.resources[0];
-
-	log(`Found build for ${commit}, with ${build.assets.length} assets`);
-
-	const storageAccount = process.env['AZURE_STORAGE_ACCOUNT_2']!;
-
-	const blobService = azure.createBlobService(storageAccount, process.env['AZURE_STORAGE_ACCESS_KEY_2']!)
-		.withFilter(new azure.ExponentialRetryPolicyFilter(20));
-
-	const mooncakeBlobService = azure.createBlobService(storageAccount, process.env['MOONCAKE_STORAGE_ACCESS_KEY']!, `${storageAccount}.blob.core.chinacloudapi.cn`)
-		.withFilter(new azure.ExponentialRetryPolicyFilter(20));
-
-	// mooncake is fussy and far away, this is needed!
-	blobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
-	mooncakeBlobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
-
-	for (const asset of build.assets) {
-		try {
-			const blobPath = url.parse(asset.url).path;
-
-			if (!blobPath) {
-				throw new Error(`Failed to parse URL: ${asset.url}`);
-			}
-
-			const blobName = blobPath.replace(/^\/\w+\//, '');
-
-			log(`Found ${blobName}`);
-
-			if (asset.mooncakeUrl) {
-				log(`  Already in Mooncake ✔️`);
-				continue;
-			}
-
-			const readStream = blobService.createReadStream(quality, blobName, undefined!);
-			const blobOptions: azure.BlobService.CreateBlockBlobRequestOptions = {
-				contentSettings: {
-					contentType: mime.lookup(blobPath),
-					cacheControl: 'max-age=31536000, public'
-				}
-			};
-
-			const writeStream = mooncakeBlobService.createWriteStreamToBlockBlob(quality, blobName, blobOptions, undefined);
-
-			log(`  Uploading to Mooncake...`);
-			await new Promise((c, e) => readStream.pipe(writeStream).on('finish', c).on('error', e));
-
-			log(`  Updating build in DB...`);
-			const mooncakeUrl = `${process.env['MOONCAKE_CDN_URL']}${blobPath}`;
-			await container.scripts.storedProcedure('setAssetMooncakeUrl')
-				.execute('', [commit, asset.platform, asset.type, mooncakeUrl]);
-
-			log(`  Done ✔️`);
-		} catch (err) {
-			error(err);
-		}
-	}
-
-	log(`All done ✔️`);
-}
-
-function main(): void {
-	const commit = process.env['BUILD_SOURCEVERSION'];
-
-	if (!commit) {
-		error('Skipping publish due to missing BUILD_SOURCEVERSION');
-		return;
-	}
-
-	const quality = process.argv[2];
-
-	sync(commit, quality).catch(err => {
-		error(err);
-		process.exit(1);
-	});
-}
-
-main();

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

@@ -8,5 +8,11 @@
     <true/>
     <key>com.apple.security.cs.allow-dyld-environment-variables</key>
     <true/>
+    <key>com.apple.security.device.audio-input</key>
+    <true/>
+    <key>com.apple.security.device.camera</key>
+    <true/>
+    <key>com.apple.security.automation.apple-events</key>
+    <true/>
 </dict>
 </plist>

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

@@ -1,24 +1,26 @@
 steps:
-- task: NodeTool@0
-  inputs:
-    versionSpec: "12.14.1"
+  - task: NodeTool@0
+    inputs:
+      versionSpec: "12.18.3"
 
 - 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: |
-    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
-  displayName: Install Dependencies
-  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+  - script: |
+      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 # {{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'
@@ -33,21 +35,21 @@ steps:
 #     yarn monaco-compile-check
 #   displayName: Run Monaco Editor Checks
 
-- script: |
-    yarn valid-layers-check
-  displayName: Run Valid Layers Checks
+  - script: |
+      yarn valid-layers-check
+    displayName: Run Valid Layers Checks
 
-- script: |
-    yarn compile
-  displayName: Compile Sources
+  - script: |
+      yarn compile
+    displayName: Compile Sources
 
 # - script: | {{SQL CARBON EDIT}} remove step
 #     yarn download-builtin-extensions
 #   displayName: Download Built-in Extensions
 
-- script: |
-    ./scripts/test.sh --tfs "Unit Tests"
-  displayName: Run Unit Tests (Electron)
+  - script: |
+      ./scripts/test.sh --tfs "Unit Tests"
+    displayName: Run Unit Tests (Electron)
 
 # - script: | {{SQL CARBON EDIT}} disable
 #     yarn test-browser --browser chromium --browser webkit --browser firefox --tfs "Browser Unit Tests"
@@ -57,17 +59,17 @@ steps:
 #     ./scripts/test-integration.sh --tfs "Integration Tests"
 #   displayName: Run Integration Tests (Electron)
 
-- task: PublishPipelineArtifact@0
-  inputs:
-    artifactName: crash-dump-macos
-    targetPath: .build/crashes
-  displayName: 'Publish Crash Reports'
-  continueOnError: true
-  condition: failed()
+  - task: PublishPipelineArtifact@0
+    inputs:
+      artifactName: crash-dump-macos
+      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()
+  - task: PublishTestResults@2
+    displayName: Publish Tests Results
+    inputs:
+      testResultsFiles: "*-results.xml"
+      searchFolder: "$(Build.ArtifactStagingDirectory)/test-results"
+    condition: succeededOrFailed()

build/azure-pipelines/darwin/helper-plugin-entitlements.plist

@@ -1,10 +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-unsigned-executable-memory</key>
-    <true/>
-    <key>com.apple.security.cs.disable-library-validation</key>
-    <true/>
-</dict>
-</plist>

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

@@ -0,0 +1,125 @@
+steps:
+  - task: NodeTool@0
+    inputs:
+      versionSpec: "14.x"
+
+  - task: AzureKeyVault@1
+    displayName: "Azure Key Vault: Get Secrets"
+    inputs:
+      azureSubscription: "vscode-builds-subscription"
+      KeyVaultName: vscode
+
+  - 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 pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
+    displayName: Merge distro
+
+  - script: |
+      pushd build \
+      && yarn \
+      && npm install -g typescript \
+      && tsc azure-pipelines/common/createAsset.ts \
+      && popd
+    displayName: Restore modules for just build folder and compile it
+
+  - download: current
+    artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
+    displayName: Download $(VSCODE_ARCH) artifact
+
+  - script: |
+      set -e
+      unzip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip -d $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      mv $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
+    displayName: Unzip & move
+
+  - 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: |
+      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(), ne(variables['VSCODE_ARCH'], 'arm64'))
+
+  - script: |
+      # For legacy purposes, arch for x64 is just 'darwin'
+      case $VSCODE_ARCH in
+        x64) ASSET_ID="darwin" ;;
+        arm64) ASSET_ID="darwin-arm64" ;;
+        universal) ASSET_ID="darwin-universal" ;;
+      esac
+      echo "##vso[task.setvariable variable=ASSET_ID]$ASSET_ID"
+    displayName: Set asset id variable
+
+  - script: mv $(agent.builddirectory)/VSCode-darwin-x64.zip $(agent.builddirectory)/VSCode-darwin.zip
+    displayName: Rename x64 build to it's legacy name
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
+
+  - publish: $(Agent.BuildDirectory)/VSCode-$(ASSET_ID).zip
+    artifact: vscode_client_darwin_$(VSCODE_ARCH)_archive

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

@@ -1,265 +1,313 @@
 steps:
-- script: |
-    mkdir -p .build
-    echo -n $BUILD_SOURCEVERSION > .build/commit
-    echo -n $VSCODE_QUALITY > .build/quality
-  displayName: Prepare cache flag
+  - task: NodeTool@0
+    inputs:
+      versionSpec: "14.x"
 
-- 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'
+  - task: AzureKeyVault@1
+    displayName: "Azure Key Vault: Get Secrets"
+    inputs:
+      azureSubscription: "vscode-builds-subscription"
+      KeyVaultName: vscode
 
-- script: |
-    set -e
-    exit 1
-  displayName: Check RestoreCache
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      artifact: Compilation
+      path: $(Build.ArtifactStagingDirectory)
+    displayName: Download compilation output
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))
 
-- task: NodeTool@0
-  inputs:
-    versionSpec: "12.14.1"
+  - script: |
+      set -e
+      tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
+    displayName: Extract compilation output
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))
 
-- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-  inputs:
-    versionSpec: "1.x"
+  # Set up the credentials to retrieve distro repo and setup git persona
+  # to create a merge commit for when we merge distro into oss
+  - script: |
+      set -e
+      cat << EOF > ~/.netrc
+      machine github.com
+      login vscode
+      password $(github-distro-mixin-password)
+      EOF
 
-- task: AzureKeyVault@1
-  displayName: 'Azure Key Vault: Get Secrets'
-  inputs:
-    azureSubscription: 'vscode-builds-subscription'
-    KeyVaultName: vscode
+      git config user.email "vscode@microsoft.com"
+      git config user.name "VSCode"
+    displayName: Prepare tooling
 
-- script: |
-    set -e
+  - script: |
+      set -e
+      sudo xcode-select -s /Applications/Xcode_12.2.app
+    displayName: Switch to Xcode 12
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
 
-    cat << EOF > ~/.netrc
-    machine github.com
-    login vscode
-    password $(github-distro-mixin-password)
-    EOF
+  - script: |
+      set -e
+      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
+    displayName: Merge distro
 
-    git config user.email "vscode@microsoft.com"
-    git config user.name "VSCode"
-  displayName: Prepare tooling
+  - script: |
+      mkdir -p .build
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash
+    displayName: Prepare yarn cache flags
 
-- 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: Cache@2
+    inputs:
+      key: 'nodeModules | $(Agent.OS) | .build/yarnlockhash'
+      path: .build/node_modules_cache
+      cacheHitVar: NODE_MODULES_RESTORED
+    displayName: Restore node_modules cache
 
-- 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
+      tar -xzf .build/node_modules_cache/cache.tgz
+    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Extract node_modules cache
 
-- script: |
-    set -e
-    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
-  displayName: Install dependencies
-  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+  - script: |
+      set -e
+      npm install -g node-gyp@latest
+      node-gyp --version
+    displayName: Update node-gyp
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, '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
+      npx https://aka.ms/enablesecurefeed standAlone
+    timeoutInMinutes: 5
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
+    displayName: Switch to Terrapin packages
 
-- script: |
-    set -e
-    yarn postinstall
-  displayName: Run postinstall scripts
-  condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
+  - script: |
+      set -e
+      export npm_config_arch=$(VSCODE_ARCH)
+      export npm_config_node_gyp=$(which node-gyp)
+      export npm_config_build_from_source=true
+      export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
 
-- script: |
-    set -e
-    node build/azure-pipelines/mixin
-  displayName: Mix in quality
+      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
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+    displayName: Install dependencies
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
-- script: |
-    set -e
-    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-darwin-min-ci
-  displayName: Build
+  - script: |
+      set -e
+      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+      mkdir -p .build/node_modules_cache
+      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Create node_modules archive
 
-- script: |
-    set -e
-    ./scripts/test.sh --build --tfs "Unit Tests"
-  displayName: Run unit tests (Electron)
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  # This script brings in the right resources (images, icons, etc) based on the quality (insiders, stable, exploration)
+  - script: |
+      set -e
+      node build/azure-pipelines/mixin
+    displayName: Mix in quality
 
-- script: |
-    set -e
-    yarn test-browser --build --browser chromium --browser webkit --browser firefox --tfs "Browser Unit Tests"
-  displayName: Run unit tests (Browser)
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  - script: |
+      set -e
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
+    displayName: Build client
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))
 
-- script: |
-    # Figure out the full absolute path of the product we just built
-    # 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)/VSCode-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)/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: |
+      set -e
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn gulp vscode-reh-darwin-min-ci
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn gulp vscode-reh-web-darwin-min-ci
+    displayName: Build Server
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
 
-- script: |
-    set -e
-    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
-    ./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: |
+      set -e
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
+    displayName: Download Electron and Playwright
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-- script: |
-    set -e
-    APP_ROOT=$(agent.builddirectory)/VSCode-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)/vscode-reh-darwin" \
-    ./resources/server/test/test-remote-integration.sh
-  displayName: Run remote integration tests (Electron)
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  - download: current
+    artifact: unsigned_vscode_client_darwin_x64_archive
+    displayName: Download x64 artifact
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
 
-- script: |
-    set -e
-    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
-    APP_NAME="`ls $APP_ROOT | head -n 1`"
-    yarn smoketest --build "$APP_ROOT/$APP_NAME"
-  continueOnError: true
-  displayName: Run smoke tests (Electron)
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  - download: current
+    artifact: unsigned_vscode_client_darwin_arm64_archive
+    displayName: Download arm64 artifact
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
 
-- script: |
-    set -e
-    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
-    yarn smoketest --web --headless
-  continueOnError: true
-  displayName: Run smoke tests (Browser)
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  - script: |
+      set -e
+      cp $(Pipeline.Workspace)/unsigned_vscode_client_darwin_x64_archive/VSCode-darwin-x64.zip $(agent.builddirectory)/VSCode-darwin-x64.zip
+      cp $(Pipeline.Workspace)/unsigned_vscode_client_darwin_arm64_archive/VSCode-darwin-arm64.zip $(agent.builddirectory)/VSCode-darwin-arm64.zip
+      unzip $(agent.builddirectory)/VSCode-darwin-x64.zip -d $(agent.builddirectory)/VSCode-darwin-x64
+      unzip $(agent.builddirectory)/VSCode-darwin-arm64.zip -d $(agent.builddirectory)/VSCode-darwin-arm64
+      DEBUG=* node build/darwin/create-universal-app.js
+    displayName: Create Universal App
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
 
-- task: PublishPipelineArtifact@0
-  inputs:
-    artifactName: crash-dump-macos
-    targetPath: .build/crashes
-  displayName: 'Publish Crash Reports'
-  continueOnError: true
-  condition: failed()
+  # Setting hardened entitlements is a requirement for:
+  # * Apple notarization
+  # * Running tests on Big Sur (because Big Sur has additional security precautions)
+  - script: |
+      set -e
+      security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+      security default-keychain -s $(agent.tempdirectory)/buildagent.keychain
+      security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+      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
+      VSCODE_ARCH=$(VSCODE_ARCH) DEBUG=electron-osx-sign* node build/darwin/sign.js
+    displayName: Set Hardened Entitlements
 
-- task: PublishTestResults@2
-  displayName: Publish Tests Results
-  inputs:
-    testResultsFiles: '*-results.xml'
-    searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
-  condition: succeededOrFailed()
+  - script: |
+      set -e
+      ./scripts/test.sh --build --tfs "Unit Tests"
+    displayName: Run unit tests (Electron)
+    timeoutInMinutes: 7
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-- script: |
-    set -e
-    security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
-    security default-keychain -s $(agent.tempdirectory)/buildagent.keychain
-    security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
-    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
-    DEBUG=electron-osx-sign* node build/darwin/sign.js
-  displayName: Set Hardened Entitlements
+  - script: |
+      set -e
+      yarn test-browser --build --browser chromium --browser webkit --browser firefox --tfs "Browser Unit Tests"
+    displayName: Run unit tests (Browser)
+    timeoutInMinutes: 7
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-- script: |
-    set -e
-    pushd $(agent.builddirectory)/VSCode-darwin && zip -r -X -y $(agent.builddirectory)/VSCode-darwin.zip * && popd
-  displayName: Archive build
+  - script: |
+      set -e
+      yarn --cwd test/integration/browser compile
+    displayName: Compile integration tests
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-  inputs:
-    ConnectedServiceName: 'ESRP CodeSign'
-    FolderPath: '$(agent.builddirectory)'
-    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: |
+      # Figure out the full absolute path of the product we just built
+      # 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)/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)
+    timeoutInMinutes: 10
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-- script: |
-    zip -d $(agent.builddirectory)/VSCode-darwin.zip "*.pkg"
-  displayName: Clean Archive
+  - script: |
+      set -e
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
+      ./resources/server/test/test-web-integration.sh --browser webkit
+    displayName: Run integration tests (Browser)
+    timeoutInMinutes: 10
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-- script: |
-    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
-    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
+  - script: |
+      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" \
+      ./resources/server/test/test-remote-integration.sh
+    displayName: Run remote integration tests (Electron)
+    timeoutInMinutes: 7
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-  inputs:
-    ConnectedServiceName: 'ESRP CodeSign'
-    FolderPath: '$(agent.builddirectory)'
-    Pattern: 'VSCode-darwin.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
+      yarn --cwd test/smoke compile
+    displayName: Compile smoke tests
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-- script: |
-    set -e
-    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
-    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)
+  - script: |
+      set -e
+      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      APP_NAME="`ls $APP_ROOT | head -n 1`"
+      yarn smoketest-no-compile --build "$APP_ROOT/$APP_NAME"
+    timeoutInMinutes: 5
+    displayName: Run smoke tests (Electron)
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-- 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)" \
-    ./build/azure-pipelines/darwin/publish.sh
-  displayName: Publish
+  - script: |
+      set -e
+      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      APP_NAME="`ls $APP_ROOT | head -n 1`"
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin" \
+      yarn smoketest-no-compile --build "$APP_ROOT/$APP_NAME" --remote
+    timeoutInMinutes: 5
+    displayName: Run smoke tests (Remote)
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-- script: |
-    AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
-    yarn gulp upload-vscode-configuration
-  displayName: Upload configuration (for Bing settings search)
-  continueOnError: true
+  - script: |
+      set -e
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
+      yarn smoketest-no-compile --web --headless
+    timeoutInMinutes: 5
+    displayName: Run smoke tests (Browser)
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-  displayName: 'Component Detection'
-  continueOnError: true
+  - task: PublishPipelineArtifact@0
+    inputs:
+      artifactName: crash-dump-macos-$(VSCODE_ARCH)
+      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: and(succeededOrFailed(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+  - 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
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - script: |
+      set -e
+
+      # package Remote Extension Host
+      pushd .. && mv vscode-reh-darwin vscode-server-darwin && zip -Xry vscode-server-darwin.zip vscode-server-darwin && popd
+
+      # package Remote Extension Host (Web)
+      pushd .. && mv vscode-reh-web-darwin vscode-server-darwin-web && zip -Xry vscode-server-darwin-web.zip vscode-server-darwin-web && popd
+    displayName: Prepare to publish servers
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
+    artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
+    displayName: Publish client archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(Agent.BuildDirectory)/vscode-server-darwin.zip
+    artifact: vscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned
+    displayName: Publish server archive
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(Agent.BuildDirectory)/vscode-server-darwin-web.zip
+    artifact: vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned
+    displayName: Publish web server archive
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - 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'), ne(variables['VSCODE_PUBLISH'], 'false'))
+    continueOnError: true

build/azure-pipelines/darwin/publish.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-# publish the build
-node build/azure-pipelines/common/createAsset.js \
-	darwin \
-	archive \
-	"VSCode-darwin-$VSCODE_QUALITY.zip" \
-	../VSCode-darwin.zip
-
-# package Remote Extension Host
-pushd .. && mv vscode-reh-darwin vscode-server-darwin && zip -Xry vscode-server-darwin.zip vscode-server-darwin && popd
-
-# publish Remote Extension Host
-node build/azure-pipelines/common/createAsset.js \
-	server-darwin \
-	archive-unsigned \
-	"vscode-server-darwin.zip" \
-	../vscode-server-darwin.zip

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

@@ -5,25 +5,15 @@ steps:
       certSecureFile: 'osx_signing_key.p12'
     condition: eq(variables['signed'], true)
 
-  - 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
+  - task: DownloadPipelineArtifact@2
     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'
+      artifact: Compilation
+    displayName: Download compilation output
 
   - script: |
       set -e
-      exit 1
-    displayName: Check RestoreCache
-    condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
+      tar -xzf $(Pipeline.Workspace)/compilation.tar.gz
+    displayName: Extract compilation output
 
   - task: NodeTool@0
     inputs:
@@ -49,7 +39,7 @@ steps:
       password $(github-distro-mixin-password)
       EOF
 
-      git config user.email "andresse@microsoft.com"
+      git config user.email "sqltools@service.microsoft.com"
       git config user.name "AzureDataStudio"
     displayName: Prepare tooling
 
@@ -60,11 +50,23 @@ steps:
       git merge $(node -p "require('./package.json').distro")
     displayName: Merge distro
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+  - script: |
+      mkdir -p .build
+      node build/azure-pipelines/common/sql-computeNodeModulesCacheKey.js > .build/yarnlockhash
+    displayName: Prepare yarn cache key
+
+  - task: Cache@2
+    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'
-      vstsFeed: 'BuildCache'
+      key: 'nodeModules | $(Agent.OS) | .build/yarnlockhash'
+      path: .build/node_modules_cache
+      cacheHitVar: NODE_MODULES_RESTORED
+
+  - script: |
+      set -e
+      tar -xzf .build/node_modules_cache/cache.tgz
+    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Extract node_modules archive
 
   - script: |
       set -e
@@ -72,20 +74,21 @@ steps:
     displayName: Install dependencies
     env:
       GITHUB_TOKEN: $(github-distro-mixin-password)
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    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: 'BuildCache'
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+  - script: |
+      set -e
+      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+      mkdir -p .build/node_modules_cache
+      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Create node_modules archive
 
   - script: |
       set -e
       yarn postinstall
     displayName: Run postinstall scripts
-    condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
+    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
 
   - script: |
       set -e
@@ -95,7 +98,7 @@ steps:
   - script: |
       set -e
       yarn gulp package-rebuild-extensions
-      yarn gulp vscode-darwin-min-ci
+      yarn gulp vscode-darwin-x64-min-ci
     displayName: Build
     env:
       VSCODE_MIXIN_PASSWORD: $(github-distro-mixin-password)
@@ -111,7 +114,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
+      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-x64
       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" \
@@ -121,9 +124,14 @@ steps:
 
   - script: |
       set -e
-      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin
+      yarn gulp compile-extensions
+    displayName: Compile Extensions
+
+  - script: |
+      set -e
+      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-x64
       APP_NAME="`ls $APP_ROOT | head -n 1`"
-      yarn smoketest --build "$APP_ROOT/$APP_NAME" --screenshots "$(build.artifactstagingdirectory)/smokeshots" --log "$(build.artifactstagingdirectory)/logs/darwin/smoke.log"
+      yarn smoketest --build "$APP_ROOT/$APP_NAME" --screenshots "$(build.artifactstagingdirectory)/smokeshots" --log "$(build.artifactstagingdirectory)/logs/darwin/smoke.log" --extensionsDir "$(build.sourcesdirectory)/extensions"
     displayName: Run smoke tests (Electron)
     continueOnError: true
     condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
@@ -139,7 +147,7 @@ steps:
 
   - script: |
       set -e
-      pushd ../azuredatastudio-darwin
+      pushd ../azuredatastudio-darwin-x64
       ls
 
       echo "Cleaning the application"
@@ -169,7 +177,7 @@ steps:
   - script: |
       set -e
       mkdir -p .build/darwin/archive
-      pushd ../azuredatastudio-darwin
+      pushd ../azuredatastudio-darwin-x64
       ditto -c -k --keepParent *.app $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin.zip
       popd
     displayName: 'Archive (no signing)'
@@ -178,7 +186,7 @@ steps:
   - script: |
       set -e
       mkdir -p .build/darwin/archive
-      pushd ../azuredatastudio-darwin
+      pushd ../azuredatastudio-darwin-x64
       ditto -c -k --keepParent *.app $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin-unsigned.zip
       popd
     displayName: 'Archive'
@@ -199,7 +207,7 @@ steps:
       testResultsFiles: 'test-results.xml'
       searchFolder: '$(Build.SourcesDirectory)'
     continueOnError: true
-    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+    condition: and(succeededOrFailed(), eq(variables['RUN_TESTS'], 'true'))
 
   - task: PublishCodeCoverageResults@1
     displayName: 'Publish code coverage from $(Build.SourcesDirectory)/.build/coverage/cobertura-coverage.xml'

build/azure-pipelines/distro-build.yml

@@ -1,45 +1,45 @@
 pool:
-  vmImage: 'Ubuntu-16.04'
+  vmImage: 'Ubuntu-18.04'
 
 trigger:
   branches:
-    include: ['main', 'release/*']
+    include: ["main", "release/*"]
 pr:
   branches:
-    include: ['main', 'release/*']
+    include: ["main", "release/*"]
 
 steps:
-- task: NodeTool@0
-  inputs:
-    versionSpec: "12.14.1"
+  - task: NodeTool@0
+    inputs:
+      versionSpec: "14.x"
 
-- task: AzureKeyVault@1
-  displayName: 'Azure Key Vault: Get Secrets'
-  inputs:
-    azureSubscription: 'azuredatastudio-adointegration'
-    KeyVaultName: ado-secrets
+  - task: AzureKeyVault@1
+    displayName: "Azure Key Vault: Get Secrets"
+    inputs:
+      azureSubscription: "vscode-builds-subscription"
+      KeyVaultName: vscode
 
-- script: |
-    set -e
+  - script: |
+      set -e
 
-    cat << EOF > ~/.netrc
-    machine github.com
-    login azuredatastudio
-    password $(github-distro-mixin-password)
-    EOF
+      cat << EOF > ~/.netrc
+      machine github.com
+      login vscode
+      password $(github-distro-mixin-password)
+      EOF
 
-    git config user.email "andresse@microsoft.com"
-    git config user.name "AzureDataStudio"
+      git config user.email "vscode@microsoft.com"
+      git config user.name "VSCode"
 
-    git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
-    git fetch distro
+      git remote add distro "https://github.com/$VSCODE_MIXIN_REPO.git"
+      git fetch distro
 
-    # Push main branch into oss/master
-    git push distro origin/main:refs/heads/oss/master
+      # Push main branch into oss/main
+      git push distro origin/main:refs/heads/oss/main
 
-    # 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
+      # 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 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/Dockerfile

@@ -1,10 +1,14 @@
-#Download base image ubuntu 16.04
-FROM ubuntu:16.04
+#Download base image ubuntu 21.04
+FROM ubuntu:21.04
+ENV TZ=America/Los_Angeles
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 # Update Software repository
-RUN apt-get update
+RUN apt-get update && apt-get upgrade -y
 
-RUN apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus libgtk-3-0
+RUN apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 \
+        libkrb5-dev git apt-transport-https ca-certificates curl gnupg-agent software-properties-common \
+        libnss3 libasound2 make gcc libx11-dev fakeroot rpm libgconf-2-4 libunwind8 g++  python3-dev python3-pip
 
 ADD ./ /opt/ads-server