Bump version for 1.25.2 release (#14007)

(cherry picked from commit 94feb1a80d)

.config/CredScanSuppressions.json

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

.devcontainer/Dockerfile

@@ -0,0 +1,122 @@
+#-------------------------------------------------------------------------------------------------------------
+# 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,8 +1,8 @@
 # Code - OSS Development Container
 
-This repository includes configuration for a development container for working with Code - OSS in an isolated local container or using [GitHub Codespaces](https://github.com/features/codespaces).
+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).
 
-> **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.
+> **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.
 
 ## Quick start - local
 
@@ -30,41 +30,25 @@ Anything you start in VS Code or the integrated terminal will appear here.
 
 Next: **[Try it out!](#try-it)**
 
-## Quick start - GitHub Codespaces
+## Quick start - Codespaces
 
-> **IMPORTANT:** The current free user beta for GitHub Codespaces uses a "Basic" sized codespace which does not have enough RAM to run a full build of VS Code and will be considerably slower during codespace start and running VS Code. You'll soon be able to use a "Standard" sized codespace (4-core, 8GB) that will be better suited for this purpose (along with even larger sizes should you need it).
+>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 the **New codespace**
+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 that you will not see these options if you are not in the beta yet.
+    ![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> and select **View: Show Remote Explorer**.
+    > Note that the Visual Studio Codespaces extension requires the Visual Studio Code distribution of Code - OSS.
 
-3. You should see port `6080` under **Forwarded Ports**. Select the line and click on the globe icon to open it in a browser tab.
+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.
 
-    > If you do not see port `6080`, press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd>, select **Forward a Port** and enter port `6080`.
+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 will likely see better performance when accessing the codespace you created from VS Code since you can use a[VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/). Here's how to do it.
-
-1. [Create a codespace](#quick-start---github-codespaces) if you have not already.
-
-2. Set up [VS Code for use with GitHub Codespaces](https://docs.github.com/github/developing-online-with-codespaces/using-codespaces-in-visual-studio-code)
-
-3. After the VS Code is up and running, press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd>, choose **Codespaces: Connect to Codespace**, and select the codespace you created.
-
-4. After you've connected to the codespace, use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password.
-
-5. Anything you start in VS Code or the integrated terminal will appear here.
-
-Next: **[Try it out!](#try-it)**
 
 ## Try it!
 
@@ -81,9 +65,7 @@ To start working with Code - OSS, follow these steps:
     bash scripts/code.sh
     ```
 
-    Note that a previous run of `yarn install`  will already be cached, so this step should simply pick up any recent differences.
+2. After the build is complete, open a web browser 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 the desktop environnement as described in the quick start and enter `vscode` as the password.
 
 3. You should now see Code - OSS!
 

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

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

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

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

.devcontainer/cache/before-cache.sh

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

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

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

.devcontainer/cache/cache-diff.sh

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

.devcontainer/cache/cache.Dockerfile

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

.devcontainer/cache/restore-diff.sh

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

.devcontainer/devcontainer.json

@@ -1,30 +1,45 @@
 {
 	"name": "Code - OSS",
-
+	"build": {
-	// Image contents: https://github.com/microsoft/vscode-dev-containers/blob/master/repository-containers/images/github.com/microsoft/vscode/.devcontainer/base.Dockerfile
+		"dockerfile": "Dockerfile",
-	"image": "mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:branch-master",
+		"args": {
-
+			"MAX_VNC_RESOLUTION": "1920x1080x16",
-	"workspaceMount": "source=${localWorkspaceFolder},target=/home/node/workspace/vscode,type=bind,consistency=cached",
+			"TARGET_VNC_RESOLUTION": "1280x768",
-	"workspaceFolder": "/home/node/workspace/vscode",
+			"TARGET_VNC_PORT": "5901",
+			"TARGET_NOVNC_PORT": "6080",
+			"VNC_PASSWORD": "vscode",
+			"INSTALL_FIREFOX": "true"
+		}
+	},
 	"overrideCommand": false,
-	"runArgs": [ "--init", "--security-opt", "seccomp=unconfined"],
+	"runArgs": [
+		"--init",
+		// seccomp=unconfined is required for Chrome sandboxing
+		"--security-opt", "seccomp=unconfined"
+	],
 
 	"settings": {
+		// zsh is also available
 		"terminal.integrated.shell.linux": "/bin/bash",
 		"resmon.show.battery": false,
-		"resmon.show.cpufreq": false
+		"resmon.show.cpufreq": false,
+		"remote.extensionKind": {
+			"ms-vscode.js-debug-nightly": "workspace",
+			"msjsdiag.debugger-for-chrome": "workspace"
+		},
+		"debug.chrome.useV3": true
 	},
 
-	// noVNC, VNC, debug ports
+	// noVNC, VNC ports
-	"forwardPorts": [6080, 5901, 9222],
+	"forwardPorts": [6080, 5901],
 
 	"extensions": [
 		"dbaeumer.vscode-eslint",
-		"mutantdino.resourcemonitor"
+		"EditorConfig.EditorConfig",
+		"msjsdiag.debugger-for-chrome",
+		"mutantdino.resourcemonitor",
+		"GitHub.vscode-pull-request-github"
 	],
 
-	// Optionally loads a cached yarn install for the repo
-	"postCreateCommand": ".devcontainer/cache/restore-diff.sh",
-
 	"remoteUser": "node"
 }

.devcontainer/fluxbox/apps

@@ -0,0 +1,9 @@
+[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

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

@@ -0,0 +1,16 @@
+[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

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

.eslintignore

@@ -5,7 +5,7 @@
 **/vs/loader.js
 **/insane/**
 **/marked/**
-**/semver/**
+**/markjs/**
 **/test/**/*.js
 **/node_modules/**
 **/vscode-api-tests/testWorkspace/**
@@ -14,4 +14,3 @@
 **/extensions/**/build/**
 **/extensions/markdown-language-features/media/**
 **/extensions/typescript-basics/test/colorize-fixtures/**
-**/extensions/**/dist/**

.eslintrc.json

@@ -7,8 +7,7 @@
     },
     "plugins": [
         "@typescript-eslint",
-        "jsdoc",
+        "jsdoc"
-        "mocha"
     ],
     "rules": {
         "constructor-super": "warn",
@@ -42,7 +41,6 @@
         "no-var": "warn",
         "jsdoc/no-types": "warn",
         "semi": "off",
-        "mocha/no-exclusive-tests": "warn",
         "@typescript-eslint/semi": "warn",
         "@typescript-eslint/naming-convention": [
             "warn",
@@ -546,8 +544,7 @@
                     "vscode-textmate",
                     "vscode-oniguruma",
                     "iconv-lite-umd",
-                    "tas-client-umd",
+                    "semver-umd"
-                    "jschardet"
                 ]
             },
             {
@@ -608,11 +605,7 @@
                     "**/{vs,sql}/editor/**",
                     "**/{vs,sql}/workbench/{common,browser,electron-sandbox}/**",
                     "**/{vs,sql}/workbench/api/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/workbench/services/**/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/workbench/services/**/{common,browser,electron-sandbox}/**"
-                    "vscode-textmate",
-                    "vscode-oniguruma",
-                    "iconv-lite-umd",
-                    "jschardet"
                 ]
             },
             {
@@ -740,13 +733,7 @@
 					"angular2-grid",
 					"html-query-plan",
 					"turndown",
-					"gridstack",
+					"mark.js"
-					"gridstack/**",
-					"mark.js",
-		            "vscode-textmate",
-                    "vscode-oniguruma",
-                    "iconv-lite-umd",
-                    "jschardet"
                 ]
             },
             {
@@ -775,11 +762,7 @@
                     "**/{vs,sql}/workbench/{common,browser,electron-sandbox}/**",
                     "**/{vs,sql}/workbench/api/{common,browser,electron-sandbox}/**",
                     "**/{vs,sql}/workbench/services/**/{common,browser,electron-sandbox}/**",
-                    "**/{vs,sql}/workbench/contrib/**/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/workbench/contrib/**/{common,browser,electron-sandbox}/**"
-                    "vscode-textmate",
-                    "vscode-oniguruma",
-                    "iconv-lite-umd",
-                    "jschardet"
                 ]
             },
             {
@@ -941,13 +924,6 @@
                     "*" // node modules
                 ]
             },
-            {
-                "target": "**/test/monaco/**",
-                "restrictions": [
-                    "**/test/monaco/**",
-                    "*" // node modules
-                ]
-            },
             {
                 "target": "**/api/**.test.ts",
                 "restrictions": [
@@ -955,9 +931,9 @@
                     "assert",
                     "sinon",
                     "crypto",
-                    "vscode",
+					"vscode",
-                    "typemoq",
+					"typemoq",
-                    "azdata"
+					"azdata"
                 ]
             },
             {
@@ -1048,7 +1024,6 @@
                             "collapse",
                             "create",
                             "delete",
-                            "discover",
                             "dispose",
                             "edit",
                             "end",

.github/CODEOWNERS

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

.github/commands.yml

@@ -1,12 +1,11 @@
 {
   perform: true,
-  commands:
+  commands: [
-    [
+    {
-      {
+      type: 'label',
-        type: "label",
+      name: 'Needs Logs',
-        name: "Needs Logs",
+      action: 'comment',
-        action: "comment",
+      comment: "We need more info to debug your particular issue. If you could attach your logs to the issue (ensure no private data is in them), it would help us fix the issue much faster.\n\nTo find your logs:\n\n- Open command palette (Click **View** -> **Command Palette**)\n- Run the command: **`Developer: Open Logs Folder`**\n\nThis will open the log file locally. Please include renderer.log"
-        comment: "We need more info to debug your particular issue. If you could attach your logs to the issue (ensure no private data is in them), it would help us fix the issue much faster.\n\nTo find your logs:\n\n- Open command palette (Click **View** -> **Command Palette**)\n- Run the command: **`Developer: Open Logs Folder`**\n\nThis will open the log file locally. Please include renderer.log",
+    }
-      },
+  ]
-    ],
 }

.github/copycat.yml

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

.github/label-actions.yml

@@ -1,27 +0,0 @@
-Needs Logs:
-  comment: "We need more info to debug your particular issue. If you could attach your logs to the issue (ensure no private data is in them), it would help us fix the issue much faster.
-
-
-There are two types of logs to collect:
-
-
-**Console Logs**
-
-
-- Open Developer Tools (Help -> Toggle Developer Tools)
-
-- Click the **Console** tab
-
-- Click in the log area and select all text (CTRL+A)
-
-- Save this text into a file named console.log and attach it to this issue.
-
-
-**Application Logs**
-
-
-- Open command palette (Click **View** -> **Command Palette**)
-
-- Run the command: **`Developer: Open Logs Folder`**
-
-- This will open the log folder locally. Please zip up this folder and attach it to the issue."

.github/similarity.yml

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

.github/subscribers.json

@@ -1,9 +1,7 @@
 {
-	"notebook": [
+	"label-to-subscribe-to": [
-		"claudiaregio",
+		"list of usernames to subscribe",
-		"rchiodo",
+		"such as:",
-		"greazer",
+		"JacksonKearl"
-		"donjayamanne",
-		"jilljac"
 	]
 }

.github/workflows/build-chat.yml

@@ -1,35 +0,0 @@
-name: "Build Chat"
-
-on:
-  workflow_run:
-    workflows:
-      - CI
-    types:
-      - completed
-    branches:
-      - master
-      - release/*
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v2
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Install Additional Dependencies
-        # Pulls in a bunch of other packages that arent needed for the rest of the actions
-        run: npm install @azure/storage-blob@12.1.1
-      - name: Build Chat
-        uses: ./actions/build-chat
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          slack_token: ${{ secrets.SLACK_TOKEN }}
-          storage_connection_string: ${{ secrets.BUILD_CHAT_STORAGE_CONNECTION_STRING }}
-          workflow_run_url: ${{ github.event.workflow_run.url }}
-          notification_channel: build
-          log_channel: bot-log

.github/workflows/ci.yml

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

.github/workflows/codeql.yml

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

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

@@ -12,8 +12,8 @@ jobs:
       - name: Checkout Actions
         uses: actions/checkout@v2
         with:
-          repository: "microsoft/vscode-github-triage-actions"
+          repository: 'microsoft/vscode-github-triage-actions'
-          ref: v42
+          ref: v35
           path: ./actions
       - name: Install Actions
         run: npm install --production --prefix ./actions

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

@@ -10,8 +10,8 @@ jobs:
       - name: Checkout Actions
         uses: actions/checkout@v2
         with:
-          repository: "microsoft/vscode-github-triage-actions"
+          repository: 'microsoft/vscode-github-triage-actions'
-          ref: v42
+          ref: v35
           path: ./actions
       - name: Install Actions
         run: npm install --production --prefix ./actions

.github/workflows/devcontainer-cache.yml

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

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

@@ -12,9 +12,9 @@ jobs:
       - name: Checkout Actions
         uses: actions/checkout@v2
         with:
-          repository: "microsoft/vscode-github-triage-actions"
+          repository: 'microsoft/vscode-github-triage-actions'
           path: ./actions
-          ref: v42
+          ref: v35
       - name: Install Actions
         run: npm install --production --prefix ./actions
       - name: Install Storage Module

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

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

.github/workflows/on-label.yml

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

.gitignore

@@ -5,8 +5,26 @@ Thumbs.db
 node_modules/
 .build/
 extensions/**/dist/
-/out*/
+out/
-/extensions/**/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/
 src/vs/server
 resources/server
 build/node_modules

.nvmrc

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

.vscode/extensions.json

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

.vscode/launch.json

@@ -41,7 +41,10 @@
 			"port": 5876,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
-			]
+			],
+			"presentation": {
+				"hidden": true,
+			}
 		},
 		{
 			"type": "node",
@@ -105,7 +108,8 @@
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			],
-			"browserLaunchLocation": "workspace"
+			"browserLaunchLocation": "workspace",
+			"preLaunchTask": "Ensure Prelaunch Dependencies",
 		},
 		{
 			"type": "node",
@@ -137,11 +141,9 @@
 			}
 		},
 		{
-			"type": "pwa-chrome",
+			"type": "chrome",
 			"request": "launch",
-			"outFiles": [],
+			"name": "Launch ADS (Web, Chrome) (TBD)",
-			"perScriptSourcemaps": "yes",
-			"name": "VS Code (Web, Chrome)",
 			"url": "http://localhost:8080",
 			"preLaunchTask": "Run web",
 			"presentation": {
@@ -152,8 +154,6 @@
 		{
 			"type": "pwa-msedge",
 			"request": "launch",
-			"outFiles": [],
-			"perScriptSourcemaps": "yes",
 			"name": "VS Code (Web, Edge)",
 			"url": "http://localhost:8080",
 			"pauseForSourceMap": false,
@@ -193,7 +193,7 @@
 			}
 		},
 		{
-			"type": "pwa-node",
+			"type": "node",
 			"request": "launch",
 			"name": "Run Unit Tests",
 			"program": "${workspaceFolder}/test/unit/electron/index.js",
@@ -212,9 +212,6 @@
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			],
-			"cascadeTerminateToConfigurations": [
-				"Attach to azuredatastudio"
-			],
 			"env": {
 				"MOCHA_COLORS": "true"
 			},
@@ -222,35 +219,6 @@
 				"hidden": true
 			}
 		},
-		{
-			"type": "pwa-node",
-			"request": "launch",
-			"name": "Run Unit Tests For Current File",
-			"program": "${workspaceFolder}/test/unit/electron/index.js",
-			"runtimeExecutable": "${workspaceFolder}/.build/electron/Azure Data Studio.app/Contents/MacOS/Electron",
-			"windows": {
-				"runtimeExecutable": "${workspaceFolder}/.build/electron/azuredatastudio.exe"
-			},
-			"linux": {
-				"runtimeExecutable": "${workspaceFolder}/.build/electron/azuredatastudio"
-			},
-			"cascadeTerminateToConfigurations": [
-				"Attach to azuredatastudio"
-			],
-			"outputCapture": "std",
-			"args": [
-				"--remote-debugging-port=9222",
-				"--run",
-				"${relativeFile}"
-			],
-			"cwd": "${workspaceFolder}",
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"env": {
-				"MOCHA_COLORS": "true"
-			}
-		},
 		{
 			"type": "chrome",
 			"request": "launch",
@@ -347,17 +315,6 @@
 				"group": "1_vscode",
 				"order": 2
 			}
-		},
-		{
-			"name": "Debug Unit Tests (Current File)",
-			"configurations": [
-				"Attach to azuredatastudio",
-				"Run Unit Tests For Current File"
-			],
-			"presentation": {
-				"group": "1_vscode",
-				"order": 2
-			}
 		}
 	]
 }

.vscode/notebooks/api.github-issues

@@ -8,7 +8,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"February 2021\"",
+    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"September 2020\"",
     "editable": true
   },
   {

.vscode/notebooks/endgame.github-issues

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

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

@@ -1,770 +0,0 @@
-[
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Config",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "$since=2020-10-01",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# vscode\n\nQuery exceeds the maximum result. Run the query manually: `is:issue is:open closed:>2020-10-01`",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "//repo:microsoft/vscode is:issue closed:>$since",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "//repo:microsoft/vscode is:issue created:>$since",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# vscode-remote-release",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/vscode-remote-release is:issue closed:>$since",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/vscode-remote-release is:issue created:>$since",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# monaco-editor",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/monaco-editor is:issue closed:>$since",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/monaco-editor is:issue created:>$since",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# vscode-docs",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/vscode-docs is:issue closed:>$since",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/vscode-docs is:issue created:>$since",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# vscode-js-debug",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/vscode-js-debug is:issue closed:>$since",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/vscode-js-debug is:issue created:>$since",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# language-server-protocol",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/language-server-protocol is:issue closed:>$since",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/language-server-protocol is:issue created:>$since",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# vscode-eslint",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/vscode-eslint is:issue closed:>$since",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/vscode-eslint is:issue created:>$since",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# vscode-css-languageservice",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/vscode-css-languageservice is:issue closed:>$since",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/vscode-css-languageservice is:issue created:>$since",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# vscode-test",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/vscode-test is:issue closed:>$since",
-    "editable": true
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "repo:microsoft/vscode-test is:issue created:>$since",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# vscode-pull-request-github",
-    "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

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

.vscode/notebooks/inbox.github-issues

@@ -1,16 +1,4 @@
 [
-  {
-    "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",
@@ -18,9 +6,9 @@
     "editable": true
   },
   {
-    "kind": 1,
+    "kind": 2,
-    "language": "markdown",
+    "language": "github-issues",
-    "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": "$inbox=repo:microsoft/vscode is:open no:assignee -label:feature-request -label:testplan-item -label:plan-item ",
     "editable": true
   },
   {
@@ -32,19 +20,31 @@
   {
     "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/master/.github/classifier.json). \n\n💡 The bot is being run through a GitHub action that runs every 30 minutes. Give the bot the opportunity to classify an issue before doing it manually.\n\n### Inbox Tracking\n\nThe inbox tracker is responsible for the [global inbox](https://github.com/Microsoft/vscode/issues?utf8=%E2%9C%93&q=is%3Aopen+no%3Aassignee+-label%3Afeature-request+-label%3Atestplan-item+-label%3Aplan-item) containing all **open issues and pull requests** that\n- are neither **feature requests** nor **test plan items** nor **plan items** and\n- have **no owner assignment**.\n\nThe **inbox tracker** may perform any step described in our [issue triaging documentation](https://github.com/microsoft/vscode/wiki/Issues-Triaging) but its main responsibility is to route issues to the actual feature area owner.\n\nFeature area owners track the **feature area inbox** containing all **open issues and pull requests** that\n- are personally assigned to them and are not assigned to any milestone\n- are labeled with their feature area label and are not assigned to any milestone.\nThis secondary triage may involve any of the steps described in our [issue triaging documentation](https://github.com/microsoft/vscode/wiki/Issues-Triaging) and results in a fully triaged or closed issue.\n\nThe [github triage extension](https://github.com/microsoft/vscode-github-triage-extension) can be used to assist with triaging — it provides a \"Command Palette\"-style list of triaging actions like assignment, labeling, and triggers for various bot actions.",
     "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "## All Inbox Items\n\nAll issues that have no assignee and that have neither **feature requests** nor **test plan items** nor **plan items**.",
+    "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",
     "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$inbox",
+    "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",
     "editable": true
   }
 ]

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

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

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

@@ -8,7 +8,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog\n\n// current milestone name\n$milestone=milestone:\"February 2021\"",
+    "value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks\n\n// current milestone name\n$milestone=milestone:\"September 2020\"",
     "editable": true
   },
   {
@@ -83,24 +83,6 @@
     "value": "$repos assignee:@me is:open milestone:\"Backlog Candidates\"",
     "editable": false
   },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "### Personal Inbox\n",
-    "editable": true
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "\n#### Missing Type label",
-    "editable": true
-  },
-  {
-    "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",
-    "editable": true
-  },
   {
     "kind": 1,
     "language": "markdown",

.vscode/notebooks/papercuts.github-issues

@@ -1,44 +0,0 @@
-[
-  {
-    "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:\"January 2021\"",
+    "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks \n$milestone=milestone:\"September 2020\"",
     "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:meganrogge -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:misolori -author:mjbvz -author:rebornix -author:RMacfarlane -author:roblourens -author:sana-ajani -author:sandy081 -author:sbatten -author:Tyriar -author:weinand",
     "editable": false
   },
   {

.vscode/searches/TrustedTypes.code-search

@@ -1,37 +1,54 @@
 # Query: .innerHTML = 
 # Flags: CaseSensitive WordMatch
 # Including: src/vs/**/*.{t,j}s
-# Excluding: *.test.ts, **/test/**
+# Excluding: *.test.ts
 # ContextLines: 3
 
-12 results - 9 files
+22 results - 14 files
-
-src/vs/base/browser/dom.ts:
-  1359  	);
-  1360  
-  1361  	const html = _ttpSafeInnerHtml?.createHTML(value, options) ?? insane(value, options);
-  1362: 	node.innerHTML = html as unknown as string;
-  1363  }
 
 src/vs/base/browser/markdownRenderer.ts:
-  272  	};
+  161  				const strValue = values[0];
-  273  
+  162  				const span = element.querySelector(`div[data-code="${id}"]`);
-  274  	if (_ttpInsane) {
+  163  				if (span) {
-  275: 		element.innerHTML = _ttpInsane.createHTML(renderedMarkdown, insaneOptions) as unknown as string;
+  164: 					span.innerHTML = strValue;
-  276  	} else {
+  165  				}
-  277: 		element.innerHTML = insane(renderedMarkdown, insaneOptions);
+  166  			}).catch(err => {
-  278  	}
+  167  				// ignore
-  279  
-  280  	// signal that async code blocks can be now be inserted
 
-src/vs/editor/browser/core/markdownRenderer.ts:
+  243  		return true;
-  88  
+  244  	}
-  89  				const element = document.createElement('span');
+  245  
-  90  
+  246: 	element.innerHTML = insane(renderedMarkdown, {
-  91: 				element.innerHTML = MarkdownRenderer._ttpTokenizer
+  247  		allowedSchemes,
-  92  					? MarkdownRenderer._ttpTokenizer.createHTML(value, tokenization) as unknown as string
+  248  		// allowedTags should included everything that markdown renders to.
-  93  					: tokenizeToString(value, tokenization);
+  249  		// Since we have our own sanitize function for marked, it's possible we missed some tag so let insane make sure.
-  94  
+
+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/view/domLineBreaksComputer.ts:
   107  		allCharOffsets[i] = tmp[0];
@@ -43,21 +60,21 @@ src/vs/editor/browser/view/domLineBreaksComputer.ts:
   113  	containerDomNode.style.top = '10000';
 
 src/vs/editor/browser/view/viewLayer.ts:
-  512  		}
+  507  	private _finishRenderingNewLines(ctx: IRendererContext<T>, domNodeIsEmpty: boolean, newLinesHTML: string, wasNew: boolean[]): void {
-  513  		const lastChild = <HTMLElement>this.domNode.lastChild;
+  508  		const lastChild = <HTMLElement>this.domNode.lastChild;
-  514  		if (domNodeIsEmpty || !lastChild) {
+  509  		if (domNodeIsEmpty || !lastChild) {
-  515: 			this.domNode.innerHTML = newLinesHTML;
+  510: 			this.domNode.innerHTML = newLinesHTML;
-  516  		} else {
+  511  		} else {
-  517  			lastChild.insertAdjacentHTML('afterend', newLinesHTML);
+  512  			lastChild.insertAdjacentHTML('afterend', newLinesHTML);
-  518  		}
+  513  		}
 
-  533  		if (ViewLayerRenderer._ttPolicy) {
+  525  	private _finishRenderingInvalidLines(ctx: IRendererContext<T>, invalidLinesHTML: string, wasInvalid: boolean[]): void {
-  534  			invalidLinesHTML = ViewLayerRenderer._ttPolicy.createHTML(invalidLinesHTML) as unknown as string;
+  526  		const hugeDomNode = document.createElement('div');
-  535  		}
+  527  
-  536: 		hugeDomNode.innerHTML = invalidLinesHTML;
+  528: 		hugeDomNode.innerHTML = invalidLinesHTML;
-  537  
+  529  
-  538  		for (let i = 0; i < ctx.linesLength; i++) {
+  530  		for (let i = 0; i < ctx.linesLength; i++) {
-  539  			const line = ctx.lines[i];
+  531  			const line = ctx.lines[i];
 
 src/vs/editor/browser/widget/diffEditorWidget.ts:
   2157  
@@ -82,14 +99,64 @@ 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:
-  580  		const element = DOM.$('div', { style });
+  454  
-  581  
+  455  	private getMarkdownDragImage(templateData: MarkdownCellRenderTemplate): HTMLElement {
-  582  		const linesHtml = this.getRichTextLinesAsHtml(model, modelRange, colorMap);
+  456  		const dragImageContainer = DOM.$('.cell-drag-image.monaco-list-row.focused.markdown-cell-row');
-  583: 		element.innerHTML = linesHtml as unknown as string;
+  457: 		dragImageContainer.innerHTML = templateData.container.outerHTML;
-  584  		return element;
+  458  
-  585  	}
+  459  		// Remove all rendered content nodes after the
-  586  
+  460  		const markdownContent = dragImageContainer.querySelector('.cell.markdown')!;
+
+  611  			return null;
+  612  		}
+  613  
+  614: 		editorContainer.innerHTML = richEditorText;
+  615  
+  616  		return dragImageContainer;
+  617  	}
 
 src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts:
   375  					addMouseoverListeners(outputNode, outputId);
@@ -98,4 +165,30 @@ src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts:
   378: 						outputNode.innerHTML = content.htmlContent;
   379  						cellOutputContainer.appendChild(outputNode);
   380  						domEval(outputNode);
-  381  					} else if (preloadErrs.some(e => !!e)) {
+  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) => {

.vscode/searches/es6.code-search

@@ -0,0 +1,61 @@
+# 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,9 +73,6 @@
 	},
 	"gulp.autoDetect": "off",
 	"files.insertFinalNewline": true,
-	"[plaintext]": {
-		"files.insertFinalNewline": false,
-	},
 	"[typescript]": {
 		"editor.defaultFormatter": "vscode.typescript-language-features"
 	},

.vscode/tasks.json

@@ -62,8 +62,7 @@
 			"group": {
 				"kind": "build",
 				"isDefault": true
-			},
+			}
-			"problemMatcher": []
 		},
 		{
 			"type": "npm",
@@ -91,8 +90,7 @@
 				"Kill Build VS Code Core",
 				"Kill Build VS Code Extensions"
 			],
-			"group": "build",
+			"group": "build"
-			"problemMatcher": []
 		},
 		{
 			"type": "npm",
@@ -219,7 +217,7 @@
 					"base": "$tsc",
 					"applyTo": "allDocuments",
 					"owner": "tsec"
-				}
+				},
 			],
 			"group": "build",
 			"label": "npm: tsec-compile-check",

.yarnrc

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

CHANGELOG.md

@@ -1,89 +1,5 @@
 # Change Log
 
-## 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
-* Kusto extension improvements
-* SQL Project extension improvements
-* Notebook improvements
-* Azure Browse Connections Preview performance improvements
-* Bug Fixes
-
 ## Version 1.24.0
 * Release date: November 12, 2020
 * Release status: General Availability

README.md

@@ -131,10 +131,10 @@ Copyright (c) Microsoft Corporation. All rights reserved.
 
 Licensed under the [Source EULA](LICENSE.txt).
 
-[win-user]: https://go.microsoft.com/fwlink/?linkid=2163435
+[win-user]: https://go.microsoft.com/fwlink/?linkid=2148607
-[win-system]: https://go.microsoft.com/fwlink/?linkid=2163531
+[win-system]: https://go.microsoft.com/fwlink/?linkid=2148907
-[win-zip]: https://go.microsoft.com/fwlink/?linkid=2163529
+[win-zip]: https://go.microsoft.com/fwlink/?linkid=2148908
-[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2163528
+[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2148710
-[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2163530
+[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2148708
-[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2163437
+[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2148709
-[linux-deb]: https://go.microsoft.com/fwlink/?linkid=2163436
+[linux-deb]: https://go.microsoft.com/fwlink/?linkid=2148806

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,7 +29,6 @@ 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
@@ -40,7 +39,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
@@ -55,8 +54,7 @@ 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
-    pyzmq: https://github.com/zeromq/pyzmq
+		qs: https://github.com/ljharb/qs
-    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
@@ -494,32 +492,6 @@ 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)
@@ -1554,6 +1526,30 @@ END OF primeng NOTICES AND INFORMATION
 
 %% process-nextick-args NOTICES AND INFORMATION BEGIN HERE
 =========================================
+# Copyright (c) 2015 Calvin Metcalf
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+**THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.**
+=========================================
+END OF process-nextick-args NOTICES AND INFORMATION
+
+%% pty.js NOTICES AND INFORMATION BEGIN HERE
+=========================================
 Copyright (c) 2012-2015, Christopher Jeffrey (https://github.com/chjj/)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -1576,40 +1572,6 @@ 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

azure-pipelines.yml

@@ -20,8 +20,3 @@ jobs:
     vmImage: macOS-latest
   steps:
   - template: build/azure-pipelines/darwin/continuous-build-darwin.yml
-
-trigger:
-  branches:
-    exclude:
-    - electron-11.x.y

build/.cachesalt

@@ -1 +1 @@
-2021-04-07T00:04:17.775Z
+2020-04-29T05:20:58.491Z

build/.gitattributes

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

build/.moduleignore

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

@@ -0,0 +1,124 @@
+# 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,10 +8,6 @@
 **/LICENSE
 **/CONTRIBUTORS
 
-**/docs/**
-**/example/**
-**/examples/**
-
 jschardet/index.js
 jschardet/src/**
 jschardet/dist/jschardet.js

build/actions/copycat/action.yml

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

@@ -0,0 +1,19 @@
+"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

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

@@ -0,0 +1,21 @@
+"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

@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.21.1",
+		"axios": "^0.19.2",
     "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.21.1:
+axios@^0.19.2:
-  version "0.21.1"
+  version "0.19.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
-  integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
+  integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
   dependencies:
-    follow-redirects "^1.10.0"
+    follow-redirects "1.5.10"
 
 before-after-hook@^2.0.0:
   version "2.1.0"
@@ -177,6 +177,13 @@ cross-spawn@^6.0.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+debug@=3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
+  dependencies:
+    ms "2.0.0"
+
 deprecation@^2.0.0, deprecation@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
@@ -207,10 +214,12 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-follow-redirects@^1.10.0:
+follow-redirects@1.5.10:
-  version "1.13.1"
+  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
-  integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==
+  integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
+  dependencies:
+    debug "=3.1.0"
 
 get-stream@^4.0.0:
   version "4.1.0"
@@ -266,6 +275,11 @@ 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

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

build/azure-pipelines/common/computeNodeModulesCacheKey.js

@@ -1,25 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const 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

@@ -1,32 +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 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

@@ -1,41 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const 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,7 +11,6 @@ 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
@@ -25,7 +24,7 @@ const files = [
 ];
 
 async function main() {
-	return new Promise<void>((resolve, reject) => {
+	return new Promise((resolve, reject) => {
 		const stream = vfs.src(files, { base: '.build', allowEmpty: true })
 			.pipe(es.through(file => {
 				const filePath = path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY!,

build/azure-pipelines/common/createAsset.js

@@ -1,94 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = require("fs");
-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 !== 6) {
-    console.error('Usage: node createAsset.js PLATFORM TYPE NAME FILE');
-    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')));
-    });
-}
-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 [, , platform, type, fileName, filePath] = process.argv;
-    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;
-    }
-    console.log('Uploading blobs to Azure storage...');
-    await uploadBlob(blobService, quality, blobName, filePath, fileName);
-    console.log('Blobs successfully uploaded.');
-    const asset = {
-        platform,
-        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, '  '));
-    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]));
-}
-main().then(() => {
-    console.log('Asset successfully created');
-    process.exit(0);
-}, err => {
-    console.error(err);
-    process.exit(1);
-});

build/azure-pipelines/common/createAsset.ts

@@ -11,7 +11,6 @@ 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;
@@ -122,7 +121,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 retry(() => scripts.storedProcedure('createAsset').execute('', [commit, asset, true]));
+	await scripts.storedProcedure('createAsset').execute('', [commit, asset, true]);
 }
 
 main().then(() => {

build/azure-pipelines/common/createBuild.js

@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const 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,7 +6,6 @@
 'use strict';
 
 import { CosmosClient } from '@azure/cosmos';
-import { retry } from './retry';
 
 if (process.argv.length !== 3) {
 	console.error('Usage: node createBuild.js VERSION');
@@ -49,7 +48,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 retry(() => scripts.storedProcedure('createBuild').execute('', [{ ...build, _partitionKey: '' }]));
+	await scripts.storedProcedure('createBuild').execute('', [{ ...build, _partitionKey: '' }]);
 }
 
 main().then(() => {

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

@@ -10,8 +10,8 @@ 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/build/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 .
+node $BUILD_SOURCESDIRECTORY/build/node_modules/.bin/vscode-telemetry-extractor --config $BUILD_SOURCESDIRECTORY/build/azure-pipelines/common/telemetry-config.json -o .
 mkdir -p $BUILD_SOURCESDIRECTORY/.build/telemetry
 mv declarations-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-core.json
 mv config-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-extensions.json

build/azure-pipelines/common/installPlaywright.js

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

@@ -1,40 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-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

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

@@ -1,71 +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 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

@@ -1,224 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const 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<void>((c, e) => blobService.createContainerIfNotExists(quality, { publicAccessLevel: 'blob' }, err => err ? e(err) : c()));
+	await new Promise((c, e) => blobService.createContainerIfNotExists(quality, { publicAccessLevel: 'blob' }, err => err ? e(err) : c()));
 }
 
 async function doesAssetExist(blobService: azure.BlobService, quality: string, blobName: string): Promise<boolean | undefined> {
@@ -144,7 +144,7 @@ async function uploadBlob(blobService: azure.BlobService, quality: string, blobN
 		}
 	};
 
-	await new Promise<void>((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, file, blobOptions, err => err ? e(err) : c()));
+	await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, file, blobOptions, err => err ? e(err) : c()));
 }
 
 interface PublishOptions {

build/azure-pipelines/common/release.js

@@ -1,91 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const 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

@@ -1,50 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const 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,7 +6,6 @@
 'use strict';
 
 import { CosmosClient } from '@azure/cosmos';
-import { retry } from './retry';
 
 function getEnv(name: string): string {
 	const result = process.env[name];
@@ -59,7 +58,7 @@ async function main(): Promise<void> {
 	console.log(`Releasing build ${commit}...`);
 
 	const scripts = client.database('builds').container(quality).scripts;
-	await retry(() => scripts.storedProcedure('releaseBuild').execute('', [commit]));
+	await scripts.storedProcedure('releaseBuild').execute('', [commit]);
 }
 
 main().then(() => {

build/azure-pipelines/common/retry.js

@@ -1,25 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-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

@@ -1,26 +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';
-
-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

@@ -1,47 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const 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

@@ -1,54 +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 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.js

@@ -1,87 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const url = require("url");
-const azure = require("azure-storage");
-const mime = require("mime");
-const cosmos_1 = require("@azure/cosmos");
-const retry_1 = require("./retry");
-function log(...args) {
-    console.log(...[`[${new Date().toISOString()}]`, ...args]);
-}
-function error(...args) {
-    console.error(...[`[${new Date().toISOString()}]`, ...args]);
-}
-if (process.argv.length < 3) {
-    error('Usage: node sync-mooncake.js <quality>');
-    process.exit(-1);
-}
-async function sync(commit, quality) {
-    log(`Synchronizing Mooncake assets for ${quality}, ${commit}...`);
-    const client = new cosmos_1.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(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 = {
-                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 retry_1.retry(() => container.scripts.storedProcedure('setAssetMooncakeUrl')
-                .execute('', [commit, asset.platform, asset.type, mooncakeUrl]));
-            log(`  Done ✔️`);
-        }
-        catch (err) {
-            error(err);
-        }
-    }
-    log(`All done ✔️`);
-}
-function main() {
-    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/common/sync-mooncake.ts

@@ -9,7 +9,6 @@ import * as url from 'url';
 import * as azure from 'azure-storage';
 import * as mime from 'mime';
 import { CosmosClient } from '@azure/cosmos';
-import { retry } from './retry';
 
 function log(...args: any[]) {
 	console.log(...[`[${new Date().toISOString()}]`, ...args]);
@@ -100,8 +99,8 @@ async function sync(commit: string, quality: string): Promise<void> {
 
 			log(`  Updating build in DB...`);
 			const mooncakeUrl = `${process.env['MOONCAKE_CDN_URL']}${blobPath}`;
-			await retry(() => container.scripts.storedProcedure('setAssetMooncakeUrl')
+			await container.scripts.storedProcedure('setAssetMooncakeUrl')
-				.execute('', [commit, asset.platform, asset.type, mooncakeUrl]));
+				.execute('', [commit, asset.platform, asset.type, mooncakeUrl]);
 
 			log(`  Done ✔️`);
 		} catch (err) {

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

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

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

@@ -0,0 +1,10 @@
+<?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.yml

@@ -1,393 +1,265 @@
 steps:
-  - task: NodeTool@0
+- script: |
-    inputs:
+    mkdir -p .build
-      versionSpec: "12.18.3"
+    echo -n $BUILD_SOURCEVERSION > .build/commit
+    echo -n $VSCODE_QUALITY > .build/quality
+  displayName: Prepare cache flag
 
-  - task: AzureKeyVault@1
+- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    displayName: "Azure Key Vault: Get Secrets"
+  inputs:
-    inputs:
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
-      azureSubscription: "vscode-builds-subscription"
+    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
-      KeyVaultName: vscode
+    vstsFeed: 'npm-vscode'
+    platformIndependent: true
+    alias: 'Compilation'
 
-  - task: DownloadPipelineArtifact@2
+- script: |
-    inputs:
+    set -e
-      artifact: Compilation
+    exit 1
-      path: $(Build.ArtifactStagingDirectory)
+  displayName: Check RestoreCache
-    displayName: Download compilation output
+  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))
 
-  - script: |
+- task: NodeTool@0
-      set -e
+  inputs:
-      tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
+    versionSpec: "12.14.1"
-    displayName: Extract compilation output
-    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))
 
-  - script: |
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-      set -e
+  inputs:
-      cat << EOF > ~/.netrc
+    versionSpec: "1.x"
-      machine github.com
-      login vscode
-      password $(github-distro-mixin-password)
-      EOF
 
-      git config user.email "vscode@microsoft.com"
+- task: AzureKeyVault@1
-      git config user.name "VSCode"
+  displayName: 'Azure Key Vault: Get Secrets'
-    displayName: Prepare tooling
+  inputs:
+    azureSubscription: 'vscode-builds-subscription'
+    KeyVaultName: vscode
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      sudo xcode-select -s /Applications/Xcode_12.2.app
-    displayName: Switch to Xcode 12
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
 
-  - script: |
+    cat << EOF > ~/.netrc
-      set -e
+    machine github.com
-      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
+    login vscode
-    displayName: Merge distro
+    password $(github-distro-mixin-password)
+    EOF
 
-  - script: |
+    git config user.email "vscode@microsoft.com"
-      mkdir -p .build
+    git config user.name "VSCode"
-      node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash
+  displayName: Prepare tooling
-    displayName: Prepare yarn cache flags
 
-  - task: Cache@2
+- script: |
-    inputs:
+    set -e
-      key: 'nodeModules | $(Agent.OS) | .build/yarnlockhash'
+    git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
-      path: .build/node_modules_cache
+    git fetch distro
-      cacheHitVar: NODE_MODULES_RESTORED
+    git merge $(node -p "require('./package.json').distro")
-    displayName: Restore node_modules cache
+  displayName: Merge distro
 
-  - script: |
+- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-      set -e
+  inputs:
-      tar -xzf .build/node_modules_cache/cache.tgz
+    keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
+    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    displayName: Extract node_modules cache
+    vstsFeed: 'npm-vscode'
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      npm install -g node-gyp@latest
+    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
-      node-gyp --version
+  displayName: Install dependencies
-    displayName: Update node-gyp
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
-  - script: |
+- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-      npx https://aka.ms/enablesecurefeed standAlone
+  inputs:
-    timeoutInMinutes: 5
+    keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
+    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    displayName: Switch to Terrapin packages
+    vstsFeed: 'npm-vscode'
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      export npm_config_arch=$(VSCODE_ARCH)
+    yarn postinstall
-      export npm_config_node_gyp=$(which node-gyp)
+  displayName: Run postinstall scripts
-      export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
+  condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
 
-      for i in {1..3}; do # try 3 times, for Terrapin
+- script: |
-        yarn --frozen-lockfile && break
+    set -e
-        if [ $i -eq 3 ]; then
+    node build/azure-pipelines/mixin
-          echo "Yarn failed too many times" >&2
+  displayName: Mix in quality
-          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: |
+- script: |
-      set -e
+    set -e
-      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      mkdir -p .build/node_modules_cache
+      yarn gulp vscode-darwin-min-ci
-      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
+  displayName: Build
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-    displayName: Create node_modules archive
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      export npm_config_arch=$(VSCODE_ARCH)
+    ./scripts/test.sh --build --tfs "Unit Tests"
-      export npm_config_node_gyp=$(which node-gyp)
+  displayName: Run unit tests (Electron)
-      export npm_config_build_from_source=true
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-      export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
-      ls /Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
-      yarn electron-rebuild
-      # remove once https://github.com/prebuild/prebuild-install/pull/140 is merged and found in keytar
-      cd ./node_modules/keytar
-      node-gyp rebuild
-    displayName: Rebuild native modules for ARM64
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
 
-  - download: current
+- script: |
-    artifact: vscode-darwin-x64
+    set -e
-    displayName: Download x64 artifact
+    yarn test-browser --build --browser chromium --browser webkit --browser firefox --tfs "Browser Unit Tests"
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
+  displayName: Run unit tests (Browser)
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - download: current
+- script: |
-    artifact: vscode-darwin-arm64
+    # Figure out the full absolute path of the product we just built
-    displayName: Download arm64 artifact
+    # including the remote server and configure the integration tests
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
+    # 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: |
+- script: |
-      set -e
+    set -e
-      node build/azure-pipelines/mixin
+    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
-    displayName: Mix in quality
+    ./resources/server/test/test-web-integration.sh --browser webkit
+  displayName: Run integration tests (Browser)
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
-        yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
+    APP_NAME="`ls $APP_ROOT | head -n 1`"
-    displayName: Build
+    INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
-    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))
+    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'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
-        yarn gulp vscode-reh-darwin-min-ci
+    APP_NAME="`ls $APP_ROOT | head -n 1`"
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+    yarn smoketest --build "$APP_ROOT/$APP_NAME"
-        yarn gulp vscode-reh-web-darwin-min-ci
+  continueOnError: true
-    displayName: Build Server
+  displayName: Run smoke tests (Electron)
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      unzip $(Pipeline.Workspace)/vscode-darwin-x64/VSCode-darwin-x64.zip -d $(agent.builddirectory)/vscode-x64
+    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
-      unzip $(Pipeline.Workspace)/vscode-darwin-arm64/VSCode-darwin-arm64.zip -d $(agent.builddirectory)/vscode-arm64
+    yarn smoketest --web --headless
-      DEBUG=* node build/darwin/create-universal-app.js
+  continueOnError: true
-    displayName: Create Universal App
+  displayName: Run smoke tests (Browser)
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
+- task: PublishPipelineArtifact@0
-      set -e
+  inputs:
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+    artifactName: crash-dump-macos
-        yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
+    targetPath: .build/crashes
-    displayName: Download Electron and Playwright
+  displayName: 'Publish Crash Reports'
-    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  continueOnError: true
+  condition: failed()
 
-  - script: |
+- task: PublishTestResults@2
-      set -e
+  displayName: Publish Tests Results
-      security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+  inputs:
-      security default-keychain -s $(agent.tempdirectory)/buildagent.keychain
+    testResultsFiles: '*-results.xml'
-      security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+    searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
-      echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12
+  condition: succeededOrFailed()
-      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
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      ./scripts/test.sh --build --tfs "Unit Tests"
+    security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
-    displayName: Run unit tests (Electron)
+    security default-keychain -s $(agent.tempdirectory)/buildagent.keychain
-    timeoutInMinutes: 5
+    security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+    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: |
+- script: |
-      set -e
+    set -e
-      yarn test-browser --build --browser chromium --browser webkit --browser firefox --tfs "Browser Unit Tests"
+    pushd $(agent.builddirectory)/VSCode-darwin && zip -r -X -y $(agent.builddirectory)/VSCode-darwin.zip * && popd
-    displayName: Run unit tests (Browser)
+  displayName: Archive build
-    timeoutInMinutes: 5
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
+- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-      set -e
+  inputs:
-      yarn --cwd test/integration/browser compile
+    ConnectedServiceName: 'ESRP CodeSign'
-    displayName: Compile integration tests
+    FolderPath: '$(agent.builddirectory)'
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+    Pattern: 'VSCode-darwin.zip'
+    signConfigType: inlineSignParams
+    inlineOperation: |
+      [
+        {
+          "keyCode": "CP-401337-Apple",
+          "operationSetCode": "MacAppDeveloperSign",
+          "parameters": [
+            {
+              "parameterName": "Hardening",
+              "parameterValue": "--options=runtime"
+            }
+          ],
+          "toolName": "sign",
+          "toolVersion": "1.0"
+        }
+      ]
+    SessionTimeout: 60
+  displayName: Codesign
 
-  - script: |
+- script: |
-      # Figure out the full absolute path of the product we just built
+    zip -d $(agent.builddirectory)/VSCode-darwin.zip "*.pkg"
-      # including the remote server and configure the integration tests
+  displayName: Clean Archive
-      # to run with these builds instead of running out of sources.
-      set -e
-      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-      APP_NAME="`ls $APP_ROOT | head -n 1`"
-      INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
-      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin" \
-      ./scripts/test-integration.sh --build --tfs "Integration Tests"
-    displayName: Run integration tests (Electron)
-    timeoutInMinutes: 10
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
+- script: |
-      set -e
+    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
-      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
+    APP_NAME="`ls $APP_ROOT | head -n 1`"
-      ./resources/server/test/test-web-integration.sh --browser webkit
+    BUNDLE_IDENTIFIER=$(node -p "require(\"$APP_ROOT/$APP_NAME/Contents/Resources/app/product.json\").darwinBundleIdentifier")
-    displayName: Run integration tests (Browser)
+    echo "##vso[task.setvariable variable=BundleIdentifier]$BUNDLE_IDENTIFIER"
-    timeoutInMinutes: 5
+  displayName: Export bundle identifier
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
+- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-      set -e
+  inputs:
-      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+    ConnectedServiceName: 'ESRP CodeSign'
-      APP_NAME="`ls $APP_ROOT | head -n 1`"
+    FolderPath: '$(agent.builddirectory)'
-      INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
+    Pattern: 'VSCode-darwin.zip'
-      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin" \
+    signConfigType: inlineSignParams
-      ./resources/server/test/test-remote-integration.sh
+    inlineOperation: |
-    displayName: Run remote integration tests (Electron)
+      [
-    timeoutInMinutes: 5
+        {
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+          "keyCode": "CP-401337-Apple",
+          "operationSetCode": "MacAppNotarize",
+          "parameters": [
+            {
+              "parameterName": "BundleId",
+              "parameterValue": "$(BundleIdentifier)"
+            }
+          ],
+          "toolName": "sign",
+          "toolVersion": "1.0"
+        }
+      ]
+    SessionTimeout: 60
+  displayName: Notarization
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      yarn --cwd test/smoke compile
+    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
-    displayName: Compile smoke tests
+    APP_NAME="`ls $APP_ROOT | head -n 1`"
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+    "$APP_ROOT/$APP_NAME/Contents/Resources/app/bin/code" --export-default-configuration=.build
+  displayName: Verify start after signing (export configuration)
 
-  - script: |
+- script: |
-      set -e
+    set -e
-      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      APP_NAME="`ls $APP_ROOT | head -n 1`"
+    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-      yarn smoketest-no-compile --build "$APP_ROOT/$APP_NAME"
+    AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
-    timeoutInMinutes: 5
+    AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-    displayName: Run smoke tests (Electron)
+    ./build/azure-pipelines/darwin/publish.sh
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  displayName: Publish
 
-  - script: |
+- script: |
-      set -e
+    AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
-      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+    yarn gulp upload-vscode-configuration
-      APP_NAME="`ls $APP_ROOT | head -n 1`"
+  displayName: Upload configuration (for Bing settings search)
-      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin" \
+  continueOnError: true
-      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: |
+- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-      set -e
+  displayName: 'Component Detection'
-      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
+  continueOnError: true
-      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: 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'))
-
-  - 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
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
-  - script: |
-      zip -d $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip "*.pkg"
-    displayName: Clean
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
-  - 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
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
-  - 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
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
-  - 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'), ne(variables['VSCODE_PUBLISH'], '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)" \
-      VSCODE_ARCH="$(VSCODE_ARCH)" \
-      ./build/azure-pipelines/darwin/publish.sh
-    displayName: Publish
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
-  - publish: $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
-    artifact: vscode-darwin-$(VSCODE_ARCH)
-    displayName: Publish archive
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
-  - publish: $(Agent.BuildDirectory)/vscode-server-darwin.zip
-    artifact: vscode-server-darwin-$(VSCODE_ARCH)
-    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-server-darwin-$(VSCODE_ARCH)-web
-    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
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: "Component Detection"
-    continueOnError: true

build/azure-pipelines/darwin/publish.sh

@@ -1,28 +1,19 @@
 #!/usr/bin/env bash
 set -e
 
-# Publish DEB
-case $VSCODE_ARCH in
-	x64) ASSET_ID="darwin" ;;
-	arm64) ASSET_ID="darwin-arm64" ;;
-	universal) ASSET_ID="darwin-universal" ;;
-esac
-
 # publish the build
 node build/azure-pipelines/common/createAsset.js \
-	"$ASSET_ID" \
+	darwin \
 	archive \
-	"VSCode-$ASSET_ID.zip" \
+	"VSCode-darwin-$VSCODE_QUALITY.zip" \
-	../VSCode-darwin-$VSCODE_ARCH.zip
+	../VSCode-darwin.zip
 
-if [ "$VSCODE_ARCH" == "x64" ]; then
+# package Remote Extension Host
-	# package Remote Extension Host
+pushd .. && mv vscode-reh-darwin vscode-server-darwin && zip -Xry vscode-server-darwin.zip vscode-server-darwin && popd
-	pushd .. && mv vscode-reh-darwin vscode-server-darwin && zip -Xry vscode-server-darwin.zip vscode-server-darwin && popd
 
-	# publish Remote Extension Host
+# publish Remote Extension Host
-	node build/azure-pipelines/common/createAsset.js \
+node build/azure-pipelines/common/createAsset.js \
-		server-darwin \
+	server-darwin \
-		archive-unsigned \
+	archive-unsigned \
-		"vscode-server-darwin.zip" \
+	"vscode-server-darwin.zip" \
-		../vscode-server-darwin.zip
+	../vscode-server-darwin.zip
-fi

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

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

build/azure-pipelines/distro-build.yml

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

build/azure-pipelines/docker/Dockerfile

@@ -1,5 +1,5 @@
-#Download base image ubuntu 18.04
+#Download base image ubuntu 16.04
-FROM ubuntu:18.04
+FROM ubuntu:16.04
 
 # Update Software repository
 RUN apt-get update

build/azure-pipelines/docker/createDrop.sh

@@ -7,7 +7,7 @@ SERVER_BUILD_NAME="azuredatastudio-server-$PLATFORM_LINUX"
 
 # create docker
 mkdir -p $REPO/.build/docker
-docker build -t azuredatastudio-server -f $REPO/build/azure-pipelines/docker/Dockerfile $ROOT/$SERVER_BUILD_NAME-web
+docker build -t azuredatastudio-server -f $REPO/build/azure-pipelines/docker/Dockerfile $ROOT/$SERVER_BUILD_NAME
 docker save azuredatastudio-server | gzip > $REPO/.build/docker/azuredatastudio-server-docker.tar.gz
 
 node build/azure-pipelines/common/copyArtifacts.js