Fix for issue where bulk-adding scripts could perform a rescan after each script (#22665) (#22667)

* Changed bulk script add to delay reloading file list until end of operation.

* Adding style name to sqlproj typing file

* vBump to 1.0.1

.configurations/configuration.dsc.yaml

@@ -1,67 +0,0 @@
-# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
-# Reference: https://github.com/microsoft/vscode/wiki/How-to-Contribute
-properties:
-  resources:
-    - resource: Microsoft.WinGet.DSC/WinGetPackage
-      directives:
-        description: Install Git
-        allowPrerelease: true
-      settings:
-        id: Git.Git
-        source: winget
-    - resource: Microsoft.WinGet.DSC/WinGetPackage
-      id: npm
-      directives:
-        description: Install NodeJS version >=16.17.x and <17
-        allowPrerelease: true
-      settings:
-        id: OpenJS.NodeJS.LTS
-        version: "16.20.0"
-        source: winget
-    - resource: NpmDsc/NpmPackage
-      id: yarn
-      dependsOn:
-        - npm
-      directives:
-        description: Install Yarn
-        allowPrerelease: true
-      settings:
-        Name: 'yarn'
-        Global: true
-        PackageDirectory: '${WinGetConfigRoot}\..\'
-    - resource: Microsoft.WinGet.DSC/WinGetPackage
-      directives:
-        description: Install Python 3.10
-        allowPrerelease: true
-      settings:
-        id: Python.Python.3.10
-        source: winget
-    - resource: Microsoft.WinGet.DSC/WinGetPackage
-      id: vsPackage
-      directives:
-        description: Install Visual Studio 2022 (any edition is OK)
-        allowPrerelease: true
-      settings:
-        id: Microsoft.VisualStudio.2022.BuildTools
-        source: winget
-    - resource: Microsoft.VisualStudio.DSC/VSComponents
-      dependsOn:
-        - vsPackage
-      directives:
-        description: Install required VS workloads
-        allowPrerelease: true
-      settings:
-        productId: Microsoft.VisualStudio.Product.BuildTools
-        channelId: VisualStudio.17.Release
-        includeRecommended: true
-        components:
-          - Microsoft.VisualStudio.Workload.VCTools
-    - resource: YarnDsc/YarnInstall
-      dependsOn:
-        - npm
-      directives:
-        description: Install dependencies
-        allowPrerelease: true
-      settings:
-        PackageDirectory: '${WinGetConfigRoot}\..\'
-  configurationVersion: 0.2.0

.devcontainer/Dockerfile

@@ -1,12 +0,0 @@
-FROM mcr.microsoft.com/devcontainers/typescript-node:16-bullseye
-
-ADD install-vscode.sh /root/
-RUN /root/install-vscode.sh
-
-RUN git config --system codespaces-theme.hide-status 1
-
-USER node
-RUN YARN_CACHE="$(yarn cache dir)" && rm -rf "$YARN_CACHE" && ln -s /vscode-dev/yarn-cache "$YARN_CACHE"
-
-USER root
-CMD chown node:node /vscode-dev && sudo -u node mkdir -p /vscode-dev/yarn-cache && sleep inf

.devcontainer/README.md

@@ -1,32 +1,84 @@
 # Code - OSS Development Container
 
-This dev container includes configuration for a development container for working with Code - OSS in a local container. For using [GitHub Codespaces](https://github.com/features/codespaces) follow the [prebuilt setup](prebuilt/README.md) which installs VNC for displaying the application window.
+[![Open in Remote - Containers](https://img.shields.io/static/v1?label=Remote%20-%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode)
 
-> **Note:** You will need X11's `DISPLAY` or Wayland's `WAYLAND_DISPLAY` environment variable set locally to allow for the Code - OSS window to display. See [Running GUI app on WSL](https://learn.microsoft.com/en-us/windows/wsl/tutorials/gui-apps) for Windows and [Quartz](https://www.xquartz.org) for Mac.
+This repository includes configuration for a development container for working with Code - OSS in a local container or using [GitHub Codespaces](https://github.com/features/codespaces).
 
-## Quick start
+> **Tip:** The default VNC password is `vscode`. The VNC server runs on port `5901` and a web client is available on port `6080`.
+
+## Quick start - local
+
+If you already have VS Code and Docker installed, you can click the badge above or [here](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode) to get started. Clicking these links will cause VS Code to automatically install the Remote - Containers extension if needed, clone the source code into a container volume, and spin up a dev container for use.
 
 1. Install Docker Desktop or Docker for Linux on your local machine. (See [docs](https://aka.ms/vscode-remote/containers/getting-started) for additional details.)
 
-2. **Important**: Docker needs at least **4 Cores and 8 GB of RAM** to run a full build with **9 GB of RAM** being recommended. If you are on macOS, or are using the old Hyper-V engine for Windows, update these values for Docker Desktop by right-clicking on the Docker status bar item and going to **Preferences/Settings > Resources > Advanced**.
+2. **Important**: Docker needs at least **4 Cores and 8 GB of RAM** to run a full build. If you are on macOS, or are using the old Hyper-V engine for Windows, update these values for Docker Desktop by right-clicking on the Docker status bar item and going to **Preferences/Settings > Resources > Advanced**.
 
     > **Note:** The [Resource Monitor](https://marketplace.visualstudio.com/items?itemName=mutantdino.resourcemonitor) extension is included in the container so you can keep an eye on CPU/Memory in the status bar.
 
-3. Install [Visual Studio Code Stable](https://code.visualstudio.com/) or [Insiders](https://code.visualstudio.com/insiders/) and the [Dev Containers](https://aka.ms/vscode-remote/download/containers) extension.
+3. Install [Visual Studio Code Stable](https://code.visualstudio.com/) or [Insiders](https://code.visualstudio.com/insiders/) and the [Remote - Containers](https://aka.ms/vscode-remote/download/containers) extension.
 
-    ![Image of Dev Containers extension](https://microsoft.github.io/vscode-remote-release/images/dev-containers-extn.png)
+    ![Image of Remote - Containers extension](https://microsoft.github.io/vscode-remote-release/images/remote-containers-extn.png)
 
-    > **Note:** The Dev Containers extension requires the Visual Studio Code distribution of Code - OSS. See the [FAQ](https://aka.ms/vscode-remote/faq/license) for details.
+    > **Note:** The Remote - Containers extension requires the Visual Studio Code distribution of Code - OSS. See the [FAQ](https://aka.ms/vscode-remote/faq/license) for details.
 
-4. Due to the size of the repository we strongly recommend cloning it on a Linux filesystem for better bind mount performance. On macOS we recommend using a Docker volume (press <kbd>F1</kbd> and select **Dev Containers: Clone Repository in Container Volume...**) and on Windows we recommend using a WSL folder:
-- Make sure you are running a recent WSL version to get X11 and Wayland support.
-- Use the WSL extension for VS Code to open the cloned folder in WSL.
-- Press <kbd>F1</kbd> and select **Dev Containers: Reopen in Container**.
+4. Press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd> and select **Remote-Containers: Clone Repository in Container Volume...**.
+
+    > **Tip:** While you can use your local source tree instead, operations like `yarn install` can be slow on macOS or when using the Hyper-V engine on Windows. We recommend the "clone repository in container" approach instead since it uses "named volume" rather than the local filesystem.
+
+5. Type `https://github.com/microsoft/vscode` (or a branch or PR URL) in the input box and press <kbd>Enter</kbd>.
+
+6. After the container is running, open a web browser and go to [http://localhost:6080](http://localhost:6080), or use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password.
+
+Anything you start in VS Code, or the integrated terminal, will appear here.
+
+Next: **[Try it out!](#try-it)**
+
+## Quick start - GitHub Codespaces
+
+1. From the [microsoft/vscode GitHub repository](https://github.com/microsoft/vscode), click on the **Code** dropdown, select **Open with Codespaces**, and then click on **New codespace**. If prompted, select the **Standard** machine size (which is also the default).
+
+   > **Note:** You will not see these options within GitHub if you are not in the Codespaces beta.
+
+2. After the codespace is up and running in your browser, press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd> and select **Ports: Focus on Ports View**.
+
+3. You should see **VNC web client (6080)** under in the list of ports. Select the line and click on the globe icon to open it in a browser tab.
+
+    > **Tip:** If you do not see the port, <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd>, select **Forward a Port** and enter port `6080`.
+
+4. In the new tab, you should see noVNC. Click **Connect** and enter `vscode` as the password.
+
+Anything you start in VS Code, or the integrated terminal, will appear here.
+
+Next: **[Try it out!](#try-it)**
+
+### Using VS Code with GitHub Codespaces
+
+You may see improved VNC responsiveness when accessing a codespace from VS Code client since you can use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/). Here's how to do it.
+
+1.  Install [Visual Studio Code Stable](https://code.visualstudio.com/) or [Insiders](https://code.visualstudio.com/insiders/) and the the [GitHub Codespaces extension](https://marketplace.visualstudio.com/items?itemName=GitHub.codespaces).
+
+	> **Note:** The GitHub Codespaces extension requires the Visual Studio Code distribution of Code - OSS.
+
+2. After the VS Code is up and running, press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd>, choose **Codespaces: Create New Codespace**, and use the following settings:
+    - `microsoft/vscode` for the repository.
+	- Select any branch (e.g. **main**) - you can select a different one later.
+	- Choose **Standard** (4-core, 8GB) as the size.
+
+4. After you have connected to the codespace, you can use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password.
+
+    > **Tip:** You may also need change your VNC client's **Picture Quality** setting to **High** to get a full color desktop.
+
+5. Anything you start in VS Code, or the integrated terminal, will appear here.
 
 Next: **[Try it out!](#try-it)**
 
 ## Try it!
 
+This container uses the [Fluxbox](http://fluxbox.org/) window manager to keep things lean. **Right-click on the desktop** to see menu options. It works with GNOME and GTK applications, so other tools can be installed if needed.
+
+> **Note:** You can also set the resolution from the command line by typing `set-resolution`.
+
 To start working with Code - OSS, follow these steps:
 
 1. In your local VS Code client, open a terminal (<kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>\`</kbd>) and type the following commands:
@@ -36,20 +88,18 @@ To start working with Code - OSS, follow these steps:
     bash scripts/code.sh
     ```
 
-2. You should now see Code - OSS!
+2. After the build is complete, open a web browser or a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to the desktop environment as described in the quick start and enter `vscode` as the password.
+
+3. You should now see Code - OSS!
 
 Next, let's try debugging.
 
-1. Shut down Code - OSS by clicking the box in the upper right corner of the Code - OSS window.
+1. Shut down Code - OSS by clicking the box in the upper right corner of the Code - OSS window through your browser or VNC viewer.
 
 2. Go to your local VS Code client, and use the **Run / Debug** view to launch the **VS Code** configuration. (Typically the default, so you can likely just press <kbd>F5</kbd>).
 
-    > **Note:** If launching times out, you can increase the value of `timeout` in the "VS Code", "Attach Main Process", "Attach Extension Host", and "Attach to Shared Process" configurations in [launch.json](../../.vscode/launch.json). However, running `scripts/code.sh` first will set up Electron which will usually solve timeout issues.
+    > **Note:** If launching times out, you can increase the value of `timeout` in the "VS Code", "Attach Main Process", "Attach Extension Host", and "Attach to Shared Process" configurations in [launch.json](../.vscode/launch.json). However, running `scripts/code.sh` first will set up Electron which will usually solve timeout issues.
 
 3. After a bit, Code - OSS will appear with the debugger attached!
 
 Enjoy!
-
-# Notes
-
-The container comes with VS Code Insiders installed. To run it from an Integrated Terminal use `VSCODE_IPC_HOOK_CLI= /usr/bin/code-insiders .`.

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

@@ -17,7 +17,7 @@ fi
 
 TAG="branch-${BRANCH//\//-}"
 echo "[$(date)] ${BRANCH} => ${TAG}"
-cd "${SCRIPT_PATH}/../../.."
+cd "${SCRIPT_PATH}/../.."
 
 echo "[$(date)] Starting image build and push..."
 export DOCKER_BUILDKIT=1

.devcontainer/cache/cache.Dockerfile

@@ -9,9 +9,9 @@ COPY --chown=${USERNAME}:${USERNAME} . /repo-source-tmp/
 RUN mkdir -p ${CACHE_FOLDER} && chown ${USERNAME} ${CACHE_FOLDER} /repo-source-tmp \
 	&& su ${USERNAME} -c "\
 		cd /repo-source-tmp \
-		&& .devcontainer/prebuilt/cache/before-cache.sh . ${CACHE_FOLDER} \
-		&& .devcontainer/prebuilt/prepare.sh . ${CACHE_FOLDER} \
-		&& .devcontainer/prebuilt/cache/cache-diff.sh . ${CACHE_FOLDER}"
+		&& .devcontainer/cache/before-cache.sh . ${CACHE_FOLDER} \
+		&& .devcontainer/prepare.sh . ${CACHE_FOLDER} \
+		&& .devcontainer/cache/cache-diff.sh . ${CACHE_FOLDER}"
 
 # This second stage starts fresh and just copies in cache.tar from the previous stage. The related
 # devcontainer.json file is then setup to have postCreateCommand fire restore-diff.sh to expand it.

.devcontainer/devcontainer.json

@@ -1,22 +1,40 @@
 {
-	"name": "Code - OSS with X11/Wayland",
-	"build": {
-		"dockerfile": "Dockerfile"
-	},
+	"name": "Code - OSS",
+
+	// Image contents: https://github.com/microsoft/vscode-dev-containers/blob/master/repository-containers/images/github.com/microsoft/vscode/.devcontainer/base.Dockerfile
+	"image": "mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:branch-main",
 	"overrideCommand": false,
-	"privileged": true,
-	"mounts": [
-		{
-			"source": "vscode-dev",
-			"target": "/vscode-dev",
-			"type": "volume"
+	"runArgs": [ "--init", "--security-opt", "seccomp=unconfined", "--shm-size=1g"],
+
+	"settings": {
+		"resmon.show.battery": false,
+		"resmon.show.cpufreq": false
+	},
+
+	// noVNC, VNC
+	"forwardPorts": [6080, 5901],
+	"portsAttributes": {
+		"6080": {
+			"label": "VNC web client (noVNC)",
+			"onAutoForward": "silent"
+		},
+		"5901": {
+			"label": "VNC TCP port",
+			"onAutoForward": "silent"
 		}
+	},
+
+	"extensions": [
+		"dbaeumer.vscode-eslint",
+		"mutantdino.resourcemonitor"
 	],
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"mutantdino.resourcemonitor"
-			]
-		}
+
+	// Optionally loads a cached yarn install for the repo
+	"postCreateCommand": ".devcontainer/cache/restore-diff.sh",
+
+	"remoteUser": "node",
+
+	"hostRequirements": {
+		"memory": "8gb"
 	}
 }

.devcontainer/install-vscode.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-apt update
-apt install -y wget gpg
-
-wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > packages.microsoft.gpg
-install -D -o root -g root -m 644 packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg
-sh -c 'echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" > /etc/apt/sources.list.d/vscode.list'
-rm -f packages.microsoft.gpg
-
-apt update
-apt install -y code-insiders libsecret-1-dev libxkbfile-dev

.devcontainer/prebuilt/README.md

@@ -1,105 +0,0 @@
-# Code - OSS Development Container
-
-[![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode)
-
-This repository includes configuration for a development container for working with Code - OSS in a local container or using [GitHub Codespaces](https://github.com/features/codespaces).
-
-> **Tip:** The default VNC password is `vscode`. The VNC server runs on port `5901` and a web client is available on port `6080`.
-
-## Quick start - local
-
-If you already have VS Code and Docker installed, you can click the badge above or [here](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode) to get started. Clicking these links will cause VS Code to automatically install the Dev Containers extension if needed, clone the source code into a container volume, and spin up a dev container for use.
-
-1. Install Docker Desktop or Docker for Linux on your local machine. (See [docs](https://aka.ms/vscode-remote/containers/getting-started) for additional details.)
-
-2. **Important**: Docker needs at least **4 Cores and 8 GB of RAM** to run a full build with **9 GB of RAM** being recommended. If you are on macOS, or are using the old Hyper-V engine for Windows, update these values for Docker Desktop by right-clicking on the Docker status bar item and going to **Preferences/Settings > Resources > Advanced**.
-
-    > **Note:** The [Resource Monitor](https://marketplace.visualstudio.com/items?itemName=mutantdino.resourcemonitor) extension is included in the container so you can keep an eye on CPU/Memory in the status bar.
-
-3. Install [Visual Studio Code Stable](https://code.visualstudio.com/) or [Insiders](https://code.visualstudio.com/insiders/) and the [Dev Containers](https://aka.ms/vscode-remote/download/containers) extension.
-
-    ![Image of Dev Containers extension](https://microsoft.github.io/vscode-remote-release/images/dev-containers-extn.png)
-
-    > **Note:** The Dev Containers extension requires the Visual Studio Code distribution of Code - OSS. See the [FAQ](https://aka.ms/vscode-remote/faq/license) for details.
-
-4. Press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd> and select **Dev Containers: Clone Repository in Container Volume...**.
-
-    > **Tip:** While you can use your local source tree instead, operations like `yarn install` can be slow on macOS or when using the Hyper-V engine on Windows. We recommend the "clone repository in container" approach instead since it uses "named volume" rather than the local filesystem.
-
-5. Type `https://github.com/microsoft/vscode` (or a branch or PR URL) in the input box and press <kbd>Enter</kbd>.
-
-6. After the container is running, open a web browser and go to [http://localhost:6080](http://localhost:6080), or use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password.
-
-Anything you start in VS Code, or the integrated terminal, will appear here.
-
-Next: **[Try it out!](#try-it)**
-
-## Quick start - GitHub Codespaces
-
-1. From the [microsoft/vscode GitHub repository](https://github.com/microsoft/vscode), click on the **Code** dropdown, select **Open with Codespaces**, and then click on **New codespace**. If prompted, select the **Standard** machine size (which is also the default).
-
-   > **Note:** You will not see these options within GitHub if you are not in the Codespaces beta.
-
-2. After the codespace is up and running in your browser, press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd> and select **Ports: Focus on Ports View**.
-
-3. You should see **VNC web client (6080)** under in the list of ports. Select the line and click on the globe icon to open it in a browser tab.
-
-    > **Tip:** If you do not see the port, <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd>, select **Forward a Port** and enter port `6080`.
-
-4. In the new tab, you should see noVNC. Click **Connect** and enter `vscode` as the password.
-
-Anything you start in VS Code, or the integrated terminal, will appear here.
-
-Next: **[Try it out!](#try-it)**
-
-### Using VS Code with GitHub Codespaces
-
-You may see improved VNC responsiveness when accessing a codespace from VS Code client since you can use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/). Here's how to do it.
-
-1.  Install [Visual Studio Code Stable](https://code.visualstudio.com/) or [Insiders](https://code.visualstudio.com/insiders/) and the the [GitHub Codespaces extension](https://marketplace.visualstudio.com/items?itemName=GitHub.codespaces).
-
-	> **Note:** The GitHub Codespaces extension requires the Visual Studio Code distribution of Code - OSS.
-
-2. After the VS Code is up and running, press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd>, choose **Codespaces: Create New Codespace**, and use the following settings:
-    - `microsoft/vscode` for the repository.
-	- Select any branch (e.g. **main**) - you can select a different one later.
-	- Choose **Standard** (4-core, 8GB) as the size.
-
-4. After you have connected to the codespace, you can use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password.
-
-    > **Tip:** You may also need change your VNC client's **Picture Quality** setting to **High** to get a full color desktop.
-
-5. Anything you start in VS Code, or the integrated terminal, will appear here.
-
-Next: **[Try it out!](#try-it)**
-
-## Try it!
-
-This container uses the [Fluxbox](http://fluxbox.org/) window manager to keep things lean. **Right-click on the desktop** to see menu options. It works with GNOME and GTK applications, so other tools can be installed if needed.
-
-> **Note:** You can also set the resolution from the command line by typing `set-resolution`.
-
-To start working with Code - OSS, follow these steps:
-
-1. In your local VS Code client, open a terminal (<kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>\`</kbd>) and type the following commands:
-
-    ```bash
-    yarn install
-    bash scripts/code.sh
-    ```
-
-2. After the build is complete, open a web browser or a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to the desktop environment as described in the quick start and enter `vscode` as the password.
-
-3. You should now see Code - OSS!
-
-Next, let's try debugging.
-
-1. Shut down Code - OSS by clicking the box in the upper right corner of the Code - OSS window through your browser or VNC viewer.
-
-2. Go to your local VS Code client, and use the **Run / Debug** view to launch the **VS Code** configuration. (Typically the default, so you can likely just press <kbd>F5</kbd>).
-
-    > **Note:** If launching times out, you can increase the value of `timeout` in the "VS Code", "Attach Main Process", "Attach Extension Host", and "Attach to Shared Process" configurations in [launch.json](../../.vscode/launch.json). However, running `scripts/code.sh` first will set up Electron which will usually solve timeout issues.
-
-3. After a bit, Code - OSS will appear with the debugger attached!
-
-Enjoy!

.devcontainer/prebuilt/devcontainer.json

@@ -1,44 +0,0 @@
-{
-	"name": "Code - OSS with VNC",
-
-	// Image contents: https://github.com/microsoft/vscode-dev-containers/blob/master/repository-containers/images/github.com/microsoft/vscode/.devcontainer/base.Dockerfile
-	"image": "mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:branch-main",
-	"overrideCommand": false,
-	"runArgs": [ "--init", "--security-opt", "seccomp=unconfined", "--shm-size=1g"],
-
-	// VS Code extensions and settings
-	"customizations": {
-		"vscode": {
-			"settings": {
-				"resmon.show.battery": false,
-				"resmon.show.cpufreq": false
-			},
-			"extensions": [
-				"dbaeumer.vscode-eslint",
-				"mutantdino.resourcemonitor"
-			]
-		}
-	},
-
-	// noVNC, VNC
-	"forwardPorts": [6080, 5901],
-	"portsAttributes": {
-		"6080": {
-			"label": "VNC web client (noVNC)",
-			"onAutoForward": "silent"
-		},
-		"5901": {
-			"label": "VNC TCP port",
-			"onAutoForward": "silent"
-		}
-	},
-
-	// Optionally loads a cached yarn install for the repo
-	"postCreateCommand": ".devcontainer/prebuilt/cache/restore-diff.sh",
-
-	"remoteUser": "node",
-
-	"hostRequirements": {
-		"memory": "9gb"
-	}
-}

.devcontainer/prepare.sh

@@ -5,5 +5,5 @@
 # running commands like "yarn install" from the ground up. Developers (and should) still run these commands
 # after the actual dev container is created, but only differences will be processed.
 
-yarn install --network-timeout 180000
+yarn install
 yarn electron

.eslintignore

@@ -1,22 +1,40 @@
 **/build/*/**/*.js
 **/dist/**/*.js
-**/extensions/shared.webpack.config.js
-**/extensions/*/extension.webpack.config.js
 **/extensions/**/*.d.ts
 **/extensions/**/build/**
 **/extensions/**/colorize-fixtures/**
 **/extensions/css-language-features/server/test/pathCompletionFixtures/**
 **/extensions/html-language-features/server/lib/jquery.d.ts
 **/extensions/html-language-features/server/src/test/pathCompletionFixtures/**
-**/extensions/ipynb/notebook-out/**
 **/extensions/markdown-language-features/media/**
 **/extensions/markdown-language-features/notebook-out/**
 **/extensions/markdown-math/notebook-out/**
 **/extensions/notebook-renderers/renderer-out/index.js
 **/extensions/simple-browser/media/index.js
 **/extensions/typescript-language-features/test-workspace/**
-**/extensions/typescript-language-features/extension.webpack.config.js
-**/extensions/typescript-language-features/extension-browser.webpack.config.js
+**/vs/nls.build.js
+**/vs/nls.js
+**/vs/css.build.js
+**/vs/css.js
+**/vs/loader.js
+**/dompurify/**
+**/marked/**
+**/semver/**
+**/test/**/*.js
+**/node_modules/**
+**/extensions/**/out/**
+**/extensions/**/build/**
+**/extensions/**/colorize-fixtures/**
+**/extensions/html-language-features/server/lib/jquery.d.ts
+/extensions/markdown-language-features/media/**
+/extensions/markdown-language-features/notebook-out/**
+**/extensions/markdown-math/notebook-out/**
+**/extensions/typescript-basics/test/colorize-fixtures/**
+**/extensions/**/dist/**
+/extensions/types
+/extensions/typescript-language-features/test-workspace/**
+/test/automation/out
+/resources/web/code-web.js
 **/extensions/vscode-api-tests/testWorkspace/**
 **/extensions/vscode-api-tests/testWorkspace2/**
 **/fixtures/**
@@ -30,7 +48,10 @@
 **/src/typings/**/*.d.ts
 **/src/vs/*/**/*.d.ts
 **/src/vs/base/test/common/filters.perf.data.js
+**/src/vs/css.build.js
+**/src/vs/css.js
 **/src/vs/loader.js
+**/src/vs/nls.build.js
+**/src/vs/nls.js
 **/test/unit/assert.js
-**/test/automation/out/**
 **/typings/**

.eslintplugin/code-declare-service-brand.ts

@@ -1,27 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as eslint from 'eslint';
-
-export = new class DeclareServiceBrand implements eslint.Rule.RuleModule {
-
-	readonly meta: eslint.Rule.RuleMetaData = {
-		fixable: 'code'
-	};
-
-	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
-		return {
-			['PropertyDefinition[key.name="_serviceBrand"][value]']: (node: any) => {
-				return context.report({
-					node,
-					message: `The '_serviceBrand'-property should not have a value`,
-					fix: (fixer) => {
-						return fixer.replaceText(node, 'declare _serviceBrand: undefined;')
-					}
-				});
-			}
-		};
-	}
-};

.eslintplugin/index.js

@@ -1,12 +0,0 @@
-const glob = require('glob');
-const path = require('path');
-
-require('ts-node').register({ experimentalResolver: true, transpileOnly: true });
-
-// Re-export all .ts files as rules
-const rules = {};
-glob.sync(`${__dirname}/*.ts`).forEach((file) => {
-	rules[path.basename(file, '.ts')] = require(file);
-});
-
-exports.rules = rules;

.eslintplugin/tsconfig.json

@@ -1,26 +0,0 @@
-{
-	"compilerOptions": {
-		"target": "es2020",
-		"lib": [
-			"ES2020"
-		],
-		"module": "commonjs",
-		"esModuleInterop": true,
-		"alwaysStrict": true,
-		"allowJs": true,
-		"strict": true,
-		"exactOptionalPropertyTypes": false,
-		"useUnknownInCatchVariables": false,
-		"noUnusedLocals": true,
-		"noUnusedParameters": true,
-		"newLine": "lf",
-		"noEmit": true
-	},
-	"include": [
-		"**/*.ts",
-		"**/*.js"
-	],
-	"exclude": [
-		"node_modules/**"
-	]
-}

.eslintplugin/vscode-dts-string-type-literals.ts

@@ -1,34 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as eslint from 'eslint';
-import { TSESTree } from '@typescript-eslint/experimental-utils';
-
-export = new class ApiTypeDiscrimination implements eslint.Rule.RuleModule {
-
-	readonly meta: eslint.Rule.RuleMetaData = {
-		docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines' },
-		messages: {
-			noTypeDiscrimination: 'Do not use type descrimination properties'
-		}
-	};
-
-	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
-		return {
-			['TSPropertySignature[optional=undefined] TSTypeAnnotation TSLiteralType Literal']: (node: any) => {
-
-				const raw = String((<TSESTree.Literal>node).raw)
-
-				if (/^('|").*\1$/.test(raw)) {
-
-					context.report({
-						node: node,
-						messageId: 'noTypeDiscrimination'
-					});
-				}
-			}
-		}
-	}
-};

.eslintrc.json

@@ -8,8 +8,7 @@
 	"plugins": [
 		"@typescript-eslint",
 		"jsdoc",
-		"header",
-		"local"
+		"header"
 	],
 	"rules": {
 		"no-undef": "off",
@@ -56,18 +55,17 @@
 				]
 			}
 		],
-		"local/code-no-unused-expressions": [
+		"code-no-unused-expressions": [
 			"off",
 			{
 				"allowTernary": true
 			}
 		],
 		"code-translation-remind": "off",
-		"local/code-no-nls-in-standalone-editor": "warn",
-		"local/code-no-standalone-editor": "warn",
+		"code-no-nls-in-standalone-editor": "warn",
+		"code-no-standalone-editor": "warn",
 		"code-no-unexternalized-strings": "off",
-		"local/code-declare-service-brand": "warn",
-		"local/code-layering": [
+		"code-layering": [
 			"warn",
 			{
 				"common": [],
@@ -81,6 +79,12 @@
 					"common",
 					"browser"
 				],
+				"electron-browser": [
+					"common",
+					"browser",
+					"node",
+					"electron-sandbox"
+				],
 				"electron-main": [
 					"common",
 					"node"
@@ -766,7 +770,6 @@
 					"chart.js",
 					"plotly.js",
 					"angular2-grid",
-					"kburtram-query-plan",
 					"html-to-image",
 					"turndown",
 					"gridstack",
@@ -1062,9 +1065,9 @@
 				"**/sql/**"
 			],
 			"rules": {
-				"code-no-test-only": "off",
+				"no-sync": "warn",
 				"strict": ["warn", "never"],
-				"code-no-unexternalized-strings": "off"
+				"no-console": "warn"
 			}
 		},
 		{
@@ -1073,15 +1076,14 @@
 				"**/vscode.proposed.d.ts"
 			],
 			"rules": {
-				"local/vscode-dts-create-func": "warn",
-				"local/vscode-dts-literal-or-types": "warn",
-				"local/vscode-dts-string-type-literals": "warn",
-				"local/vscode-dts-interface-naming": "warn",
-				"local/vscode-dts-cancellation": "warn",
-				"local/vscode-dts-use-thenable": "warn",
-				"local/vscode-dts-region-comments": "warn",
-				"local/vscode-dts-vscode-in-comments": "warn",
-				"local/vscode-dts-provider-naming": [
+				"vscode-dts-create-func": "warn",
+				"vscode-dts-literal-or-types": "warn",
+				"vscode-dts-interface-naming": "warn",
+				"vscode-dts-cancellation": "warn",
+				"vscode-dts-use-thenable": "warn",
+				"vscode-dts-region-comments": "warn",
+				"vscode-dts-vscode-in-comments": "warn",
+				"vscode-dts-provider-naming": [
 					"warn",
 					{
 						"allowed": [
@@ -1096,7 +1098,7 @@
 						]
 					}
 				],
-				"local/vscode-dts-event-naming": [
+				"vscode-dts-event-naming": [
 					"warn",
 					{
 						"allowed": [
@@ -1120,7 +1122,6 @@
 							"invalidate",
 							"open",
 							"override",
-							"perform",
 							"receive",
 							"register",
 							"remove",
@@ -1137,425 +1138,6 @@
 				]
 			}
 		},
-		{
-			"files": [
-				"src/**/*.ts"
-			],
-			"rules": {
-				"local/code-no-look-behind-regex": "warn",
-				"local/code-import-patterns": [
-					"off",
-					{
-						// imports that are allowed in all files of layers:
-						// - browser
-						// - electron-sandbox
-						"when": "hasBrowser",
-						"allow": [
-							"vs/css!./**/*"
-						]
-					},
-					{
-						// imports that are allowed in all files of layers:
-						// - node
-						// - electron-main
-						"when": "hasNode",
-						"allow": [
-							"@parcel/watcher",
-							"@vscode/sqlite3",
-							"@vscode/vscode-languagedetection",
-							"@vscode/ripgrep",
-							"@vscode/iconv-lite-umd",
-							"@vscode/policy-watcher",
-							"@vscode/proxy-agent",
-							"@vscode/spdlog",
-							"@vscode/windows-process-tree",
-							"assert",
-							"child_process",
-							"console",
-							"cookie",
-							"crypto",
-							"electron",
-							"events",
-							"fs",
-							"graceful-fs",
-							"http",
-							"https",
-							"minimist",
-							"native-keymap",
-							"native-watchdog",
-							"net",
-							"node-pty",
-							"os",
-							"path",
-							"perf_hooks",
-							"stream",
-							"string_decoder",
-							"tas-client-umd",
-							"tls",
-							"url",
-							"util",
-							"v8-inspect-profiler",
-							"vscode-regexpp",
-							"vscode-textmate",
-							"worker_threads",
-							"xterm",
-							"xterm-addon-canvas",
-							"xterm-addon-image",
-							"xterm-addon-search",
-							"xterm-addon-serialize",
-							"xterm-addon-unicode11",
-							"xterm-addon-webgl",
-							"xterm-headless",
-							"yauzl",
-							"yazl",
-							"zlib"
-						]
-					},
-					{
-						// imports that are allowed in all /test/ files
-						"when": "test",
-						"allow": [
-							"vs/css.build",
-							"assert",
-							"sinon",
-							"sinon-test"
-						]
-					},
-					// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-					// !!! Do not relax these rules !!!
-					// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-					//
-					// A path ending in /~ has a special meaning. It indicates a template position
-					// which will be substituted with one or more layers.
-					//
-					// When /~ is used in the target, the rule will be expanded to 14 distinct rules.
-					// e.g. "src/vs/base/~" will be expanded to:
-					//  - src/vs/base/common
-					//  - src/vs/base/worker
-					//  - src/vs/base/browser
-					//  - src/vs/base/electron-sandbox
-					//  - src/vs/base/node
-					//  - src/vs/base/electron-main
-					//  - src/vs/base/test/common
-					//  - src/vs/base/test/worker
-					//  - src/vs/base/test/browser
-					//  - src/vs/base/test/electron-sandbox
-					//  - src/vs/base/test/node
-					//  - src/vs/base/test/electron-main
-					//
-					// When /~ is used in the restrictions, it will be replaced with the correct
-					// layers that can be used e.g. "src/vs/base/electron-sandbox" will be able
-					// to import "{common,browser,electron-sanbox}", etc.
-					//
-					// It is possible to use /~ in the restrictions property even without using it in
-					// the target property by adding a layer property.
-					{
-						"target": "src/vs/base/~",
-						"restrictions": [
-							"vs/base/~"
-						]
-					},
-					{
-						"target": "src/vs/base/parts/*/~",
-						"restrictions": [
-							"vs/base/~",
-							"vs/base/parts/*/~"
-						]
-					},
-					{
-						"target": "src/vs/platform/*/~",
-						"restrictions": [
-							"vs/base/~",
-							"vs/base/parts/*/~",
-							"vs/platform/*/~",
-							"tas-client-umd", // node module allowed even in /common/
-							"@microsoft/1ds-core-js", // node module allowed even in /common/
-							"@microsoft/1ds-post-js" // node module allowed even in /common/
-						]
-					},
-					{
-						"target": "src/vs/editor/~",
-						"restrictions": [
-							"vs/base/~",
-							"vs/base/parts/*/~",
-							"vs/platform/*/~",
-							"vs/editor/~"
-						]
-					},
-					{
-						"target": "src/vs/editor/contrib/*/~",
-						"restrictions": [
-							"vs/base/~",
-							"vs/base/parts/*/~",
-							"vs/platform/*/~",
-							"vs/editor/~",
-							"vs/editor/contrib/*/~"
-						]
-					},
-					{
-						"target": "src/vs/editor/standalone/~",
-						"restrictions": [
-							"vs/base/~",
-							"vs/base/parts/*/~",
-							"vs/platform/*/~",
-							"vs/editor/~",
-							"vs/editor/contrib/*/~",
-							"vs/editor/standalone/~"
-						]
-					},
-					{
-						"target": "src/vs/editor/editor.all.ts",
-						"layer": "browser",
-						"restrictions": [
-							"vs/base/~",
-							"vs/base/parts/*/~",
-							"vs/platform/*/~",
-							"vs/editor/~",
-							"vs/editor/contrib/*/~"
-						]
-					},
-					{
-						"target": "src/vs/editor/editor.worker.ts",
-						"layer": "worker",
-						"restrictions": [
-							"vs/base/~",
-							"vs/base/parts/*/~",
-							"vs/platform/*/~",
-							"vs/editor/~"
-						]
-					},
-					{
-						"target": "src/vs/editor/{editor.api.ts,editor.main.ts}",
-						"layer": "browser",
-						"restrictions": [
-							"vs/base/~",
-							"vs/base/parts/*/~",
-							"vs/editor/~",
-							"vs/editor/contrib/*/~",
-							"vs/editor/standalone/~",
-							"vs/editor/*"
-						]
-					},
-					{
-						"target": "src/vs/workbench/~",
-						"restrictions": [
-							"vs/base/~",
-							"vs/base/parts/*/~",
-							"vs/platform/*/~",
-							"vs/editor/~",
-							"vs/editor/contrib/*/~",
-							"vs/workbench/~",
-							"vs/workbench/services/*/~",
-							"assert",
-							{
-								"when": "test",
-								"pattern": "vs/workbench/contrib/*/~"
-							} // TODO@layers
-						]
-					},
-					{
-						"target": "src/vs/workbench/api/~",
-						"restrictions": [
-							"vscode",
-							"vs/base/~",
-							"vs/base/parts/*/~",
-							"vs/platform/*/~",
-							"vs/editor/~",
-							"vs/editor/contrib/*/~",
-							"vs/workbench/api/~",
-							"vs/workbench/~",
-							"vs/workbench/services/*/~",
-							"vs/workbench/contrib/*/~",
-							"vs/workbench/contrib/terminalContrib/*/~"
-						]
-					},
-					{
-						"target": "src/vs/workbench/services/*/~",
-						"restrictions": [
-							"vs/base/~",
-							"vs/base/parts/*/~",
-							"vs/platform/*/~",
-							"vs/editor/~",
-							"vs/editor/contrib/*/~",
-							"vs/workbench/~",
-							"vs/workbench/services/*/~",
-							{
-								"when": "test",
-								"pattern": "vs/workbench/contrib/*/~"
-							}, // TODO@layers
-							"tas-client-umd", // node module allowed even in /common/
-							"vscode-textmate", // node module allowed even in /common/
-							"@vscode/vscode-languagedetection" // node module allowed even in /common/
-						]
-					},
-					{
-						"target": "src/vs/workbench/contrib/*/~",
-						"restrictions": [
-							"vs/base/~",
-							"vs/base/parts/*/~",
-							"vs/platform/*/~",
-							"vs/editor/~",
-							"vs/editor/contrib/*/~",
-							"vs/workbench/~",
-							"vs/workbench/services/*/~",
-							"vs/workbench/contrib/*/~",
-							"vscode-notebook-renderer", // Type only import
-							{
-								"when": "hasBrowser",
-								"pattern": "xterm"
-							}, // node module allowed even in /browser/
-							{
-								"when": "hasBrowser",
-								"pattern": "xterm-addon-*"
-							}, // node module allowed even in /browser/
-							{
-								"when": "hasBrowser",
-								"pattern": "vscode-textmate"
-							} // node module allowed even in /browser/
-						]
-					},
-					{
-						"target": "src/vs/workbench/contrib/terminalContrib/*/~",
-						"restrictions": [
-							"vs/base/~",
-							"vs/base/parts/*/~",
-							"vs/platform/*/~",
-							"vs/editor/~",
-							"vs/editor/contrib/*/~",
-							"vs/workbench/~",
-							"vs/workbench/services/*/~",
-							"vs/workbench/contrib/*/~",
-							// Only allow terminalContrib to import from itself, this works because
-							// terminalContrib is one extra folder deep
-							"vs/workbench/contrib/terminalContrib/*/~",
-							"vscode-notebook-renderer", // Type only import
-							{
-								"when": "hasBrowser",
-								"pattern": "xterm"
-							}, // node module allowed even in /browser/
-							{
-								"when": "hasBrowser",
-								"pattern": "xterm-addon-*"
-							}, // node module allowed even in /browser/
-							{
-								"when": "hasBrowser",
-								"pattern": "vscode-textmate"
-							} // node module allowed even in /browser/
-						]
-					},
-					{
-						"target": "src/vs/code/~",
-						"restrictions": [
-							"vs/base/~",
-							"vs/base/parts/*/~",
-							"vs/platform/*/~",
-							"vs/editor/~",
-							"vs/editor/contrib/*/~",
-							"vs/code/~",
-							{
-								"when": "hasBrowser",
-								"pattern": "vs/workbench/workbench.web.main"
-							},
-							{
-								"when": "hasBrowser",
-								"pattern": "vs/workbench/~"
-							},
-							{
-								"when": "hasBrowser",
-								"pattern": "vs/workbench/services/*/~"
-							}
-						]
-					},
-					{
-						"target": "src/vs/server/~",
-						"restrictions": [
-							"vs/base/~",
-							"vs/base/parts/*/~",
-							"vs/platform/*/~",
-							"vs/workbench/~",
-							"vs/workbench/api/~",
-							"vs/workbench/services/*/~",
-							"vs/workbench/contrib/*/~",
-							"vs/server/~"
-						]
-					},
-					{
-						"target": "src/vs/workbench/contrib/terminal/terminal.all.ts",
-						"layer": "browser",
-						"restrictions": [
-							"vs/workbench/contrib/**"
-						]
-					},
-					{
-						"target": "src/vs/workbench/workbench.common.main.ts",
-						"layer": "browser",
-						"restrictions": [
-							"vs/base/~",
-							"vs/base/parts/*/~",
-							"vs/platform/*/~",
-							"vs/editor/~",
-							"vs/editor/contrib/*/~",
-							"vs/editor/editor.all",
-							"vs/workbench/~",
-							"vs/workbench/api/~",
-							"vs/workbench/services/*/~",
-							"vs/workbench/contrib/*/~",
-							"vs/workbench/contrib/terminal/terminal.all"
-						]
-					},
-					{
-						"target": "src/vs/workbench/workbench.web.main.ts",
-						"layer": "browser",
-						"restrictions": [
-							"vs/base/~",
-							"vs/base/parts/*/~",
-							"vs/platform/*/~",
-							"vs/editor/~",
-							"vs/editor/contrib/*/~",
-							"vs/editor/editor.all",
-							"vs/workbench/~",
-							"vs/workbench/api/~",
-							"vs/workbench/services/*/~",
-							"vs/workbench/contrib/*/~",
-							"vs/workbench/workbench.common.main"
-						]
-					},
-					{
-						"target": "src/vs/workbench/workbench.desktop.main.ts",
-						"layer": "electron-sandbox",
-						"restrictions": [
-							"vs/base/*/~",
-							"vs/base/parts/*/~",
-							"vs/platform/*/~",
-							"vs/editor/~",
-							"vs/editor/contrib/*/~",
-							"vs/editor/editor.all",
-							"vs/workbench/~",
-							"vs/workbench/api/~",
-							"vs/workbench/services/*/~",
-							"vs/workbench/contrib/*/~",
-							"vs/workbench/workbench.common.main"
-						]
-					},
-					{
-						"target": "src/vs/workbench/{workbench.desktop.main.nls.js,workbench.web.main.nls.js}",
-						"restrictions": []
-					},
-					{
-						"target": "src/vs/{loader.d.ts,css.ts,css.build.ts,monaco.d.ts,nls.ts,nls.build.ts,nls.mock.ts}",
-						"restrictions": []
-					},
-					{
-						"target": "src/vscode-dts/**",
-						"restrictions": []
-					},
-					{
-						"target": "src/{bootstrap-amd.js,bootstrap-fork.js,bootstrap-node.js,bootstrap-window.js,bootstrap.js,cli.js,main.js,server-cli.js,server-main.js}",
-						"restrictions": []
-					}
-				]
-			}
-		},
 		{
 			"files": [
 				"src/{vs,sql}/server/*",
@@ -1564,7 +1146,6 @@
 				"extensions/azuremonitor/src/prompts/**",
 				"extensions/azuremonitor/src/typings/findRemove.d.ts",
 				"extensions/kusto/src/prompts/**",
-				"extensions/mssql/src/hdfs/webhdfs.ts",
 				"extensions/mssql/src/prompts/**",
 				"extensions/mssql/src/typings/bufferStreamReader.d.ts",
 				"extensions/mssql/src/typings/findRemove.d.ts",
@@ -1599,4 +1180,3 @@
 		}
 	]
 }
-

.git-blame-ignore

@@ -15,9 +15,6 @@ ae1452eea678f5266ef513f22dacebb90955d6c9
 # joaomoreno: add ghooks dev dependency
 0dfc06e0f9de5925de792cdf9f0e6597bb25908f
 
-# joaomoreno: line endings
-12ab70d329a13dd5b18d892cd40edd7138259bc3
-
 # mjbvz: organize imports
 494cbbd02d67e87727ec885f98d19551aa33aad1
 a3cb14be7f2cceadb17adf843675b1a59537dbbd

.github/CODEOWNERS

@@ -18,7 +18,6 @@
 /extensions/sql-database-projects/ @Benjin @kisantia
 /extensions/sql-migration @AkshayMata @raymondtruong @brian-harris @junierch @siyangMicrosoft
 /extensions/mssql/config.json @Charles-Gagnon @alanrenmsft @kburtram
-/extensions/query-store/ @kisantia @Benjin @aasimkhan30 @SakshiS-harma
 
 /src/sql/*.d.ts @alanrenmsft @Charles-Gagnon
 /src/sql/workbench/browser/modelComponents @Charles-Gagnon @alanrenmsft

.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/label-actions.yml

@@ -0,0 +1,51 @@
+# actions for Needs Logs label
+Needs Logs:
+  comment: "We need more info to debug your particular issue. If you could attach your logs to the issue (ensure no private data is in them), it would help us fix the issue much faster.
+
+First open the Settings page, find the `Mssql: Tracing Level` setting and change that to `All` then restart ADS and repro your issue.
+
+Next there are two types of logs to collect:
+
+
+**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.
+
+- Developer Tools can be closed via Help -> Toggle Developer Tools
+
+**Application Logs**
+
+
+- Open command palette (Click **View** -> **Command Palette**)
+
+- Run the command: **`Developer: Open Logs Folder`**
+
+- This will open the log folder locally. Please zip up this folder and attach it to the issue."
+
+# actions for Needs Logs - Azure label
+Needs Logs - Azure:
+  comment: "We need more info to debug your Azure Active Directory issue. If you could attach your logs to the issue (ensure no private data is in them), it would help us fix the issue much faster.
+
+- In the settings menu, find the setting titled `Azure: Logging Level` and select the `Verbose` option
+
+- Run the process that produces your error
+
+- Open command palette (Click **View** -> **Command Palette**)
+
+- Run the command: **`Developer: Open Logs Folder`**
+
+- Follow this path to find the Azure Accounts log file: `[default log folder]/exthost1/output_logging_[earliest timestamp]/#-Azure Acounts.log`
+
+- Please attach the Azure-Accounts.log file to the issue."
+
+# actions for Out of Scope label
+Out of Scope:
+  comment: "Thank you for your feedback! This feature is currently out of scope and we do not plan to work on it in a currently planned release. We will close this issue to keep our backlog focused on requests that we are planning to work on. Please note that users can continue to vote and comment on closed issues, which we encourage as it helps us understand user interest and can provide more details about why a feature is requested."
+  close: true

.github/pull_request_template.md

@@ -5,3 +5,5 @@
 * Ensure that the code is up-to-date with the `main` branch.
 * Include a description of the proposed changes and how to test them.
 -->
+
+This PR fixes #

.github/respond-to-issue-based-on-label.yml

@@ -1,39 +0,0 @@
-# actions for Needs Logs label
-Needs Logs:
-  comment: |
-    We need more info to debug your particular issue. If you could attach your logs to the issue (ensure no private data is in them), it would help us fix the issue much faster.
-    1. First open the Settings page, find the `Mssql: Tracing Level` setting and change that to `All` then restart Azure Data Studio.
-    2. Open command palette (Click **View** -> **Command Palette**) and run the command `Developer: Set Log Level...` and set the level to `Trace`.
-    3. Run the repro scenarios.
-    4. Collect the following logs:
-
-      **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.
-      - Developer Tools can be closed via Help -> Toggle Developer Tools
-
-      **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.
-    5. Now you can revert the Log/Tracing levels changes made in step 1 and step 2.
-
-# actions for Needs Logs - Azure label
-Needs Logs - Azure:
-  comment: |
-    We need more info to debug your Azure Active Directory issue. If you could attach your logs to the issue (ensure no private data is in them), it would help us fix the issue much faster.
-
-    - In the settings menu, find the setting titled `Azure: Logging Level` and select the `Verbose` option
-    - Restart Azure Data Studio
-    - Run the process that produces your error
-    - Open command palette (Click **View** -> **Command Palette**)
-    - Run the command: **`Developer: Open Logs Folder`**
-    - Follow this path to find the Azure Accounts log file: `[default log folder]/exthost1/output_logging_[earliest timestamp]/#-Azure Acounts.log`
-    - Please attach the Azure-Accounts.log file to the issue.
-
-# actions for Out of Scope label
-Out of Scope:
-  comment: "Thank you for your feedback! This feature is currently out of scope and we do not plan to work on it in a currently planned release. We will close this issue to keep our backlog focused on requests that we are planning to work on. Please note that users can continue to vote and comment on closed issues, which we encourage as it helps us understand user interest and can provide more details about why a feature is requested."
-  close: true

.github/workflows/bad-tag.yml

@@ -1,22 +0,0 @@
-name: Bad Tag
-on:
-  create
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    if: github.event.ref == '1.999.0'
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v3
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Run Bad Tag
-        uses: ./actions/tag-alert
-        with:
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          tag-name: '1.999.0'

.github/workflows/basic.yml

@@ -1,180 +0,0 @@
-name: Basic checks
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  main:
-    if: github.ref != 'refs/heads/main'
-    name: Compilation, Unit and Integration Tests
-    runs-on: ubuntu-latest
-    timeout-minutes: 40
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - uses: actions/checkout@v3
-
-      # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
-      - name: Setup Build Environment
-        run: |
-          sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
-          sudo chmod +x /etc/init.d/xvfb
-          sudo update-rc.d xvfb defaults
-          sudo service xvfb start
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-
-      - name: Compute node modules cache key
-        id: nodeModulesCacheKey
-        run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
-      - name: Cache node modules
-        id: cacheNodeModules
-        uses: actions/cache@v3
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-cacheNodeModules23-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-cacheNodeModules23-
-      - name: Get yarn cache directory path
-        id: yarnCacheDirPath
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Cache yarn directory
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
-          key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-yarnCacheDir-
-      - name: Execute yarn
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        env:
-          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-        run: yarn --frozen-lockfile --network-timeout 180000
-
-      - name: Compile and Download
-        run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64"
-
-      - name: Run Unit Tests
-        id: electron-unit-tests
-        run: DISPLAY=:10 ./scripts/test.sh
-
-      - name: Run Integration Tests (Electron)
-        id: electron-integration-tests
-        run: DISPLAY=:10 ./scripts/test-integration.sh
-
-  hygiene:
-    if: github.ref != 'refs/heads/main'
-    name: Hygiene and Layering
-    runs-on: ubuntu-latest
-    timeout-minutes: 40
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-
-      # {{SQL CARBON TODO}} Update node modules caching to work with our cache keys
-      # - name: Compute node modules cache key
-      #   id: nodeModulesCacheKey
-      #   run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
-      # - name: Cache node modules
-      #   id: cacheNodeModules
-      #   uses: actions/cache@v3
-      #   with:
-      #     path: "**/node_modules"
-      #     key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
-      # - name: Get yarn cache directory path
-      #   id: yarnCacheDirPath
-      #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-      #   run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-      # - name: Cache yarn directory
-      #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-      #   uses: actions/cache@v3
-      #   with:
-      #     path: ${{ steps.yarnCacheDirPath.outputs.dir }}
-      #     key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
-      #     restore-keys: ${{ runner.os }}-yarnCacheDir-
-      - name: Execute yarn
-        # if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} {{SQL CARBON TODO}} Update node modules caching to work with our cache keys
-        env:
-          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-        run: yarn --frozen-lockfile --network-timeout 180000
-
-      - name: Run Hygiene Checks
-        run: yarn gulp hygiene
-
-      - name: Run Valid Layers Checks
-        run: yarn valid-layers-check
-
-      - name: Compile /build/
-        run: yarn --cwd build compile
-
-      - name: Check clean git state
-        run: ./.github/workflows/check-clean-git-state.sh
-
-      - name: Run eslint
-        run: yarn eslint
-
-      # {{SQL CARBON EDIT}} Add linting for our folders
-      - name: Run sqllint
-        run: yarn sqllint
-
-      - name: Run vscode-dts Compile Checks
-        run: yarn vscode-dts-compile-check
-
-      - name: Run Trusted Types Checks
-        run: yarn tsec-compile-check
-
-  # {{SQL CARBON TODO}} Update node modules caching to work with our cache keys
-  # warm-cache:
-  #   name: Warm up node modules cache
-  #   if: github.ref == 'refs/heads/main'
-  #   runs-on: ubuntu-latest
-  #   timeout-minutes: 40
-  #   env:
-  #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  #   steps:
-  #     - uses: actions/checkout@v3
-
-  #     - uses: actions/setup-node@v3
-  #       with:
-  #         node-version: 16
-
-  #     - name: Compute node modules cache key
-  #       id: nodeModulesCacheKey
-  #       run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
-  #     - name: Cache node modules
-  #       id: cacheNodeModules
-  #       uses: actions/cache@v3
-  #       with:
-  #         path: "**/node_modules"
-  #         key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
-  #     - name: Get yarn cache directory path
-  #       id: yarnCacheDirPath
-  #       if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-  #       run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-  #     - name: Cache yarn directory
-  #       if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-  #       uses: actions/cache@v3
-  #       with:
-  #         path: ${{ steps.yarnCacheDirPath.outputs.dir }}
-  #         key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
-  #         restore-keys: ${{ runner.os }}-yarnCacheDir-
-  #     - name: Execute yarn
-  #       if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-  #       env:
-  #         PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-  #         ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-  #       run: yarn --frozen-lockfile --network-timeout 180000

.github/workflows/check-clean-git-state.sh

@@ -1,6 +0,0 @@
-R=`git status --porcelain | wc -l`
-if [ "$R" -ne "0" ]; then
-  echo "The git repo is not clean after compiling the /build/ folder. Did you forget to commit .js output for .ts files?";
-  git status --porcelain
-  exit 1;
-fi

.github/workflows/ci.yml

@@ -1,33 +1,31 @@
 name: CI
 
-on: workflow_dispatch
-
-# on:
-#   push:
-#     branches:
-#       - main
-#       - release/*
-#   pull_request:
-#     branches:
-#       - main
-#       - release/*
+on:
+  push:
+    branches:
+      - main
+      - release/*
+  pull_request:
+    branches:
+      - main
+      - release/*
 
 jobs:
   windows:
     name: Windows
-    runs-on: windows-2022
-    timeout-minutes: 60
+    runs-on: windows-2019
+    timeout-minutes: 30
     env:
       CHILD_CONCURRENCY: "1"
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v2
         with:
           node-version: 16
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v2
         with:
           python-version: "2.x"
 
@@ -37,7 +35,7 @@ jobs:
       #   run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
       # - name: Cache node_modules archive
       #   id: cacheNodeModules
-      #   uses: actions/cache@v3
+      #   uses: actions/cache@v2
       #   with:
       #     path: ".build/node_modules_cache"
       #     key: "${{ runner.os }}-cacheNodeModulesArchive-${{ steps.nodeModulesCacheKey.outputs.value }}"
@@ -50,7 +48,7 @@ jobs:
       #   run: echo "::set-output name=dir::$(yarn cache dir)"
       # - name: Cache yarn directory
       #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-      #   uses: actions/cache@v3
+      #   uses: actions/cache@v2
       #   with:
       #     path: ${{ steps.yarnCacheDirPath.outputs.dir }}
       #     key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -90,7 +88,7 @@ jobs:
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2.2.0
 
       # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
       - name: Setup Build Environment
@@ -102,7 +100,7 @@ jobs:
           sudo update-rc.d xvfb defaults
           sudo service xvfb start
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v2
         with:
           node-version: 16
       # {{SQL CARBON EDIT}} Skip caching for now
@@ -111,7 +109,7 @@ jobs:
       #   run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
       # - name: Cache node modules
       #   id: cacheNodeModules
-      #   uses: actions/cache@v3
+      #   uses: actions/cache@v2
       #   with:
       #     path: "**/node_modules"
       #     key: ${{ runner.os }}-cacheNodeModules14-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -122,7 +120,7 @@ jobs:
       #   run: echo "::set-output name=dir::$(yarn cache dir)"
       # - name: Cache yarn directory
       #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-      #   uses: actions/cache@v3
+      #   uses: actions/cache@v2
       #   with:
       #     path: ${{ steps.yarnCacheDirPath.outputs.dir }}
       #     key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -152,7 +150,7 @@ jobs:
       - name: Combine code coverage files
         run: node test/combineCoverage
       - name: Upload Code Coverage
-        uses: coverallsapp/github-action@v2.2.0
+        uses: coverallsapp/github-action@v1.1.1
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path-to-lcov: "test/coverage/lcov.info"
@@ -173,9 +171,9 @@ jobs:
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2.2.0
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v2
         with:
           node-version: 16
 
@@ -185,7 +183,7 @@ jobs:
       #   run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
       # - name: Cache node modules
       #   id: cacheNodeModules
-      #   uses: actions/cache@v3
+      #   uses: actions/cache@v2
       #   with:
       #     path: "**/node_modules"
       #     key: ${{ runner.os }}-cacheNodeModules14-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -196,7 +194,7 @@ jobs:
       #   run: echo "::set-output name=dir::$(yarn cache dir)"
       # - name: Cache yarn directory
       #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-      #   uses: actions/cache@v3
+      #   uses: actions/cache@v2
       #   with:
       #     path: ${{ steps.yarnCacheDirPath.outputs.dir }}
       #     key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -232,13 +230,13 @@ jobs:
   hygiene:
     name: Hygiene and Layering
     runs-on: ubuntu-latest
-    timeout-minutes: 40
+    timeout-minutes: 30
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v2
         with:
           node-version: 16
 
@@ -247,18 +245,18 @@ jobs:
         run: echo "::set-output name=value::$(node build/azure-pipelines/common/sql-computeNodeModulesCacheKey.js)"
       - name: Cache node modules
         id: cacheNodeModules
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: "**/node_modules"
-          key: ${{ runner.os }}-cacheNodeModules23-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-cacheNodeModules23-
+          key: ${{ runner.os }}-cacheNodeModules14-${{ steps.nodeModulesCacheKey.outputs.value }}
+          restore-keys: ${{ runner.os }}-cacheNodeModules14-
       - name: Get yarn cache directory path
         id: yarnCacheDirPath
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Cache yarn directory
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: ${{ steps.yarnCacheDirPath.outputs.dir }}
           key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -275,27 +273,59 @@ jobs:
           ELECTRON_SKIP_BINARY_DOWNLOAD: 1
         run: yarn --frozen-lockfile --network-timeout 180000
 
-      - name: Download Playwright
-        run: yarn playwright-install
-
       - name: Run Hygiene Checks
         run: yarn gulp hygiene
 
       - name: Run Valid Layers Checks
         run: yarn valid-layers-check
 
+      # - name: Run Monaco Editor Checks {{SQL CARBON EDIT}} Remove Monaco checks
+      #   run: yarn monaco-compile-check
+
       - name: Compile /build/
         run: yarn --cwd build compile
 
-      - name: Check clean git state
-        run: ./.github/workflows/check-clean-git-state.sh
-
       - name: Run eslint
         run: yarn eslint
 
+      # {{SQL CARBON EDIT}} Don't need this
+      # - name: Run Monaco Editor Checks
+      #   run: yarn monaco-compile-check
+
       # {{SQL CARBON EDIT}} Don't need this
       # - name: Run vscode-dts Compile Checks
       #   run: yarn vscode-dts-compile-check
 
       - name: Run Trusted Types Checks
         run: yarn tsec-compile-check
+
+      # - name: Editor Distro & ESM Bundle {{SQL CARBON EDIT}} Remove Monaco checks
+      #   run: yarn gulp editor-esm-bundle
+
+      # - name: Typings validation prep {{SQL CARBON EDIT}} Remove Monaco checks
+      #   run: |
+      #     mkdir typings-test
+
+      # - name: Typings validation {{SQL CARBON EDIT}} Remove Monaco checks
+      #   working-directory: ./typings-test
+      #   run: |
+      #     yarn init -yp
+      #     ../node_modules/.bin/tsc --init
+      #     echo "import '../out-monaco-editor-core';" > a.ts
+      #     ../node_modules/.bin/tsc --noEmit
+
+      # - name: Webpack Editor {{SQL CARBON EDIT}} Remove Monaco checks
+      #   working-directory: ./test/monaco
+      #   run: yarn run bundle
+
+      # - name: Compile Editor Tests {{SQL CARBON EDIT}} Remove Monaco checks
+      #   working-directory: ./test/monaco
+      #   run: yarn run compile
+
+      # - name: Download Playwright {{SQL CARBON EDIT}} Remove Monaco checks
+      #   run: yarn playwright-install
+
+      # - name: Run Editor Tests {{SQL CARBON EDIT}} Remove Monaco checks
+      #   timeout-minutes: 5
+      #   working-directory: ./test/monaco
+      #   run: yarn test

.github/workflows/on-label.yml

@@ -8,8 +8,8 @@ jobs:
     name: Process Label Action
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Process Label Action
-        uses: hramos/label-actions@v2
+        uses: hramos/label-actions@v1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}

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

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           repository: 'microsoft/azuredatastudio'
           ref: main

.github/workflows/telemetry.yml

@@ -1,19 +0,0 @@
-name: 'Telemetry'
-on:
-  pull_request:
-jobs:
-  check-metdata:
-    name: 'Check metadata'
-    runs-on: 'ubuntu-latest'
-
-    steps:
-      - uses: 'actions/checkout@v3'
-
-      - uses: 'actions/setup-node@v3'
-        with:
-          node-version: 'lts/*'
-
-      - name: 'Run vscode-telemetry-extractor'
-        run: 'npx --package=@vscode/telemetry-extractor --yes vscode-telemetry-extractor -s .'
-        env:
-          GITHUB_TOKEN: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}

.gitignore

@@ -17,5 +17,3 @@ vscode.lsif
 vscode.db
 /.profile-oss
 *.orig
-/cli/target
-product.overrides.json

.nvmrc

@@ -1 +0,0 @@
-16.17

.vscode/cglicenses.schema.json

@@ -55,31 +55,6 @@
 						}
 					}
 				}
-			},
-			{
-				"type": "object",
-				"required": [
-					"name",
-					"fullLicenseTextUri"
-				],
-				"properties": {
-					"name": {
-						"type": "string",
-						"description": "The name of the dependency"
-					},
-					"fullLicenseTextUri": {
-						"type": "string",
-						"description": "The URI to the license text of this repository",
-						"format": "uri"
-					},
-					"prependLicenseText": {
-						"type": "array",
-						"description": "A piece of text to prepend to the auto-detected license text of the dependency",
-						"items": {
-							"type": "string"
-						}
-					}
-				}
 			}
 		]
 	}

.vscode/extensions.json

@@ -4,8 +4,6 @@
 	"recommendations": [
 		"dbaeumer.vscode-eslint",
 		"EditorConfig.EditorConfig",
-		"GitHub.vscode-pull-request-github",
-		"ms-vscode.vscode-github-issue-notebooks",
-		"ms-vscode.vscode-selfhost-test-provider"
+		"redhat.vscode-yaml"
 	]
 }

.vscode/launch.json

@@ -8,100 +8,9 @@
 			"program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
 			"stopOnEntry": true,
 			"args": [
-				"vscode-win32-x64"
+				"hygiene"
 			]
-		},
-		{
-			"type": "extensionHost",
-			"request": "launch",
-			"name": "VS Code Git Tests",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"/tmp/my4g9l",
-				"--extensionDevelopmentPath=${workspaceFolder}/extensions/git",
-				"--extensionTestsPath=${workspaceFolder}/extensions/git/out/test"
-			],
-			"outFiles": [
-				"${workspaceFolder}/extensions/git/out/**/*.js"
-			],
-			"presentation": {
-				"group": "5_tests",
-				"order": 6
-			}
-		},
-		{
-			"type": "extensionHost",
-			"request": "launch",
-			"name": "VS Code Github Tests",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"${workspaceFolder}/extensions/github/testWorkspace",
-				"--extensionDevelopmentPath=${workspaceFolder}/extensions/github",
-				"--extensionTestsPath=${workspaceFolder}/extensions/github/out/test"
-			],
-			"outFiles": [
-				"${workspaceFolder}/extensions/github/out/**/*.js"
-			],
-			"presentation": {
-				"group": "5_tests",
-				"order": 6
-			}
-		},
-		{
-			"type": "extensionHost",
-			"request": "launch",
-			"name": "VS Code API Tests (single folder)",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				// "${workspaceFolder}", // Uncomment for running out of sources.
-				"${workspaceFolder}/extensions/vscode-api-tests/testWorkspace",
-				"--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode-api-tests",
-				"--extensionTestsPath=${workspaceFolder}/extensions/vscode-api-tests/out/singlefolder-tests",
-				"--disable-extensions"
-			],
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"group": "5_tests",
-				"order": 3
-			}
-		},
-		{
-			"type": "extensionHost",
-			"request": "launch",
-			"name": "VS Code API Tests (workspace)",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"${workspaceFolder}/extensions/vscode-api-tests/testworkspace.code-workspace",
-				"--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode-api-tests",
-				"--extensionTestsPath=${workspaceFolder}/extensions/vscode-api-tests/out/workspace-tests"
-			],
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"group": "5_tests",
-				"order": 4
-			}
-		},
-		{
-			"type": "extensionHost",
-			"request": "launch",
-			"name": "VS Code Tokenizer Tests",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"${workspaceFolder}/extensions/vscode-colorize-tests/test",
-				"--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode-colorize-tests",
-				"--extensionTestsPath=${workspaceFolder}/extensions/vscode-colorize-tests/out"
-			],
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"group": "5_tests"
-			}
-		},
+		},	
 		{
 			"type": "node",
 			"request": "launch",
@@ -110,18 +19,8 @@
 			"windows": {
 				"runtimeExecutable": "${workspaceFolder}/scripts/sql.bat",
 			},
-			"osx": {
-				"runtimeExecutable": "${workspaceFolder}/scripts/sql.sh"
-			},
-			"linux": {
-				"runtimeExecutable": "${workspaceFolder}/scripts/sql.sh"
-			},
 			"runtimeArgs": [
-				"--inspect=5875",
-				"--no-cached-data",
-				"--crash-reporter-directory=${workspaceFolder}/.profile-oss/crashes",
-				// for general runtime freezes: https://github.com/microsoft/vscode/issues/127861#issuecomment-904144910
-				"--disable-features=CalculateNativeWinOcclusion",
+				"--no-cached-data"
 			],
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
@@ -154,9 +53,6 @@
 			"runtimeArgs": [
 				"--inspect=5875",
 				"--no-cached-data",
-				"--crash-reporter-directory=${workspaceFolder}/.profile-oss/crashes",
-				// for general runtime freezes: https://github.com/microsoft/vscode/issues/127861#issuecomment-904144910
-				"--disable-features=CalculateNativeWinOcclusion",
 			],
 			"webRoot": "${workspaceFolder}",
 			"cascadeTerminateToConfigurations": [
@@ -212,18 +108,6 @@
 				"group": "2_attach"
 			}
 		},
-		{
-			"type": "node",
-			"request": "attach",
-			"name": "Attach to CLI Process",
-			"port": 5874,
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"group": "2_attach"
-			}
-		},
 		{
 			"type": "pwa-chrome",
 			"request": "attach",
@@ -244,49 +128,6 @@
 				"order": 2
 			}
 		},
-		{
-			"type": "node",
-			"request": "attach",
-			"name": "Attach to Search Process",
-			"port": 5876,
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"group": "2_attach"
-			}
-		},
-		{
-			"type": "node",
-			"request": "attach",
-			"name": "Attach to Pty Host Process",
-			"port": 5877,
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"group": "2_attach"
-			}
-		},
-		{
-			/* Added for "VS Code Selfhost Test Provider" extension support */
-			"type": "pwa-chrome",
-			"request": "attach",
-			"name": "Attach to VS Code",
-			"browserAttachLocation": "workspace",
-			"port": 9222,
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"group": "2_attach",
-				"hidden": true
-			},
-			"resolveSourceMapLocations": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"perScriptSourcemaps": "yes"
-		},
 		{
 			"type": "node",
 			"request": "launch",

.vscode/notebooks/api.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"May 2023\""
+    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"May 2022\""
   },
   {
     "kind": 1,

.vscode/notebooks/endgame.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$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 repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"May 2023\""
+    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-unpkg\n\n$MILESTONE=milestone:\"April 2022\""
   },
   {
     "kind": 1,
@@ -32,7 +32,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS -$MILESTONE is:issue is:closed reason:completed label:bug label:insiders-released -label:verified -label:*duplicate -label:*as-designed -label:z-author-verified -label:on-testplan"
+    "value": "$REPOS -$MILESTONE is:issue is:closed label:bug label:insiders-released -label:verified -label:*duplicate -label:*as-designed -label:z-author-verified -label:on-testplan"
   },
   {
     "kind": 1,
@@ -42,7 +42,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS -$MILESTONE is:issue is:closed reason:completed label:feature-request label:insiders-released -label:on-testplan -label:verified -label:*duplicate"
+    "value": "$REPOS -$MILESTONE is:issue is:closed label:feature-request label:insiders-released -label:on-testplan -label:verified -label:*duplicate"
   },
   {
     "kind": 1,
@@ -62,7 +62,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE is:issue is:closed reason:completed label:feature-request -label:verification-needed -label:on-testplan -label:verified -label:*duplicate"
+    "value": "$REPOS $MILESTONE is:issue is:closed label:feature-request -label:verification-needed -label:on-testplan -label:verified -label:*duplicate"
   },
   {
     "kind": 1,
@@ -97,7 +97,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE is:issue is:closed reason:completed label:verification-needed -label:verified"
+    "value": "$REPOS $MILESTONE is:issue is:closed label:verification-needed -label:verified"
   },
   {
     "kind": 1,
@@ -112,7 +112,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE is:issue is:closed reason:completed 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:z-author-verified -label:unreleased"
+    "value": "$REPOS $MILESTONE is:issue is:closed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -label:z-author-verified -label:unreleased"
   },
   {
     "kind": 1,
@@ -122,7 +122,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE is:issue is:closed reason:completed 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:z-author-verified label:unreleased"
+    "value": "$REPOS $MILESTONE is:issue is:closed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -label:z-author-verified label:unreleased"
   },
   {
     "kind": 1,

.vscode/notebooks/inbox.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$inbox -label:\"info-needed\" sort:created-desc"
+    "value": "$inbox -label:\"needs more info\" sort:created-desc"
   },
   {
     "kind": 2,

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

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$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 repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"May 2023\"\n\n$MINE=assignee:@me"
+    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal\n\n$MILESTONE=milestone:\"April 2022\"\n\n$MINE=assignee:@me"
   },
   {
     "kind": 1,
@@ -42,7 +42,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request -label:verification-needed -label:on-testplan -label:verified -label:*duplicate"
+    "value": "$REPOS $MILESTONE $MINE is:issue is:closed label:feature-request -label:verification-needed -label:on-testplan -label:verified -label:*duplicate"
   },
   {
     "kind": 1,
@@ -62,7 +62,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request label:verification-needed -label:verified"
+    "value": "$REPOS $MILESTONE $MINE is:issue is:closed label:feature-request label:verification-needed -label:verified"
   },
   {
     "kind": 1,
@@ -87,7 +87,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed -assignee:@me -label:verified -label:z-author-verified label:feature-request label:verification-needed -label:verification-steps-needed -label:unreleased"
+    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed -assignee:@me -label:verified -label:z-author-verified label:feature-request label:verification-needed"
   },
   {
     "kind": 1,
@@ -147,7 +147,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed author:@me sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:triage-needed -label:verification-found"
+    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed author:@me sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:needs-triage -label:verification-found"
   },
   {
     "kind": 1,
@@ -157,7 +157,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:andreamah -author:bamurtaugh -author:bpasero -author:chrisdias -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:egamma -author:fiveisprime -author:gregvanl -author:hediet -author:isidorn -author:joaomoreno -author:joyceerhl -author:jrieken -author:karrtikr -author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:roblourens -author:rzhao271 -author:sandy081 -author:sbatten -author:stevencl -author:tanhakabir -author:TylerLeonhardt -author:Tyriar -author:weinand -author:amunger -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy -author:paulacamargo25 -author:ulugbekna -author:aiday-mar"
+    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:bamurtaugh -author:bpasero -author:chrisdias -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:dynamicwebpaige -author:eamodio -author:egamma -author:fiveisprime -author:greazer -author:gregvanl -author:hediet -author:IanMatthewHuff -author:isidorn -author:ItalyPaleAle -author:JacksonKearl -author:joaomoreno -author:joyceerhl -author:jrieken -author:karrtikr-author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:ornellaalt -author:orta -author:rchiodo -author:rebornix -author:roblourens -author:rzhao271 -author:sana-ajani -author:sandy081 -author:sbatten -author:stevencl -author:tanhakabir -author:TylerLeonhardt -author:Tyriar -author:weinand -author:kimadeline -author:amunger"
   },
   {
     "kind": 1,
@@ -167,7 +167,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed -author:@me sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found"
+    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed -author:@me sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found"
   },
   {
     "kind": 1,
@@ -177,6 +177,6 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request -label:on-release-notes\nrepo:microsoft/vscode $MILESTONE $MINE is:issue is:closed reason:completed label:engineering -label:on-release-notes\nrepo:microsoft/vscode $MILESTONE $MINE is:issue is:closed reason:completed label:plan-item -label:on-release-notes"
+    "value": "repo:microsoft/vscode $MILESTONE $MINE is:issue is:closed label:feature-request -label:on-release-notes"
   }
 ]

.vscode/notebooks/verification.github-issues

@@ -2,7 +2,7 @@
   {
     "kind": 1,
     "language": "markdown",
-    "value": "### Bug Verification Queries\r\n\r\nBefore shipping we want to verify _all_ bugs. That means when a bug is fixed we check that the fix actually works. It's always best to start with bugs that you have filed and the proceed with bugs that have been filed from users outside the development team. "
+    "value": "### Bug Verification Queries\n\nBefore shipping we want to verify _all_ bugs. That means when a bug is fixed we check that the fix actually works. It's always best to start with bugs that you have filed and the proceed with bugs that have been filed from users outside the development team. "
   },
   {
     "kind": 1,
@@ -12,7 +12,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$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 repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n$milestone=milestone:\"February 2023\""
+    "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-jupyter repo:microsoft/vscode-python\n$milestone=milestone:\"March 2022\""
   },
   {
     "kind": 1,
@@ -22,7 +22,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos $milestone is:closed reason:completed -assignee:@me label:bug -label:verified -label:*duplicate author:@me"
+    "value": "$repos $milestone is:closed -assignee:@me label:bug -label:verified -label:*duplicate author:@me"
   },
   {
     "kind": 1,
@@ -32,7 +32,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos $milestone is:closed reason:completed -assignee:@me label:bug -label:verified -label:*duplicate -author:@me -assignee:@me label:bug -label:verified -author:@me -author:aeschli -author:alexdima -author:alexr00 -author:bpasero -author:chrisdias -author:chrmarti -author:connor4312 -author:dbaeumer -author:deepak1556 -author:eamodio -author:egamma -author:gregvanl  -author:isidorn -author:JacksonKearl -author:joaomoreno -author:jrieken -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:RMacfarlane -author:roblourens -author:sana-ajani -author:sandy081 -author:sbatten -author:Tyriar -author:weinand -author:rzhao271 -author:kieferrm -author:TylerLeonhardt -author:bamurtaugh -author:hediet -author:joyceerhl -author:rchiodo"
+    "value": "$repos $milestone is:closed  -assignee:@me label:bug -label:verified -label:*duplicate -author:@me -assignee:@me label:bug -label:verified -author:@me -author:aeschli -author:alexdima -author:alexr00 -author:bpasero -author:chrisdias -author:chrmarti -author:connor4312 -author:dbaeumer -author:deepak1556 -author:eamodio -author:egamma -author:gregvanl  -author:isidorn -author:JacksonKearl -author:joaomoreno -author:jrieken -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:RMacfarlane -author:roblourens -author:sana-ajani -author:sandy081 -author:sbatten -author:Tyriar -author:weinand -author:rzhao271 -author:kieferrm -author:TylerLeonhardt -author:bamurtaugh -author:hediet -author:joyceerhl -author:rchiodo -author:IanMatthewHuff"
   },
   {
     "kind": 1,
@@ -42,6 +42,6 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos $milestone is:closed reason:completed -assignee:@me label:bug -label:verified -label:*duplicate"
+    "value": "$repos $milestone is:closed -assignee:@me label:bug -label:verified -label:*duplicate"
   }
 ]

.vscode/notebooks/vscode-dev.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-dev milestone:\"May 2022\" is:open"
+    "value": "repo:microsoft/vscode-dev milestone:\"December 2021\" is:open"
   },
   {
     "kind": 2,
@@ -32,11 +32,11 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-remote-repositories-github milestone:\"May 2022\" is:open"
+    "value": "repo:microsoft/vscode-remote-repositories-github milestone:\"December 2021\" is:open"
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode-remotehub milestone:\"May 2022\" is:open"
+    "value": "repo:microsoft/vscode-remotehub milestone:\"December 2021\" is:open"
   }
-]
+]

.vscode/settings.json

@@ -6,44 +6,27 @@
 		".build": true,
 		".profile-oss": true,
 		"**/.DS_Store": true,
-		"cli/target": true,
 		"build/**/*.js": {
 			"when": "$(basename).ts"
 		}
 	},
 	"files.associations": {
-		"cglicenses.json": "jsonc",
-		"*.tst": "typescript"
+		"cglicenses.json": "jsonc"
 	},
 	"search.exclude": {
 		"**/node_modules": true,
-		"cli/target/**": true,
+		"**/bower_components": true,
 		".build/**": true,
 		"out/**": true,
 		"out-build/**": true,
 		"out-vscode/**": true,
 		"i18n/**": true,
-		"extensions/**/dist/**": true,
 		"extensions/**/out/**": true,
 		"test/smoke/out/**": true,
 		"test/automation/out/**": true,
 		"test/integration/browser/out/**": true,
-		"src/vs/base/test/common/filters.perf.data.js": true,
 		"src/vs/base/test/node/uri.test.data.txt": true,
-		"src/vs/workbench/api/test/browser/extHostDocumentData.test.perf-data.ts": true,
-		"src/vs/editor/test/node/diffing/fixtures/**": true,
-	},
-	"files.readonlyInclude": {
-		"**/node_modules/**": true,
-		"out/**": true,
-		"out-build/**": true,
-		"out-vscode/**": true,
-		"out-vscode-reh/**": true,
-		"extensions/**/dist/**": true,
-		"extensions/**/out/**": true,
-		"test/smoke/out/**": true,
-		"test/automation/out/**": true,
-		"test/integration/browser/out/**": true,
+		"src/vs/workbench/api/test/browser/extHostDocumentData.test.perf-data.ts": true
 	},
 	"lcov.path": [
 		"./.build/coverage/lcov.info",
@@ -58,6 +41,11 @@
 			}
 		}
 	],
+	"eslint.options": {
+		"rulePaths": [
+			"./build/lib/eslint"
+		]
+	},
 	"typescript.tsdk": "node_modules/typescript/lib",
 	"npm.exclude": "**/extensions/**",
 	"npm.packageManager": "yarn",
@@ -69,7 +57,7 @@
 			"fileMatch": [
 				"cgmanifest.json"
 			],
-			"url": "./.vscode/cgmanifest.schema.json"
+			"url": "https://json.schemastore.org/component-detection-manifest.json"
 		},
 		{
 			"fileMatch": [
@@ -79,15 +67,6 @@
 		}
 	],
 	"git.ignoreLimitWarning": true,
-	"git.branchProtection": [
-		"main",
-		"distro",
-		"release/*"
-	],
-	"git.branchProtectionPrompt": "alwaysCommitToNewBranch",
-	"git.branchRandomName.enable": true,
-	"git.pullBeforeCheckout": true,
-	"git.mergeEditor": true,
 	"remote.extensionKind": {
 		"msjsdiag.debugger-for-chrome": "workspace"
 	},
@@ -104,13 +83,6 @@
 		"editor.defaultFormatter": "vscode.typescript-language-features",
 		"editor.formatOnSave": true
 	},
-	"[rust]": {
-		"editor.defaultFormatter": "rust-lang.rust-analyzer",
-		"editor.formatOnSave": true,
-	},
-	"rust-analyzer.linkedProjects": [
-		"cli/Cargo.toml"
-	],
 	"typescript.tsc.autoDetect": "off",
 	"testing.autoRun.mode": "rerun",
 	"conventionalCommits.scopes": [
@@ -123,21 +95,12 @@
 		"git",
 		"sash"
 	],
-	"debug.javascript.terminalOptions": {
-		"outFiles": [
-			"${workspaceFolder}/out/**/*.js",
-			"${workspaceFolder}/build/**/*.js"
-		]
+	"editor.quickSuggestions": {
+		"other": "inline",
+		"comments": "inline",
+		"strings": "inline"
 	},
-	"githubPullRequests.assignCreated": "${user}",
-	"githubPullRequests.defaultMergeMethod": "squash",
-	"githubPullRequests.ignoredPullRequestBranches": [
-		"main"
-	],
-	"application.experimental.rendererProfiling": true,
-	"editor.experimental.asyncTokenization": true,
-	"editor.experimental.asyncTokenizationVerification": true,
 	"yaml.schemas": {
 		"https://raw.githubusercontent.com/microsoft/azure-pipelines-vscode/master/service-schema.json": "build/azure-pipelines/**/*.yml"
-	}
+	},
 }

.vscode/tasks.json

@@ -203,28 +203,6 @@
 				"reveal": "never"
 			}
 		},
-		{
-			"type": "shell",
-			"command": "./scripts/code-web.sh",
-			"windows": {
-				"command": ".\\scripts\\code-web.bat"
-			},
-			"args": ["--port", "8080", "--browser", "none"],
-			"label": "Run code web",
-			"isBackground": true,
-			"problemMatcher": {
-				"pattern": {
-					"regexp": ""
-				},
-				"background": {
-					"beginsPattern": ".*node .*",
-					"endsPattern": "Listening on .*"
-				}
-			},
-			"presentation": {
-				"reveal": "never"
-			}
-		},
 		{
 			"type": "npm",
 			"script": "eslint",

.yarnrc

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

CHANGELOG.md

@@ -1,194 +1,5 @@
 # Change Log
 
-## July 2023
-
-Azure Data Studio 1.45.0 is the latest general availability (GA) release.
-
-- Release number: 1.45.0
-- Release date: July 26, 2023
-
-### What's new in 1.45.0
-
-| New Item | Details |
-| --- | --- |
-| Connection | Introduced support for Tenant hierarchy in the Azure tree |
-| Connection | Updated Azure tree icons |
-| Connection | Updated the Azure tree in the Connection Pane to show only available resource types |
-| Connection | Added Azure Postgres Flexible Server and Azure CosmosDB for PostgreSQL in the Azure resource tree |
-| Connection | Added support for advanced connection options for other providers |
-| Connection | Added capability to clear encryption keys with the 'Clear Azure Account Token Cache' command |
-| Connection | Introduced support for connection pooling for MSSQL connections |
-| GitHub Copilot | GitHub Copilot extension version 1.95.239 |
-| MySQL Extension | General Availability |
-| Object Explorer | Added support for additional Filter options in Object Explorer |
-| Object Explorer | Reduced size of server group color block |
-| Object Explorer | Enabled 'Async Server tree' for the Server tree view |
-| Object Explorer | Added inline actions (e.g. edit, delete, refresh) |
-| Object Explorer | Introduced an action to collapse all open objects in Object Explorer |
-| Object Explorer | Added ability to use left and right arrows in OE to open or close trees |
-| Object Explorer | Right-click menu options updated and order modified |
-| Profiler / Extended Events | Introduced support for opening .XEL files up to 1GB in size |
-| Query Editor | Introduced a new configuration option to control whether to add a line break between rows when copying if the previous row has a trailing line break |
-| Result Set | Introduced keyboard shortcut (Ctrl/CMD + Shift + C) to copy information from the results grid with headers |
-| Result Set | Introduced keyboard shortcut (Ctrl/CMD + Shift + O) to sort columns in a result set |
-| SQL Database Projects Extension | Added the ability to create a publish profile from the Add Item… menu |
-| Table Designer | Added configuration option to prevent DDL triggers from being disabled as part of the table modification |
-| User Management | Improved table component performance in the Securables dialog of User properties |
-| VS Code merge | VS Code merges to version 1.79, read [their release notes](https://code.visualstudio.com/updates/v1_79) to learn more |
-
-### Bug fixes in 1.45.0
-
-| New Item | Details |
-| --- | --- |
-| Accessibility | Improved contrast for buttons on Welcome page when using light themes |
-| Accessibility | Improved focus on Home tab when using High Contrast Aquatic/Desert theme |
-| Accessibility | Corrected border color the issue reporter dialog when using light theme |
-| Accessibility | Fixed multiple issues with screen readers |
-| Accessibility | Improved keyboard navigation in select database dropdown and added visual label |
-| Accessibility | Added required indicator for Server group name when configuring a server group |
-| Accessibility | Fixed display so contents are visible at 200% zoom in Notebook cell |
-| Accessibility | Added tooltip for Learn more button in New Deployment window |
-| Backup/Restore | Addressed issue with backup/restore dialog titles not updating for non-MSSQL databases |
-| Central Management Servers Extension | Resolved error generated after saving a connection using SQL authentication |
-| Charting | Addressed issue with mix/max value setting for a chart axis |
-| Connection | Improved dialog window for adding an Azure account when authentication code is required |
-| Connection | Fixed throttling of ARM requests when in the Browse Connections tab |
-| General | Fixed issue with vertical scrolling in dialog windows |
-| General | Fixed error "Cannot read properties of undefined" |
-| Notebooks | Addressed inability to open JSON in a new tab from Notebook results cell |
-| Notebooks | Fixed error "Unable to load and parse grammar for scope markdown.math.inline" when creating a Notebook text cell |
-| Object Explorer | Addressed connection leak which occurred when renaming a table |
-| Object Explorer | Improved error handling in server tree expand requests |
-| Object Explorer | Fixed issue with unexpected connection drops in Object Explorer |
-| Query Editor | Corrected syntax highlighting for nested multi-line comments |
-| Query Editor | Addressed issue where folding behavior incorrectly included blank lines at the end of a text block |
-| Query Editor | Resolved issue when executing USE DATABASE_NAME command and database context did not change in the status bar |
-| Query Plan Viewer | Fixed issue with filter icon appearing over query text in Top Operations window |
-| Result Set | Fixed issue where HTML entered in Edit Rows mode was being rendered |
-| Result Set | Fixed incorrect aggregation (sum) when selecting rows in the result set and implemented performance improvements |
-| Result Set | Improved support for copying large result sets to the clipboard |
-| Result Set | Added progress notification when copying result sets and implemented performance improvements |
-| Result Set | Improved formatting and result set navigation for columns containing XML |
-| Result Set | Added notification to identify when the number of rows or columns copied exceed Excel limits |
-| SQL Database Projects Extension | Addressed issue with schema compare dropping constraints |
-| SQL Database Projects Extension | Removed incorrect delete command from database references node |
-| SQL Database Projects Extension | Introduced ability to add sqlcmd variables without a default value via the quickpick |
-| User Management | Removed unsupported database roles for Azure SQL DB user creation |
-| User Management | Included MUST_CHANGE option for Azure SQL when creating a new login or for a password change |
-
-### Known issues in 1.45.0
-
- New Item | Details | Workaround |
-| --- | --- | --- |
-| Installation | Azure Data Studio installation fails on RHEL 8 | Use RHEL 9, or manually install glibc-2.29 and add it to the Library Path and then re-install ADS |
-
-## May 2023 (hotfix)
-
-Azure Data Studio 1.44.1 is the latest general availability (GA) release.
-
-- Release number: 1.44.1
-- Release date: June 5, 2023
-
-### Bug fixes in 1.44.1
-
-| New Item | Details |
-| --- | --- |
-| Backup & Restore | Fixed an issue in Object Explorer where the Restore dialog failed to open. https://github.com/microsoft/azuredatastudio/issues/23257 |
-| Connection | Resolved issue that caused a login failure in Azure SQL for hyphenated user accounts. https://github.com/microsoft/azuredatastudio/issues/23210 |
-| Object Explorer | Addressed inability to open a view using CTRL/CMD + Q or the Open View menu. https://github.com/microsoft/azuredatastudio/issues/23236 |
-| Query Editor | Introduced a performance improvement in the Query Editor language service by enabling connection pooling. https://github.com/microsoft/azuredatastudio/issues/22970 |
-
-## Version 1.44.0
-
-Azure Data Studio 1.44.0 is the latest general availability (GA) release.
-
-- Release number: 1.44.0
-- Release date: May 24, 2023
-
-### What's new in 1.44.0
-
-| New Item | Details |
-| --- | --- |
-| Connection | Enabled Sql Authentication Provider by default for Azure SQL connections and the MSAL Authentication Library.  Learn more at [Connect with Azure Data Studio](https://aka.ms/azuredatastudio-connection) |
-| Connection | Introduced support for passing in advanced connection options in command line arguments |
-| Connection | Added ability to provide an Application Name in the connection string parameter |
-| General | Added support for customizing table keyboard shortcuts |
-| General | Added warning notification on startup if Azure PII logging is enabled |
-| GitHub Copilot | GitHub Copilot extension for autocomplete-style suggestions added to extension gallery. Learn more at https://aka.ms/ads-copilot |
-| Notebooks | Fixed issue where deleted text listed using the Find feature |
-| Object Explorer | Introduced filtering capability for Object Explorer (preview) |
-| Query Editor | Shorted text for Change Connection and Export as Notebook button |
-| Query Results | Increased the default max column width |
-| SQL Database Projects Extension | Released version 1.1.1 |
-| SQL Database Projects Extension | Improved performance of loading one or more large projects |
-| SQL Database Projects Extension | Introduced ability to save publish settings to a new or existing  publish profile |
-| User Management | Added support for creating database and server roles (preview) |
-| User Management | Improved authentication options when creating database users (preview) |
-
-### Bug fixes in 1.44.0
-
-| New Item | Details |
-| --- | --- |
-| Accessibility | Added labels to radio groups in SQL Database Projects dialog |
-| Accessibility | Fixed issue with narrator reading character twice in network share path for Azure SQL migration extension |
-| Accessibility | Addressed problem where keyboard focus did not shift to error message when creating a new database |
-| Accessibility | Fixed issue with voiceover not announcing label names correctly when updating a database project |
-| Connection | Improved token refresh behavior |
-| Connection | Enabled support to login with blank passwords when creating MSSQL connection |
-| Connection | Added change password dialog display after password expiration occurs for a SQL login |
-| Connection | Addressed scenario where Intellisense stopped working after a connection token expired |
-| Connection | Fixed behavior where PostgreSQL username was incorrectly replaced |
-| Connection | Implemented support for connections against the same server but with different properties |
-| Connection | Resolved issue where connection status changed to red (disconnected) after moving an active connection to a server group |
-| Connection | Updated Azure node in Connection dialog to include notation when no subscriptions are found |
-| Connection | Updated firewall dialog to pre-select the account and tenant in the connection dialog |
-| Extension | Fixed an issue with over-encoded URLs in diagnostic error messages |
-| Intellisense | Resolved issue with SORT_IN_TEMPDB not recognized as valid T-SQL syntax when creating an object |
-| Notebooks | Updated Notebook connection to support MySQL and PostgreSQL when connecting to an existing Notebook |
-| Query Results | Fixed overlapping action display when multiple result sets are returned |
-| Schema Compare | Update scmp files to be backwards compatible |
-| SQL Database Projects Extension | Fixed multiple issues related to SQLCMD variables and projects |
-| SQL Database Projects Extension | Addressed a failure that was occurring when using schema compare with Azure Synapse dedicated pools |
-| SQL Database Projects Extension | Resolved problem where a database project would not build after a reference to a system database was added from SSDT |
-| SQL Database Projects Extension | Fixed issue where projects were listed twice when using multi root workspaces |
-| SQL Database Projects Extension | Fixed an issue where file structure information was not stored in the scmp file after a schema compare |
-| SQL Database Projects (VS Code) | Updated default folder location when creating a new project from database workflow |
-
-For a full list of bug fixes addressed for the May 2023 release, visit the [May 2023 Release on GitHub](https://github.com/microsoft/azuredatastudio/milestone/98?closed=1).
-
-## Version 1.43.0
-* Release number: 1.43.0
-* Release date: April 12, 2023
-
-### What's new in 1.43.0
-
-| New Item | Details |
-| --- | --- |
-| Connection | Added notation for required properties (e.g. Attestation protocol and Attestation URL) when Secure Enclaves are enabled |
-| SQL Database Projects extension | General Availability |
-| SQL Database Projects extension | Move and rename files within Database Projects view |
-| SQL Database Projects extension | SQLCMD variables available for editing in Database Projects view |
-| Object Explorer | Double-clicking on a user or table in Object Explorer will open the designer for the object |
-| Query Editor | Added a Parse button to the Query Editor toolbar for parsing queries before execution |
-| Query Results | Added support to select a row in query results via double click |
-
-### Bug fixes in 1.43.0
-
-| New Item | Details |
-| --- | --- |
-| Connection | Added support for linked accounts with same username but different domains |
-| Connection | Fixed issue with incorrect cache write path |
-| Connection | Added ability to include optional name and grouping when creating a new connection using a connection string |
-| Connection | Updating username in MSSQL connections to use Preferred username for the display name |
-| Connection | Fixed issue with encoding for OSX keychain on macOS |
-| Connection | Added support for Azure MFA and ‘Sql Authentication Provider’ on Linux |
-| Dataverse | Addressed error generated when expanding the database node for a Dataverse database in Object Explorer |
-| IntelliCode extension | Fixed error that occurred when launching Azure Data Studio with Visual Studio Code IntelliCode extension installed |
-| PostgreSQL extension | Implemented support for exporting query results on Apple M1 from a notebook |
-| SQL Database Projects extension | Added Accessibility Fixes related to screen reader, label names, and improved focus when navigating |
-
-For a full list of bug fixes addressed for the April 2023 release, visit the [April 2023 Release on GitHub](https://github.com/microsoft/azuredatastudio/milestone/99?closed=1).
-
 ## Version 1.42.0
 * Release number: 1.42.0
 * Release date: March 22, 2023
@@ -286,7 +97,7 @@ For a list of the current known issues, visit the [issues list on GitHub](https:
 | Connection | Include ability to change password for new or expired login. |
 | Connection | Add support for SQL Server Alias use when connecting to a server. |
 | MongoDB Atlas Extension | Provides the ability to connect to and query data on MongoDB Atlas (Preview). |
-| Notebooks | Provide option for users to convert markdown to a table or not when HTML table tag is present. |
+| Notebooks | Provide option for users to convert markdown to a table or not when HMTL table tag is present. |
 | Object Explorer | Databases are no longer brought online in serverless Azure SQL when Databases node is expanded. |
 | Object Explorer | Added support for Ledger views. |
 | Object Explorer | Fixed issue with key binding for objectExplorer.manage not working. |

README.md

@@ -4,7 +4,7 @@
 [![Build Status](https://dev.azure.com/ms/azuredatastudio/_apis/build/status/AzureDataStudio-Localization-CI?branchName=main)](https://dev.azure.com/ms/azuredatastudio/_build/latest?definitionId=453&branchName=main)
 [![Twitter Follow](https://img.shields.io/twitter/follow/azuredatastudio?style=social)](https://twitter.com/azuredatastudio)
 
-Azure Data Studio is a data management and development tool with connectivity to popular cloud and on-premises databases. Azure Data Studio supports Windows, macOS, and Linux, with immediate capability to connect to Azure SQL and SQL Server.  Browse the [extension library](wiki/List-of-Extensions) for additional database support options including MySQL, PostreSQL, and MongoDB.
+Azure Data Studio is a data management tool that enables you to work with SQL Server, Azure SQL DB and SQL DW from Windows, macOS and Linux.
 
 ## **Download the latest Azure Data Studio release**
 
@@ -18,18 +18,18 @@ Azure Data Studio is a data management and development tool with connectivity to
 |         |.rpm             |[64 bit][linux-rpm] |
 |Mac      |.zip             |[Universal][osx-universal] [Intel Chip][osx-zip] [Apple Silicon][osx-arm64] |
 
-[win-user]: https://azuredatastudio-update.azurewebsites.net/latest/win32-x64-user/stable
-[win-system]: https://azuredatastudio-update.azurewebsites.net/latest/win32-x64/stable
-[win-zip]: https://azuredatastudio-update.azurewebsites.net/latest/win32-x64-archive/stable
-[win-user-arm64]: https://azuredatastudio-update.azurewebsites.net/latest/win32-arm64-user/stable
-[win-system-arm64]: https://azuredatastudio-update.azurewebsites.net/latest/win32-arm64/stable
-[win-zip-arm64]: https://azuredatastudio-update.azurewebsites.net/latest/win32-arm64-archive/stable
-[linux-zip]: https://azuredatastudio-update.azurewebsites.net/latest/linux-x64/stable
-[linux-deb]: https://azuredatastudio-update.azurewebsites.net/latest/linux-deb-x64/stable
-[linux-rpm]: https://azuredatastudio-update.azurewebsites.net/latest/linux-rpm-x64/stable
-[osx-universal]: https://azuredatastudio-update.azurewebsites.net/latest/darwin-universal/stable
-[osx-zip]: https://azuredatastudio-update.azurewebsites.net/latest/darwin/stable
-[osx-arm64]: https://azuredatastudio-update.azurewebsites.net/latest/darwin-arm64/stable
+[win-user]: https://go.microsoft.com/fwlink/?linkid=2228644
+[win-system]: https://go.microsoft.com/fwlink/?linkid=2228645
+[win-zip]: https://go.microsoft.com/fwlink/?linkid=2228646
+[win-user-arm64]: https://go.microsoft.com/fwlink/?linkid=2229004
+[win-system-arm64]: https://go.microsoft.com/fwlink/?linkid=2228647
+[win-zip-arm64]: https://go.microsoft.com/fwlink/?linkid=2229005
+[osx-universal]: https://go.microsoft.com/fwlink/?linkid=2228649
+[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2228179
+[osx-arm64]: https://go.microsoft.com/fwlink/?linkid=2228648
+[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2229006
+[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2228650
+[linux-deb]: https://go.microsoft.com/fwlink/?linkid=2228180
 
 Go to our [download page](https://aka.ms/getazuredatastudio) for more specific instructions.
 
@@ -58,9 +58,10 @@ Go to our [download page](https://aka.ms/getazuredatastudio) for more specific i
 [in-osx-zip]: https://azuredatastudio-update.azurewebsites.net/latest/darwin/insider
 [in-osx-arm64]: https://azuredatastudio-update.azurewebsites.net/latest/darwin-arm64/insider
 
-Please visit our [download page](https://aka.ms/getazuredatastudio) for more specific installation instructions.
-Check out the [change log](https://github.com/Microsoft/azuredatastudio/blob/main/CHANGELOG.md) or [release notes](https://learn.microsoft.com/sql/azure-data-studio/release-notes-azure-data-studio) for additional details of what's in the each release.
-The [Azure Data Studio documentation](https://learn.microsoft.com/sql/azure-data-studio) includes complete details on getting started, connection quickstarts, and feature tutorials.
+
+See the [change log](https://github.com/Microsoft/azuredatastudio/blob/main/CHANGELOG.md) for additional details of what's in this release.
+Go to our [download page](https://aka.ms/getazuredatastudio) for more specific instructions.
+
 
 ## **Feature Highlights**
 

build/.cachesalt

@@ -1 +1 @@
-2023-07-18T12:39:03.753Z
+2022-10-06T02:27:18.022Z

build/.gitignore

@@ -1 +0,0 @@
-.yarnrc

build/.moduleignore

@@ -12,14 +12,6 @@ fsevents/src/**
 fsevents/test/**
 !fsevents/**/*.node
 
-@vscode/spdlog/binding.gyp
-@vscode/spdlog/build/**
-@vscode/spdlog/deps/**
-@vscode/spdlog/src/**
-@vscode/spdlog/test/**
-@vscode/spdlog/*.yml
-!@vscode/spdlog/build/Release/*.node
-
 @vscode/sqlite3/binding.gyp
 @vscode/sqlite3/benchmark/**
 @vscode/sqlite3/cloudformation/**
@@ -29,20 +21,10 @@ fsevents/test/**
 @vscode/sqlite3/src/**
 !@vscode/sqlite3/build/Release/*.node
 
-@vscode/windows-mutex/binding.gyp
-@vscode/windows-mutex/build/**
-@vscode/windows-mutex/src/**
-!@vscode/windows-mutex/**/*.node
-
-@vscode/windows-process-tree/binding.gyp
-@vscode/windows-process-tree/build/**
-@vscode/windows-process-tree/src/**
-!@vscode/windows-process-tree/**/*.node
-
-@vscode/windows-registry/binding.gyp
-@vscode/windows-registry/src/**
-@vscode/windows-registry/build/**
-!@vscode/windows-registry/build/Release/*.node
+windows-mutex/binding.gyp
+windows-mutex/build/**
+windows-mutex/src/**
+!windows-mutex/**/*.node
 
 native-keymap/binding.gyp
 native-keymap/build/**
@@ -61,16 +43,26 @@ native-watchdog/build/**
 native-watchdog/src/**
 !native-watchdog/build/Release/*.node
 
-node-vsce-sign/**
-!node-vsce-sign/src/main.js
-!node-vsce-sign/package.json
-!node-vsce-sign/bin/**
+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/**
@@ -81,11 +73,9 @@ keytar/node_modules/**
 node-pty/binding.gyp
 node-pty/build/**
 node-pty/src/**
-node-pty/lib/*.test.js
 node-pty/tools/**
 node-pty/deps/**
 node-pty/scripts/**
-!node-pty/build/Release/spawn-helper
 !node-pty/build/Release/*.exe
 !node-pty/build/Release/*.dll
 !node-pty/build/Release/*.node
@@ -114,6 +104,18 @@ kerberos/build/**
 
 # END SQL Modules
 
+nsfw/binding.gyp
+nsfw/build/**
+nsfw/src/**
+nsfw/includes/**
+!nsfw/build/Release/*.node
+
+vscode-nsfw/binding.gyp
+vscode-nsfw/build/**
+vscode-nsfw/src/**
+vscode-nsfw/includes/**
+!vscode-nsfw/build/Release/*.node
+
 @parcel/watcher/binding.gyp
 @parcel/watcher/build/**
 @parcel/watcher/prebuilds/**
@@ -126,7 +128,6 @@ vsda/src/**
 vsda/.gitignore
 vsda/binding.gyp
 vsda/README.md
-vsda/SECURITY.md
 vsda/targets
 !vsda/build/Release/vsda.node
 
@@ -138,20 +139,11 @@ vscode-encrypt/binding.gyp
 vscode-encrypt/README.md
 !vscode-encrypt/build/Release/vscode-encrypt-native.node
 
-@vscode/policy-watcher/build/**
-@vscode/policy-watcher/.husky/**
-@vscode/policy-watcher/src/**
-@vscode/policy-watcher/binding.gyp
-@vscode/policy-watcher/README.md
-@vscode/policy-watcher/index.d.ts
-!@vscode/policy-watcher/build/Release/vscode-policy-watcher.node
-
-@vscode/windows-ca-certs/**/*
-!@vscode/windows-ca-certs/package.json
-!@vscode/windows-ca-certs/**/*.node
+vscode-windows-ca-certs/**/*
+!vscode-windows-ca-certs/package.json
+!vscode-windows-ca-certs/**/*.node
 
 node-addon-api/**/*
-prebuild-install/**/*
 
 # other node modules
 
@@ -166,22 +158,11 @@ prebuild-install/**/*
 **/README.md
 **/readme.md
 **/readme.markdown
-**/CODE_OF_CONDUCT.md
-**/SUPPORT.md
-**/CONTRIBUTING.md
 
 **/*.ts
+!typescript/**/*.d.ts
 
-# Exclude TS files that aren't needed by TS extension
-typescript/lib/tsc.js
-typescript/lib/typescriptServices.js
-typescript/lib/tsserverlibrary.js
-# We still need to include stdlib d.ts
-!typescript/lib/lib*.d.ts
-
-jschardet/index.js
-jschardet/src/**
-jschardet/dist/jschardet.js
+jschardet/dist/**
 
 es6-promise/lib/**
 
@@ -200,3 +181,5 @@ xterm-addon-*/src/**
 xterm-addon-*/fixtures/**
 xterm-addon-*/out/**
 xterm-addon-*/out-test/**
+
+

build/.webignore

@@ -20,12 +20,6 @@ vscode-textmate/webpack.config.js
 
 xterm/src/**
 
-xterm-addon-canvas/src/**
-xterm-addon-canvas/out/**
-
-xterm-addon-image/src/**
-xterm-addon-image/out/**
-
 xterm-addon-search/src/**
 xterm-addon-search/out/**
 xterm-addon-search/fixtures/**
@@ -38,15 +32,3 @@ xterm-addon-webgl/out/**
 
 # This makes sure the model is included in the package
 !@vscode/vscode-languagedetection/model/**
-# Ensure only the required telemetry pieces are loaded in web to reduce bundle size
-@microsoft/1ds-core-js/**
-@microsoft/1ds-post-js/**
-@microsoft/applicationinsights-core-js/**
-@microsoft/applicationinsights-shims/**
-!@microsoft/1ds-core-js/dist/ms.core.min.js
-!@microsoft/1ds-post-js/dist/ms.post.min.js
-!@microsoft/applicationinsights-core-js/browser/applicationinsights-core-js.min.js
-!@microsoft/applicationinsights-shims/dist/umd/applicationinsights-shims.min.js
-
-vsda/**
-!vsda/rust/web/**

build/actions/api/api.js

@@ -4,4 +4,3 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRyJ9

build/actions/api/octokit.ts

@@ -25,6 +25,7 @@ export class OctoKit implements GitHub {
 
 	async *query(query: Query): AsyncIterableIterator<GitHubIssue[]> {
 		const q = query.q + ` repo:${this.params.owner}/${this.params.repo}`
+		console.log(`Querying for ${q}:`)
 
 		const options = this.octokit.search.issuesAndPullRequests.endpoint.merge({
 			...query,
@@ -49,6 +50,7 @@ export class OctoKit implements GitHub {
 			await timeout()
 			await logRateLimit(this.token)
 			const page: Array<Octokit.SearchIssuesAndPullRequestsResponseItemsItem> = pageResponse.data
+			console.log(`Page ${++pageNum}: ${page.map(({ number }) => number).join(' ')}`)
 			yield page.map(
 				(issue) => new OctoKitIssue(this.token, this.params, this.octokitIssueToIssue(issue)),
 			)
@@ -197,6 +199,7 @@ export class OctoKitIssue extends OctoKit implements GitHubIssue {
 			return this.issueData
 		}
 
+		console.log('Fetching issue ' + this.issueData.number)
 		const issue = (
 			await this.octokit.issues.get({
 				...this.params,
@@ -283,6 +286,7 @@ export class OctoKitIssue extends OctoKit implements GitHubIssue {
 				})
 		} catch (err) {
 			if (err.status === 404) {
+				console.log(`Label ${name} not found on issue`)
 				return
 			}
 			throw err
@@ -310,6 +314,7 @@ export class OctoKitIssue extends OctoKit implements GitHubIssue {
 				}
 			}
 		}
+		console.log(`Got ${closingCommit} as closing commit of ${this.issueData.number}`)
 		return closingCommit
 	}
 }

build/actions/auto-labeler/index.js

@@ -8,16 +8,15 @@ const core = require("@actions/core");
 const github_1 = require("@actions/github");
 const octokit_1 = require("../api/octokit");
 const utils_1 = require("../utils/utils");
-const token = (0, utils_1.getRequiredInput)('token');
-const label = (0, utils_1.getRequiredInput)('label');
+const token = utils_1.getRequiredInput('token');
+const label = utils_1.getRequiredInput('label');
 async function main() {
     const pr = new octokit_1.OctoKitIssue(token, github_1.context.repo, { number: github_1.context.issue.number });
     pr.addLabel(label);
 }
 main()
-    .then(() => (0, utils_1.logRateLimit)(token))
+    .then(() => utils_1.logRateLimit(token))
     .catch(async (error) => {
     core.setFailed(error.message);
-    await (0, utils_1.logErrorToIssue)(error.message, true, token);
+    await utils_1.logErrorToIssue(error.message, true, token);
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7O0FBRWhHLHNDQUFxQztBQUNyQyw0Q0FBeUM7QUFDekMsNENBQTZDO0FBQzdDLDBDQUFnRjtBQUVoRixNQUFNLEtBQUssR0FBRyxJQUFBLHdCQUFnQixFQUFDLE9BQU8sQ0FBQyxDQUFDO0FBQ3hDLE1BQU0sS0FBSyxHQUFHLElBQUEsd0JBQWdCLEVBQUMsT0FBTyxDQUFDLENBQUM7QUFFeEMsS0FBSyxVQUFVLElBQUk7SUFFbEIsTUFBTSxFQUFFLEdBQUcsSUFBSSxzQkFBWSxDQUFDLEtBQUssRUFBRSxnQkFBTyxDQUFDLElBQUksRUFBRSxFQUFFLE1BQU0sRUFBRSxnQkFBTyxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO0lBRW5GLEVBQUUsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDcEIsQ0FBQztBQUVELElBQUksRUFBRTtLQUNKLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFBLG9CQUFZLEVBQUMsS0FBSyxDQUFDLENBQUM7S0FDL0IsS0FBSyxDQUFDLEtBQUssRUFBRSxLQUFLLEVBQUUsRUFBRTtJQUN0QixJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUM3QixNQUFNLElBQUEsdUJBQWUsRUFBQyxLQUFLLENBQUMsT0FBTyxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQTtBQUNsRCxDQUFDLENBQUMsQ0FBQSJ9

build/actions/package.json

@@ -1,25 +1,24 @@
 {
-  "name": "github-actions",
-  "version": "1.0.0",
-  "description": "GitHub Actions",
-  "scripts": {
-    "test": "mocha -r ts-node/register **/*.test.ts",
-    "build": "tsc -p ./tsconfig.json",
-    "compile": "tsc -p ./tsconfig.json",
-    "lint": "eslint -c .eslintrc --fix --ext .ts .",
-    "watch-typecheck": "tsc --watch"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/microsoft/azuredatastudio.git"
-  },
-  "keywords": [],
-  "author": "",
-  "dependencies": {
-    "@actions/core": "^1.2.6",
-    "@actions/github": "^2.1.1",
-    "axios": "^0.21.4",
+	"name": "github-actions",
+	"version": "1.0.0",
+	"description": "GitHub Actions",
+	"scripts": {
+		"test": "mocha -r ts-node/register **/*.test.ts",
+		"build": "tsc -p ./tsconfig.json",
+		"lint": "eslint -c .eslintrc --fix --ext .ts .",
+		"watch-typecheck": "tsc --watch"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/microsoft/azuredatastudio.git"
+	},
+	"keywords": [],
+	"author": "",
+	"dependencies": {
+		"@actions/core": "^1.2.6",
+		"@actions/github": "^2.1.1",
+		"axios": "^0.21.4",
     "ts-node": "^8.6.2",
     "typescript": "^3.8.3"
-  }
+	}
 }

build/actions/utils/utils.js

@@ -4,16 +4,13 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logErrorToIssue = exports.logRateLimit = exports.daysAgoToHumanReadbleDate = exports.daysAgoToTimestamp = exports.loadLatestRelease = exports.normalizeIssue = exports.getRequiredInput = exports.getInput = void 0;
 const core = require("@actions/core");
 const github_1 = require("@actions/github");
 const axios_1 = require("axios");
 const octokit_1 = require("../api/octokit");
-const getInput = (name) => core.getInput(name) || undefined;
-exports.getInput = getInput;
-const getRequiredInput = (name) => core.getInput(name, { required: true });
-exports.getRequiredInput = getRequiredInput;
-const normalizeIssue = (issue) => {
+exports.getInput = (name) => core.getInput(name) || undefined;
+exports.getRequiredInput = (name) => core.getInput(name, { required: true });
+exports.normalizeIssue = (issue) => {
     const { body, title } = issue;
     const isBug = body.includes('bug_report_template') || /Issue Type:.*Bug.*/.test(body);
     const isFeatureRequest = body.includes('feature_request_template') || /Issue Type:.*Feature Request.*/.test(body);
@@ -36,25 +33,23 @@ const normalizeIssue = (issue) => {
         issueType: isBug ? 'bug' : isFeatureRequest ? 'feature_request' : 'unknown',
     };
 };
-exports.normalizeIssue = normalizeIssue;
-const loadLatestRelease = async (quality) => (await axios_1.default.get(`https://vscode-update.azurewebsites.net/api/update/darwin/${quality}/latest`)).data;
-exports.loadLatestRelease = loadLatestRelease;
-const daysAgoToTimestamp = (days) => +new Date(Date.now() - days * 24 * 60 * 60 * 1000);
-exports.daysAgoToTimestamp = daysAgoToTimestamp;
-const daysAgoToHumanReadbleDate = (days) => new Date(Date.now() - days * 24 * 60 * 60 * 1000).toISOString().replace(/\.\d{3}\w$/, '');
-exports.daysAgoToHumanReadbleDate = daysAgoToHumanReadbleDate;
-const logRateLimit = async (token) => {
+exports.loadLatestRelease = async (quality) => (await axios_1.default.get(`https://vscode-update.azurewebsites.net/api/update/darwin/${quality}/latest`)).data;
+exports.daysAgoToTimestamp = (days) => +new Date(Date.now() - days * 24 * 60 * 60 * 1000);
+exports.daysAgoToHumanReadbleDate = (days) => new Date(Date.now() - days * 24 * 60 * 60 * 1000).toISOString().replace(/\.\d{3}\w$/, '');
+exports.logRateLimit = async (token) => {
     const usageData = (await new github_1.GitHub(token).rateLimit.get()).data.resources;
     ['core', 'graphql', 'search'].forEach(async (category) => {
         const usage = 1 - usageData[category].remaining / usageData[category].limit;
         const message = `Usage at ${usage} for ${category}`;
+        if (usage > 0) {
+            console.log(message);
+        }
         if (usage > 0.5) {
-            await (0, exports.logErrorToIssue)(message, false, token);
+            await exports.logErrorToIssue(message, false, token);
         }
     });
 };
-exports.logRateLimit = logRateLimit;
-const logErrorToIssue = async (message, ping, token) => {
+exports.logErrorToIssue = async (message, ping, token) => {
     // Attempt to wait out abuse detection timeout if present
     await new Promise((resolve) => setTimeout(resolve, 10000));
     const dest = github_1.context.repo.repo === 'vscode-internalbacklog'
@@ -75,5 +70,3 @@ ${JSON.stringify(github_1.context, null, 2).replace(/<!--/gu, '<@--').replace(/-
 -->
 `);
 };
-exports.logErrorToIssue = logErrorToIssue;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ1dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUVoRyxzQ0FBcUM7QUFDckMsNENBQWlEO0FBQ2pELGlDQUF5QjtBQUN6Qiw0Q0FBNkM7QUFHdEMsTUFBTSxRQUFRLEdBQUcsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksU0FBUyxDQUFBO0FBQTdELFFBQUEsUUFBUSxZQUFxRDtBQUNuRSxNQUFNLGdCQUFnQixHQUFHLENBQUMsSUFBWSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFBO0FBQTVFLFFBQUEsZ0JBQWdCLG9CQUE0RDtBQUVsRixNQUFNLGNBQWMsR0FBRyxDQUM3QixLQUFZLEVBQ3dFLEVBQUU7SUFDdEYsTUFBTSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsR0FBRyxLQUFLLENBQUE7SUFFN0IsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxxQkFBcUIsQ0FBQyxJQUFJLG9CQUFvQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUNyRixNQUFNLGdCQUFnQixHQUNyQixJQUFJLENBQUMsUUFBUSxDQUFDLDBCQUEwQixDQUFDLElBQUksZ0NBQWdDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFBO0lBRXpGLE1BQU0sT0FBTyxHQUFHLENBQUMsR0FBVyxFQUFFLEVBQUUsQ0FDL0IsR0FBRztTQUNELFdBQVcsRUFBRTtTQUNiLE9BQU8sQ0FBQyxjQUFjLEVBQUUsRUFBRSxDQUFDO1NBQzNCLE9BQU8sQ0FBQyxrQkFBa0IsRUFBRSxFQUFFLENBQUM7U0FDL0IsT0FBTyxDQUFDLGtCQUFrQixFQUFFLEVBQUUsQ0FBQztTQUMvQixPQUFPLENBQUMsZ0NBQWdDLEVBQUUsRUFBRSxDQUFDO1NBQzdDLE9BQU8sQ0FBQyxZQUFZLEVBQUUsRUFBRSxDQUFDO1NBQ3pCLE9BQU8sQ0FBQyxrQ0FBa0MsRUFBRSxFQUFFLENBQUM7U0FDL0MsT0FBTyxDQUFDLHVCQUF1QixFQUFFLEVBQUUsQ0FBQztTQUNwQyxPQUFPLENBQUMsNERBQTRELEVBQUUsRUFBRSxDQUFDO1NBQ3pFLE9BQU8sQ0FBQyxrQkFBa0IsRUFBRSxFQUFFLENBQUM7U0FDL0IsT0FBTyxDQUFDLG9CQUFvQixFQUFFLEVBQUUsQ0FBQztTQUNqQyxPQUFPLENBQUMsT0FBTyxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBRXhCLE9BQU87UUFDTixJQUFJLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQztRQUNuQixLQUFLLEVBQUUsT0FBTyxDQUFDLEtBQUssQ0FBQztRQUNyQixTQUFTLEVBQUUsS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDLENBQUMsU0FBUztLQUMzRSxDQUFBO0FBQ0YsQ0FBQyxDQUFBO0FBN0JZLFFBQUEsY0FBYyxrQkE2QjFCO0FBUU0sTUFBTSxpQkFBaUIsR0FBRyxLQUFLLEVBQUUsT0FBNkIsRUFBZ0MsRUFBRSxDQUN0RyxDQUFDLE1BQU0sZUFBSyxDQUFDLEdBQUcsQ0FBQyw2REFBNkQsT0FBTyxTQUFTLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQTtBQUR6RixRQUFBLGlCQUFpQixxQkFDd0U7QUFFL0YsTUFBTSxrQkFBa0IsR0FBRyxDQUFDLElBQVksRUFBVSxFQUFFLENBQUMsQ0FBQyxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsSUFBSSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFBO0FBQWpHLFFBQUEsa0JBQWtCLHNCQUErRTtBQUV2RyxNQUFNLHlCQUF5QixHQUFHLENBQUMsSUFBWSxFQUFFLEVBQUUsQ0FDekQsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLElBQUksR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxPQUFPLENBQUMsWUFBWSxFQUFFLEVBQUUsQ0FBQyxDQUFBO0FBRDdFLFFBQUEseUJBQXlCLDZCQUNvRDtBQUVuRixNQUFNLFlBQVksR0FBRyxLQUFLLEVBQUUsS0FBYSxFQUFFLEVBQUU7SUFDbkQsTUFBTSxTQUFTLEdBQUcsQ0FBQyxNQUFNLElBQUksZUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLFNBQVMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUM7SUFDMUUsQ0FBQyxNQUFNLEVBQUUsU0FBUyxFQUFFLFFBQVEsQ0FBVyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsUUFBUSxFQUFFLEVBQUU7UUFDbkUsTUFBTSxLQUFLLEdBQUcsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxTQUFTLEdBQUcsU0FBUyxDQUFDLFFBQVEsQ0FBQyxDQUFDLEtBQUssQ0FBQTtRQUMzRSxNQUFNLE9BQU8sR0FBRyxZQUFZLEtBQUssUUFBUSxRQUFRLEVBQUUsQ0FBQTtRQUNuRCxJQUFJLEtBQUssR0FBRyxHQUFHLEVBQUU7WUFDaEIsTUFBTSxJQUFBLHVCQUFlLEVBQUMsT0FBTyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsQ0FBQTtTQUM1QztJQUNGLENBQUMsQ0FBQyxDQUFBO0FBQ0gsQ0FBQyxDQUFBO0FBVFksUUFBQSxZQUFZLGdCQVN4QjtBQUVNLE1BQU0sZUFBZSxHQUFHLEtBQUssRUFBRSxPQUFlLEVBQUUsSUFBYSxFQUFFLEtBQWEsRUFBaUIsRUFBRTtJQUNyRyx5REFBeUQ7SUFDekQsTUFBTSxJQUFJLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsVUFBVSxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFBO0lBQzFELE1BQU0sSUFBSSxHQUNULGdCQUFPLENBQUMsSUFBSSxDQUFDLElBQUksS0FBSyx3QkFBd0I7UUFDN0MsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLHdCQUF3QixFQUFFLEtBQUssRUFBRSxHQUFHLEVBQUU7UUFDaEQsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLENBQUE7SUFDcEMsT0FBTyxJQUFJLHNCQUFZLENBQUMsS0FBSyxFQUFFLEVBQUUsS0FBSyxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxFQUFFLEVBQUUsTUFBTSxFQUFFLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztTQUM3RixXQUFXLENBQUM7WUFDSCxnQkFBTyxDQUFDLFFBQVE7O1NBRW5CLE9BQU87O1NBRVAsSUFBSSxDQUFDLENBQUMsQ0FBQyxHQUFHLGdCQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssSUFBSSxnQkFBTyxDQUFDLElBQUksQ0FBQyxJQUFJLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxHQUFHLGdCQUFPLENBQUMsS0FBSyxDQUFDLE1BQU07O1FBRWpGLGdCQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssSUFBSSxnQkFBTyxDQUFDLElBQUksQ0FBQyxJQUFJOzs7RUFHN0MsSUFBSSxDQUFDLFNBQVMsQ0FBQyxnQkFBTyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDOztDQUVwRixDQUFDLENBQUE7QUFDRixDQUFDLENBQUE7QUFyQlksUUFBQSxlQUFlLG1CQXFCM0IifQ==

build/actions/utils/utils.ts

@@ -58,10 +58,13 @@ export const daysAgoToHumanReadbleDate = (days: number) =>
 	new Date(Date.now() - days * 24 * 60 * 60 * 1000).toISOString().replace(/\.\d{3}\w$/, '')
 
 export const logRateLimit = async (token: string) => {
-	const usageData = (await new GitHub(token).rateLimit.get()).data.resources;
-	(['core', 'graphql', 'search'] as const).forEach(async (category) => {
+	const usageData = (await new GitHub(token).rateLimit.get()).data.resources
+	;(['core', 'graphql', 'search'] as const).forEach(async (category) => {
 		const usage = 1 - usageData[category].remaining / usageData[category].limit
 		const message = `Usage at ${usage} for ${category}`
+		if (usage > 0) {
+			console.log(message)
+		}
 		if (usage > 0.5) {
 			await logErrorToIssue(message, false, token)
 		}

build/actions/yarn.lock

@@ -285,8 +285,6 @@ node-fetch@^2.3.0:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
   integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
-  dependencies:
-    whatwg-url "^5.0.0"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
@@ -373,11 +371,6 @@ strip-eof@^1.0.0:
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
   integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
-
 ts-node@^8.6.2:
   version "8.9.0"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.9.0.tgz#d7bf7272dcbecd3a2aa18bd0b96c7d2f270c15d4"
@@ -395,9 +388,9 @@ tunnel@0.0.6, tunnel@^0.0.6:
   integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
 
 typescript@^3.8.3:
-  version "3.9.10"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8"
-  integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
+  integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
 
 universal-user-agent@^4.0.0:
   version "4.0.1"
@@ -418,19 +411,6 @@ uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
-
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
 which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"

build/azure-pipelines/.gdntsa

@@ -0,0 +1,21 @@
+{
+    "codebaseName": "vscode-client",
+    "ppe": false,
+    "notificationAliases": [
+        "sbatten@microsoft.com"
+    ],
+    "codebaseAdmins": [
+        "REDMOND\\stbatt",
+        "REDMOND\\monacotools",
+    ],
+    "instanceUrl": "https://msazure.visualstudio.com/defaultcollection",
+    "projectName": "One",
+    "areaPath": "One\\VSCode\\Visual Studio Code Client",
+    "iterationPath": "One",
+    "notifyAlways": true,
+    "tools": [
+        "BinSkim",
+        "CredScan",
+        "CodeQL"
+    ]
+}

build/azure-pipelines/common/computeBuiltInDepsCacheKey.js

@@ -1,16 +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 fs = require("fs");
-const path = require("path");
-const crypto = require("crypto");
-const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../../product.json'), 'utf8'));
-const shasum = crypto.createHash('sha1');
-for (const ext of productjson.builtInExtensions) {
-    shasum.update(`${ext.name}@${ext.version}`);
-}
-process.stdout.write(shasum.digest('hex'));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcHV0ZUJ1aWx0SW5EZXBzQ2FjaGVLZXkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjb21wdXRlQnVpbHRJbkRlcHNDYWNoZUtleS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7O0FBRWhHLHlCQUF5QjtBQUN6Qiw2QkFBNkI7QUFDN0IsaUNBQWlDO0FBRWpDLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSx1QkFBdUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUM7QUFDdkcsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUV6QyxLQUFLLE1BQU0sR0FBRyxJQUFJLFdBQVcsQ0FBQyxpQkFBaUIsRUFBRTtJQUNoRCxNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsR0FBRyxDQUFDLElBQUksSUFBSSxHQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztDQUM1QztBQUVELE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyJ9

build/azure-pipelines/common/computeBuiltInDepsCacheKey.ts

@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as fs from 'fs';
-import * as path from 'path';
-import * as crypto from 'crypto';
-
-const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../../product.json'), 'utf8'));
-const shasum = crypto.createHash('sha1');
-
-for (const ext of productjson.builtInExtensions) {
-	shasum.update(`${ext.name}@${ext.version}`);
-}
-
-process.stdout.write(shasum.digest('hex'));

build/azure-pipelines/common/computeNodeModulesCacheKey.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  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");
@@ -14,15 +14,14 @@ shasum.update(fs.readFileSync(path.join(ROOT, 'build/.cachesalt')));
 shasum.update(fs.readFileSync(path.join(ROOT, '.yarnrc')));
 shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc')));
 // Add `package.json` and `yarn.lock` files
-for (const dir of dirs) {
+for (let dir of dirs) {
     const packageJsonPath = path.join(ROOT, dir, 'package.json');
     const packageJson = JSON.parse(fs.readFileSync(packageJsonPath).toString());
     const relevantPackageJsonSections = {
         dependencies: packageJson.dependencies,
         devDependencies: packageJson.devDependencies,
         optionalDependencies: packageJson.optionalDependencies,
-        resolutions: packageJson.resolutions,
-        distro: packageJson.distro
+        resolutions: packageJson.resolutions
     };
     shasum.update(JSON.stringify(relevantPackageJsonSections));
     const yarnLockPath = path.join(ROOT, dir, 'yarn.lock');
@@ -33,4 +32,3 @@ for (let i = 2; i < process.argv.length; i++) {
     shasum.update(process.argv[i]);
 }
 process.stdout.write(shasum.digest('hex'));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcHV0ZU5vZGVNb2R1bGVzQ2FjaGVLZXkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjb21wdXRlTm9kZU1vZHVsZXNDYWNoZUtleS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7O0FBRWhHLHlCQUF5QjtBQUN6Qiw2QkFBNkI7QUFDN0IsaUNBQWlDO0FBQ2pDLE1BQU0sRUFBRSxJQUFJLEVBQUUsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztBQUUzQyxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxXQUFXLENBQUMsQ0FBQztBQUUvQyxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBRXpDLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNwRSxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQzNELE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxnQkFBZ0IsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUVsRSwyQ0FBMkM7QUFDM0MsS0FBSyxNQUFNLEdBQUcsSUFBSSxJQUFJLEVBQUU7SUFDdkIsTUFBTSxlQUFlLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLGNBQWMsQ0FBQyxDQUFDO0lBQzdELE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxlQUFlLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO0lBQzVFLE1BQU0sMkJBQTJCLEdBQUc7UUFDbkMsWUFBWSxFQUFFLFdBQVcsQ0FBQyxZQUFZO1FBQ3RDLGVBQWUsRUFBRSxXQUFXLENBQUMsZUFBZTtRQUM1QyxvQkFBb0IsRUFBRSxXQUFXLENBQUMsb0JBQW9CO1FBQ3RELFdBQVcsRUFBRSxXQUFXLENBQUMsV0FBVztRQUNwQyxNQUFNLEVBQUUsV0FBVyxDQUFDLE1BQU07S0FDMUIsQ0FBQztJQUNGLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQywyQkFBMkIsQ0FBQyxDQUFDLENBQUM7SUFFM0QsTUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLFdBQVcsQ0FBQyxDQUFDO0lBQ3ZELE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO0NBQzdDO0FBRUQsdUNBQXVDO0FBQ3ZDLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRTtJQUM3QyxNQUFNLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztDQUMvQjtBQUVELE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyJ9

build/azure-pipelines/common/computeNodeModulesCacheKey.ts

@@ -3,6 +3,8 @@
  *  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';
@@ -17,15 +19,14 @@ shasum.update(fs.readFileSync(path.join(ROOT, '.yarnrc')));
 shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc')));
 
 // Add `package.json` and `yarn.lock` files
-for (const dir of dirs) {
+for (let dir of dirs) {
 	const packageJsonPath = path.join(ROOT, dir, 'package.json');
 	const packageJson = JSON.parse(fs.readFileSync(packageJsonPath).toString());
 	const relevantPackageJsonSections = {
 		dependencies: packageJson.dependencies,
 		devDependencies: packageJson.devDependencies,
 		optionalDependencies: packageJson.optionalDependencies,
-		resolutions: packageJson.resolutions,
-		distro: packageJson.distro
+		resolutions: packageJson.resolutions
 	};
 	shasum.update(JSON.stringify(relevantPackageJsonSections));
 

build/azure-pipelines/common/copyArtifacts.js

@@ -40,4 +40,3 @@ main().catch(err => {
     console.error(err);
     process.exit(1);
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29weUFydGlmYWN0cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNvcHlBcnRpZmFjdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7OztnR0FHZ0c7QUFFaEcsWUFBWSxDQUFDOztBQUViLGdDQUFnQztBQUNoQyw2QkFBNkI7QUFDN0IsbUNBQW1DO0FBQ25DLHlCQUF5QjtBQUV6QixNQUFNLEtBQUssR0FBRztJQUNiLDRCQUE0QjtJQUM1Qiw2QkFBNkI7SUFDN0IsaUNBQWlDO0lBQ2pDLG1DQUFtQztJQUNuQywrQkFBK0I7SUFDL0Isa0NBQWtDO0lBQ2xDLCtCQUErQjtJQUMvQix1QkFBdUI7SUFDdkIsd0JBQXdCO0lBQ3hCLGlCQUFpQjtJQUNqQixpQkFBaUI7SUFDakIscUJBQXFCLENBQUMsc0JBQXNCO0NBQzVDLENBQUM7QUFFRixLQUFLLFVBQVUsSUFBSTtJQUNsQixPQUFPLElBQUksT0FBTyxDQUFPLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFO1FBQzVDLE1BQU0sTUFBTSxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFFLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxVQUFVLEVBQUUsSUFBSSxFQUFFLENBQUM7YUFDakUsSUFBSSxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDdkIsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLDhCQUErQjtZQUNyRSx1REFBdUQ7WUFDdkQsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUN0RCxFQUFFLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUUsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUMxRCxFQUFFLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDcEMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUVMLE1BQU0sQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLEdBQUcsRUFBRSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7UUFDbEMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNwQyxDQUFDLENBQUMsQ0FBQztBQUNKLENBQUM7QUFFRCxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUU7SUFDbEIsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNuQixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2pCLENBQUMsQ0FBQyxDQUFDIn0=

build/azure-pipelines/common/createAsset.ts

@@ -3,6 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import * as fs from 'fs';
 import { Readable } from 'stream';
 import * as crypto from 'crypto';
@@ -56,8 +58,6 @@ function getPlatform(product: string, os: string, arch: string, type: string): s
 						throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
 					}
 					return arch === 'ia32' ? 'server-win32-web' : `server-win32-${arch}-web`;
-				case 'cli':
-					return `cli-win32-${arch}`;
 				default:
 					throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
 			}
@@ -67,8 +67,6 @@ function getPlatform(product: string, os: string, arch: string, type: string): s
 					return `server-alpine-${arch}`;
 				case 'web':
 					return `server-alpine-${arch}-web`;
-				case 'cli':
-					return `cli-alpine-${arch}`;
 				default:
 					throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
 			}
@@ -91,8 +89,6 @@ function getPlatform(product: string, os: string, arch: string, type: string): s
 					return `linux-deb-${arch}`;
 				case 'rpm-package':
 					return `linux-rpm-${arch}`;
-				case 'cli':
-					return `cli-linux-${arch}`;
 				default:
 					throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
 			}
@@ -113,8 +109,6 @@ function getPlatform(product: string, os: string, arch: string, type: string): s
 						return 'server-darwin-web';
 					}
 					return `server-darwin-${arch}-web`;
-				case 'cli':
-					return `cli-darwin-${arch}`;
 				default:
 					throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
 			}
@@ -163,7 +157,7 @@ async function main(): Promise<void> {
 	const platform = getPlatform(product, os, arch, unprocessedType);
 	const type = getRealType(unprocessedType);
 	const quality = getEnv('VSCODE_QUALITY');
-	const commit = getEnv('BUILD_SOURCEVERSION');
+	const commit = process.env['VSCODE_DISTRO_COMMIT'] || getEnv('BUILD_SOURCEVERSION');
 
 	console.log('Creating asset...');
 
@@ -186,6 +180,12 @@ async function main(): Promise<void> {
 	const blobServiceClient = new BlobServiceClient(`https://vscode.blob.core.windows.net`, credential, storagePipelineOptions);
 	const containerClient = blobServiceClient.getContainerClient(quality);
 	const blobClient = containerClient.getBlockBlobClient(blobName);
+	const blobExists = await blobClient.exists();
+
+	if (blobExists) {
+		console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`);
+		return;
+	}
 
 	const blobOptions: BlockBlobParallelUploadOptions = {
 		blobHTTPHeaders: {
@@ -195,15 +195,12 @@ async function main(): Promise<void> {
 		}
 	};
 
-	const uploadPromises: Promise<void>[] = [];
-	if (await blobClient.exists()) {
-		console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`);
-	} else {
-		uploadPromises.push(retry(async () => {
+	const uploadPromises: Promise<void>[] = [
+		retry(async () => {
 			await blobClient.uploadFile(filePath, blobOptions);
 			console.log('Blob successfully uploaded to Azure storage.');
-		}));
-	}
+		})
+	];
 
 	const shouldUploadToMooncake = /true/i.test(process.env['VSCODE_PUBLISH_TO_MOONCAKE'] ?? 'true');
 
@@ -213,27 +210,18 @@ async function main(): Promise<void> {
 		const mooncakeContainerClient = mooncakeBlobServiceClient.getContainerClient(quality);
 		const mooncakeBlobClient = mooncakeContainerClient.getBlockBlobClient(blobName);
 
-		if (await mooncakeBlobClient.exists()) {
-			console.log(`Mooncake Blob ${quality}, ${blobName} already exists, not publishing again.`);
-		} else {
-			uploadPromises.push(retry(async () => {
-				await mooncakeBlobClient.uploadFile(filePath, blobOptions);
-				console.log('Blob successfully uploaded to Mooncake Azure storage.');
-			}));
-		}
+		uploadPromises.push(retry(async () => {
+			await mooncakeBlobClient.uploadFile(filePath, blobOptions);
+			console.log('Blob successfully uploaded to Mooncake Azure storage.');
+		}));
 
-		if (uploadPromises.length) {
-			console.log('Uploading blobs to Azure storage and Mooncake Azure storage...');
-		}
+		console.log('Uploading blobs to Azure storage and Mooncake Azure storage...');
 	} else {
-		if (uploadPromises.length) {
-			console.log('Uploading blobs to Azure storage...');
-		}
+		console.log('Uploading blobs to Azure storage...');
 	}
 
 	await Promise.all(uploadPromises);
-
-	console.log(uploadPromises.length ? 'All blobs successfully uploaded.' : 'No blobs to upload.');
+	console.log('All blobs successfully uploaded.');
 
 	const assetUrl = `${process.env['AZURE_CDN_URL']}/${quality}/${blobName}`;
 	const blobPath = new URL(assetUrl).pathname;

build/azure-pipelines/common/createBuild.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  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 identity_1 = require("@azure/identity");
 const cosmos_1 = require("@azure/cosmos");
@@ -19,11 +19,12 @@ function getEnv(name) {
     return result;
 }
 async function main() {
+    var _a, _b, _c;
     const [, , _version] = process.argv;
     const quality = getEnv('VSCODE_QUALITY');
-    const commit = getEnv('BUILD_SOURCEVERSION');
+    const commit = ((_a = process.env['VSCODE_DISTRO_COMMIT']) === null || _a === void 0 ? void 0 : _a.trim()) || getEnv('BUILD_SOURCEVERSION');
     const queuedBy = getEnv('BUILD_QUEUEDBY');
-    const sourceBranch = getEnv('BUILD_SOURCEBRANCH');
+    const sourceBranch = ((_b = process.env['VSCODE_DISTRO_REF']) === null || _b === void 0 ? void 0 : _b.trim()) || getEnv('BUILD_SOURCEBRANCH');
     const version = _version + (quality === 'stable' ? '' : `-${quality}`);
     console.log('Creating build...');
     console.log('Quality:', quality);
@@ -34,7 +35,7 @@ async function main() {
         timestamp: (new Date()).getTime(),
         version,
         isReleased: false,
-        private: process.env['VSCODE_PRIVATE_BUILD']?.toLowerCase() === 'true',
+        private: Boolean((_c = process.env['VSCODE_DISTRO_REF']) === null || _c === void 0 ? void 0 : _c.trim()),
         sourceBranch,
         queuedBy,
         assets: [],
@@ -43,7 +44,7 @@ async function main() {
     const aadCredentials = new identity_1.ClientSecretCredential(process.env['AZURE_TENANT_ID'], process.env['AZURE_CLIENT_ID'], process.env['AZURE_CLIENT_SECRET']);
     const client = new cosmos_1.CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT'], aadCredentials });
     const scripts = client.database('builds').container(quality).scripts;
-    await (0, retry_1.retry)(() => scripts.storedProcedure('createBuild').execute('', [{ ...build, _partitionKey: '' }]));
+    await (0, retry_1.retry)(() => scripts.storedProcedure('createBuild').execute('', [Object.assign(Object.assign({}, build), { _partitionKey: '' })]));
 }
 main().then(() => {
     console.log('Build successfully created');
@@ -52,4 +53,3 @@ main().then(() => {
     console.error(err);
     process.exit(1);
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlQnVpbGQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjcmVhdGVCdWlsZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7O0FBRWhHLDhDQUF5RDtBQUN6RCwwQ0FBNkM7QUFDN0MsbUNBQWdDO0FBRWhDLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO0lBQzlCLE9BQU8sQ0FBQyxLQUFLLENBQUMsb0NBQW9DLENBQUMsQ0FBQztJQUNwRCxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7Q0FDakI7QUFFRCxTQUFTLE1BQU0sQ0FBQyxJQUFZO0lBQzNCLE1BQU0sTUFBTSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFakMsSUFBSSxPQUFPLE1BQU0sS0FBSyxXQUFXLEVBQUU7UUFDbEMsTUFBTSxJQUFJLEtBQUssQ0FBQyxlQUFlLEdBQUcsSUFBSSxDQUFDLENBQUM7S0FDeEM7SUFFRCxPQUFPLE1BQU0sQ0FBQztBQUNmLENBQUM7QUFFRCxLQUFLLFVBQVUsSUFBSTtJQUNsQixNQUFNLENBQUMsRUFBRSxBQUFELEVBQUcsUUFBUSxDQUFDLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQztJQUNwQyxNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztJQUN6QyxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMscUJBQXFCLENBQUMsQ0FBQztJQUM3QyxNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztJQUMxQyxNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUNsRCxNQUFNLE9BQU8sR0FBRyxRQUFRLEdBQUcsQ0FBQyxPQUFPLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksT0FBTyxFQUFFLENBQUMsQ0FBQztJQUV2RSxPQUFPLENBQUMsR0FBRyxDQUFDLG1CQUFtQixDQUFDLENBQUM7SUFDakMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDakMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDakMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFFL0IsTUFBTSxLQUFLLEdBQUc7UUFDYixFQUFFLEVBQUUsTUFBTTtRQUNWLFNBQVMsRUFBRSxDQUFDLElBQUksSUFBSSxFQUFFLENBQUMsQ0FBQyxPQUFPLEVBQUU7UUFDakMsT0FBTztRQUNQLFVBQVUsRUFBRSxLQUFLO1FBQ2pCLE9BQU8sRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLHNCQUFzQixDQUFDLEVBQUUsV0FBVyxFQUFFLEtBQUssTUFBTTtRQUN0RSxZQUFZO1FBQ1osUUFBUTtRQUNSLE1BQU0sRUFBRSxFQUFFO1FBQ1YsT0FBTyxFQUFFLEVBQUU7S0FDWCxDQUFDO0lBRUYsTUFBTSxjQUFjLEdBQUcsSUFBSSxpQ0FBc0IsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFFLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBRSxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMscUJBQXFCLENBQUUsQ0FBQyxDQUFDO0lBQ3pKLE1BQU0sTUFBTSxHQUFHLElBQUkscUJBQVksQ0FBQyxFQUFFLFFBQVEsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLDJCQUEyQixDQUFFLEVBQUUsY0FBYyxFQUFFLENBQUMsQ0FBQztJQUN6RyxNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxPQUFPLENBQUM7SUFDckUsTUFBTSxJQUFBLGFBQUssRUFBQyxHQUFHLEVBQUUsQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLGFBQWEsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxFQUFFLEdBQUcsS0FBSyxFQUFFLGFBQWEsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUMxRyxDQUFDO0FBRUQsSUFBSSxFQUFFLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRTtJQUNoQixPQUFPLENBQUMsR0FBRyxDQUFDLDRCQUE0QixDQUFDLENBQUM7SUFDMUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNqQixDQUFDLEVBQUUsR0FBRyxDQUFDLEVBQUU7SUFDUixPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ25CLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDakIsQ0FBQyxDQUFDLENBQUMifQ==

build/azure-pipelines/common/createBuild.ts

@@ -3,6 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import { ClientSecretCredential } from '@azure/identity';
 import { CosmosClient } from '@azure/cosmos';
 import { retry } from './retry';
@@ -25,9 +27,9 @@ function getEnv(name: string): string {
 async function main(): Promise<void> {
 	const [, , _version] = process.argv;
 	const quality = getEnv('VSCODE_QUALITY');
-	const commit = getEnv('BUILD_SOURCEVERSION');
+	const commit = process.env['VSCODE_DISTRO_COMMIT']?.trim() || getEnv('BUILD_SOURCEVERSION');
 	const queuedBy = getEnv('BUILD_QUEUEDBY');
-	const sourceBranch = getEnv('BUILD_SOURCEBRANCH');
+	const sourceBranch = process.env['VSCODE_DISTRO_REF']?.trim() || getEnv('BUILD_SOURCEBRANCH');
 	const version = _version + (quality === 'stable' ? '' : `-${quality}`);
 
 	console.log('Creating build...');
@@ -40,7 +42,7 @@ async function main(): Promise<void> {
 		timestamp: (new Date()).getTime(),
 		version,
 		isReleased: false,
-		private: process.env['VSCODE_PRIVATE_BUILD']?.toLowerCase() === 'true',
+		private: Boolean(process.env['VSCODE_DISTRO_REF']?.trim()),
 		sourceBranch,
 		queuedBy,
 		assets: [],

build/azure-pipelines/common/install-builtin-extensions.yml

@@ -1,24 +0,0 @@
-steps:
-  - pwsh: mkdir .build -ea 0
-    condition: and(succeeded(), contains(variables['Agent.OS'], 'windows'))
-    displayName: Create .build folder
-
-  - script: mkdir -p .build
-    condition: and(succeeded(), not(contains(variables['Agent.OS'], 'windows')))
-    displayName: Create .build folder
-
-  - script: node build/azure-pipelines/common/computeBuiltInDepsCacheKey.js > .build/builtindepshash
-    displayName: Prepare built-in extensions cache key
-
-  - task: Cache@2
-    inputs:
-      key: '"builtin-extensions" | .build/builtindepshash'
-      path: .build/builtInExtensions
-      cacheHitVar: BUILTIN_EXTENSIONS_RESTORED
-    displayName: Restore built-in extensions cache
-
-  - script: node build/lib/builtInExtensions.js
-    env:
-      GITHUB_TOKEN: "$(github-distro-mixin-password)"
-    condition: and(succeeded(), ne(variables.BUILTIN_EXTENSIONS_RESTORED, 'true'))
-    displayName: Download built-in extensions

build/azure-pipelines/common/installPlaywright.js

@@ -3,10 +3,10 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-process.env.DEBUG = 'pw:install'; // enable logging for this (https://github.com/microsoft/playwright/issues/17394)
+Object.defineProperty(exports, "__esModule", { value: true });
+const retry_1 = require("./retry");
 const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/server');
 async function install() {
-    await installDefaultBrowsersForNpmInstall();
+    await (0, retry_1.retry)(() => installDefaultBrowsersForNpmInstall());
 }
 install();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdGFsbFBsYXl3cmlnaHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbnN0YWxsUGxheXdyaWdodC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7QUFFaEcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEdBQUMsWUFBWSxDQUFDLENBQUMsaUZBQWlGO0FBRWpILE1BQU0sRUFBRSxtQ0FBbUMsRUFBRSxHQUFHLE9BQU8sQ0FBQyw0QkFBNEIsQ0FBQyxDQUFDO0FBRXRGLEtBQUssVUFBVSxPQUFPO0lBQ3JCLE1BQU0sbUNBQW1DLEVBQUUsQ0FBQztBQUM3QyxDQUFDO0FBRUQsT0FBTyxFQUFFLENBQUMifQ==

build/azure-pipelines/common/installPlaywright.ts

@@ -3,12 +3,11 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-process.env.DEBUG='pw:install'; // enable logging for this (https://github.com/microsoft/playwright/issues/17394)
-
+import { retry } from './retry';
 const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/server');
 
 async function install() {
-	await installDefaultBrowsersForNpmInstall();
+	await retry(() => installDefaultBrowsersForNpmInstall());
 }
 
 install();

build/azure-pipelines/common/listNodeModules.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  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");
@@ -38,4 +38,3 @@ function findNodeModulesFiles(location, inNodeModules, result) {
 const result = [];
 findNodeModulesFiles('', false, result);
 fs.writeFileSync(process.argv[2], result.join('\n') + '\n');
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlzdE5vZGVNb2R1bGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibGlzdE5vZGVNb2R1bGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7QUFFaEcseUJBQXlCO0FBQ3pCLDZCQUE2QjtBQUU3QixJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRTtJQUM5QixPQUFPLENBQUMsS0FBSyxDQUFDLDRDQUE0QyxDQUFDLENBQUM7SUFDNUQsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0NBQ2pCO0FBRUQsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsV0FBVyxDQUFDLENBQUM7QUFFL0MsU0FBUyxvQkFBb0IsQ0FBQyxRQUFnQixFQUFFLGFBQXNCLEVBQUUsTUFBZ0I7SUFDdkYsTUFBTSxPQUFPLEdBQUcsRUFBRSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDO0lBQzFELEtBQUssTUFBTSxLQUFLLElBQUksT0FBTyxFQUFFO1FBQzVCLE1BQU0sU0FBUyxHQUFHLEdBQUcsUUFBUSxJQUFJLEtBQUssRUFBRSxDQUFDO1FBRXpDLElBQUksNENBQTRDLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxFQUFFO1lBQ2pFLFNBQVM7U0FDVDtRQUVELElBQUksSUFBYyxDQUFDO1FBQ25CLElBQUk7WUFDSCxJQUFJLEdBQUcsRUFBRSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFDO1NBQy9DO1FBQUMsT0FBTyxHQUFHLEVBQUU7WUFDYixTQUFTO1NBQ1Q7UUFFRCxJQUFJLElBQUksQ0FBQyxXQUFXLEVBQUUsRUFBRTtZQUN2QixvQkFBb0IsQ0FBQyxTQUFTLEVBQUUsYUFBYSxJQUFJLENBQUMsS0FBSyxLQUFLLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDO1NBQ3JGO2FBQU07WUFDTixJQUFJLGFBQWEsRUFBRTtnQkFDbEIsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7YUFDakM7U0FDRDtLQUNEO0FBQ0YsQ0FBQztBQUVELE1BQU0sTUFBTSxHQUFhLEVBQUUsQ0FBQztBQUM1QixvQkFBb0IsQ0FBQyxFQUFFLEVBQUUsS0FBSyxFQUFFLE1BQU0sQ0FBQyxDQUFDO0FBQ3hDLEVBQUUsQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxDQUFDIn0=

build/azure-pipelines/common/listNodeModules.ts

@@ -3,6 +3,8 @@
  *  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';
 

build/azure-pipelines/common/publish.ts

@@ -8,10 +8,10 @@
 import * as fs from 'fs';
 import { Readable } from 'stream';
 import * as crypto from 'crypto';
+import * as azure from 'azure-storage';
 import * as mime from 'mime';
 import * as minimist from 'minimist';
 import { DocumentClient, NewDocument } from 'documentdb';
-import { BlobServiceClient, BlockBlobClient, ContainerClient, StorageRetryPolicyType } from '@azure/storage-blob';
 
 // {{SQL CARBON EDIT}}
 if (process.argv.length < 9) {
@@ -127,23 +127,24 @@ function createOrUpdate(commit: string, quality: string, platform: string, type:
 	}));
 }
 
-async function assertContainer(containerClient: ContainerClient): Promise<boolean> {
-	let containerResponse = await containerClient.createIfNotExists({ access: 'blob' });
-	return containerResponse && !!containerResponse.errorCode;
+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()));
 }
 
-async function uploadBlob(blobClient: BlockBlobClient, file: string): Promise<void> {
-	const result = await blobClient.uploadFile(file, {
-		blobHTTPHeaders: {
-			blobContentType: mime.lookup(file),
-			blobCacheControl: 'max-age=31536000, public'
+async function doesAssetExist(blobService: azure.BlobService, quality: string, blobName: string): Promise<boolean | undefined> {
+	const existsResult = await new Promise<azure.BlobService.BlobResult>((c, e) => blobService.doesBlobExist(quality, blobName, (err, r) => err ? e(err) : c(r)));
+	return existsResult.exists;
+}
+
+async function uploadBlob(blobService: azure.BlobService, quality: string, blobName: string, file: string): Promise<void> {
+	const blobOptions: azure.BlobService.CreateBlockBlobRequestOptions = {
+		contentSettings: {
+			contentType: mime.lookup(file),
+			cacheControl: 'max-age=31536000, public'
 		}
-	});
-	if (result && !result.errorCode) {
-		console.log(`Blobs uploaded successfully, response status: ${result?._response?.status}`);
-	} else {
-		console.error(`Blobs failed to upload, response status: ${result?._response?.status}, errorcode: ${result?.errorCode}`)
-	}
+	};
+
+	await new Promise<void>((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, file, blobOptions, err => err ? e(err) : c()));
 }
 
 interface PublishOptions {
@@ -179,78 +180,74 @@ async function publish(commit: string, quality: string, platform: string, type:
 
 	const blobName = commit + '/' + name;
 	const storageAccount = process.env['AZURE_STORAGE_ACCOUNT_2']!;
-	const storageKey = process.env['AZURE_STORAGE_ACCESS_KEY_2']!;
-	const connectionString = `DefaultEndpointsProtocol=https;AccountName=${storageAccount};AccountKey=${storageKey};EndpointSuffix=core.windows.net`;
 
-	let blobServiceClient = BlobServiceClient.fromConnectionString(connectionString, {
-		retryOptions: {
-			maxTries: 20,
-			retryPolicyType: StorageRetryPolicyType.EXPONENTIAL
-		}
-	});
+	const blobService = azure.createBlobService(storageAccount, process.env['AZURE_STORAGE_ACCESS_KEY_2']!)
+		.withFilter(new azure.ExponentialRetryPolicyFilter(20));
 
-	let containerClient = blobServiceClient.getContainerClient(quality);
-	if (await assertContainer(containerClient)) {
-		const blobClient = containerClient.getBlockBlobClient(blobName);
-		const blobExists = await blobClient.exists();
+	await assertContainer(blobService, quality);
 
-		if (blobExists) {
-			console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`);
-			return;
-		}
+	const blobExists = await doesAssetExist(blobService, quality, blobName);
 
-		console.log('Uploading blobs to Azure storage...');
-		await uploadBlob(blobClient, file);
-		const config = await getConfig(quality);
-
-		console.log('Quality config:', config);
-		const asset: 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: [] as Array<Asset>,
-			updates: {} as any
-		};
-
-		if (!opts['upload-only']) {
-			release.assets.push(asset);
-
-			if (isUpdate) {
-				release.updates[platform] = type;
-			}
-		}
-
-		await createOrUpdate(commit, quality, platform, type, release, asset, isUpdate);
+	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: 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: [] as Array<Asset>,
+		updates: {} as any
+	};
+
+	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;

build/azure-pipelines/common/release.js

@@ -89,4 +89,3 @@ main().catch(err => {
     console.error(err);
     process.exit(1);
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVsZWFzZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInJlbGVhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7OztnR0FHZ0c7QUFFaEcsWUFBWSxDQUFDOztBQUViLDJDQUE0QztBQU81QyxTQUFTLG1CQUFtQixDQUFDLE9BQWU7SUFDM0MsT0FBTztRQUNOLEVBQUUsRUFBRSxPQUFPO1FBQ1gsTUFBTSxFQUFFLEtBQUs7S0FDYixDQUFDO0FBQ0gsQ0FBQztBQUVELFNBQVMsU0FBUyxDQUFDLE9BQWU7SUFDakMsTUFBTSxNQUFNLEdBQUcsSUFBSSwyQkFBYyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsMkJBQTJCLENBQUUsRUFBRSxFQUFFLFNBQVMsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLDRCQUE0QixDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ3ZJLE1BQU0sVUFBVSxHQUFHLHlCQUF5QixDQUFDO0lBQzdDLE1BQU0sS0FBSyxHQUFHO1FBQ2IsS0FBSyxFQUFFLDZDQUE2QztRQUNwRCxVQUFVLEVBQUU7WUFDWCxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRTtTQUNwQztLQUNELENBQUM7SUFFRixPQUFPLElBQUksT0FBTyxDQUFTLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFO1FBQ25DLE1BQU0sQ0FBQyxjQUFjLENBQUMsVUFBVSxFQUFFLEtBQUssQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEdBQUcsRUFBRSxPQUFPLEVBQUUsRUFBRTtZQUNqRSxJQUFJLEdBQUcsSUFBSSxHQUFHLENBQUMsSUFBSSxLQUFLLEdBQUcsRUFBRTtnQkFBRSxPQUFPLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQzthQUFFO1lBRS9DLENBQUMsQ0FBQyxDQUFDLE9BQU8sSUFBSSxPQUFPLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsbUJBQW1CLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQWtCLENBQUMsQ0FBQztRQUNsRyxDQUFDLENBQUMsQ0FBQztJQUNKLENBQUMsQ0FBQyxDQUFDO0FBQ0osQ0FBQztBQUVELFNBQVMsU0FBUyxDQUFDLE1BQWMsRUFBRSxPQUFlO0lBQ2pELE1BQU0sTUFBTSxHQUFHLElBQUksMkJBQWMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLDJCQUEyQixDQUFFLEVBQUUsRUFBRSxTQUFTLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyw0QkFBNEIsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUN2SSxNQUFNLFVBQVUsR0FBRyxtQkFBbUIsR0FBRyxPQUFPLENBQUM7SUFDakQsTUFBTSxLQUFLLEdBQUc7UUFDYixLQUFLLEVBQUUsd0NBQXdDO1FBQy9DLFVBQVUsRUFBRSxDQUFDLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLENBQUM7S0FDNUMsQ0FBQztJQUVGLElBQUksV0FBVyxHQUFHLENBQUMsQ0FBQztJQUVwQixTQUFTLE1BQU07UUFDZCxXQUFXLEVBQUUsQ0FBQztRQUVkLE9BQU8sSUFBSSxPQUFPLENBQU8sQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUU7WUFDakMsTUFBTSxDQUFDLGNBQWMsQ0FBQyxVQUFVLEVBQUUsS0FBSyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsR0FBRyxFQUFFLE9BQU8sRUFBRSxFQUFFO2dCQUNqRSxJQUFJLEdBQUcsRUFBRTtvQkFBRSxPQUFPLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQztpQkFBRTtnQkFDM0IsSUFBSSxPQUFPLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRTtvQkFBRSxPQUFPLENBQUMsQ0FBQyxJQUFJLEtBQUssQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDO2lCQUFFO2dCQUVsRSxNQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQzNCLE9BQU8sQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDO2dCQUUxQixNQUFNLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLEdBQUcsQ0FBQyxFQUFFO29CQUNwRCxJQUFJLEdBQUcsSUFBSSxHQUFHLENBQUMsSUFBSSxLQUFLLEdBQUcsSUFBSSxXQUFXLEdBQUcsQ0FBQyxFQUFFO3dCQUFFLE9BQU8sQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUM7cUJBQUU7b0JBQ3ZFLElBQUksR0FBRyxFQUFFO3dCQUFFLE9BQU8sQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDO3FCQUFFO29CQUUzQixPQUFPLENBQUMsR0FBRyxDQUFDLDZCQUE2QixDQUFDLENBQUM7b0JBQzNDLENBQUMsRUFBRSxDQUFDO2dCQUNMLENBQUMsQ0FBQyxDQUFDO1lBQ0osQ0FBQyxDQUFDLENBQUM7UUFDSixDQUFDLENBQUMsQ0FBQztJQUNKLENBQUM7SUFFRCxPQUFPLE1BQU0sRUFBRSxDQUFDO0FBQ2pCLENBQUM7QUFFRCxLQUFLLFVBQVUsT0FBTyxDQUFDLE1BQWMsRUFBRSxPQUFlO0lBQ3JELE1BQU0sTUFBTSxHQUFHLE1BQU0sU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBRXhDLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFFdkMsSUFBSSxNQUFNLENBQUMsTUFBTSxFQUFFO1FBQ2xCLE9BQU8sQ0FBQyxHQUFHLENBQUMsb0NBQW9DLE9BQU8sYUFBYSxDQUFDLENBQUM7UUFDdEUsT0FBTztLQUNQO0lBRUQsTUFBTSxTQUFTLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBQ2xDLENBQUM7QUFFRCxTQUFTLEdBQUcsQ0FBQyxJQUFZO0lBQ3hCLE1BQU0sTUFBTSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFakMsSUFBSSxDQUFDLE1BQU0sRUFBRTtRQUNaLE1BQU0sSUFBSSxLQUFLLENBQUMsd0NBQXdDLElBQUksRUFBRSxDQUFDLENBQUM7S0FDaEU7SUFFRCxPQUFPLE1BQU0sQ0FBQztBQUNmLENBQUM7QUFFRCxLQUFLLFVBQVUsSUFBSTtJQUNsQixNQUFNLE1BQU0sR0FBRyxHQUFHLENBQUMscUJBQXFCLENBQUMsQ0FBQztJQUMxQyxNQUFNLE9BQU8sR0FBRyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztJQUV0QyxNQUFNLE9BQU8sQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUM7QUFDaEMsQ0FBQztBQUVELElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRTtJQUNsQixPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ25CLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDakIsQ0FBQyxDQUFDLENBQUMifQ==

build/azure-pipelines/common/releaseBuild.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  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 identity_1 = require("@azure/identity");
 const cosmos_1 = require("@azure/cosmos");
@@ -28,29 +28,25 @@ async function getConfig(client, quality) {
     }
     return res.resources[0];
 }
-async function main(force) {
-    const commit = getEnv('BUILD_SOURCEVERSION');
+async function main() {
+    const commit = process.env['VSCODE_DISTRO_COMMIT'] || getEnv('BUILD_SOURCEVERSION');
     const quality = getEnv('VSCODE_QUALITY');
     const aadCredentials = new identity_1.ClientSecretCredential(process.env['AZURE_TENANT_ID'], process.env['AZURE_CLIENT_ID'], process.env['AZURE_CLIENT_SECRET']);
     const client = new cosmos_1.CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT'], aadCredentials });
-    if (!force) {
-        const config = await getConfig(client, quality);
-        console.log('Quality config:', config);
-        if (config.frozen) {
-            console.log(`Skipping release because quality ${quality} is frozen.`);
-            return;
-        }
+    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 (0, retry_1.retry)(() => scripts.storedProcedure('releaseBuild').execute('', [commit]));
 }
-const [, , force] = process.argv;
-main(force === 'true').then(() => {
+main().then(() => {
     console.log('Build successfully released');
     process.exit(0);
 }, err => {
     console.error(err);
     process.exit(1);
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVsZWFzZUJ1aWxkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicmVsZWFzZUJ1aWxkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7QUFFaEcsOENBQXlEO0FBQ3pELDBDQUE2QztBQUM3QyxtQ0FBZ0M7QUFFaEMsU0FBUyxNQUFNLENBQUMsSUFBWTtJQUMzQixNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRWpDLElBQUksT0FBTyxNQUFNLEtBQUssV0FBVyxFQUFFO1FBQ2xDLE1BQU0sSUFBSSxLQUFLLENBQUMsZUFBZSxHQUFHLElBQUksQ0FBQyxDQUFDO0tBQ3hDO0lBRUQsT0FBTyxNQUFNLENBQUM7QUFDZixDQUFDO0FBT0QsU0FBUyxtQkFBbUIsQ0FBQyxPQUFlO0lBQzNDLE9BQU87UUFDTixFQUFFLEVBQUUsT0FBTztRQUNYLE1BQU0sRUFBRSxLQUFLO0tBQ2IsQ0FBQztBQUNILENBQUM7QUFFRCxLQUFLLFVBQVUsU0FBUyxDQUFDLE1BQW9CLEVBQUUsT0FBZTtJQUM3RCxNQUFNLEtBQUssR0FBRyx1Q0FBdUMsT0FBTyxHQUFHLENBQUM7SUFFaEUsTUFBTSxHQUFHLEdBQUcsTUFBTSxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBRTlGLElBQUksR0FBRyxDQUFDLFNBQVMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO1FBQy9CLE9BQU8sbUJBQW1CLENBQUMsT0FBTyxDQUFDLENBQUM7S0FDcEM7SUFFRCxPQUFPLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFXLENBQUM7QUFDbkMsQ0FBQztBQUVELEtBQUssVUFBVSxJQUFJLENBQUMsS0FBYztJQUNqQyxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMscUJBQXFCLENBQUMsQ0FBQztJQUM3QyxNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztJQUV6QyxNQUFNLGNBQWMsR0FBRyxJQUFJLGlDQUFzQixDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUUsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFFLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBRSxDQUFDLENBQUM7SUFDekosTUFBTSxNQUFNLEdBQUcsSUFBSSxxQkFBWSxDQUFDLEVBQUUsUUFBUSxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsMkJBQTJCLENBQUUsRUFBRSxjQUFjLEVBQUUsQ0FBQyxDQUFDO0lBRXpHLElBQUksQ0FBQyxLQUFLLEVBQUU7UUFDWCxNQUFNLE1BQU0sR0FBRyxNQUFNLFNBQVMsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFFaEQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsRUFBRSxNQUFNLENBQUMsQ0FBQztRQUV2QyxJQUFJLE1BQU0sQ0FBQyxNQUFNLEVBQUU7WUFDbEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxvQ0FBb0MsT0FBTyxhQUFhLENBQUMsQ0FBQztZQUN0RSxPQUFPO1NBQ1A7S0FDRDtJQUVELE9BQU8sQ0FBQyxHQUFHLENBQUMsbUJBQW1CLE1BQU0sS0FBSyxDQUFDLENBQUM7SUFFNUMsTUFBTSxPQUFPLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUMsT0FBTyxDQUFDO0lBQ3JFLE1BQU0sSUFBQSxhQUFLLEVBQUMsR0FBRyxFQUFFLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBQyxPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2xGLENBQUM7QUFFRCxNQUFNLENBQUMsRUFBRSxBQUFELEVBQUcsS0FBSyxDQUFDLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQztBQUVqQyxJQUFJLENBQUMsS0FBSyxLQUFLLE1BQU0sQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUU7SUFDaEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyw2QkFBNkIsQ0FBQyxDQUFDO0lBQzNDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDakIsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxFQUFFO0lBQ1IsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNuQixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2pCLENBQUMsQ0FBQyxDQUFDIn0=

build/azure-pipelines/common/releaseBuild.ts

@@ -3,6 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import { ClientSecretCredential } from '@azure/identity';
 import { CosmosClient } from '@azure/cosmos';
 import { retry } from './retry';
@@ -41,22 +43,19 @@ async function getConfig(client: CosmosClient, quality: string): Promise<Config>
 	return res.resources[0] as Config;
 }
 
-async function main(force: boolean): Promise<void> {
-	const commit = getEnv('BUILD_SOURCEVERSION');
+async function main(): Promise<void> {
+	const commit = process.env['VSCODE_DISTRO_COMMIT'] || getEnv('BUILD_SOURCEVERSION');
 	const quality = getEnv('VSCODE_QUALITY');
 
 	const aadCredentials = new ClientSecretCredential(process.env['AZURE_TENANT_ID']!, process.env['AZURE_CLIENT_ID']!, process.env['AZURE_CLIENT_SECRET']!);
 	const client = new CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT']!, aadCredentials });
+	const config = await getConfig(client, quality);
 
-	if (!force) {
-		const config = await getConfig(client, quality);
+	console.log('Quality config:', config);
 
-		console.log('Quality config:', config);
-
-		if (config.frozen) {
-			console.log(`Skipping release because quality ${quality} is frozen.`);
-			return;
-		}
+	if (config.frozen) {
+		console.log(`Skipping release because quality ${quality} is frozen.`);
+		return;
 	}
 
 	console.log(`Releasing build ${commit}...`);
@@ -65,9 +64,7 @@ async function main(force: boolean): Promise<void> {
 	await retry(() => scripts.storedProcedure('releaseBuild').execute('', [commit]));
 }
 
-const [, , force] = process.argv;
-
-main(force === 'true').then(() => {
+main().then(() => {
 	console.log('Build successfully released');
 	process.exit(0);
 }, err => {

build/azure-pipelines/common/retry.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  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) {
@@ -26,4 +26,3 @@ async function retry(fn) {
     throw lastError;
 }
 exports.retry = retry;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmV0cnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJyZXRyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUV6RixLQUFLLFVBQVUsS0FBSyxDQUFJLEVBQW9CO0lBQ2xELElBQUksU0FBNEIsQ0FBQztJQUVqQyxLQUFLLElBQUksR0FBRyxHQUFHLENBQUMsRUFBRSxHQUFHLElBQUksRUFBRSxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQ25DLElBQUk7WUFDSCxPQUFPLE1BQU0sRUFBRSxFQUFFLENBQUM7U0FDbEI7UUFBQyxPQUFPLEdBQUcsRUFBRTtZQUNiLElBQUksQ0FBQyxtRUFBbUUsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUFFO2dCQUMzRixNQUFNLEdBQUcsQ0FBQzthQUNWO1lBRUQsU0FBUyxHQUFHLEdBQUcsQ0FBQztZQUNoQixNQUFNLE1BQU0sR0FBRyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsR0FBRyxHQUFHLENBQUMsR0FBRyxDQUFDLEVBQUUsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBQ2pFLE9BQU8sQ0FBQyxHQUFHLENBQUMsK0JBQStCLE1BQU0sT0FBTyxDQUFDLENBQUM7WUFFMUQsMENBQTBDO1lBQzFDLE1BQU0sSUFBSSxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUM7U0FDOUM7S0FDRDtJQUVELE9BQU8sQ0FBQyxHQUFHLENBQUMsNkJBQTZCLENBQUMsQ0FBQztJQUMzQyxNQUFNLFNBQVMsQ0FBQztBQUNqQixDQUFDO0FBdEJELHNCQXNCQyJ9

build/azure-pipelines/common/retry.ts

@@ -3,6 +3,8 @@
  *  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> {
 	let lastError: Error | undefined;
 

build/azure-pipelines/common/sign-win32.js

@@ -15,4 +15,3 @@ const path = require("path");
     path.dirname(process.argv[2]),
     path.basename(process.argv[2])
 ]);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lnbi13aW4zMi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNpZ24td2luMzIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Z0dBR2dHOztBQUVoRyxpQ0FBOEI7QUFDOUIsNkJBQTZCO0FBRTdCLElBQUEsV0FBSSxFQUFDO0lBQ0osT0FBTyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBRTtJQUM5QixTQUFTO0lBQ1QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUU7SUFDdkIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBRTtJQUMvQixPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFFO0lBQy9CLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUM3QixJQUFJLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7Q0FDOUIsQ0FBQyxDQUFDIn0=

build/azure-pipelines/common/sign.js

@@ -7,33 +7,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.main = void 0;
 const cp = require("child_process");
 const fs = require("fs");
-const path = require("path");
-const os = require("os");
+const tmp = require("tmp");
 const crypto = require("crypto");
-class Temp {
-    _files = [];
-    tmpNameSync() {
-        const file = path.join(os.tmpdir(), crypto.randomBytes(20).toString('hex'));
-        this._files.push(file);
-        return file;
-    }
-    dispose() {
-        for (const file of this._files) {
-            try {
-                fs.unlinkSync(file);
-            }
-            catch (err) {
-                // noop
-            }
-        }
-    }
-}
 function getParams(type) {
     switch (type) {
         case 'windows':
             return '[{"keyCode":"CP-230012","operationSetCode":"SigntoolSign","parameters":[{"parameterName":"OpusName","parameterValue":"VS Code"},{"parameterName":"OpusInfo","parameterValue":"https://code.visualstudio.com/"},{"parameterName":"Append","parameterValue":"/as"},{"parameterName":"FileDigest","parameterValue":"/fd \\"SHA256\\""},{"parameterName":"PageHash","parameterValue":"/NPH"},{"parameterName":"TimeStamp","parameterValue":"/tr \\"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\\" /td sha256"}],"toolName":"sign","toolVersion":"1.0"},{"keyCode":"CP-230012","operationSetCode":"SigntoolVerify","parameters":[{"parameterName":"VerifyAll","parameterValue":"/all"}],"toolName":"sign","toolVersion":"1.0"}]';
-        case 'windows-appx':
-            return '[{"keyCode":"CP-229979","operationSetCode":"SigntoolSign","parameters":[{"parameterName":"OpusName","parameterValue":"VS Code"},{"parameterName":"OpusInfo","parameterValue":"https://code.visualstudio.com/"},{"parameterName":"FileDigest","parameterValue":"/fd \\"SHA256\\""},{"parameterName":"PageHash","parameterValue":"/NPH"},{"parameterName":"TimeStamp","parameterValue":"/tr \\"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\\" /td sha256"}],"toolName":"sign","toolVersion":"1.0"},{"keyCode":"CP-229979","operationSetCode":"SigntoolVerify","parameters":[],"toolName":"sign","toolVersion":"1.0"}]';
         case 'rpm':
             return '[{ "keyCode": "CP-450779-Pgp", "operationSetCode": "LinuxSign", "parameters": [], "toolName": "sign", "toolVersion": "1.0" }]';
         case 'darwin-sign':
@@ -45,8 +24,7 @@ function getParams(type) {
     }
 }
 function main([esrpCliPath, type, cert, username, password, folderPath, pattern]) {
-    const tmp = new Temp();
-    process.on('exit', () => tmp.dispose());
+    tmp.setGracefulCleanup();
     const patternPath = tmp.tmpNameSync();
     fs.writeFileSync(patternPath, pattern);
     const paramsPath = tmp.tmpNameSync();
@@ -105,4 +83,3 @@ if (require.main === module) {
     main(process.argv.slice(2));
     process.exit(0);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lnbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNpZ24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Z0dBR2dHOzs7QUFFaEcsb0NBQW9DO0FBQ3BDLHlCQUF5QjtBQUN6Qiw2QkFBNkI7QUFDN0IseUJBQXlCO0FBQ3pCLGlDQUFpQztBQUVqQyxNQUFNLElBQUk7SUFDRCxNQUFNLEdBQWEsRUFBRSxDQUFDO0lBRTlCLFdBQVc7UUFDVixNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxNQUFNLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBQzVFLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3ZCLE9BQU8sSUFBSSxDQUFDO0lBQ2IsQ0FBQztJQUVELE9BQU87UUFDTixLQUFLLE1BQU0sSUFBSSxJQUFJLElBQUksQ0FBQyxNQUFNLEVBQUU7WUFDL0IsSUFBSTtnQkFDSCxFQUFFLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDO2FBQ3BCO1lBQUMsT0FBTyxHQUFHLEVBQUU7Z0JBQ2IsT0FBTzthQUNQO1NBQ0Q7SUFDRixDQUFDO0NBQ0Q7QUFFRCxTQUFTLFNBQVMsQ0FBQyxJQUFZO0lBQzlCLFFBQVEsSUFBSSxFQUFFO1FBQ2IsS0FBSyxTQUFTO1lBQ2IsT0FBTyx3c0JBQXdzQixDQUFDO1FBQ2p0QixLQUFLLGNBQWM7WUFDbEIsT0FBTyxpbUJBQWltQixDQUFDO1FBQzFtQixLQUFLLEtBQUs7WUFDVCxPQUFPLCtIQUErSCxDQUFDO1FBQ3hJLEtBQUssYUFBYTtZQUNqQixPQUFPLGtNQUFrTSxDQUFDO1FBQzNNLEtBQUssaUJBQWlCO1lBQ3JCLE9BQU8sMkhBQTJILENBQUM7UUFDcEk7WUFDQyxNQUFNLElBQUksS0FBSyxDQUFDLGFBQWEsSUFBSSxZQUFZLENBQUMsQ0FBQztLQUNoRDtBQUNGLENBQUM7QUFFRCxTQUFnQixJQUFJLENBQUMsQ0FBQyxXQUFXLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFLFVBQVUsRUFBRSxPQUFPLENBQVc7SUFDaEcsTUFBTSxHQUFHLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQztJQUN2QixPQUFPLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxHQUFHLEVBQUUsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztJQUV4QyxNQUFNLFdBQVcsR0FBRyxHQUFHLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDdEMsRUFBRSxDQUFDLGFBQWEsQ0FBQyxXQUFXLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFFdkMsTUFBTSxVQUFVLEdBQUcsR0FBRyxDQUFDLFdBQVcsRUFBRSxDQUFDO0lBQ3JDLEVBQUUsQ0FBQyxhQUFhLENBQUMsVUFBVSxFQUFFLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO0lBRTlDLE1BQU0sT0FBTyxHQUFHLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUNsQyxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ25DLE1BQU0sRUFBRSxHQUFHLE1BQU0sQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDbEMsRUFBRSxDQUFDLGFBQWEsQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxFQUFFLEdBQUcsRUFBRSxHQUFHLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBRWhHLE1BQU0sYUFBYSxHQUFHLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUN4QyxNQUFNLGVBQWUsR0FBRyxNQUFNLENBQUMsY0FBYyxDQUFDLGFBQWEsRUFBRSxHQUFHLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDdEUsSUFBSSxTQUFTLEdBQUcsZUFBZSxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQ2hFLFNBQVMsSUFBSSxlQUFlLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzFDLEVBQUUsQ0FBQyxhQUFhLENBQUMsYUFBYSxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBRTNDLE1BQU0sY0FBYyxHQUFHLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUN6QyxNQUFNLGdCQUFnQixHQUFHLE1BQU0sQ0FBQyxjQUFjLENBQUMsYUFBYSxFQUFFLEdBQUcsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUN2RSxJQUFJLFVBQVUsR0FBRyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxLQUFLLENBQUMsQ0FBQztJQUM5RCxVQUFVLElBQUksZ0JBQWdCLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzVDLEVBQUUsQ0FBQyxhQUFhLENBQUMsY0FBYyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBRTdDLE1BQU0sSUFBSSxHQUFHO1FBQ1osV0FBVztRQUNYLFdBQVc7UUFDWCxJQUFJLEVBQUUsUUFBUTtRQUNkLElBQUksRUFBRSxhQUFhO1FBQ25CLElBQUksRUFBRSxjQUFjO1FBQ3BCLElBQUksRUFBRSxVQUFVO1FBQ2hCLElBQUksRUFBRSxXQUFXO1FBQ2pCLElBQUksRUFBRSxPQUFPO1FBQ2IsSUFBSSxFQUFFLGdCQUFnQjtRQUN0QixJQUFJLEVBQUUsWUFBWTtRQUNsQixJQUFJLEVBQUUsbUNBQW1DO1FBQ3pDLElBQUksRUFBRSxrQkFBa0I7UUFDeEIsSUFBSSxFQUFFLFVBQVU7UUFDaEIsSUFBSSxFQUFFLE1BQU07UUFDWixJQUFJLEVBQUUsS0FBSztRQUNYLElBQUksRUFBRSxJQUFJO1FBQ1YsSUFBSSxFQUFFLE9BQU87UUFDYixJQUFJLEVBQUUsdUNBQXVDO1FBQzdDLElBQUksRUFBRSxHQUFHO1FBQ1QsSUFBSSxFQUFFLFdBQVc7UUFDakIsSUFBSSxFQUFFLDJCQUEyQjtRQUNqQyxJQUFJLEVBQUUsR0FBRztRQUNULElBQUksRUFBRSxNQUFNO1FBQ1osSUFBSSxFQUFFLE9BQU87S0FDYixDQUFDO0lBRUYsSUFBSTtRQUNILEVBQUUsQ0FBQyxZQUFZLENBQUMsUUFBUSxFQUFFLElBQUksRUFBRSxFQUFFLEtBQUssRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDO0tBQ3REO0lBQUMsT0FBTyxHQUFHLEVBQUU7UUFDYixPQUFPLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQzdCLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDbkIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztLQUNoQjtBQUNGLENBQUM7QUE3REQsb0JBNkRDO0FBRUQsSUFBSSxPQUFPLENBQUMsSUFBSSxLQUFLLE1BQU0sRUFBRTtJQUM1QixJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUM1QixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0NBQ2hCIn0=

build/azure-pipelines/common/sign.ts

@@ -5,36 +5,13 @@
 
 import * as cp from 'child_process';
 import * as fs from 'fs';
-import * as path from 'path';
-import * as os from 'os';
+import * as tmp from 'tmp';
 import * as crypto from 'crypto';
 
-class Temp {
-	private _files: string[] = [];
-
-	tmpNameSync(): string {
-		const file = path.join(os.tmpdir(), crypto.randomBytes(20).toString('hex'));
-		this._files.push(file);
-		return file;
-	}
-
-	dispose(): void {
-		for (const file of this._files) {
-			try {
-				fs.unlinkSync(file);
-			} catch (err) {
-				// noop
-			}
-		}
-	}
-}
-
 function getParams(type: string): string {
 	switch (type) {
 		case 'windows':
 			return '[{"keyCode":"CP-230012","operationSetCode":"SigntoolSign","parameters":[{"parameterName":"OpusName","parameterValue":"VS Code"},{"parameterName":"OpusInfo","parameterValue":"https://code.visualstudio.com/"},{"parameterName":"Append","parameterValue":"/as"},{"parameterName":"FileDigest","parameterValue":"/fd \\"SHA256\\""},{"parameterName":"PageHash","parameterValue":"/NPH"},{"parameterName":"TimeStamp","parameterValue":"/tr \\"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\\" /td sha256"}],"toolName":"sign","toolVersion":"1.0"},{"keyCode":"CP-230012","operationSetCode":"SigntoolVerify","parameters":[{"parameterName":"VerifyAll","parameterValue":"/all"}],"toolName":"sign","toolVersion":"1.0"}]';
-		case 'windows-appx':
-			return '[{"keyCode":"CP-229979","operationSetCode":"SigntoolSign","parameters":[{"parameterName":"OpusName","parameterValue":"VS Code"},{"parameterName":"OpusInfo","parameterValue":"https://code.visualstudio.com/"},{"parameterName":"FileDigest","parameterValue":"/fd \\"SHA256\\""},{"parameterName":"PageHash","parameterValue":"/NPH"},{"parameterName":"TimeStamp","parameterValue":"/tr \\"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\\" /td sha256"}],"toolName":"sign","toolVersion":"1.0"},{"keyCode":"CP-229979","operationSetCode":"SigntoolVerify","parameters":[],"toolName":"sign","toolVersion":"1.0"}]';
 		case 'rpm':
 			return '[{ "keyCode": "CP-450779-Pgp", "operationSetCode": "LinuxSign", "parameters": [], "toolName": "sign", "toolVersion": "1.0" }]';
 		case 'darwin-sign':
@@ -47,8 +24,7 @@ function getParams(type: string): string {
 }
 
 export function main([esrpCliPath, type, cert, username, password, folderPath, pattern]: string[]) {
-	const tmp = new Temp();
-	process.on('exit', () => tmp.dispose());
+	tmp.setGracefulCleanup();
 
 	const patternPath = tmp.tmpNameSync();
 	fs.writeFileSync(patternPath, pattern);

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

@@ -45,4 +45,3 @@ for (let i = 2; i < process.argv.length; i++) {
     shasum.update(process.argv[i]);
 }
 process.stdout.write(shasum.digest('hex'));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3FsLWNvbXB1dGVOb2RlTW9kdWxlc0NhY2hlS2V5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsic3FsLWNvbXB1dGVOb2RlTW9kdWxlc0NhY2hlS2V5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Z0dBR2dHO0FBRWhHLFlBQVksQ0FBQzs7QUFFYix5QkFBeUI7QUFDekIsNkJBQTZCO0FBQzdCLGlDQUFpQztBQUVqQyxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxXQUFXLENBQUMsQ0FBQztBQUUvQyxTQUFTLFNBQVMsQ0FBQyxRQUFnQixFQUFFLE9BQWUsRUFBRSxNQUFnQjtJQUNyRSxNQUFNLE9BQU8sR0FBRyxFQUFFLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUM7SUFFMUQsS0FBSyxNQUFNLEtBQUssSUFBSSxPQUFPLEVBQUU7UUFDNUIsTUFBTSxTQUFTLEdBQUcsR0FBRyxRQUFRLElBQUksS0FBSyxFQUFFLENBQUM7UUFDekMsSUFBSSxJQUFjLENBQUM7UUFDbkIsSUFBSTtZQUNILElBQUksR0FBRyxFQUFFLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUM7U0FDL0M7UUFBQyxPQUFPLEdBQUcsRUFBRTtZQUNiLFNBQVM7U0FDVDtRQUNELElBQUksSUFBSSxDQUFDLFdBQVcsRUFBRSxFQUFFO1lBQ3ZCLFNBQVMsQ0FBQyxTQUFTLEVBQUUsT0FBTyxFQUFFLE1BQU0sQ0FBQyxDQUFDO1NBQ3RDO2FBQU07WUFDTixJQUFJLElBQUksQ0FBQyxNQUFNLEVBQUUsSUFBSSxLQUFLLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxFQUFFO2dCQUM3QyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUM7YUFDeEM7U0FDRDtLQUNEO0FBQ0YsQ0FBQztBQUVELE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7QUFFekM7O0dBRUc7QUFDSCxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsa0JBQWtCLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDcEUsTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUMzRCxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFFbEUsMkNBQTJDO0FBQzNDLE1BQU0sTUFBTSxHQUFhLEVBQUUsQ0FBQztBQUM1QixTQUFTLENBQUMsRUFBRSxFQUFFLFdBQVcsRUFBRSxNQUFNLENBQUMsQ0FBQztBQUNuQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUV2RCx1Q0FBdUM7QUFDdkMsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFO0lBQzdDLE1BQU0sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0NBQy9CO0FBRUQsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDIn0=

build/azure-pipelines/common/telemetry-config.json

@@ -1,4 +1,12 @@
 [
+	{
+		"eventPrefix": "typescript-language-features/",
+		"sourceDirs": [
+			"../../s/extensions/typescript-language-features"
+		],
+		"excludedDirs": [],
+		"applyEndpoints": true
+	},
 	{
 		"eventPrefix": "git/",
 		"sourceDirs": [
@@ -41,6 +49,16 @@
 		"excludedDirs": [],
 		"applyEndpoints": true
 	},
+	{
+		"eventPrefix": "ms-vscode.node2/",
+		"sourceDirs": [
+			"vscode-chrome-debug-core",
+			"vscode-node-debug2"
+		],
+		"excludedDirs": [],
+		"applyEndpoints": true,
+		"patchDebugEvents": true
+	},
 	{
 		"eventPrefix": "ms-vscode.node/",
 		"sourceDirs": [
@@ -51,4 +69,4 @@
 		"applyEndpoints": true,
 		"patchDebugEvents": true
 	}
-]
+]

build/azure-pipelines/config/tsaoptions.json

@@ -1,21 +1,12 @@
 {
-	"codebaseName": "devdiv_vscode-client",
-	"ppe": false,
+	"instanceUrl": "https://msazure.visualstudio.com/defaultcollection",
+	"projectName": "One",
+	"areaPath": "One\\VSCode\\Client",
+	"iterationPath": "One",
 	"notificationAliases": [
-			"sbatten@microsoft.com"
+		"sbatten@microsoft.com"
 	],
-	"codebaseAdmins": [
-			"REDMOND\\stbatt",
-			"REDMOND\\monacotools"
-	],
-	"instanceUrl": "https://devdiv.visualstudio.com/defaultcollection",
-	"projectName": "DevDiv",
-	"areaPath": "DevDiv\\VS Code (compliance tracking only)\\Visual Studio Code Client",
-	"notifyAlways": true,
-	"template": "TFSDEVDIV",
-	"tools": [
-			"BinSkim",
-			"CredScan",
-			"CodeQL"
-	]
+	"ppe": "false",
+	"template": "TFSMSAzure",
+	"codebaseName": "vscode-client"
 }

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

@@ -4,6 +4,12 @@
 <dict>
     <key>com.apple.security.cs.allow-jit</key>
     <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
     <key>com.apple.security.device.audio-input</key>
     <true/>
     <key>com.apple.security.device.camera</key>

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

@@ -1,67 +0,0 @@
-parameters:
-  - name: VSCODE_QUALITY
-    type: string
-  - name: VSCODE_BUILD_MACOS
-    type: boolean
-    default: false
-  - name: VSCODE_BUILD_MACOS_ARM64
-    type: boolean
-    default: false
-
-steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: "16.x"
-
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - template: ../distro/download-distro.yml
-    - script: node build/azure-pipelines/distro/apply-cli-patches
-      displayName: Apply distro patches
-
-  - task: Npm@1
-    displayName: Download openssl prebuilt
-    inputs:
-      command: custom
-      customCommand: pack @vscode-internal/openssl-prebuilt@0.0.8
-      customRegistry: useFeed
-      customFeed: "Monaco/openssl-prebuilt"
-      workingDir: $(Build.ArtifactStagingDirectory)
-
-  - script: |
-      set -e
-      mkdir $(Build.ArtifactStagingDirectory)/openssl
-      tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.8.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
-    displayName: Extract openssl prebuilt
-
-  - script: node build/azure-pipelines/cli/prepare.js
-    displayName: Prepare CLI build
-    env:
-      VSCODE_CLI_PREPARE_ROOT: $(Build.SourcesDirectory)/.build/distro
-      VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
-      GITHUB_TOKEN: "$(github-distro-mixin-password)"
-
-  - template: ../cli/install-rust-posix.yml
-    parameters:
-      targets:
-        - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}:
-          - x86_64-apple-darwin
-        - ${{ if eq(parameters.VSCODE_BUILD_MACOS_ARM64, true) }}:
-          - aarch64-apple-darwin
-
-  - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}:
-    - template: ../cli/cli-compile-and-publish.yml
-      parameters:
-        VSCODE_CLI_TARGET: x86_64-apple-darwin
-        VSCODE_CLI_ARTIFACT: unsigned_vscode_cli_darwin_x64_cli
-        VSCODE_CLI_ENV:
-          OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-osx/lib
-          OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-osx/include
-
-  - ${{ if eq(parameters.VSCODE_BUILD_MACOS_ARM64, true) }}:
-    - template: ../cli/cli-compile-and-publish.yml
-      parameters:
-        VSCODE_CLI_TARGET: aarch64-apple-darwin
-        VSCODE_CLI_ARTIFACT: unsigned_vscode_cli_darwin_arm64_cli
-        VSCODE_CLI_ENV:
-          OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-osx/lib
-          OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-osx/include

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

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

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

@@ -1,50 +0,0 @@
-parameters:
-  - name: VSCODE_BUILD_MACOS
-    type: boolean
-  - name: VSCODE_BUILD_MACOS_ARM64
-    type: boolean
-
-steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: "16.x"
-
-  - script: node build/setup-npm-registry.js $NPM_REGISTRY build
-    condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM Registry
-
-  - script: |
-      set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      npm config set always-auth=true --location=project
-      yarn config set registry "$NPM_REGISTRY"
-    workingDirectory: build
-    condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
-
-  - task: npmAuthenticate@0
-    inputs:
-      workingFile: build/.npmrc
-    condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM Authentication
-
-  - script: |
-      set -e
-      for i in {1..5}; do # try 5 times
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
-          exit 1
-        fi
-        echo "Yarn failed $i, trying again..."
-      done
-    workingDirectory: build
-    displayName: Install build dependencies
-
-  - template: ../cli/cli-darwin-sign.yml
-    parameters:
-      VSCODE_CLI_ARTIFACTS:
-        - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}:
-          - unsigned_vscode_cli_darwin_x64_cli
-        - ${{ if eq(parameters.VSCODE_BUILD_MACOS_ARM64, true) }}:
-          - unsigned_vscode_cli_darwin_arm64_cli

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

@@ -3,43 +3,91 @@ steps:
     inputs:
       versionSpec: "16.x"
 
-  - task: UseDotNet@2
-    inputs:
-      version: 6.x
-
-  - task: EsrpClientTool@1
-    continueOnError: true
-    displayName: Download ESRPClient
-
   - task: AzureKeyVault@1
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
-      KeyVaultName: vscode-build-secrets
-      SecretsFilter: "ESRP-PKI,esrp-aad-username,esrp-aad-password"
+      KeyVaultName: vscode
+      SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"
+
+  - script: |
+      set -e
+      cat << EOF > ~/.netrc
+      machine github.com
+      login vscode
+      password $(github-distro-mixin-password)
+      EOF
+
+      git config user.email "vscode@microsoft.com"
+      git config user.name "VSCode"
+    displayName: Prepare tooling
+
+  - script: |
+      set -e
+      git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
+      echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
+      git checkout FETCH_HEAD
+    condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
+    displayName: Checkout override commit
+
+  - script: |
+      set -e
+      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
+    displayName: Merge distro
+
+  - script: |
+      set -e
+      npx https://aka.ms/enablesecurefeed standAlone
+    timeoutInMinutes: 5
+    retryCountOnTaskFailure: 3
+    condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true'))
+    displayName: Switch to Terrapin packages
+
+  - script: |
+      set -e
+      for i in {1..3}; do # try 3 times, for Terrapin
+        yarn --cwd build --frozen-lockfile --check-files && break
+        if [ $i -eq 3 ]; then
+          echo "Yarn failed too many times" >&2
+          exit 1
+        fi
+        echo "Yarn failed $i, trying again..."
+      done
+    displayName: Install build dependencies
 
   - download: current
     artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
     displayName: Download $(VSCODE_ARCH) artifact
 
-  - script: node build/azure-pipelines/common/sign $(Agent.ToolsDirectory)/esrpclient/*/*/net6.0/esrpcli.dll darwin-sign $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive VSCode-darwin-$(VSCODE_ARCH).zip
-    displayName: Codesign
+  - script: |
+      set -e
+      unzip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip -d $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      mv $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
+    displayName: Unzip & move
 
-  - script: node build/azure-pipelines/common/sign $(Agent.ToolsDirectory)/esrpclient/*/*/net6.0/esrpcli.dll darwin-notarize $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive VSCode-darwin-$(VSCODE_ARCH).zip
-    displayName: Notarize
+  - task: UseDotNet@2
+    inputs:
+      version: 2.x
 
-  - script: unzip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip -d $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH)
-    displayName: Extract signed app
-    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
+  - task: EsrpClientTool@1
+    displayName: Download ESRPClient
 
   - script: |
       set -e
-      APP_ROOT="$(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH)"
+      node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" darwin-sign $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(agent.builddirectory) VSCode-darwin-$(VSCODE_ARCH).zip
+    displayName: Codesign
+
+  - script: |
+      set -e
+      node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" darwin-notarize $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(agent.builddirectory) VSCode-darwin-$(VSCODE_ARCH).zip
+    displayName: Notarize
+
+  - script: |
+      set -e
+      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
       APP_NAME="`ls $APP_ROOT | head -n 1`"
-      APP_PATH="$APP_ROOT/$APP_NAME"
-      codesign -dv --deep --verbose=4 "$APP_PATH"
-      "$APP_PATH/Contents/Resources/app/bin/code" --export-default-configuration=.build
-    displayName: Verify signature
+      "$APP_ROOT/$APP_NAME/Contents/Resources/app/bin/code" --export-default-configuration=.build
+    displayName: Verify start after signing (export configuration)
     condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
 
   - script: |
@@ -52,9 +100,9 @@ steps:
       echo "##vso[task.setvariable variable=ASSET_ID]$ASSET_ID"
     displayName: Set asset id variable
 
-  - script: mv $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-x64.zip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin.zip
-    displayName: Rename x64 build to its legacy name
+  - script: mv $(agent.builddirectory)/VSCode-darwin-x64.zip $(agent.builddirectory)/VSCode-darwin.zip
+    displayName: Rename x64 build to it's legacy name
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
 
-  - publish: $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-$(ASSET_ID).zip
+  - publish: $(Agent.BuildDirectory)/VSCode-$(ASSET_ID).zip
     artifact: vscode_client_darwin_$(VSCODE_ARCH)_archive

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

@@ -1,197 +1,270 @@
-parameters:
-  - name: VSCODE_QUALITY
-    type: string
-  - name: VSCODE_RUN_UNIT_TESTS
-    type: boolean
-  - name: VSCODE_RUN_INTEGRATION_TESTS
-    type: boolean
-  - name: VSCODE_RUN_SMOKE_TESTS
-    type: boolean
-
 steps:
-  - script: yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
+  - task: NodeTool@0
+    inputs:
+      versionSpec: "16.x"
+
+  - task: AzureKeyVault@1
+    displayName: "Azure Key Vault: Get Secrets"
+    inputs:
+      azureSubscription: "vscode-builds-subscription"
+      KeyVaultName: vscode
+      SecretsFilter: "github-distro-mixin-password,macos-developer-certificate,macos-developer-certificate-key"
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      artifact: Compilation
+      path: $(Build.ArtifactStagingDirectory)
+    displayName: Download compilation output
+
+  - script: |
+      set -e
+      tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
+    displayName: Extract compilation output
+
+  # Set up the credentials to retrieve distro repo and setup git persona
+  # to create a merge commit for when we merge distro into oss
+  - script: |
+      set -e
+      cat << EOF > ~/.netrc
+      machine github.com
+      login vscode
+      password $(github-distro-mixin-password)
+      EOF
+
+      git config user.email "vscode@microsoft.com"
+      git config user.name "VSCode"
+    displayName: Prepare tooling
+
+  - script: |
+      set -e
+      git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
+      echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
+      git checkout FETCH_HEAD
+    condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
+    displayName: Checkout override commit
+
+  - script: |
+      set -e
+      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
+    displayName: Merge distro
+
+  - script: |
+      mkdir -p .build
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash
+    displayName: Prepare yarn cache flags
+
+  - task: Cache@2
+    inputs:
+      key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
+      path: .build/node_modules_cache
+      cacheHitVar: NODE_MODULES_RESTORED
+    displayName: Restore node_modules cache
+
+  - script: |
+      set -e
+      tar -xzf .build/node_modules_cache/cache.tgz
+    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Extract node_modules cache
+
+  - script: |
+      set -e
+      npm install -g node-gyp@latest
+      node-gyp --version
+    displayName: Update node-gyp
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+
+  - script: |
+      set -e
+      npx https://aka.ms/enablesecurefeed standAlone
+    timeoutInMinutes: 5
+    retryCountOnTaskFailure: 3
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
+    displayName: Switch to Terrapin packages
+
+  - script: |
+      set -e
+      export npm_config_arch=$(VSCODE_ARCH)
+      export npm_config_node_gyp=$(which node-gyp)
+
+      for i in {1..3}; do # try 3 times, for Terrapin
+        yarn --frozen-lockfile --check-files && break
+        if [ $i -eq 3 ]; then
+          echo "Yarn failed too many times" >&2
+          exit 1
+        fi
+        echo "Yarn failed $i, trying again..."
+      done
     env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
+    displayName: Install dependencies
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+
+  - script: |
+      set -e
+      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+      mkdir -p .build/node_modules_cache
+      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Create node_modules archive
+
+  # This script brings in the right resources (images, icons, etc) based on the quality (insiders, stable, exploration)
+  - script: |
+      set -e
+      node build/azure-pipelines/mixin
+    displayName: Mix in quality
+
+  - script: |
+      set -e
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
+    displayName: Build client
+
+  - script: |
+      set -e
+      node build/azure-pipelines/mixin --server
+    displayName: Mix in server quality
+
+  - script: |
+      set -e
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn gulp vscode-reh-darwin-$(VSCODE_ARCH)-min-ci
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn gulp vscode-reh-web-darwin-$(VSCODE_ARCH)-min-ci
+    displayName: Build Server
+
+  - script: |
+      set -e
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
     displayName: Download Electron and Playwright
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}:
-    - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: ./scripts/test.sh --tfs "Unit Tests"
-        displayName: Run unit tests (Electron)
-        timeoutInMinutes: 15
+  # Setting hardened entitlements is a requirement for:
+  # * Running tests on Big Sur (because Big Sur has additional security precautions)
+  - script: |
+      set -e
+      security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+      security default-keychain -s $(agent.tempdirectory)/buildagent.keychain
+      security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+      echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12
+      security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
+      security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
+      VSCODE_ARCH=$(VSCODE_ARCH) DEBUG=electron-osx-sign* node build/darwin/sign.js
+    displayName: Set Hardened Entitlements
 
-      - script: yarn test-node
-        displayName: Run unit tests (node.js)
-        timeoutInMinutes: 15
+  - script: |
+      set -e
+      ./scripts/test.sh --build --tfs "Unit Tests"
+    displayName: Run unit tests (Electron)
+    timeoutInMinutes: 15
 
-      - script: yarn test-browser-no-install --sequential --browser chromium --browser webkit --tfs "Browser Unit Tests"
-        env:
-          DEBUG: "*browser*"
-        displayName: Run unit tests (Browser, Chromium & Webkit)
-        timeoutInMinutes: 30
+  - script: |
+      set -e
+      yarn test-node --build
+    displayName: Run unit tests (node.js)
+    timeoutInMinutes: 15
 
-    - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: ./scripts/test.sh --build --tfs "Unit Tests"
-        displayName: Run unit tests (Electron)
-        timeoutInMinutes: 15
+  - script: |
+      set -e
+      DEBUG=*browser* yarn test-browser-no-install --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests"
+    displayName: Run unit tests (Browser, Chromium & Webkit)
+    timeoutInMinutes: 30
 
-      - script: yarn test-node --build
-        displayName: Run unit tests (node.js)
-        timeoutInMinutes: 15
+  - script: |
+      # Figure out the full absolute path of the product we just built
+      # including the remote server and configure the integration tests
+      # to run with these builds instead of running out of sources.
+      set -e
+      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      APP_NAME="`ls $APP_ROOT | head -n 1`"
+      INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH)" \
+      ./scripts/test-integration.sh --build --tfs "Integration Tests"
+    displayName: Run integration tests (Electron)
+    timeoutInMinutes: 20
 
-      - script: yarn test-browser-no-install --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests"
-        env:
-          DEBUG: "*browser*"
-        displayName: Run unit tests (Browser, Chromium & Webkit)
-        timeoutInMinutes: 30
+  - script: |
+      set -e
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin-$(VSCODE_ARCH)" \
+      ./scripts/test-web-integration.sh --browser webkit
+    displayName: Run integration tests (Browser, Webkit)
+    timeoutInMinutes: 20
 
-  - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
-    - script: |
-        set -e
-        yarn gulp \
-          compile-extension:configuration-editing \
-          compile-extension:css-language-features-server \
-          compile-extension:emmet \
-          compile-extension:git \
-          compile-extension:github-authentication \
-          compile-extension:html-language-features-server \
-          compile-extension:ipynb \
-          compile-extension:json-language-features-server \
-          compile-extension:markdown-language-features-server \
-          compile-extension:markdown-language-features \
-          compile-extension-media \
-          compile-extension:microsoft-authentication \
-          compile-extension:vscode-api-tests \
-          compile-extension:vscode-colorize-tests \
-          compile-extension:vscode-test-resolver
-      displayName: Build integration tests
+  - script: |
+      set -e
+      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      APP_NAME="`ls $APP_ROOT | head -n 1`"
+      INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH)" \
+      ./scripts/test-remote-integration.sh
+    displayName: Run integration tests (Remote)
+    timeoutInMinutes: 20
 
-    - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: ./scripts/test-integration.sh --tfs "Integration Tests"
-        displayName: Run integration tests (Electron)
-        timeoutInMinutes: 20
+  - script: |
+      set -e
+      ps -ef
+    displayName: Diagnostics before smoke test run
+    continueOnError: true
+    condition: succeededOrFailed()
 
-    - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: |
-          # Figure out the full absolute path of the product we just built
-          # including the remote server and configure the integration tests
-          # to run with these builds instead of running out of sources.
-          set -e
-          APP_ROOT="$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)"
-          APP_NAME="`ls $APP_ROOT | head -n 1`"
-          INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
-          ./scripts/test-integration.sh --build --tfs "Integration Tests"
-        env:
-          VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH)
-        displayName: Run integration tests (Electron)
-        timeoutInMinutes: 20
+  - script: |
+      set -e
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin-$(VSCODE_ARCH)" \
+      yarn smoketest-no-compile --web --tracing --headless
+    timeoutInMinutes: 10
+    displayName: Run smoke tests (Browser, Chromium)
 
-      - script: ./scripts/test-web-integration.sh --browser webkit
-        env:
-          VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-reh-web-darwin-$(VSCODE_ARCH)
-        displayName: Run integration tests (Browser, Webkit)
-        timeoutInMinutes: 20
+  - script: |
+      set -e
+      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      APP_NAME="`ls $APP_ROOT | head -n 1`"
+      yarn smoketest-no-compile --tracing --build "$APP_ROOT/$APP_NAME"
+    timeoutInMinutes: 20
+    displayName: Run smoke tests (Electron)
 
-      - script: |
-          set -e
-          APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-          APP_NAME="`ls $APP_ROOT | head -n 1`"
-          INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
-          ./scripts/test-remote-integration.sh
-        env:
-          VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH)
-        displayName: Run integration tests (Remote)
-        timeoutInMinutes: 20
+  - script: |
+      set -e
+      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      APP_NAME="`ls $APP_ROOT | head -n 1`"
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH)" \
+      yarn smoketest-no-compile --tracing --remote --build "$APP_ROOT/$APP_NAME"
+    timeoutInMinutes: 20
+    displayName: Run smoke tests (Remote)
 
-  - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}:
-    - script: ps -ef
-      displayName: Diagnostics before smoke test run
-      continueOnError: true
-      condition: succeededOrFailed()
+  - script: |
+      set -e
+      ps -ef
+    displayName: Diagnostics after smoke test run
+    continueOnError: true
+    condition: succeededOrFailed()
 
-    - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: yarn --cwd test/smoke compile
-        displayName: Compile smoke tests
+  - task: PublishPipelineArtifact@0
+    inputs:
+      artifactName: crash-dump-macos-$(VSCODE_ARCH)
+      targetPath: .build/crashes
+    displayName: "Publish Crash Reports"
+    continueOnError: true
+    condition: failed()
 
-      - script: yarn gulp compile-extension-media
-        displayName: Compile extensions for smoke tests
+  # In order to properly symbolify above crash reports
+  # (if any), we need the compiled native modules too
+  - task: PublishPipelineArtifact@0
+    inputs:
+      artifactName: node-modules-macos-$(VSCODE_ARCH)
+      targetPath: node_modules
+    displayName: "Publish Node Modules"
+    continueOnError: true
+    condition: failed()
 
-      - script: yarn smoketest-no-compile --tracing
-        timeoutInMinutes: 20
-        displayName: Run smoke tests (Electron)
-
-    - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: |
-          set -e
-          APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-          APP_NAME="`ls $APP_ROOT | head -n 1`"
-          yarn smoketest-no-compile --tracing --build "$APP_ROOT/$APP_NAME"
-        timeoutInMinutes: 20
-        displayName: Run smoke tests (Electron)
-
-      - script: yarn smoketest-no-compile --web --tracing --headless
-        env:
-          VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-reh-web-darwin-$(VSCODE_ARCH)
-        timeoutInMinutes: 20
-        displayName: Run smoke tests (Browser, Chromium)
-
-      - script: |
-          set -e
-          yarn gulp compile-extension:vscode-test-resolver
-          APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-          APP_NAME="`ls $APP_ROOT | head -n 1`"
-          yarn smoketest-no-compile --tracing --remote --build "$APP_ROOT/$APP_NAME"
-        env:
-          VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH)
-        timeoutInMinutes: 20
-        displayName: Run smoke tests (Remote)
-
-    - script: ps -ef
-      displayName: Diagnostics after smoke test run
-      continueOnError: true
-      condition: succeededOrFailed()
-
-  - ${{ if or(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-    - task: PublishPipelineArtifact@0
-      inputs:
-        targetPath: .build/crashes
-        ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-          artifactName: crash-dump-macos-$(VSCODE_ARCH)-integration-$(System.JobAttempt)
-        ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-          artifactName: crash-dump-macos-$(VSCODE_ARCH)-smoke-$(System.JobAttempt)
-        ${{ else }}:
-          artifactName: crash-dump-macos-$(VSCODE_ARCH)-$(System.JobAttempt)
-      displayName: "Publish Crash Reports"
-      continueOnError: true
-      condition: failed()
-
-    # In order to properly symbolify above crash reports
-    # (if any), we need the compiled native modules too
-    - task: PublishPipelineArtifact@0
-      inputs:
-        targetPath: node_modules
-        ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-          artifactName: node-modules-macos-$(VSCODE_ARCH)-integration-$(System.JobAttempt)
-        ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-          artifactName: node-modules-macos-$(VSCODE_ARCH)-smoke-$(System.JobAttempt)
-        ${{ else }}:
-          artifactName: node-modules-macos-$(VSCODE_ARCH)-$(System.JobAttempt)
-      displayName: "Publish Node Modules"
-      continueOnError: true
-      condition: failed()
-
-    - task: PublishPipelineArtifact@0
-      inputs:
-        targetPath: .build/logs
-        ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-          artifactName: logs-macos-$(VSCODE_ARCH)-integration-$(System.JobAttempt)
-        ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-          artifactName: logs-macos-$(VSCODE_ARCH)-smoke-$(System.JobAttempt)
-        ${{ else }}:
-          artifactName: logs-macos-$(VSCODE_ARCH)-$(System.JobAttempt)
-      displayName: "Publish Log Files"
-      continueOnError: true
-      condition: succeededOrFailed()
+  - task: PublishPipelineArtifact@0
+    inputs:
+      artifactName: logs-macos-$(VSCODE_ARCH)-$(System.JobAttempt)
+      targetPath: .build/logs
+    displayName: "Publish Log Files"
+    continueOnError: true
+    condition: failed()
 
   - task: PublishTestResults@2
     displayName: Publish Tests Results

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

@@ -3,46 +3,59 @@ steps:
     inputs:
       versionSpec: "16.x"
 
-  - template: ../distro/download-distro.yml
-
   - task: AzureKeyVault@1
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
-      KeyVaultName: vscode-build-secrets
+      KeyVaultName: vscode
       SecretsFilter: "github-distro-mixin-password,macos-developer-certificate,macos-developer-certificate-key"
 
-  - script: node build/setup-npm-registry.js $NPM_REGISTRY build
-    condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM Registry
+  - script: |
+      set -e
+      cat << EOF > ~/.netrc
+      machine github.com
+      login vscode
+      password $(github-distro-mixin-password)
+      EOF
+
+      git config user.email "vscode@microsoft.com"
+      git config user.name "VSCode"
+    displayName: Prepare tooling
 
   - script: |
       set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      npm config set always-auth=true --location=project
-      yarn config set registry "$NPM_REGISTRY"
-    workingDirectory: build
-    condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+      git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
+      echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
+      git checkout FETCH_HEAD
+    condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
+    displayName: Checkout override commit
 
-  - task: npmAuthenticate@0
+  - script: |
+      set -e
+      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
+    displayName: Merge distro
+
+  - script: |
+      mkdir -p .build
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js x64 $ENABLE_TERRAPIN > .build/yarnlockhash
+    displayName: Prepare yarn cache flags
+
+  - task: Cache@2
     inputs:
-      workingFile: build/.npmrc
-    condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM Authentication
+      key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
+      path: .build/node_modules_cache
+      cacheHitVar: NODE_MODULES_RESTORED
+    displayName: Restore node_modules cache
 
   - script: |
       set -e
-      for i in {1..5}; do # try 5 times
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
-          exit 1
-        fi
-        echo "Yarn failed $i, trying again..."
-      done
-    workingDirectory: build
-    displayName: Install build dependencies
+      tar -xzf .build/node_modules_cache/cache.tgz
+    displayName: Extract node_modules cache
+
+  - script: |
+      set -e
+      node build/azure-pipelines/mixin
+    displayName: Mix in quality
 
   - download: current
     artifact: unsigned_vscode_client_darwin_x64_archive
@@ -52,14 +65,13 @@ steps:
     artifact: unsigned_vscode_client_darwin_arm64_archive
     displayName: Download arm64 artifact
 
-  - script: node build/azure-pipelines/distro/mixin-quality
-    displayName: Mixin distro quality
-
   - script: |
       set -e
-      unzip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_x64_archive/VSCode-darwin-x64.zip -d $(agent.builddirectory)/VSCode-darwin-x64
-      unzip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_arm64_archive/VSCode-darwin-arm64.zip -d $(agent.builddirectory)/VSCode-darwin-arm64
-      DEBUG=* node build/darwin/create-universal-app.js $(agent.builddirectory)
+      cp $(Pipeline.Workspace)/unsigned_vscode_client_darwin_x64_archive/VSCode-darwin-x64.zip $(agent.builddirectory)/VSCode-darwin-x64.zip
+      cp $(Pipeline.Workspace)/unsigned_vscode_client_darwin_arm64_archive/VSCode-darwin-arm64.zip $(agent.builddirectory)/VSCode-darwin-arm64.zip
+      unzip $(agent.builddirectory)/VSCode-darwin-x64.zip -d $(agent.builddirectory)/VSCode-darwin-x64
+      unzip $(agent.builddirectory)/VSCode-darwin-arm64.zip -d $(agent.builddirectory)/VSCode-darwin-arm64
+      DEBUG=* node build/darwin/create-universal-app.js
     displayName: Create Universal App
 
   - script: |
@@ -69,12 +81,13 @@ steps:
       security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
       echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12
       security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
-      export CODESIGN_IDENTITY=$(security find-identity -v -p codesigning $(agent.tempdirectory)/buildagent.keychain | grep -oEi "([0-9A-F]{40})" | head -n 1)
       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 $(agent.builddirectory)
+      VSCODE_ARCH=$(VSCODE_ARCH) DEBUG=electron-osx-sign* node build/darwin/sign.js
     displayName: Set Hardened Entitlements
 
-  - script: pushd $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) && zip -r -X -y $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip * && popd
+  - 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
 
   - publish: $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH).zip

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

@@ -1,82 +1,90 @@
-parameters:
-  - name: VSCODE_QUALITY
-    type: string
-  - name: VSCODE_CIBUILD
-    type: boolean
-  - name: VSCODE_RUN_UNIT_TESTS
-    type: boolean
-  - name: VSCODE_RUN_INTEGRATION_TESTS
-    type: boolean
-  - name: VSCODE_RUN_SMOKE_TESTS
-    type: boolean
-
 steps:
-  - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-    - checkout: self
-      fetchDepth: 1
-      retryCountOnTaskFailure: 3
-
   - task: NodeTool@0
     inputs:
       versionSpec: "16.x"
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - template: ../distro/download-distro.yml
+  - task: AzureKeyVault@1
+    displayName: "Azure Key Vault: Get Secrets"
+    inputs:
+      azureSubscription: "vscode-builds-subscription"
+      KeyVaultName: vscode
+      SecretsFilter: "github-distro-mixin-password,macos-developer-certificate,macos-developer-certificate-key"
 
-    - task: AzureKeyVault@1
-      displayName: "Azure Key Vault: Get Secrets"
-      inputs:
-        azureSubscription: "vscode-builds-subscription"
-        KeyVaultName: vscode-build-secrets
-        SecretsFilter: "github-distro-mixin-password,macos-developer-certificate,macos-developer-certificate-key"
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      artifact: Compilation
+      path: $(Build.ArtifactStagingDirectory)
+    displayName: Download compilation output
 
-    - task: DownloadPipelineArtifact@2
-      inputs:
-        artifact: Compilation
-        path: $(Build.ArtifactStagingDirectory)
-      displayName: Download compilation output
+  - script: |
+      set -e
+      tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
+    displayName: Extract compilation output
 
-    - script: tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
-      displayName: Extract compilation output
+  - script: |
+      set -e
+      cat << EOF > ~/.netrc
+      machine github.com
+      login vscode
+      password $(github-distro-mixin-password)
+      EOF
 
-  - script: node build/setup-npm-registry.js $NPM_REGISTRY
-    condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM Registry
+      git config user.email "vscode@microsoft.com"
+      git config user.name "VSCode"
+    displayName: Prepare tooling
 
-  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js darwin $VSCODE_ARCH > .build/yarnlockhash
-    displayName: Prepare node_modules cache key
+  - script: |
+      set -e
+      git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
+      echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
+      git checkout FETCH_HEAD
+    condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
+    displayName: Checkout override commit
+
+  - script: |
+      set -e
+      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
+    displayName: Merge distro
+
+  - script: |
+      mkdir -p .build
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash
+    displayName: Prepare yarn cache flags
 
   - task: Cache@2
     inputs:
-      key: '"node_modules" | .build/yarnlockhash'
+      key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
       path: .build/node_modules_cache
       cacheHitVar: NODE_MODULES_RESTORED
     displayName: Restore node_modules cache
 
-  - script: tar -xzf .build/node_modules_cache/cache.tgz
+  - script: |
+      set -e
+      tar -xzf .build/node_modules_cache/cache.tgz
     condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
     displayName: Extract node_modules cache
 
   - script: |
       set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      npm config set always-auth=true --location=project
-      yarn config set registry "$NPM_REGISTRY"
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+      npm install -g node-gyp@latest
+      node-gyp --version
+    displayName: Update node-gyp
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
-  - task: npmAuthenticate@0
-    inputs:
-      workingFile: .npmrc
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM Authentication
+  - script: |
+      set -e
+      npx https://aka.ms/enablesecurefeed standAlone
+    timeoutInMinutes: 5
+    retryCountOnTaskFailure: 3
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
+    displayName: Switch to Terrapin packages
 
   - script: |
       set -e
       export npm_config_arch=$(VSCODE_ARCH)
       export npm_config_node_gyp=$(which node-gyp)
 
-      for i in {1..5}; do # try 5 times
+      for i in {1..3}; do # try 3 times, for Terrapin
         yarn --frozen-lockfile --check-files && break
         if [ $i -eq 3 ]; then
           echo "Yarn failed too many times" >&2
@@ -91,11 +99,6 @@ steps:
     displayName: Install dependencies
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: node build/azure-pipelines/distro/mixin-npm
-      condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-      displayName: Mixin distro node modules
-
   - script: |
       set -e
       node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
@@ -104,142 +107,115 @@ steps:
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
     displayName: Create node_modules archive
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: node build/azure-pipelines/distro/mixin-quality
-      displayName: Mixin distro quality
+  # This script brings in the right resources (images, icons, etc) based on the quality (insiders, stable, exploration)
+  - script: |
+      set -e
+      node build/azure-pipelines/mixin
+    displayName: Mix in quality
 
-  - template: ../common/install-builtin-extensions.yml
+  - script: |
+      set -e
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
+    displayName: Build client
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
-      env:
-        GITHUB_TOKEN: "$(github-distro-mixin-password)"
-      displayName: Build client
+  - script: |
+      set -e
+      node build/azure-pipelines/mixin --server
+    displayName: Mix in server quality
 
-    - script: yarn gulp vscode-reh-darwin-$(VSCODE_ARCH)-min-ci
-      env:
-        GITHUB_TOKEN: "$(github-distro-mixin-password)"
-      displayName: Build server
+  - script: |
+      set -e
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn gulp vscode-reh-darwin-$(VSCODE_ARCH)-min-ci
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn gulp vscode-reh-web-darwin-$(VSCODE_ARCH)-min-ci
+    displayName: Build Server
 
-    - script: yarn gulp vscode-reh-web-darwin-$(VSCODE_ARCH)-min-ci
-      env:
-        GITHUB_TOKEN: "$(github-distro-mixin-password)"
-      displayName: Build server (web)
+  # Setting hardened entitlements is a requirement for:
+  # * Apple notarization
+  # * Running tests on Big Sur (because Big Sur has additional security precautions)
+  - script: |
+      set -e
+      security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+      security default-keychain -s $(agent.tempdirectory)/buildagent.keychain
+      security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+      echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12
+      security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
+      security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
+      VSCODE_ARCH=$(VSCODE_ARCH) DEBUG=electron-osx-sign* node build/darwin/sign.js
+    displayName: Set Hardened Entitlements
 
-  - ${{ else }}:
-      - script: yarn gulp transpile-client-swc transpile-extensions
-        env:
-          GITHUB_TOKEN: "$(github-distro-mixin-password)"
-        displayName: Transpile
+  - 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
 
-  - ${{ if or(eq(parameters.VSCODE_RUN_UNIT_TESTS, true), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-    - template: product-build-darwin-test.yml
-      parameters:
-        VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
-        VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }}
-        VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
-        VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }}
+  - script: |
+      set -e
 
-  - ${{ elseif and(ne(parameters.VSCODE_CIBUILD, true), ne(parameters.VSCODE_QUALITY, 'oss')) }}:
-    - task: DownloadPipelineArtifact@2
-      inputs:
-        artifact: unsigned_vscode_cli_darwin_$(VSCODE_ARCH)_cli
-        patterns: "**"
-        path: $(Build.ArtifactStagingDirectory)/cli
-      displayName: Download VS Code CLI
+      # package Remote Extension Host
+      pushd .. && mv vscode-reh-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH) && zip -Xry vscode-server-darwin-$(VSCODE_ARCH).zip vscode-server-darwin-$(VSCODE_ARCH) && popd
 
-    - script: |
-        set -e
-        APP_ROOT="$(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH)"
-        APP_NAME="`ls $APP_ROOT | head -n 1`"
-        APP_PATH="$APP_ROOT/$APP_NAME"
-        ARCHIVE_NAME=$(ls "$(Build.ArtifactStagingDirectory)/cli" | head -n 1)
-        unzip "$(Build.ArtifactStagingDirectory)/cli/$ARCHIVE_NAME" -d "$(Build.ArtifactStagingDirectory)/cli"
-        CLI_APP_NAME=$(node -p "require(\"$APP_PATH/Contents/Resources/app/product.json\").tunnelApplicationName")
-        APP_NAME=$(node -p "require(\"$APP_PATH/Contents/Resources/app/product.json\").applicationName")
-        mv "$(Build.ArtifactStagingDirectory)/cli/$APP_NAME" "$APP_PATH/Contents/Resources/app/bin/$CLI_APP_NAME"
-        chmod +x "$APP_PATH/Contents/Resources/app/bin/$CLI_APP_NAME"
-      displayName: Make CLI executable
+      # package Remote Extension Host (Web)
+      pushd .. && mv vscode-reh-web-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH)-web && zip -Xry vscode-server-darwin-$(VSCODE_ARCH)-web.zip vscode-server-darwin-$(VSCODE_ARCH)-web && popd
+    displayName: Prepare to publish servers
 
-    # Setting hardened entitlements is a requirement for:
-    # * Apple notarization
-    # * Running tests on Big Sur (because Big Sur has additional security precautions)
-    - script: |
-        set -e
-        security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
-        security default-keychain -s $(agent.tempdirectory)/buildagent.keychain
-        security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
-        echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12
-        security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
-        export CODESIGN_IDENTITY=$(security find-identity -v -p codesigning $(agent.tempdirectory)/buildagent.keychain | grep -oEi "([0-9A-F]{40})" | head -n 1)
-        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 $(agent.builddirectory)
-      displayName: Set Hardened Entitlements
+  - publish: $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
+    artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
+    displayName: Publish client archive
 
-    - script: cd $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) && zip -r -X -y $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip *
-      displayName: Archive build
+  - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH).zip
+    artifact: vscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned
+    displayName: Publish server archive
 
-    - script: |
-        set -e
+  - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH)-web.zip
+    artifact: vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned
+    displayName: Publish web server archive
 
-        # package Remote Extension Host
-        pushd .. && mv vscode-reh-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH) && zip -Xry vscode-server-darwin-$(VSCODE_ARCH).zip vscode-server-darwin-$(VSCODE_ARCH) && popd
+  - task: AzureCLI@2
+    inputs:
+      azureSubscription: "vscode-builds-subscription"
+      scriptType: pscore
+      scriptLocation: inlineScript
+      addSpnToEnvironment: true
+      inlineScript: |
+        Write-Host "##vso[task.setvariable variable=AZURE_TENANT_ID]$env:tenantId"
+        Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_ID]$env:servicePrincipalId"
+        Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey"
 
-        # package Remote Extension Host (Web)
-        pushd .. && mv vscode-reh-web-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH)-web && zip -Xry vscode-server-darwin-$(VSCODE_ARCH)-web.zip vscode-server-darwin-$(VSCODE_ARCH)-web && popd
-      displayName: Prepare to publish servers
+  - script: |
+      set -e
+      AZURE_STORAGE_ACCOUNT="ticino" \
+      AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
+      AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
+      AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \
+      VSCODE_ARCH="$(VSCODE_ARCH)" \
+        node build/azure-pipelines/upload-configuration
+    displayName: Upload configuration (for Bing settings search)
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
+    continueOnError: true
 
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-      displayName: Generate SBOM (client)
-      inputs:
-        BuildDropPath: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-        PackageName: Visual Studio Code
+  - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+    displayName: Generate SBOM (client)
+    inputs:
+      BuildDropPath: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      PackageName: Visual Studio Code
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
-    - publish: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)/_manifest
-      displayName: Publish SBOM (client)
-      artifact: vscode_client_darwin_$(VSCODE_ARCH)_sbom
+  - publish: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)/_manifest
+    displayName: Publish SBOM (client)
+    artifact: vscode_client_darwin_$(VSCODE_ARCH)_sbom
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-      displayName: Generate SBOM (server)
-      inputs:
-        BuildDropPath: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)
-        PackageName: Visual Studio Code Server
+  - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+    displayName: Generate SBOM (server)
+    inputs:
+      BuildDropPath: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)
+      PackageName: Visual Studio Code Server
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
-    - publish: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)/_manifest
-      displayName: Publish SBOM (server)
-      artifact: vscode_server_darwin_$(VSCODE_ARCH)_sbom
-
-    - publish: $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
-      artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
-      displayName: Publish client archive
-
-    - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH).zip
-      artifact: vscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned
-      displayName: Publish server archive
-
-    - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH)-web.zip
-      artifact: vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned
-      displayName: Publish web server archive
-
-    - task: AzureCLI@2
-      inputs:
-        azureSubscription: "vscode-builds-subscription"
-        scriptType: pscore
-        scriptLocation: inlineScript
-        addSpnToEnvironment: true
-        inlineScript: |
-          Write-Host "##vso[task.setvariable variable=AZURE_TENANT_ID]$env:tenantId"
-          Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_ID]$env:servicePrincipalId"
-          Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey"
-
-    - script: |
-        set -e
-        AZURE_STORAGE_ACCOUNT="ticino" \
-        AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
-        AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
-        AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \
-        VSCODE_ARCH="$(VSCODE_ARCH)" \
-          node build/azure-pipelines/upload-configuration
-      displayName: Upload configuration (for Bing settings search)
-      condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
-      continueOnError: true
+  - publish: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)/_manifest
+    displayName: Publish SBOM (server)
+    artifact: vscode_server_darwin_$(VSCODE_ARCH)_sbom
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))

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

@@ -172,7 +172,7 @@ steps:
       set -e
       unzip $(agent.builddirectory)/drop/darwin/archive/azuredatastudio-darwin-x64-unsigned.zip -d $(agent.builddirectory)/azuredatastudio-darwin-x64
       unzip $(agent.builddirectory)/drop/darwin/archive/azuredatastudio-darwin-arm64-unsigned.zip -d $(agent.builddirectory)/azuredatastudio-darwin-arm64
-      DEBUG=* node build/darwin/create-universal-app.js $(agent.builddirectory)
+      DEBUG=* node build/darwin/create-universal-app.js
     displayName: Create Universal App
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))