Handle key_up in callout dialog (#15472) (#15485)

(cherry picked from commit d797ef433a)

.config/CredScanSuppressions.json

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

.devcontainer/README.md

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

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

@@ -8,7 +8,7 @@ set -e
 
 SCRIPT_PATH="$(cd "$(dirname $0)" && pwd)"
 CONTAINER_IMAGE_REPOSITORY="$1"
-BRANCH="${2:-"main"}"
+BRANCH="${2:-"master"}"
 
 if [ "${CONTAINER_IMAGE_REPOSITORY}" = "" ]; then
 	echo "Container repository not specified!"

.devcontainer/devcontainer.json

@@ -2,27 +2,21 @@
 	"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",
+	"image": "mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:branch-master",
+
+	"workspaceMount": "source=${localWorkspaceFolder},target=/home/node/workspace/vscode,type=bind,consistency=cached",
+	"workspaceFolder": "/home/node/workspace/vscode",
 	"overrideCommand": false,
 	"runArgs": [ "--init", "--security-opt", "seccomp=unconfined"],
 
 	"settings": {
+		"terminal.integrated.shell.linux": "/bin/bash",
 		"resmon.show.battery": false,
 		"resmon.show.cpufreq": false
 	},
 
-	// noVNC, VNC
-	"forwardPorts": [6080, 5901],
-	"portsAttributes": {
-		"6080": {
-			"label": "VNC web client (noVNC)",
-			"onAutoForward": "silent"
-		},
-		"5901": {
-			"label": "VNC TCP port",
-			"onAutoForward": "silent"
-		}
-	},
+	// noVNC, VNC, debug ports
+	"forwardPorts": [6080, 5901, 9222],
 
 	"extensions": [
 		"dbaeumer.vscode-eslint",

.eslintignore

@@ -12,9 +12,6 @@
 **/vscode-api-tests/testWorkspace2/**
 **/extensions/**/out/**
 **/extensions/**/build/**
-**/big-data-cluster/src/bigDataCluster/controller/apiGenerated.ts
-**/big-data-cluster/src/bigDataCluster/controller/clusterApiGenerated2.ts
 **/extensions/markdown-language-features/media/**
-**/extensions/markdown-language-features/notebook-out/**
 **/extensions/typescript-basics/test/colorize-fixtures/**
 **/extensions/**/dist/**

.eslintrc.sql.ts.json

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

.github/CODEOWNERS

@@ -3,11 +3,10 @@
 # Syntax can be found here: https://docs.github.com/free-pro-team@latest/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
 /extensions/admin-tool-ext-win @Charles-Gagnon
-/extensions/arc/ @Charles-Gagnon @swells @candiceye
-/extensions/azcli/ @Charles-Gagnon @swells @candiceye
+/extensions/arc/ @Charles-Gagnon
+/extensions/azdata/ @Charles-Gagnon
 /extensions/big-data-cluster/ @Charles-Gagnon
 /extensions/dacpac/ @kisantia
-/extensions/notebook @azure-data-studio-notebook-devs
 /extensions/query-history/ @Charles-Gagnon
 /extensions/resource-deployment/ @Charles-Gagnon
 /extensions/schema-compare/ @kisantia
@@ -15,6 +14,3 @@
 /extensions/mssql/config.json @Charles-Gagnon @alanrenmsft @kburtram
 
 /src/sql/*.d.ts @alanrenmsft @Charles-Gagnon
-/src/sql/workbench/browser/modelComponents @Charles-Gagnon @alanrenmsft
-/src/sql/workbench/api @Charles-Gagnon @alanrenmsft
-/src/sql/**/notebook @azure-data-studio-notebook-devs

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/label-actions.yml

@@ -1,4 +1,3 @@
-# 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.
 
@@ -26,11 +25,3 @@ There are two types of logs to collect:
 - Run the command: **`Developer: Open Logs Folder`**
 
 - This will open the log folder locally. Please zip up this folder and attach it to the issue."
-
-# actions for Out of Scope label
-Out of Scope:
-  comment: "Thank you for opening this suggestion!  This enhancement is not planned in our
-medium-term roadmap.  The issue is being closed to reduce active issues to focus on
-enhancements that are being considered for an upcoming release.  We will review closed issues
-with the 'Out of Scope' label when doing long-term planning."
-  close: true

.github/subscribers.json

@@ -4,7 +4,6 @@
 		"rchiodo",
 		"greazer",
 		"donjayamanne",
-		"jilljac",
-		"IanMatthewHuff"
+		"jilljac"
 	]
 }

.github/workflows/build-chat.yml

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

.github/workflows/ci.yml

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

.github/workflows/codeql.yml

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

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

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

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

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

.github/workflows/devcontainer-cache.yml

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

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

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

.lgtm/javascript-queries/promises.ql

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

.vscode/launch.json

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

.vscode/notebooks/api.github-issues

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

.vscode/notebooks/endgame.github-issues

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

.vscode/notebooks/grooming.github-issues

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

.vscode/notebooks/inbox.github-issues

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

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

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

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

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

.vscode/notebooks/papercuts.github-issues

@@ -41,4 +41,4 @@
     "value": "repo:microsoft/vscode is:open assignee:@me label:\"papercut :drop_of_blood:\"",
     "editable": true
   }
-]
+]

.vscode/notebooks/verification.github-issues

@@ -14,7 +14,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks \n$milestone=milestone:\"March 2021\"",
+    "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks \n$milestone=milestone:\"January 2021\"",
     "editable": true
   },
   {
@@ -38,7 +38,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos $milestone is:closed  -assignee:@me label:bug -label:verified -label:*duplicate -author:@me -assignee:@me label:bug -label:verified -author:@me -author:aeschli -author:alexdima -author:alexr00 -author:bpasero -author:chrisdias -author:chrmarti -author:connor4312 -author:dbaeumer -author:deepak1556 -author:eamodio -author:egamma -author:gregvanl  -author:isidorn -author:JacksonKearl -author:joaomoreno -author:jrieken -author:lramos15 -author:lszomoru -author: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",
+    "value": "$repos $milestone is:closed  -assignee:@me label:bug -label:verified -label:*duplicate -author:@me -assignee:@me label:bug -label:verified -author:@me -author:aeschli -author:alexdima -author:alexr00 -author:bpasero -author:chrisdias -author:chrmarti -author:connor4312 -author:dbaeumer -author:deepak1556 -author:eamodio -author:egamma -author:gregvanl  -author:isidorn -author:JacksonKearl -author:joaomoreno -author:jrieken -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:RMacfarlane -author:roblourens -author:sana-ajani -author:sandy081 -author:sbatten -author:Tyriar -author:weinand",
     "editable": false
   },
   {

.vscode/settings.json

@@ -79,7 +79,5 @@
 	"[typescript]": {
 		"editor.defaultFormatter": "vscode.typescript-language-features"
 	},
-	"typescript.tsc.autoDetect": "off",
-	"notebook.experimental.useMarkdownRenderer": true,
-	"testing.autoRun.mode": "rerun",
+	"typescript.tsc.autoDetect": "off"
 }

.vscode/tasks.json

@@ -4,11 +4,10 @@
 		{
 			"type": "npm",
 			"script": "watch-clientd",
-			"label": "Core - Build",
+			"label": "Build VS Code Core",
 			"isBackground": true,
 			"presentation": {
-				"reveal": "never",
-				"group": "buildWatchers"
+				"reveal": "never"
 			},
 			"problemMatcher": {
 				"owner": "typescript",
@@ -31,11 +30,10 @@
 		{
 			"type": "npm",
 			"script": "watch-extensionsd",
-			"label": "Ext - Build",
+			"label": "Build VS Code Extensions",
 			"isBackground": true,
 			"presentation": {
-				"reveal": "never",
-				"group": "buildWatchers"
+				"reveal": "never"
 			},
 			"problemMatcher": {
 				"owner": "typescript",
@@ -56,10 +54,10 @@
 			}
 		},
 		{
-			"label": "VS Code - Build",
+			"label": "Build VS Code",
 			"dependsOn": [
-				"Core - Build",
-				"Ext - Build"
+				"Build VS Code Core",
+				"Build VS Code Extensions"
 			],
 			"group": {
 				"kind": "build",
@@ -70,32 +68,28 @@
 		{
 			"type": "npm",
 			"script": "kill-watch-clientd",
-			"label": "Kill Core - Build",
+			"label": "Kill Build VS Code Core",
 			"group": "build",
 			"presentation": {
-				"reveal": "never",
-				"group": "buildKillers",
-				"close": true
+				"reveal": "never"
 			},
 			"problemMatcher": "$tsc"
 		},
 		{
 			"type": "npm",
 			"script": "kill-watch-extensionsd",
-			"label": "Kill Ext - Build",
+			"label": "Kill Build VS Code Extensions",
 			"group": "build",
 			"presentation": {
-				"reveal": "never",
-				"group": "buildKillers",
-				"close": true
+				"reveal": "never"
 			},
 			"problemMatcher": "$tsc"
 		},
 		{
-			"label": "Kill VS Code - Build",
+			"label": "Kill Build VS Code",
 			"dependsOn": [
-				"Kill Core - Build",
-				"Kill Ext - Build"
+				"Kill Build VS Code Core",
+				"Kill Build VS Code Extensions"
 			],
 			"group": "build",
 			"problemMatcher": []
@@ -117,7 +111,7 @@
 		{
 			"type": "npm",
 			"script": "watch-webd",
-			"label": "Web Ext - Build",
+			"label": "Build Web Extensions",
 			"group": "build",
 			"isBackground": true,
 			"presentation": {
@@ -144,7 +138,7 @@
 		{
 			"type": "npm",
 			"script": "kill-watch-webd",
-			"label": "Kill Web Ext - Build",
+			"label": "Kill Build Web Extensions",
 			"group": "build",
 			"presentation": {
 				"reveal": "never"
@@ -214,8 +208,7 @@
 			"command": "node build/lib/preLaunch.js",
 			"label": "Ensure Prelaunch Dependencies",
 			"presentation": {
-				"reveal": "silent",
-				"close": true
+				"reveal": "silent"
 			}
 		},
 		{

.yarnrc

@@ -1,3 +1,3 @@
 disturl "https://electronjs.org/headers"
-target "12.0.9"
+target "11.2.2"
 runtime "electron"

CHANGELOG.md

@@ -1,60 +1,5 @@
 # Change Log
 
-## Version 1.32.0
-* Release date: August 18, 2021
-* Release status: General Availability
-* Extension Updates:
-    * Arc/Az CLI extensions - Azure Arc extension now uses Azure CLI instead of Azure Data CLI for deploying and interacting with Azure Arc 
-       instances    
-    *  Langpacks
-    *  SQL Database Projects
-    *  Azure Monitor
-    *  Machine Learning
-
-## Version 1.31.1
-* Release date: July 29, 2021
-* Release status: General Availability
-## Hotfix Release
-- Fix for [#16436 Database Connection Toolbar Missing](https://github.com/microsoft/azuredatastudio/issues/16436)
-
-## Version 1.31.0
-* Release date: July 21, 2021
-* Release status: General Availability
-* New Notebook Features:
-    * WYSIWYG link improvements
-* Extension Updates:
-    * Import
-    * SandDance
-    * SQL Database Projects
-* Bug Fixes
-  * Accessibility bug fixes
-
-## Version 1.30.0
-* Release date: June 17, 2021
-* Release status: General Availability
-* New Notebook Features:
-    * Show book's notebook TOC title in pinned notebooks view
-    * Add new book icon
-    * Update Python to 3.8.10
-* Query Editor Features:
-    * Added filtering/sorting feature for query result grid in query editor and notebook, the feature can be invoked from the column headers. Note that this feature is only           available when you enable the preview features
-    * Added a status bar item to show summary of the selected cells if there are multiple numeric values
-* Extension Updates:
-    * SQL Database Projects
-    * Machine Learning
-* Bug Fixes
-  * Fix WYSIWYG Table cell adding new line in table cell
-
-## Version 1.29.0
-* Release date: May 19, 2021
-* Release status: General Availability
-* New Notebook Features:
-    * Added runs with a parameters option.
-* Extension Updates:
-    * SQL Database Projects
-    * Schema Compare
-* Bug Fixes
-
 ## Version 1.28.0
 * Release date: April 16, 2021
 * Release status: General Availability
@@ -632,7 +577,7 @@ The May release is focused on stabilization and bug fixes leading up to the Buil
 
 * Announcing **Redgate SQL Search** extension available in Extension Manager
 * Community Localization available for 10 languages: **German, Spanish, French, Italian, Japanese, Korean, Portuguese, Russian, Simplified Chinese and Traditional Chinese!**
-* Reduced telemetry collection, improved [opt-out](https://github.com/Microsoft/azuredatastudio/wiki/How-to-Disable-Telemetry-Reporting) experience and in-product links to [Privacy Statement](https://privacy.microsoft.com/privacystatement)
+* Reduced telemetry collection, improved [opt-out](https://github.com/Microsoft/azuredatastudio/wiki/How-to-Disable-Telemetry-Reporting) experience and in-product links to [Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement)
 * Extension Manager has improved Marketplace experience to easily discover community extensions
 * SQL Agent extension Jobs and Job History view improvement
 * Updates for **whoisactive** and **Server Reports** extensions

README.md

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

SECURITY.md

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

ThirdPartyNotices.txt

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

azure-pipelines.yml

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

build/.cachesalt

@@ -1 +1 @@
-2021-08-23T03:52:18.011Z
+2021-04-07T00:04:17.775Z

build/.moduleignore

@@ -104,11 +104,13 @@ 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/openpa/**
+vscode-nsfw/includes/**
+!vscode-nsfw/build/Release/*.node
+!vscode-nsfw/**/*.a
 
 vsda/build/**
 vsda/ci/**

build/actions/package.json

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

build/actions/yarn.lock

@@ -144,12 +144,12 @@ atob-lite@^2.0.0:
   resolved "https://registry.yarnpkg.com/atob-lite/-/atob-lite-2.0.0.tgz#0fef5ad46f1bd7a8502c65727f0367d5ee43d696"
   integrity sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY=
 
-axios@^0.21.4:
-  version "0.21.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
-  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
+axios@^0.21.1:
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
+  integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
   dependencies:
-    follow-redirects "^1.14.0"
+    follow-redirects "^1.10.0"
 
 before-after-hook@^2.0.0:
   version "2.1.0"
@@ -207,10 +207,10 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-follow-redirects@^1.14.0:
-  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.3.tgz#6ada78118d8d24caee595595accdc0ac6abd022e"
-  integrity sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw==
+follow-redirects@^1.10.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7"
+  integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==
 
 get-stream@^4.0.0:
   version "4.1.0"

build/azure-pipelines/common/copyArtifacts.js

@@ -9,7 +9,6 @@ const path = require("path");
 const es = require("event-stream");
 const fs = require("fs");
 const files = [
-    '.build/langpacks/**/*.vsix',
     '.build/extensions/**/*.vsix',
     '.build/win32-x64/**/*.{exe,zip}',
     '.build/linux/sha256hashes.txt',

build/azure-pipelines/common/copyArtifacts.ts

@@ -11,7 +11,6 @@ import * as es from 'event-stream';
 import * as fs from 'fs';
 
 const files = [
-	'.build/langpacks/**/*.vsix', // langpacks
 	'.build/extensions/**/*.vsix', // external extensions
 	'.build/win32-x64/**/*.{exe,zip}', // windows binaries
 	'.build/linux/sha256hashes.txt', // linux hashes

build/azure-pipelines/common/createAsset.js

@@ -5,101 +5,15 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
-const url = require("url");
 const crypto = require("crypto");
 const azure = require("azure-storage");
 const mime = require("mime");
 const cosmos_1 = require("@azure/cosmos");
 const retry_1 = require("./retry");
-if (process.argv.length !== 8) {
-    console.error('Usage: node createAsset.js PRODUCT OS ARCH TYPE NAME FILE');
+if (process.argv.length !== 6) {
+    console.error('Usage: node createAsset.js PLATFORM TYPE NAME FILE');
     process.exit(-1);
 }
-// Contains all of the logic for mapping details to our actual product names in CosmosDB
-function getPlatform(product, os, arch, type) {
-    switch (os) {
-        case 'win32':
-            switch (product) {
-                case 'client':
-                    const asset = arch === 'ia32' ? 'win32' : `win32-${arch}`;
-                    switch (type) {
-                        case 'archive':
-                            return `${asset}-archive`;
-                        case 'setup':
-                            return asset;
-                        case 'user-setup':
-                            return `${asset}-user`;
-                        default:
-                            throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
-                    }
-                case 'server':
-                    if (arch === 'arm64') {
-                        throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
-                    }
-                    return arch === 'ia32' ? 'server-win32' : `server-win32-${arch}`;
-                case 'web':
-                    if (arch === 'arm64') {
-                        throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
-                    }
-                    return arch === 'ia32' ? 'server-win32-web' : `server-win32-${arch}-web`;
-                default:
-                    throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
-            }
-        case 'linux':
-            switch (type) {
-                case 'snap':
-                    return `linux-snap-${arch}`;
-                case 'archive-unsigned':
-                    switch (product) {
-                        case 'client':
-                            return `linux-${arch}`;
-                        case 'server':
-                            return `server-linux-${arch}`;
-                        case 'web':
-                            return arch === 'standalone' ? 'web-standalone' : `server-linux-${arch}-web`;
-                        default:
-                            throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
-                    }
-                case 'deb-package':
-                    return `linux-deb-${arch}`;
-                case 'rpm-package':
-                    return `linux-rpm-${arch}`;
-                default:
-                    throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
-            }
-        case 'darwin':
-            switch (product) {
-                case 'client':
-                    if (arch === 'x64') {
-                        return 'darwin';
-                    }
-                    return `darwin-${arch}`;
-                case 'server':
-                    return 'server-darwin';
-                case 'web':
-                    if (arch !== 'x64') {
-                        throw `What should the platform be?: ${product} ${os} ${arch} ${type}`;
-                    }
-                    return 'server-darwin-web';
-                default:
-                    throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
-            }
-        default:
-            throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
-    }
-}
-// Contains all of the logic for mapping types to our actual types in CosmosDB
-function getRealType(type) {
-    switch (type) {
-        case 'user-setup':
-            return 'setup';
-        case 'deb-package':
-        case 'rpm-package':
-            return 'package';
-        default:
-            return type;
-    }
-}
 function hashStream(hashName, stream) {
     return new Promise((c, e) => {
         const shasum = crypto.createHash(hashName);
@@ -131,10 +45,7 @@ function getEnv(name) {
     return result;
 }
 async function main() {
-    const [, , product, os, arch, unprocessedType, fileName, filePath] = process.argv;
-    // getPlatform needs the unprocessedType
-    const platform = getPlatform(product, os, arch, unprocessedType);
-    const type = getRealType(unprocessedType);
+    const [, , platform, type, fileName, filePath] = process.argv;
     const quality = getEnv('VSCODE_QUALITY');
     const commit = getEnv('BUILD_SOURCEVERSION');
     console.log('Creating asset...');
@@ -154,27 +65,14 @@ async function main() {
         console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`);
         return;
     }
-    const mooncakeBlobService = azure.createBlobService(storageAccount, process.env['MOONCAKE_STORAGE_ACCESS_KEY'], `${storageAccount}.blob.core.chinacloudapi.cn`)
-        .withFilter(new azure.ExponentialRetryPolicyFilter(20));
-    // mooncake is fussy and far away, this is needed!
-    blobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
-    mooncakeBlobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
-    console.log('Uploading blobs to Azure storage and Mooncake Azure storage...');
-    await retry_1.retry(() => Promise.all([
-        uploadBlob(blobService, quality, blobName, filePath, fileName),
-        uploadBlob(mooncakeBlobService, quality, blobName, filePath, fileName)
-    ]));
+    console.log('Uploading blobs to Azure storage...');
+    await uploadBlob(blobService, quality, blobName, filePath, fileName);
     console.log('Blobs successfully uploaded.');
-    // TODO: Understand if blobName and blobPath are the same and replace blobPath with blobName if so.
-    const assetUrl = `${process.env['AZURE_CDN_URL']}/${quality}/${blobName}`;
-    const blobPath = url.parse(assetUrl).path;
-    const mooncakeUrl = `${process.env['MOONCAKE_CDN_URL']}${blobPath}`;
     const asset = {
         platform,
         type,
-        url: assetUrl,
+        url: `${process.env['AZURE_CDN_URL']}/${quality}/${blobName}`,
         hash: sha1hash,
-        mooncakeUrl,
         sha256hash,
         size
     };
@@ -186,7 +84,6 @@ async function main() {
     const client = new cosmos_1.CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT'], key: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
     const scripts = client.database('builds').container(quality).scripts;
     await retry_1.retry(() => scripts.storedProcedure('createAsset').execute('', [commit, asset, true]));
-    console.log(`  Done ✔️`);
 }
 main().then(() => {
     console.log('Asset successfully created');

build/azure-pipelines/common/createAsset.ts

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

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

@@ -4,12 +4,12 @@ set -e
 cd $BUILD_STAGINGDIRECTORY
 mkdir extraction
 cd extraction
-git clone --depth 1 https://github.com/microsoft/vscode-extension-telemetry.git
-git clone --depth 1 https://github.com/microsoft/vscode-chrome-debug-core.git
-git clone --depth 1 https://github.com/microsoft/vscode-node-debug2.git
-git clone --depth 1 https://github.com/microsoft/vscode-node-debug.git
-git clone --depth 1 https://github.com/microsoft/vscode-html-languageservice.git
-git clone --depth 1 https://github.com/microsoft/vscode-json-languageservice.git
+git clone --depth 1 https://github.com/Microsoft/vscode-extension-telemetry.git
+git clone --depth 1 https://github.com/Microsoft/vscode-chrome-debug-core.git
+git clone --depth 1 https://github.com/Microsoft/vscode-node-debug2.git
+git clone --depth 1 https://github.com/Microsoft/vscode-node-debug.git
+git clone --depth 1 https://github.com/Microsoft/vscode-html-languageservice.git
+git clone --depth 1 https://github.com/Microsoft/vscode-json-languageservice.git
 node $BUILD_SOURCESDIRECTORY/node_modules/.bin/vscode-telemetry-extractor --sourceDir $BUILD_SOURCESDIRECTORY --excludedDir $BUILD_SOURCESDIRECTORY/extensions --outputDir . --applyEndpoints
 node $BUILD_SOURCESDIRECTORY/node_modules/.bin/vscode-telemetry-extractor --config $BUILD_SOURCESDIRECTORY/build/azure-pipelines/common/telemetry-config.json -o .
 mkdir -p $BUILD_SOURCESDIRECTORY/.build/telemetry

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

@@ -0,0 +1,87 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const url = require("url");
+const azure = require("azure-storage");
+const mime = require("mime");
+const cosmos_1 = require("@azure/cosmos");
+const retry_1 = require("./retry");
+function log(...args) {
+    console.log(...[`[${new Date().toISOString()}]`, ...args]);
+}
+function error(...args) {
+    console.error(...[`[${new Date().toISOString()}]`, ...args]);
+}
+if (process.argv.length < 3) {
+    error('Usage: node sync-mooncake.js <quality>');
+    process.exit(-1);
+}
+async function sync(commit, quality) {
+    log(`Synchronizing Mooncake assets for ${quality}, ${commit}...`);
+    const client = new cosmos_1.CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT'], key: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
+    const container = client.database('builds').container(quality);
+    const query = `SELECT TOP 1 * FROM c WHERE c.id = "${commit}"`;
+    const res = await container.items.query(query, {}).fetchAll();
+    if (res.resources.length !== 1) {
+        throw new Error(`No builds found for ${commit}`);
+    }
+    const build = res.resources[0];
+    log(`Found build for ${commit}, with ${build.assets.length} assets`);
+    const storageAccount = process.env['AZURE_STORAGE_ACCOUNT_2'];
+    const blobService = azure.createBlobService(storageAccount, process.env['AZURE_STORAGE_ACCESS_KEY_2'])
+        .withFilter(new azure.ExponentialRetryPolicyFilter(20));
+    const mooncakeBlobService = azure.createBlobService(storageAccount, process.env['MOONCAKE_STORAGE_ACCESS_KEY'], `${storageAccount}.blob.core.chinacloudapi.cn`)
+        .withFilter(new azure.ExponentialRetryPolicyFilter(20));
+    // mooncake is fussy and far away, this is needed!
+    blobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
+    mooncakeBlobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
+    for (const asset of build.assets) {
+        try {
+            const blobPath = url.parse(asset.url).path;
+            if (!blobPath) {
+                throw new Error(`Failed to parse URL: ${asset.url}`);
+            }
+            const blobName = blobPath.replace(/^\/\w+\//, '');
+            log(`Found ${blobName}`);
+            if (asset.mooncakeUrl) {
+                log(`  Already in Mooncake ✔️`);
+                continue;
+            }
+            const readStream = blobService.createReadStream(quality, blobName, undefined);
+            const blobOptions = {
+                contentSettings: {
+                    contentType: mime.lookup(blobPath),
+                    cacheControl: 'max-age=31536000, public'
+                }
+            };
+            const writeStream = mooncakeBlobService.createWriteStreamToBlockBlob(quality, blobName, blobOptions, undefined);
+            log(`  Uploading to Mooncake...`);
+            await new Promise((c, e) => readStream.pipe(writeStream).on('finish', c).on('error', e));
+            log(`  Updating build in DB...`);
+            const mooncakeUrl = `${process.env['MOONCAKE_CDN_URL']}${blobPath}`;
+            await retry_1.retry(() => container.scripts.storedProcedure('setAssetMooncakeUrl')
+                .execute('', [commit, asset.platform, asset.type, mooncakeUrl]));
+            log(`  Done ✔️`);
+        }
+        catch (err) {
+            error(err);
+        }
+    }
+    log(`All done ✔️`);
+}
+function main() {
+    const commit = process.env['BUILD_SOURCEVERSION'];
+    if (!commit) {
+        error('Skipping publish due to missing BUILD_SOURCEVERSION');
+        return;
+    }
+    const quality = process.argv[2];
+    sync(commit, quality).catch(err => {
+        error(err);
+        process.exit(1);
+    });
+}
+main();

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

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

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

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

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

@@ -1,125 +0,0 @@
-steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: "14.x"
-
-  - task: AzureKeyVault@1
-    displayName: "Azure Key Vault: Get Secrets"
-    inputs:
-      azureSubscription: "vscode-builds-subscription"
-      KeyVaultName: vscode
-
-  - script: |
-      set -e
-      cat << EOF > ~/.netrc
-      machine github.com
-      login vscode
-      password $(github-distro-mixin-password)
-      EOF
-
-      git config user.email "vscode@microsoft.com"
-      git config user.name "VSCode"
-    displayName: Prepare tooling
-
-  - script: |
-      set -e
-      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
-    displayName: Merge distro
-
-  - script: |
-      pushd build \
-      && yarn \
-      && npm install -g typescript \
-      && tsc azure-pipelines/common/createAsset.ts \
-      && popd
-    displayName: Restore modules for just build folder and compile it
-
-  - download: current
-    artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
-    displayName: Download $(VSCODE_ARCH) artifact
-
-  - script: |
-      set -e
-      unzip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip -d $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-      mv $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
-    displayName: Unzip & move
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-    inputs:
-      ConnectedServiceName: "ESRP CodeSign"
-      FolderPath: "$(agent.builddirectory)"
-      Pattern: "VSCode-darwin-$(VSCODE_ARCH).zip"
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-          {
-            "keyCode": "CP-401337-Apple",
-            "operationSetCode": "MacAppDeveloperSign",
-            "parameters": [
-              {
-                "parameterName": "Hardening",
-                "parameterValue": "--options=runtime"
-              }
-            ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          }
-        ]
-      SessionTimeout: 60
-    displayName: Codesign
-
-  - script: |
-      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-      APP_NAME="`ls $APP_ROOT | head -n 1`"
-      BUNDLE_IDENTIFIER=$(node -p "require(\"$APP_ROOT/$APP_NAME/Contents/Resources/app/product.json\").darwinBundleIdentifier")
-      echo "##vso[task.setvariable variable=BundleIdentifier]$BUNDLE_IDENTIFIER"
-    displayName: Export bundle identifier
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-    inputs:
-      ConnectedServiceName: "ESRP CodeSign"
-      FolderPath: "$(agent.builddirectory)"
-      Pattern: "VSCode-darwin-$(VSCODE_ARCH).zip"
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-          {
-            "keyCode": "CP-401337-Apple",
-            "operationSetCode": "MacAppNotarize",
-            "parameters": [
-              {
-                "parameterName": "BundleId",
-                "parameterValue": "$(BundleIdentifier)"
-              }
-            ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          }
-        ]
-      SessionTimeout: 60
-    displayName: Notarization
-
-  - script: |
-      set -e
-      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-      APP_NAME="`ls $APP_ROOT | head -n 1`"
-      "$APP_ROOT/$APP_NAME/Contents/Resources/app/bin/code" --export-default-configuration=.build
-    displayName: Verify start after signing (export configuration)
-    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
-
-  - script: |
-      # For legacy purposes, arch for x64 is just 'darwin'
-      case $VSCODE_ARCH in
-        x64) ASSET_ID="darwin" ;;
-        arm64) ASSET_ID="darwin-arm64" ;;
-        universal) ASSET_ID="darwin-universal" ;;
-      esac
-      echo "##vso[task.setvariable variable=ASSET_ID]$ASSET_ID"
-    displayName: Set asset id variable
-
-  - script: mv $(agent.builddirectory)/VSCode-darwin-x64.zip $(agent.builddirectory)/VSCode-darwin.zip
-    displayName: Rename x64 build to it's legacy name
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
-
-  - publish: $(Agent.BuildDirectory)/VSCode-$(ASSET_ID).zip
-    artifact: vscode_client_darwin_$(VSCODE_ARCH)_archive

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

@@ -1,7 +1,7 @@
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "14.x"
+      versionSpec: "12.18.3"
 
   - task: AzureKeyVault@1
     displayName: "Azure Key Vault: Get Secrets"
@@ -22,8 +22,6 @@ steps:
     displayName: Extract compilation output
     condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))
 
-  # 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
@@ -73,7 +71,6 @@ steps:
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
   - script: |
-      set -e
       npx https://aka.ms/enablesecurefeed standAlone
     timeoutInMinutes: 5
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
@@ -83,7 +80,6 @@ steps:
       set -e
       export npm_config_arch=$(VSCODE_ARCH)
       export npm_config_node_gyp=$(which node-gyp)
-      export npm_config_build_from_source=true
       export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
 
       for i in {1..3}; do # try 3 times, for Terrapin
@@ -108,7 +104,30 @@ steps:
     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
+      export npm_config_arch=$(VSCODE_ARCH)
+      export npm_config_node_gyp=$(which node-gyp)
+      export npm_config_build_from_source=true
+      export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
+      ls /Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
+      yarn electron-rebuild
+      # remove once https://github.com/prebuild/prebuild-install/pull/140 is merged and found in keytar
+      cd ./node_modules/keytar
+      node-gyp rebuild
+    displayName: Rebuild native modules for ARM64
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
+
+  - download: current
+    artifact: vscode-darwin-x64
+    displayName: Download x64 artifact
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
+
+  - download: current
+    artifact: vscode-darwin-arm64
+    displayName: Download arm64 artifact
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
+
   - script: |
       set -e
       node build/azure-pipelines/mixin
@@ -118,7 +137,7 @@ steps:
       set -e
       VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
         yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
-    displayName: Build client
+    displayName: Build
     condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))
 
   - script: |
@@ -130,6 +149,14 @@ steps:
     displayName: Build Server
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
 
+  - script: |
+      set -e
+      unzip $(Pipeline.Workspace)/vscode-darwin-x64/VSCode-darwin-x64.zip -d $(agent.builddirectory)/vscode-x64
+      unzip $(Pipeline.Workspace)/vscode-darwin-arm64/VSCode-darwin-arm64.zip -d $(agent.builddirectory)/vscode-arm64
+      DEBUG=* node build/darwin/create-universal-app.js
+    displayName: Create Universal App
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
+
   - script: |
       set -e
       VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
@@ -137,29 +164,6 @@ steps:
     displayName: Download Electron and Playwright
     condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - download: current
-    artifact: unsigned_vscode_client_darwin_x64_archive
-    displayName: Download x64 artifact
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
-
-  - download: current
-    artifact: unsigned_vscode_client_darwin_arm64_archive
-    displayName: Download arm64 artifact
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
-
-  - script: |
-      set -e
-      cp $(Pipeline.Workspace)/unsigned_vscode_client_darwin_x64_archive/VSCode-darwin-x64.zip $(agent.builddirectory)/VSCode-darwin-x64.zip
-      cp $(Pipeline.Workspace)/unsigned_vscode_client_darwin_arm64_archive/VSCode-darwin-arm64.zip $(agent.builddirectory)/VSCode-darwin-arm64.zip
-      unzip $(agent.builddirectory)/VSCode-darwin-x64.zip -d $(agent.builddirectory)/VSCode-darwin-x64
-      unzip $(agent.builddirectory)/VSCode-darwin-arm64.zip -d $(agent.builddirectory)/VSCode-darwin-arm64
-      DEBUG=* node build/darwin/create-universal-app.js
-    displayName: Create Universal App
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
-
-  # 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
@@ -168,21 +172,22 @@ steps:
       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
+      VSCODE_ARCH="$(VSCODE_ARCH)" DEBUG=electron-osx-sign* node build/darwin/sign.js
     displayName: Set Hardened Entitlements
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - script: |
       set -e
       ./scripts/test.sh --build --tfs "Unit Tests"
     displayName: Run unit tests (Electron)
-    timeoutInMinutes: 7
+    timeoutInMinutes: 5
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
       set -e
       yarn test-browser --build --browser chromium --browser webkit --browser firefox --tfs "Browser Unit Tests"
     displayName: Run unit tests (Browser)
-    timeoutInMinutes: 7
+    timeoutInMinutes: 5
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
@@ -210,7 +215,7 @@ steps:
       VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
       ./resources/server/test/test-web-integration.sh --browser webkit
     displayName: Run integration tests (Browser)
-    timeoutInMinutes: 10
+    timeoutInMinutes: 5
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
@@ -221,7 +226,7 @@ steps:
       VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin" \
       ./resources/server/test/test-remote-integration.sh
     displayName: Run remote integration tests (Electron)
-    timeoutInMinutes: 7
+    timeoutInMinutes: 5
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
@@ -278,29 +283,100 @@ steps:
     displayName: Archive build
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+    inputs:
+      ConnectedServiceName: "ESRP CodeSign"
+      FolderPath: "$(agent.builddirectory)"
+      Pattern: "VSCode-darwin-$(VSCODE_ARCH).zip"
+      signConfigType: inlineSignParams
+      inlineOperation: |
+        [
+          {
+            "keyCode": "CP-401337-Apple",
+            "operationSetCode": "MacAppDeveloperSign",
+            "parameters": [
+              {
+                "parameterName": "Hardening",
+                "parameterValue": "--options=runtime"
+              }
+            ],
+            "toolName": "sign",
+            "toolVersion": "1.0"
+          }
+        ]
+      SessionTimeout: 60
+    displayName: Codesign
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - script: |
+      zip -d $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip "*.pkg"
+    displayName: Clean
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - script: |
+      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      APP_NAME="`ls $APP_ROOT | head -n 1`"
+      BUNDLE_IDENTIFIER=$(node -p "require(\"$APP_ROOT/$APP_NAME/Contents/Resources/app/product.json\").darwinBundleIdentifier")
+      echo "##vso[task.setvariable variable=BundleIdentifier]$BUNDLE_IDENTIFIER"
+    displayName: Export bundle identifier
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+    inputs:
+      ConnectedServiceName: "ESRP CodeSign"
+      FolderPath: "$(agent.builddirectory)"
+      Pattern: "VSCode-darwin-$(VSCODE_ARCH).zip"
+      signConfigType: inlineSignParams
+      inlineOperation: |
+        [
+          {
+            "keyCode": "CP-401337-Apple",
+            "operationSetCode": "MacAppNotarize",
+            "parameters": [
+              {
+                "parameterName": "BundleId",
+                "parameterValue": "$(BundleIdentifier)"
+              }
+            ],
+            "toolName": "sign",
+            "toolVersion": "1.0"
+          }
+        ]
+      SessionTimeout: 60
+    displayName: Notarization
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
   - script: |
       set -e
+      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      APP_NAME="`ls $APP_ROOT | head -n 1`"
+      "$APP_ROOT/$APP_NAME/Contents/Resources/app/bin/code" --export-default-configuration=.build
+    displayName: Verify start after signing (export configuration)
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'), ne(variables['VSCODE_PUBLISH'], 'false'))
 
-      # package Remote Extension Host
-      pushd .. && mv vscode-reh-darwin vscode-server-darwin && zip -Xry vscode-server-darwin.zip vscode-server-darwin && popd
-
-      # package Remote Extension Host (Web)
-      pushd .. && mv vscode-reh-web-darwin vscode-server-darwin-web && zip -Xry vscode-server-darwin-web.zip vscode-server-darwin-web && popd
-    displayName: Prepare to publish servers
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
+  - script: |
+      set -e
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+      AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
+      AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
+      AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
+      VSCODE_ARCH="$(VSCODE_ARCH)" \
+      ./build/azure-pipelines/darwin/publish.sh
+    displayName: Publish
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
-    artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
-    displayName: Publish client archive
+    artifact: vscode-darwin-$(VSCODE_ARCH)
+    displayName: Publish archive
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(Agent.BuildDirectory)/vscode-server-darwin.zip
-    artifact: vscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned
+    artifact: vscode-server-darwin-$(VSCODE_ARCH)
     displayName: Publish server archive
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(Agent.BuildDirectory)/vscode-server-darwin-web.zip
-    artifact: vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned
+    artifact: vscode-server-darwin-$(VSCODE_ARCH)-web
     displayName: Publish web server archive
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
 
@@ -311,3 +387,7 @@ steps:
     displayName: Upload configuration (for Bing settings search)
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
     continueOnError: true
+
+  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+    displayName: "Component Detection"
+    continueOnError: true

build/azure-pipelines/darwin/publish.sh

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

build/azure-pipelines/distro-build.yml

@@ -1,41 +1,41 @@
 pool:
-  vmImage: 'Ubuntu-18.04'
+  vmImage: 'Ubuntu-16.04'
 
 trigger:
   branches:
-    include: ["main", "release/*"]
+    include: ['main', 'release/*']
 pr:
   branches:
-    include: ["main", "release/*"]
+    include: ['main', 'release/*']
 
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "14.x"
+      versionSpec: "12.18.3"
 
-  - task: AzureKeyVault@1
-    displayName: "Azure Key Vault: Get Secrets"
-    inputs:
-      azureSubscription: "vscode-builds-subscription"
-      KeyVaultName: vscode
+- task: AzureKeyVault@1
+  displayName: 'Azure Key Vault: Get Secrets'
+  inputs:
+    azureSubscription: 'azuredatastudio-adointegration'
+    KeyVaultName: ado-secrets
 
   - script: |
       set -e
 
-      cat << EOF > ~/.netrc
-      machine github.com
-      login vscode
-      password $(github-distro-mixin-password)
-      EOF
+    cat << EOF > ~/.netrc
+    machine github.com
+    login azuredatastudio
+    password $(github-distro-mixin-password)
+    EOF
 
-      git config user.email "vscode@microsoft.com"
-      git config user.name "VSCode"
+    git config user.email "sqltools@service.microsoft.com"
+    git config user.name "AzureDataStudio"
 
-      git remote add distro "https://github.com/$VSCODE_MIXIN_REPO.git"
-      git fetch distro
+    git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
+    git fetch distro
 
-      # Push main branch into oss/main
-      git push distro origin/main:refs/heads/oss/main
+    # Push main branch into oss/master
+    git push distro origin/main:refs/heads/oss/master
 
       # Push every release branch into oss/release
       git for-each-ref --format="%(refname:short)" refs/remotes/origin/release/* | sed 's/^origin\/\(.*\)$/\0:refs\/heads\/oss\/\1/' | xargs git push distro

build/azure-pipelines/docker/Dockerfile

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

build/azure-pipelines/docker/createDrop.sh

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

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

@@ -79,7 +79,7 @@ steps:
       set -e
       for f in $(Build.SourcesDirectory)/.build/drop/linux/server/*.tar.gz
       do
-        tar -C $(Build.SourcesDirectory)/../ -zxvf $f
+        tar -C $(agent.builddirectory) -zxvf $f
         rm $f
       done
     displayName: Unzip artifacts

build/azure-pipelines/exploration-build.yml

@@ -11,7 +11,7 @@ pr:
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "14.x"
+      versionSpec: "12.18.3"
 
   - task: AzureKeyVault@1
     displayName: "Azure Key Vault: Get Secrets"
@@ -31,10 +31,10 @@ steps:
       git config user.email "vscode@microsoft.com"
       git config user.name "VSCode"
 
-      git checkout origin/electron-12.x.y
-      git merge origin/main
+      git checkout origin/electron-11.x.y
+      git merge origin/master
 
-      # Push main branch into exploration branch
-      git push origin HEAD:electron-12.x.y
+      # Push master branch into exploration branch
+      git push origin HEAD:electron-11.x.y
 
     displayName: Sync & Merge Exploration

build/azure-pipelines/linux/Dockerfile

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

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

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

build/azure-pipelines/linux/createDrop.sh

@@ -14,4 +14,13 @@ TARBALL_PATH="$REPO/.build/linux/archive/$TARBALL_FILENAME"
 rm -rf $ROOT/code-*.tar.*
 (cd $ROOT && tar -czf $TARBALL_PATH $BUILDNAME)
 
+# Publish Remote Extension Host
+LEGACY_SERVER_BUILD_NAME="azuredatastudio-reh-$PLATFORM_LINUX"
+SERVER_BUILD_NAME="azuredatastudio-server-$PLATFORM_LINUX"
+SERVER_TARBALL_FILENAME="azuredatastudio-server-$PLATFORM_LINUX.tar.gz"
+SERVER_TARBALL_PATH="$REPO/.build/linux/server/$SERVER_TARBALL_FILENAME"
+
+rm -rf $ROOT/azuredatastudio-server-*.tar.*
+(cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME)
+
 node build/azure-pipelines/common/copyArtifacts.js

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

@@ -1,7 +1,7 @@
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "14.x"
+      versionSpec: "12.18.3"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
     inputs:
@@ -69,7 +69,6 @@ steps:
     displayName: Extract node_modules cache
 
   - script: |
-      set -e
       npx https://aka.ms/enablesecurefeed standAlone
     timeoutInMinutes: 5
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
@@ -117,37 +116,23 @@ steps:
 
   - script: |
       set -e
-      REPO="$(pwd)"
-      ROOT="$REPO/.."
-
-      PLATFORM_LINUX="linux-alpine"
-
-      # Publish Remote Extension Host
-      LEGACY_SERVER_BUILD_NAME="vscode-reh-$PLATFORM_LINUX"
-      SERVER_BUILD_NAME="vscode-server-$PLATFORM_LINUX"
-      SERVER_TARBALL_FILENAME="vscode-server-$PLATFORM_LINUX.tar.gz"
-      SERVER_TARBALL_PATH="$ROOT/$SERVER_TARBALL_FILENAME"
-
-      rm -rf $ROOT/vscode-server-*.tar.*
-      (cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME)
-
-      # Publish Remote Extension Host (Web)
-      LEGACY_SERVER_BUILD_NAME="vscode-reh-web-$PLATFORM_LINUX"
-      SERVER_BUILD_NAME="vscode-server-$PLATFORM_LINUX-web"
-      SERVER_TARBALL_FILENAME="vscode-server-$PLATFORM_LINUX-web.tar.gz"
-      SERVER_TARBALL_PATH="$ROOT/$SERVER_TARBALL_FILENAME"
-
-      rm -rf $ROOT/vscode-server-*-web.tar.*
-      (cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME)
-    displayName: Prepare for publish
+      AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
+      AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+      ./build/azure-pipelines/linux/alpine/publish.sh
+    displayName: Publish
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(Agent.BuildDirectory)/vscode-server-linux-alpine.tar.gz
-    artifact: vscode_server_linux_alpine_archive-unsigned
+    artifact: vscode-server-linux-alpine
     displayName: Publish server archive
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(Agent.BuildDirectory)/vscode-server-linux-alpine-web.tar.gz
-    artifact: vscode_web_linux_alpine_archive-unsigned
+    artifact: vscode-server-linux-alpine-web
     displayName: Publish web server archive
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+    displayName: "Component Detection"
+    continueOnError: true

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

@@ -1,7 +1,7 @@
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "14.x"
+      versionSpec: "12.18.3"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
     inputs:
@@ -61,6 +61,12 @@ steps:
 
   - 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'), eq(variables['VSCODE_ARCH'], 'x64'))
+
+  - script: |
       npx https://aka.ms/enablesecurefeed standAlone
     timeoutInMinutes: 5
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
@@ -79,6 +85,7 @@ steps:
       if [ "$VSCODE_ARCH" == "x64" ]; then
         export VSCODE_REMOTE_CC=$(which gcc-4.8)
         export VSCODE_REMOTE_CXX=$(which g++-4.8)
+        export VSCODE_REMOTE_NODE_GYP=$(which node-gyp)
       fi
 
       for i in {1..3}; do # try 3 times, for Terrapin
@@ -89,6 +96,10 @@ steps:
         fi
         echo "Yarn failed $i, trying again..."
       done
+
+      # remove once https://github.com/prebuild/prebuild-install/pull/140 is merged and found in keytar
+      cd ./node_modules/keytar
+      npx node-gyp rebuild
     env:
       ELECTRON_SKIP_BINARY_DOWNLOAD: 1
       PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
@@ -133,14 +144,14 @@ steps:
       set -e
       DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
     displayName: Run unit tests (Electron)
-    timeoutInMinutes: 7
+    timeoutInMinutes: 5
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
       set -e
       DISPLAY=:10 yarn test-browser --build --browser chromium --tfs "Browser Unit Tests"
     displayName: Run unit tests (Browser)
-    timeoutInMinutes: 7
+    timeoutInMinutes: 5
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
@@ -169,7 +180,7 @@ steps:
       VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-$(VSCODE_ARCH)" \
       DISPLAY=:10 ./resources/server/test/test-web-integration.sh --browser chromium
     displayName: Run integration tests (Browser)
-    timeoutInMinutes: 10
+    timeoutInMinutes: 5
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
@@ -181,7 +192,7 @@ steps:
       VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
       DISPLAY=:10 ./resources/server/test/test-remote-integration.sh
     displayName: Run remote integration tests (Electron)
-    timeoutInMinutes: 7
+    timeoutInMinutes: 5
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - task: PublishPipelineArtifact@0
@@ -245,32 +256,27 @@ steps:
       AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
       VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
       VSCODE_ARCH="$(VSCODE_ARCH)" \
-      ./build/azure-pipelines/linux/prepare-publish.sh
-    displayName: Prepare for Publish
+      ./build/azure-pipelines/linux/publish.sh
+    displayName: Publish
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(DEB_PATH)
-    artifact: vscode_client_linux_$(VSCODE_ARCH)_deb-package
+    artifact: vscode-linux-deb-$(VSCODE_ARCH)
     displayName: Publish deb package
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(RPM_PATH)
-    artifact: vscode_client_linux_$(VSCODE_ARCH)_rpm-package
+    artifact: vscode-linux-rpm-$(VSCODE_ARCH)
     displayName: Publish rpm package
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
-  - publish: $(TARBALL_PATH)
-    artifact: vscode_client_linux_$(VSCODE_ARCH)_archive-unsigned
-    displayName: Publish client archive
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
   - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH).tar.gz
-    artifact: vscode_server_linux_$(VSCODE_ARCH)_archive-unsigned
+    artifact: vscode-server-linux-$(VSCODE_ARCH)
     displayName: Publish server archive
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH)-web.tar.gz
-    artifact: vscode_web_linux_$(VSCODE_ARCH)_archive-unsigned
+    artifact: vscode-server-linux-$(VSCODE_ARCH)-web
     displayName: Publish web server archive
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
@@ -280,3 +286,7 @@ steps:
       artifactName: "snap-$(VSCODE_ARCH)"
       targetPath: .build/linux/snap-tarball
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+    displayName: "Component Detection"
+    continueOnError: true

build/azure-pipelines/linux/publish.sh

@@ -13,6 +13,8 @@ TARBALL_PATH="$ROOT/$TARBALL_FILENAME"
 rm -rf $ROOT/code-*.tar.*
 (cd $ROOT && tar -czf $TARBALL_PATH $BUILDNAME)
 
+node build/azure-pipelines/common/createAsset.js "$PLATFORM_LINUX" archive-unsigned "$TARBALL_FILENAME" "$TARBALL_PATH"
+
 # Publish Remote Extension Host
 LEGACY_SERVER_BUILD_NAME="vscode-reh-$PLATFORM_LINUX"
 SERVER_BUILD_NAME="vscode-server-$PLATFORM_LINUX"
@@ -22,6 +24,8 @@ SERVER_TARBALL_PATH="$ROOT/$SERVER_TARBALL_FILENAME"
 rm -rf $ROOT/vscode-server-*.tar.*
 (cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME)
 
+node build/azure-pipelines/common/createAsset.js "server-$PLATFORM_LINUX" archive-unsigned "$SERVER_TARBALL_FILENAME" "$SERVER_TARBALL_PATH"
+
 # Publish Remote Extension Host (Web)
 LEGACY_SERVER_BUILD_NAME="vscode-reh-web-$PLATFORM_LINUX"
 SERVER_BUILD_NAME="vscode-server-$PLATFORM_LINUX-web"
@@ -31,6 +35,8 @@ SERVER_TARBALL_PATH="$ROOT/$SERVER_TARBALL_FILENAME"
 rm -rf $ROOT/vscode-server-*-web.tar.*
 (cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME)
 
+node build/azure-pipelines/common/createAsset.js "server-$PLATFORM_LINUX-web" archive-unsigned "$SERVER_TARBALL_FILENAME" "$SERVER_TARBALL_PATH"
+
 # Publish DEB
 case $VSCODE_ARCH in
 	x64) DEB_ARCH="amd64" ;;
@@ -41,6 +47,8 @@ PLATFORM_DEB="linux-deb-$VSCODE_ARCH"
 DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
 DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
 
+node build/azure-pipelines/common/createAsset.js "$PLATFORM_DEB" package "$DEB_FILENAME" "$DEB_PATH"
+
 # Publish RPM
 case $VSCODE_ARCH in
 	x64) RPM_ARCH="x86_64" ;;
@@ -53,6 +61,8 @@ PLATFORM_RPM="linux-rpm-$VSCODE_ARCH"
 RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
 RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME"
 
+node build/azure-pipelines/common/createAsset.js "$PLATFORM_RPM" package "$RPM_FILENAME" "$RPM_PATH"
+
 # Publish Snap
 # Pack snap tarball artifact, in order to preserve file perms
 mkdir -p $REPO/.build/linux/snap-tarball
@@ -63,4 +73,3 @@ rm -rf $SNAP_TARBALL_PATH
 # Export DEB_PATH, RPM_PATH
 echo "##vso[task.setvariable variable=DEB_PATH]$DEB_PATH"
 echo "##vso[task.setvariable variable=RPM_PATH]$RPM_PATH"
-echo "##vso[task.setvariable variable=TARBALL_PATH]$TARBALL_PATH"

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

@@ -1,7 +1,7 @@
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "14.x"
+      versionSpec: "12.18.3"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
     inputs:
@@ -48,13 +48,17 @@ steps:
         x64) SNAPCRAFT_TARGET_ARGS="" ;;
         *) SNAPCRAFT_TARGET_ARGS="--target-arch $(VSCODE_ARCH)" ;;
       esac
-      (cd $SNAP_ROOT/code-* && sudo --preserve-env snapcraft prime $SNAPCRAFT_TARGET_ARGS && snap pack prime --compression=lzo --filename="$SNAP_PATH")
+      (cd $SNAP_ROOT/code-* && sudo --preserve-env snapcraft snap $SNAPCRAFT_TARGET_ARGS --output "$SNAP_PATH")
+
+      # Publish snap package
+      AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
+      AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
+      node build/azure-pipelines/common/createAsset.js "linux-snap-$(VSCODE_ARCH)" package "$SNAP_FILENAME" "$SNAP_PATH"
 
       # Export SNAP_PATH
       echo "##vso[task.setvariable variable=SNAP_PATH]$SNAP_PATH"
-    displayName: Prepare for publish
 
   - publish: $(SNAP_PATH)
-    artifact: vscode_client_linux_$(VSCODE_ARCH)_snap
+    artifact: vscode-linux-snap-$(VSCODE_ARCH)
     displayName: Publish snap package
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))

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

@@ -94,6 +94,7 @@ steps:
   - script: |
       set -e
       yarn gulp vscode-linux-x64-min-ci
+      yarn gulp vscode-web-min-ci
     displayName: Build
     env:
       VSCODE_MIXIN_PASSWORD: $(github-distro-mixin-password)
@@ -105,11 +106,6 @@ steps:
       yarn gulp package-external-extensions
     displayName: Package External extensions
 
-  - script: |
-      set -e
-      yarn gulp package-langpacks
-    displayName: Package Langpacks
-
   - script: |
       set -e
       service xvfb start
@@ -171,7 +167,7 @@ steps:
       done
     displayName: Archive Logs
     continueOnError: true
-    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+    condition: succeededOrFailed()
 
   - script: |
       set -e
@@ -194,7 +190,7 @@ steps:
     inputs:
       ConnectedServiceName: 'Code Signing'
       FolderPath: '$(Build.SourcesDirectory)/.build'
-      Pattern: 'extensions/*.vsix,langpacks/*.vsix'
+      Pattern: 'extensions/*.vsix'
       signConfigType: inlineSignParams
       inlineOperation: |
         [
@@ -219,7 +215,7 @@ steps:
           }
         ]
       SessionTimeout: 120
-    displayName: 'Signing Extensions and Langpacks'
+    displayName: 'Signing Extensions'
     condition: and(succeeded(), eq(variables['signed'], true))
 
   - script: |

build/azure-pipelines/product-build.yml

@@ -5,7 +5,7 @@ schedules:
     displayName: Mon-Fri at 7:00
     branches:
       include:
-        - main
+        - master
 
 parameters:
   - name: VSCODE_QUALITY
@@ -86,8 +86,6 @@ variables:
     value: ${{ eq(parameters.ENABLE_TERRAPIN, true) }}
   - name: VSCODE_QUALITY
     value: ${{ parameters.VSCODE_QUALITY }}
-  - name: VSCODE_RELEASE
-    value: ${{ parameters.VSCODE_RELEASE }}
   - name: VSCODE_BUILD_STAGE_WINDOWS
     value: ${{ or(eq(parameters.VSCODE_BUILD_WIN32, true), eq(parameters.VSCODE_BUILD_WIN32_32BIT, true), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}
   - name: VSCODE_BUILD_STAGE_LINUX
@@ -256,15 +254,6 @@ stages:
               VSCODE_ARCH: x64
             steps:
               - template: darwin/product-build-darwin.yml
-          - ${{ if ne(variables['VSCODE_PUBLISH'], 'false') }}:
-            - job: macOSSign
-              dependsOn:
-                - macOS
-              timeoutInMinutes: 90
-              variables:
-                VSCODE_ARCH: x64
-              steps:
-                - template: darwin/product-build-darwin-sign.yml
 
         - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}:
           - job: macOSARM64
@@ -273,15 +262,6 @@ stages:
               VSCODE_ARCH: arm64
             steps:
               - template: darwin/product-build-darwin.yml
-          - ${{ if ne(variables['VSCODE_PUBLISH'], 'false') }}:
-            - job: macOSARM64Sign
-              dependsOn:
-                - macOSARM64
-              timeoutInMinutes: 90
-              variables:
-                VSCODE_ARCH: arm64
-              steps:
-                - template: darwin/product-build-darwin-sign.yml
 
         - ${{ if eq(variables['VSCODE_BUILD_MACOS_UNIVERSAL'], true) }}:
           - job: macOSUniversal
@@ -293,40 +273,38 @@ stages:
               VSCODE_ARCH: universal
             steps:
               - template: darwin/product-build-darwin.yml
-          - ${{ if ne(variables['VSCODE_PUBLISH'], 'false') }}:
-            - job: macOSUniversalSign
-              dependsOn:
-                - macOSUniversal
-              timeoutInMinutes: 90
-              variables:
-                VSCODE_ARCH: universal
-              steps:
-                - template: darwin/product-build-darwin-sign.yml
 
-  - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), ne(variables['VSCODE_PUBLISH'], 'false')) }}:
-    - stage: Publish
+  - ${{ if and(eq(variables['VSCODE_PUBLISH'], true), eq(parameters.VSCODE_COMPILE_ONLY, false)) }}:
+    - stage: Mooncake
       dependsOn:
-        - Compile
+        - ${{ if eq(variables['VSCODE_BUILD_STAGE_WINDOWS'], true) }}:
+          - Windows
+        - ${{ if eq(variables['VSCODE_BUILD_STAGE_LINUX'], true) }}:
+          - Linux
+        - ${{ if eq(variables['VSCODE_BUILD_STAGE_MACOS'], true) }}:
+          - macOS
+      condition: succeededOrFailed()
       pool:
         vmImage: "Ubuntu-18.04"
-      variables:
-        - name: BUILDS_API_URL
-          value: $(System.CollectionUri)$(System.TeamProject)/_apis/build/builds/$(Build.BuildId)/
       jobs:
-        - job: PublishBuild
-          timeoutInMinutes: 180
-          displayName: Publish Build
+        - job: SyncMooncake
+          displayName: Sync Mooncake
           steps:
-            - template: product-publish.yml
+            - template: sync-mooncake.yml
 
-    - ${{ if or(eq(parameters.VSCODE_RELEASE, true), and(in(parameters.VSCODE_QUALITY, 'insider', 'exploration'), eq(variables['VSCODE_SCHEDULEDBUILD'], true))) }}:
-      - stage: Release
-        dependsOn:
-          - Publish
-        pool:
-          vmImage: "Ubuntu-18.04"
-        jobs:
-          - job: ReleaseBuild
-            displayName: Release Build
-            steps:
-              - template: product-release.yml
+  - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), or(eq(parameters.VSCODE_RELEASE, true), and(in(parameters.VSCODE_QUALITY, 'insider', 'exploration'), eq(variables['VSCODE_SCHEDULEDBUILD'], true)))) }}:
+    - stage: Release
+      dependsOn:
+        - ${{ if eq(variables['VSCODE_BUILD_STAGE_WINDOWS'], true) }}:
+          - Windows
+        - ${{ if eq(variables['VSCODE_BUILD_STAGE_LINUX'], true) }}:
+          - Linux
+        - ${{ if eq(variables['VSCODE_BUILD_STAGE_MACOS'], true) }}:
+          - macOS
+      pool:
+        vmImage: "Ubuntu-18.04"
+      jobs:
+        - job: ReleaseBuild
+          displayName: Release Build
+          steps:
+            - template: release.yml

build/azure-pipelines/product-compile.yml

@@ -1,7 +1,7 @@
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "14.x"
+      versionSpec: "12.18.3"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
     inputs:
@@ -30,41 +30,39 @@ steps:
       git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
     displayName: Merge distro
 
+  - script: |
+      npx https://aka.ms/enablesecurefeed standAlone
+    displayName: Switch to Terrapin packages
+    timeoutInMinutes: 5
+    condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true'))
+
   - script: |
       mkdir -p .build
-      node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash
+      echo -n $(VSCODE_ARCH) > .build/arch
+      echo -n $ENABLE_TERRAPIN > .build/terrapin
     displayName: Prepare yarn cache flags
 
-  # using `genericNodeModules` instead of `nodeModules` here to avoid sharing the cache with builds running inside containers
-  - task: Cache@2
+  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
     inputs:
-      key: 'genericNodeModules | $(Agent.OS) | .build/yarnlockhash'
-      path: .build/node_modules_cache
-      cacheHitVar: NODE_MODULES_RESTORED
-    displayName: Restore node_modules cache
+      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
+      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
+      vstsFeed: "npm-vscode"
 
   - script: |
       set -e
-      tar -xzf .build/node_modules_cache/cache.tgz
-    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
-    displayName: Extract node_modules cache
+      export npm_config_arch=$(NPM_ARCH)
 
-  - script: |
-      set -e
-      npx https://aka.ms/enablesecurefeed standAlone
-    timeoutInMinutes: 5
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
-    displayName: Switch to Terrapin packages
+      if [ -z "$CC" ] || [ -z "$CXX" ]; then
+        export CC=$(which gcc-5)
+        export CXX=$(which g++-5)
+      fi
 
-  - script: |
-      set -e
-      sudo apt update -y
-      sudo apt install -y build-essential pkg-config libx11-dev libx11-xcb-dev libxkbfile-dev libsecret-1-dev libnotify-bin
-    displayName: Install build tools
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+      if [ "$VSCODE_ARCH" == "x64" ]; then
+        export VSCODE_REMOTE_CC=$(which gcc-4.8)
+        export VSCODE_REMOTE_CXX=$(which g++-4.8)
+        export VSCODE_REMOTE_NODE_GYP=$(which node-gyp)
+      fi
 
-  - script: |
-      set -e
       for i in {1..3}; do # try 3 times, for Terrapin
         yarn --frozen-lockfile && break
         if [ $i -eq 3 ]; then
@@ -77,15 +75,14 @@ steps:
       ELECTRON_SKIP_BINARY_DOWNLOAD: 1
       PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
     displayName: Install dependencies
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-  - script: |
-      set -e
-      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
-      mkdir -p .build/node_modules_cache
-      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-    displayName: Create node_modules archive
+  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+    inputs:
+      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
+      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
+      vstsFeed: "npm-vscode"
+    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
   # Mixin must run before optimize, because the CSS loader will inline small SVGs
   - script: |
@@ -95,8 +92,12 @@ steps:
 
   - script: |
       set -e
-      yarn npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check
-    displayName: Compile & Hygiene
+      yarn gulp compile-build
+      yarn gulp compile-extensions-build
+      yarn gulp minify-vscode
+      yarn gulp vscode-reh-linux-x64-min
+      yarn gulp vscode-reh-web-linux-x64-min
+    displayName: Compile
 
   - script: |
       set -e
@@ -105,17 +106,12 @@ steps:
     displayName: Upload sourcemaps
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
-  - script: |
-      set -
-      ./build/azure-pipelines/common/extract-telemetry.sh
-    displayName: Extract Telemetry
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
   - script: |
       set -e
-      AZURE_WEBVIEW_STORAGE_ACCESS_KEY="$(vscode-webview-storage-key)" \
-      ./build/azure-pipelines/common/publish-webview.sh
-    displayName: Publish Webview
+      VERSION=`node -p "require(\"./package.json\").version"`
+      AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
+        node build/azure-pipelines/common/createBuild.js $VERSION
+    displayName: Create build
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   # we gotta tarball everything in order to preserve file permissions
@@ -129,15 +125,3 @@ steps:
       targetPath: $(Build.ArtifactStagingDirectory)/compilation.tar.gz
       artifactName: Compilation
     displayName: Publish compilation artifact
-
-  - script: |
-      set -e
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-        yarn download-builtin-extensions-cg
-    displayName: Built-in extensions component details
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: "Component Detection"
-    inputs:
-      sourceScanPath: $(Build.SourcesDirectory)
-    continueOnError: true

build/azure-pipelines/product-publish.ps1

@@ -1,114 +0,0 @@
-. build/azure-pipelines/win32/exec.ps1
-$ErrorActionPreference = 'Stop'
-$ProgressPreference = 'SilentlyContinue'
-$ARTIFACT_PROCESSED_WILDCARD_PATH = "$env:PIPELINE_WORKSPACE/artifacts_processed_*/artifacts_processed_*"
-$ARTIFACT_PROCESSED_FILE_PATH = "$env:PIPELINE_WORKSPACE/artifacts_processed_$env:SYSTEM_STAGEATTEMPT/artifacts_processed_$env:SYSTEM_STAGEATTEMPT.txt"
-
-function Get-PipelineArtifact {
-	param($Name = '*')
-	try {
-		$res = Invoke-RestMethod "$($env:BUILDS_API_URL)artifacts?api-version=6.0" -Headers @{
-			Authorization = "Bearer $env:SYSTEM_ACCESSTOKEN"
-		} -MaximumRetryCount 5 -RetryIntervalSec 1
-
-		if (!$res) {
-			return
-		}
-
-		$res.value | Where-Object { $_.name -Like $Name }
-	} catch {
-		Write-Warning $_
-	}
-}
-
-# This set will keep track of which artifacts have already been processed
-$set = [System.Collections.Generic.HashSet[string]]::new()
-
-if (Test-Path $ARTIFACT_PROCESSED_WILDCARD_PATH) {
-	# Grab the latest artifact_processed text file and load all assets already processed from that.
-	# This means that the latest artifact_processed_*.txt file has all of the contents of the previous ones.
-	# Note: The kusto-like syntax only works in PS7+ and only in scripts, not at the REPL.
-	Get-ChildItem $ARTIFACT_PROCESSED_WILDCARD_PATH
-		| Sort-Object
-		| Select-Object -Last 1
-		| Get-Content
-		| ForEach-Object {
-			$set.Add($_) | Out-Null
-			Write-Host "Already processed artifact: $_"
-		}
-}
-
-# Create the artifact file that will be used for this run
-New-Item -Path $ARTIFACT_PROCESSED_FILE_PATH -Force | Out-Null
-
-# Determine which stages we need to watch
-$stages = @(
-	if ($env:VSCODE_BUILD_STAGE_WINDOWS -eq 'True') { 'Windows' }
-	if ($env:VSCODE_BUILD_STAGE_LINUX -eq 'True') { 'Linux' }
-	if ($env:VSCODE_BUILD_STAGE_MACOS -eq 'True') { 'macOS' }
-)
-
-do {
-	Start-Sleep -Seconds 10
-
-	$artifacts = Get-PipelineArtifact -Name 'vscode_*'
-	if (!$artifacts) {
-		continue
-	}
-
-	$artifacts | ForEach-Object {
-		$artifactName = $_.name
-		if($set.Add($artifactName)) {
-			Write-Host "Processing artifact: '$artifactName. Downloading from: $($_.resource.downloadUrl)"
-
-			try {
-				Invoke-RestMethod $_.resource.downloadUrl -OutFile "$env:AGENT_TEMPDIRECTORY/$artifactName.zip" -Headers @{
-					Authorization = "Bearer $env:SYSTEM_ACCESSTOKEN"
-				} -MaximumRetryCount 5 -RetryIntervalSec 1  | Out-Null
-
-				Expand-Archive -Path "$env:AGENT_TEMPDIRECTORY/$artifactName.zip" -DestinationPath $env:AGENT_TEMPDIRECTORY | Out-Null
-			} catch {
-				Write-Warning $_
-				$set.Remove($artifactName) | Out-Null
-				continue
-			}
-
-			$null,$product,$os,$arch,$type = $artifactName -split '_'
-			$asset = Get-ChildItem -rec "$env:AGENT_TEMPDIRECTORY/$artifactName"
-			Write-Host "Processing artifact with the following values:"
-			# turning in into an object just to log nicely
-			@{
-				product = $product
-				os = $os
-				arch = $arch
-				type = $type
-				asset = $asset.Name
-			} | Format-Table
-
-			exec { node build/azure-pipelines/common/createAsset.js $product $os $arch $type $asset.Name $asset.FullName }
-			$artifactName >> $ARTIFACT_PROCESSED_FILE_PATH
-		}
-	}
-
-	# Get the timeline and see if it says the other stage completed
-	try {
-		$timeline = Invoke-RestMethod "$($env:BUILDS_API_URL)timeline?api-version=6.0" -Headers @{
-			Authorization = "Bearer $env:SYSTEM_ACCESSTOKEN"
-		}  -MaximumRetryCount 5 -RetryIntervalSec 1
-	} catch {
-		Write-Warning $_
-		continue
-	}
-
-	foreach ($stage in $stages) {
-		$otherStageFinished = $timeline.records | Where-Object { $_.name -eq $stage -and $_.type -eq 'stage' -and $_.state -eq 'completed' }
-		if (!$otherStageFinished) {
-			break
-		}
-	}
-
-	$artifacts = Get-PipelineArtifact -Name 'vscode_*'
-	$artifactsStillToProcess = $artifacts.Count -ne $set.Count
-} while (!$otherStageFinished -or $artifactsStillToProcess)
-
-Write-Host "Processed $($set.Count) artifacts."

build/azure-pipelines/product-publish.yml

@@ -1,89 +0,0 @@
-steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: "12.x"
-
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
-      versionSpec: "1.x"
-
-  - task: AzureKeyVault@1
-    displayName: "Azure Key Vault: Get Secrets"
-    inputs:
-      azureSubscription: "vscode-builds-subscription"
-      KeyVaultName: vscode
-
-  - pwsh: |
-      . build/azure-pipelines/win32/exec.ps1
-      cd build
-      exec { yarn }
-    displayName: Install dependencies
-
-  - download: current
-    patterns: '**/artifacts_processed_*.txt'
-    displayName: Download all artifacts_processed text files
-
-  - pwsh: |
-      . build/azure-pipelines/win32/exec.ps1
-
-      if (Test-Path "$(Pipeline.Workspace)/artifacts_processed_*/artifacts_processed_*.txt") {
-        Write-Host "Artifacts already processed so a build must have already been created."
-        return
-      }
-
-      $env:AZURE_DOCUMENTDB_MASTERKEY = "$(builds-docdb-key-readwrite)"
-      $VERSION = node -p "require('./package.json').version"
-      Write-Host "Creating build with version: $VERSION"
-      exec { node build/azure-pipelines/common/createBuild.js $VERSION }
-    displayName: Create build if it hasn't been created before
-
-  - pwsh: |
-      $env:VSCODE_MIXIN_PASSWORD = "$(github-distro-mixin-password)"
-      $env:AZURE_DOCUMENTDB_MASTERKEY = "$(builds-docdb-key-readwrite)"
-      $env:AZURE_STORAGE_ACCESS_KEY = "$(ticino-storage-key)"
-      $env:AZURE_STORAGE_ACCESS_KEY_2 = "$(vscode-storage-key)"
-      $env:MOONCAKE_STORAGE_ACCESS_KEY = "$(vscode-mooncake-storage-key)"
-      build/azure-pipelines/product-publish.ps1
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-    displayName: Process artifacts
-
-  - publish: $(Pipeline.Workspace)/artifacts_processed_$(System.StageAttempt)/artifacts_processed_$(System.StageAttempt).txt
-    artifact: artifacts_processed_$(System.StageAttempt)
-    displayName: Publish what artifacts were published for this stage attempt
-
-  - pwsh: |
-      $ErrorActionPreference = 'Stop'
-
-      # Determine which stages we need to watch
-      $stages = @(
-        if ($env:VSCODE_BUILD_STAGE_WINDOWS -eq 'True') { 'Windows' }
-        if ($env:VSCODE_BUILD_STAGE_LINUX -eq 'True') { 'Linux' }
-        if ($env:VSCODE_BUILD_STAGE_MACOS -eq 'True') { 'macOS' }
-      )
-      Write-Host "Stages to check: $stages"
-
-      # Get the timeline and see if it says the other stage completed
-      $timeline = Invoke-RestMethod "$($env:BUILDS_API_URL)timeline?api-version=6.0" -Headers @{
-        Authorization = "Bearer $env:SYSTEM_ACCESSTOKEN"
-      }  -MaximumRetryCount 5 -RetryIntervalSec 1
-
-      $failedStages = @()
-      foreach ($stage in $stages) {
-        $didStageFail = $timeline.records | Where-Object {
-          $_.name -eq $stage -and $_.type -eq 'stage' -and $_.result -ne 'succeeded' -and $_.result -ne 'succeededWithIssues'
-        }
-
-        if($didStageFail) {
-          $failedStages += $stage
-        } else {
-          Write-Host "'$stage' did not fail."
-        }
-      }
-
-      if ($failedStages.Length) {
-        throw "Failed stages: $($failedStages -join ', '). This stage will now fail so that it is easier to retry failed jobs."
-      }
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-    displayName: Determine if stage should succeed

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

@@ -9,27 +9,27 @@ pr: none
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "14.x"
+      versionSpec: "12.18.3"
 
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
+  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
     inputs:
       versionSpec: "1.x"
 
-  # - bash: |
-  #     TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
-  #     CHANNEL="G1C14HJ2F"
+  - bash: |
+      TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
+      CHANNEL="G1C14HJ2F"
 
-  #     if [ "$TAG_VERSION" == "1.999.0" ]; then
-  #       MESSAGE="<!here>. Someone pushed 1.999.0 tag. Please delete it ASAP from remote and local."
+      if [ "$TAG_VERSION" == "1.999.0" ]; then
+        MESSAGE="<!here>. Someone pushed 1.999.0 tag. Please delete it ASAP from remote and local."
 
-  #       curl -X POST -H "Authorization: Bearer $(SLACK_TOKEN)" \
-  #       -H 'Content-type: application/json; charset=utf-8' \
-  #       --data '{"channel":"'"$CHANNEL"'", "link_names": true, "text":"'"$MESSAGE"'"}' \
-  #       https://slack.com/api/chat.postMessage
+        curl -X POST -H "Authorization: Bearer $(SLACK_TOKEN)" \
+        -H 'Content-type: application/json; charset=utf-8' \
+        --data '{"channel":"'"$CHANNEL"'", "link_names": true, "text":"'"$MESSAGE"'"}' \
+        https://slack.com/api/chat.postMessage
 
-  #       exit 1
-  #     fi
-  #   displayName: Check 1.999.0 tag
+        exit 1
+      fi
+    displayName: Check 1.999.0 tag
 
   - bash: |
       # Install build dependencies
@@ -37,54 +37,47 @@ steps:
       node build/azure-pipelines/publish-types/check-version.js
     displayName: Check version
 
-  # {{SQL CARBON EDIT}} Modify to fit our own scenario - specifically currently we need to use a fork of the repo since we don't
-  # have an account with push access to DT
   - bash: |
-      git config --global user.email "azuredatastudio@microsoft.com"
-      git config --global user.name "Azure Data Studio"
+      git config --global user.email "vscode@microsoft.com"
+      git config --global user.name "VSCode"
 
-      git clone https://$(GITHUB_TOKEN)@$(REPO) --depth=1
+      git clone https://$(GITHUB_TOKEN)@github.com/DefinitelyTyped/DefinitelyTyped.git --depth=1
       node build/azure-pipelines/publish-types/update-types.js
 
       TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
 
       cd DefinitelyTyped
 
-      # Sync up to latest from the DT repo
-      git remote add upstream https://github.com/DefinitelyTyped/DefinitelyTyped.git
-      git merge upstream/master
-      git push origin
-
       git diff --color | cat
       git add -A
       git status
-      git checkout -b "azdata-types-$TAG_VERSION"
-      git commit -m "Azure Data Studio $TAG_VERSION Extension API"
-      git push origin "azdata-types-$TAG_VERSION"
+      git checkout -b "vscode-types-$TAG_VERSION"
+      git commit -m "VS Code $TAG_VERSION Extension API"
+      git push origin "vscode-types-$TAG_VERSION"
 
     displayName: Push update to DefinitelyTyped
 
-  # - bash: |
-  #     TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
-  #     CHANNEL="G1C14HJ2F"
+  - bash: |
+      TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
+      CHANNEL="G1C14HJ2F"
 
-  #     MESSAGE="DefinitelyTyped/DefinitelyTyped#vscode-types-$TAG_VERSION created. Endgame champion, please open this link, examine changes and create a PR:"
-  #     LINK="https://github.com/DefinitelyTyped/DefinitelyTyped/compare/vscode-types-$TAG_VERSION?quick_pull=1&body=Updating%20VS%20Code%20Extension%20API.%20See%20https%3A%2F%2Fgithub.com%2Fmicrosoft%2Fvscode%2Fissues%2F70175%20for%20details."
-  #     MESSAGE2="[@eamodio, @jrieken, @kmaetzel, @egamma]. Please review and merge PR to publish @types/vscode."
+      MESSAGE="DefinitelyTyped/DefinitelyTyped#vscode-types-$TAG_VERSION created. Endgame master, please open this link, examine changes and create a PR:"
+      LINK="https://github.com/DefinitelyTyped/DefinitelyTyped/compare/vscode-types-$TAG_VERSION?quick_pull=1&body=Updating%20VS%20Code%20Extension%20API.%20See%20https%3A%2F%2Fgithub.com%2Fmicrosoft%2Fvscode%2Fissues%2F70175%20for%20details."
+      MESSAGE2="[@eamodio, @jrieken, @kmaetzel, @egamma]. Please review and merge PR to publish @types/vscode."
 
-  #     curl -X POST -H "Authorization: Bearer $(SLACK_TOKEN)" \
-  #     -H 'Content-type: application/json; charset=utf-8' \
-  #     --data '{"channel":"'"$CHANNEL"'", "link_names": true, "text":"'"$MESSAGE"'"}' \
-  #     https://slack.com/api/chat.postMessage
+      curl -X POST -H "Authorization: Bearer $(SLACK_TOKEN)" \
+      -H 'Content-type: application/json; charset=utf-8' \
+      --data '{"channel":"'"$CHANNEL"'", "link_names": true, "text":"'"$MESSAGE"'"}' \
+      https://slack.com/api/chat.postMessage
 
-  #     curl -X POST -H "Authorization: Bearer $(SLACK_TOKEN)" \
-  #     -H 'Content-type: application/json; charset=utf-8' \
-  #     --data '{"channel":"'"$CHANNEL"'", "link_names": true, "text":"'"$LINK"'"}' \
-  #     https://slack.com/api/chat.postMessage
+      curl -X POST -H "Authorization: Bearer $(SLACK_TOKEN)" \
+      -H 'Content-type: application/json; charset=utf-8' \
+      --data '{"channel":"'"$CHANNEL"'", "link_names": true, "text":"'"$LINK"'"}' \
+      https://slack.com/api/chat.postMessage
 
-  #     curl -X POST -H "Authorization: Bearer $(SLACK_TOKEN)" \
-  #     -H 'Content-type: application/json; charset=utf-8' \
-  #     --data '{"channel":"'"$CHANNEL"'", "link_names": true, "text":"'"$MESSAGE2"'"}' \
-  #     https://slack.com/api/chat.postMessage
+      curl -X POST -H "Authorization: Bearer $(SLACK_TOKEN)" \
+      -H 'Content-type: application/json; charset=utf-8' \
+      --data '{"channel":"'"$CHANNEL"'", "link_names": true, "text":"'"$MESSAGE2"'"}' \
+      https://slack.com/api/chat.postMessage
 
-  #   displayName: Send message on Slack
+    displayName: Send message on Slack

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

@@ -13,11 +13,11 @@ try {
         .execSync('git describe --tags `git rev-list --tags --max-count=1`')
         .toString()
         .trim();
-    const dtsUri = `https://raw.githubusercontent.com/microsoft/azuredatastudio/${tag}/src/sql/azdata.d.ts`; // {{SQL CARBON EDIT}} Use our typings
-    const outPath = path.resolve(process.cwd(), 'DefinitelyTyped/types/azdata/index.d.ts'); // {{SQL CARBON EDIT}} Use our typings
+    const dtsUri = `https://raw.githubusercontent.com/microsoft/vscode/${tag}/src/vs/vscode.d.ts`;
+    const outPath = path.resolve(process.cwd(), 'DefinitelyTyped/types/vscode/index.d.ts');
     cp.execSync(`curl ${dtsUri} --output ${outPath}`);
     updateDTSFile(outPath, tag);
-    console.log(`Done updating azdata.d.ts at ${outPath}`); // {{SQL CARBON EDIT}} Use our typings
+    console.log(`Done updating vscode.d.ts at ${outPath}`);
 }
 catch (err) {
     console.error(err);
@@ -51,25 +51,21 @@ function getNewFileContent(content, tag) {
 function getNewFileHeader(tag) {
     const [major, minor] = tag.split('.');
     const shorttag = `${major}.${minor}`;
-    // {{SQL CARBON EDIT}} Use our own header
     const header = [
-        `// Type definitions for Azure Data Studio ${shorttag}`,
-        `// Project: https://github.com/microsoft/azuredatastudio`,
-        `// Definitions by: Charles Gagnon <https://github.com/Charles-Gagnon>`,
-        `//                 Alan Ren: <https://github.com/alanrenmsft>`,
-        `//                 Karl Burtram: <https://github.com/kburtram>`,
-        `//                 Ken Van Hyning: <https://github.com/kenvanhyning>`,
+        `// Type definitions for Visual Studio Code ${shorttag}`,
+        `// Project: https://github.com/microsoft/vscode`,
+        `// Definitions by: Visual Studio Code Team, Microsoft <https://github.com/Microsoft>`,
         `// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped`,
         ``,
         `/*---------------------------------------------------------------------------------------------`,
         ` *  Copyright (c) Microsoft Corporation. All rights reserved.`,
         ` *  Licensed under the Source EULA.`,
-        ` *  See https://github.com/microsoft/azuredatastudio/blob/main/LICENSE.txt for license information.`,
+        ` *  See https://github.com/Microsoft/vscode/blob/master/LICENSE.txt for license information.`,
         ` *--------------------------------------------------------------------------------------------*/`,
         ``,
         `/**`,
-        ` * Type Definition for Azure Data Studio ${shorttag} Extension API`,
-        ` * See https://docs.microsoft.com/sql/azure-data-studio/extensibility-apis for more information`,
+        ` * Type Definition for Visual Studio Code ${shorttag} Extension API`,
+        ` * See https://code.visualstudio.com/api for more information`,
         ` */`
     ].join('\n');
     return header;

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

@@ -16,13 +16,13 @@ try {
 		.toString()
 		.trim();
 
-	const dtsUri = `https://raw.githubusercontent.com/microsoft/azuredatastudio/${tag}/src/sql/azdata.d.ts`; // {{SQL CARBON EDIT}} Use our typings
-	const outPath = path.resolve(process.cwd(), 'DefinitelyTyped/types/azdata/index.d.ts'); // {{SQL CARBON EDIT}} Use our typings
+	const dtsUri = `https://raw.githubusercontent.com/microsoft/vscode/${tag}/src/vs/vscode.d.ts`;
+	const outPath = path.resolve(process.cwd(), 'DefinitelyTyped/types/vscode/index.d.ts');
 	cp.execSync(`curl ${dtsUri} --output ${outPath}`);
 
 	updateDTSFile(outPath, tag);
 
-	console.log(`Done updating azdata.d.ts at ${outPath}`); // {{SQL CARBON EDIT}} Use our typings
+	console.log(`Done updating vscode.d.ts at ${outPath}`);
 } catch (err) {
 	console.error(err);
 	console.error('Failed to update types');
@@ -63,25 +63,21 @@ function getNewFileHeader(tag: string) {
 	const [major, minor] = tag.split('.');
 	const shorttag = `${major}.${minor}`;
 
-	// {{SQL CARBON EDIT}} Use our own header
 	const header = [
-		`// Type definitions for Azure Data Studio ${shorttag}`,
-		`// Project: https://github.com/microsoft/azuredatastudio`,
-		`// Definitions by: Charles Gagnon <https://github.com/Charles-Gagnon>`,
-		`//                 Alan Ren: <https://github.com/alanrenmsft>`,
-		`//                 Karl Burtram: <https://github.com/kburtram>`,
-		`//                 Ken Van Hyning: <https://github.com/kenvanhyning>`,
+		`// Type definitions for Visual Studio Code ${shorttag}`,
+		`// Project: https://github.com/microsoft/vscode`,
+		`// Definitions by: Visual Studio Code Team, Microsoft <https://github.com/Microsoft>`,
 		`// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped`,
 		``,
 		`/*---------------------------------------------------------------------------------------------`,
 		` *  Copyright (c) Microsoft Corporation. All rights reserved.`,
 		` *  Licensed under the Source EULA.`,
-		` *  See https://github.com/microsoft/azuredatastudio/blob/main/LICENSE.txt for license information.`,
+		` *  See https://github.com/Microsoft/vscode/blob/master/LICENSE.txt for license information.`,
 		` *--------------------------------------------------------------------------------------------*/`,
 		``,
 		`/**`,
-		` * Type Definition for Azure Data Studio ${shorttag} Extension API`,
-		` * See https://docs.microsoft.com/sql/azure-data-studio/extensibility-apis for more information`,
+		` * Type Definition for Visual Studio Code ${shorttag} Extension API`,
+		` * See https://code.visualstudio.com/api for more information`,
 		` */`
 	].join('\n');
 

build/azure-pipelines/release.yml

@@ -1,7 +1,7 @@
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "14.x"
+      versionSpec: "10.x"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
     inputs:

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

@@ -7,7 +7,7 @@ resources:
 jobs:
 - job: Compile
   pool:
-    vmImage: 'Ubuntu-18.04'
+    vmImage: 'Ubuntu-16.04'
   container: linux-x64
   steps:
   - script: |
@@ -15,7 +15,6 @@ jobs:
       echo "##vso[build.addbuildtag]$(VSCODE_QUALITY)"
     displayName: Add Quality Build Tag
   - template: sql-product-compile.yml
-  timeoutInMinutes: 120
 
 - job: macOS
   condition: and(succeeded(), eq(variables['VSCODE_BUILD_MACOS'], 'true'), ne(variables['VSCODE_QUALITY'], 'saw'))
@@ -25,7 +24,7 @@ jobs:
   - Compile
   steps:
   - template: darwin/sql-product-build-darwin.yml
-  timeoutInMinutes: 90
+  timeoutInMinutes: 180
 
 - job: macOS_Signing
   condition: and(succeeded(), eq(variables['VSCODE_BUILD_MACOS'], 'true'), eq(variables['signed'], true), ne(variables['VSCODE_QUALITY'], 'saw'))
@@ -40,15 +39,37 @@ jobs:
 - job: Linux
   condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
   pool:
-    vmImage: 'Ubuntu-18.04'
+    vmImage: 'Ubuntu-16.04'
   container: linux-x64
   dependsOn:
   - Compile
   steps:
   - template: linux/sql-product-build-linux.yml
     parameters:
-      extensionsToUnitTest: ["admin-tool-ext-win", "agent", "azcli", "azurecore", "cms", "dacpac", "data-workspace", "import", "machine-learning", "notebook", "resource-deployment", "schema-compare", "sql-database-projects"]
-  timeoutInMinutes: 90
+      extensionsToUnitTest: ["admin-tool-ext-win", "agent", "azdata", "azurecore", "cms", "dacpac", "import", "schema-compare", "notebook", "resource-deployment", "machine-learning", "sql-database-projects", "data-workspace"]
+  timeoutInMinutes: 70
+
+- job: LinuxWeb
+  condition: and(succeeded(), eq(variables['VSCODE_BUILD_WEB'], 'true'), ne(variables['VSCODE_QUALITY'], 'saw'))
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  container: linux-x64
+  variables:
+    VSCODE_ARCH: x64
+  dependsOn:
+  - Compile
+  steps:
+  - template: web/sql-product-build-web.yml
+
+# - job: Docker
+#   condition: and(succeeded(), eq(variables['VSCODE_BUILD_DOCKER'], 'true'))
+#   pool:
+#     vmImage: 'Ubuntu-16.04'
+#   container: linux-x64
+#   dependsOn:
+#   - Linux
+#   steps:
+#   - template: docker/sql-product-build-docker.yml
 
 - job: Windows
   condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
@@ -58,7 +79,7 @@ jobs:
   - Compile
   steps:
   - template: win32/sql-product-build-win32.yml
-  timeoutInMinutes: 90
+  timeoutInMinutes: 70
 
 - job: Windows_Test
   condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
@@ -69,17 +90,18 @@ jobs:
   - Windows
   steps:
   - template: win32/sql-product-test-win32.yml
-  timeoutInMinutes: 90
 
 - job: Release
   condition: and(succeeded(), or(eq(variables['VSCODE_RELEASE'], 'true'), and(eq(variables['VSCODE_QUALITY'], 'insider'), eq(variables['Build.Reason'], 'Schedule'))))
   pool:
-    vmImage: 'Ubuntu-18.04'
+    vmImage: 'Ubuntu-16.04'
   dependsOn:
   - macOS
   - Linux
+  # - Docker
   - Windows
   - Windows_Test
+  - LinuxWeb
   - macOS_Signing
   steps:
   - template: sql-release.yml

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

@@ -79,13 +79,21 @@ steps:
 
 - script: |
     set -e
-    yarn npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check
-  displayName: Compile & Hygiene
+    yarn sqllint
+    yarn gulp hygiene
+    yarn strict-vscode
+    yarn valid-layers-check
+  displayName: Run hygiene, eslint
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
     set -e
-    yarn npm-run-all -lp sqllint extensions-lint strict-vscode
-  displayName: SQL Hygiene
+    yarn gulp compile-build
+    yarn gulp compile-extensions-build
+    yarn gulp minify-vscode
+    yarn gulp vscode-reh-linux-x64-min
+    yarn gulp vscode-reh-web-linux-x64-min
+  displayName: Compile
 
 - script: |
     set -e

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

@@ -1,29 +0,0 @@
-resources:
-  containers:
-  - container: linux-x64
-    image: sqltoolscontainers.azurecr.io/web-build-image:2
-    endpoint: ContainerRegistry
-
-jobs:
-- job: LinuxWeb
-  pool:
-    vmImage: 'Ubuntu-18.04'
-  container: linux-x64
-  variables:
-    VSCODE_ARCH: x64
-  steps:
-  - template: web/sql-product-build-web.yml
-  timeoutInMinutes: 90
-
-- job: Docker
-  pool:
-    vmImage: 'Ubuntu-18.04'
-  container: linux-x64
-  dependsOn:
-  - LinuxWeb
-  steps:
-  - template: docker/sql-product-build-docker.yml
-  timeoutInMinutes: 90
-
-trigger: none
-pr: none

build/azure-pipelines/sync-mooncake.yml

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

build/azure-pipelines/upload-sourcemaps.js

@@ -2,54 +2,56 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+
 'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
-const es = require("event-stream");
-const vfs = require("vinyl-fs");
-const util = require("../lib/util");
-// @ts-ignore
-const deps = require("../lib/dependencies");
+
+const path = require('path');
+const es = require('event-stream');
 const azure = require('gulp-azure-storage');
+const vfs = require('vinyl-fs');
+const util = require('../lib/util');
 const root = path.dirname(path.dirname(__dirname));
 const commit = util.getVersion(root);
+
 // optionally allow to pass in explicit base/maps to upload
 const [, , base, maps] = process.argv;
-function src(base, maps = `${base}/**/*.map`) {
-    return vfs.src(maps, { base })
-        .pipe(es.mapSync((f) => {
-        f.path = `${f.base}/core/${f.relative}`;
-        return f;
-    }));
-}
+
+const fetch = function (base, maps = `${base}/**/*.map`) {
+	return vfs.src(maps, { base })
+		.pipe(es.mapSync(f => {
+			f.path = `${f.base}/core/${f.relative}`;
+			return f;
+		}));
+};
+
 function main() {
-    const sources = [];
-    // vscode client maps (default)
-    if (!base) {
-        const vs = src('out-vscode-min'); // client source-maps only
-        sources.push(vs);
-        const productionDependencies = deps.getProductionDependencies(root);
-        const productionDependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => `./${d}/**/*.map`);
-        const nodeModules = vfs.src(productionDependenciesSrc, { base: '.' })
-            .pipe(util.cleanNodeModules(path.join(root, 'build', '.moduleignore')));
-        sources.push(nodeModules);
-        const extensionsOut = vfs.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' });
-        sources.push(extensionsOut);
-    }
-    // specific client base/maps
-    else {
-        sources.push(src(base, maps));
-    }
-    return es.merge(...sources)
-        .pipe(es.through(function (data) {
-        console.log('Uploading Sourcemap', data.relative); // debug
-        this.emit('data', data);
-    }))
-        .pipe(azure.upload({
-        account: process.env.AZURE_STORAGE_ACCOUNT,
-        key: process.env.AZURE_STORAGE_ACCESS_KEY,
-        container: 'sourcemaps',
-        prefix: commit + '/'
-    }));
+	const sources = [];
+
+	// vscode client maps (default)
+	if (!base) {
+		const vs = fetch('out-vscode-min'); // client source-maps only
+		sources.push(vs);
+
+		const extensionsOut = vfs.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' });
+		sources.push(extensionsOut);
+	}
+
+	// specific client base/maps
+	else {
+		sources.push(fetch(base, maps));
+	}
+
+	return es.merge(...sources)
+		.pipe(es.through(function (data) {
+			console.log('Uploading Sourcemap', data.relative); // debug
+			this.emit('data', data);
+		}))
+		.pipe(azure.upload({
+			account: process.env.AZURE_STORAGE_ACCOUNT,
+			key: process.env.AZURE_STORAGE_ACCESS_KEY,
+			container: 'sourcemaps',
+			prefix: commit + '/'
+		}));
 }
+
 main();

build/azure-pipelines/upload-sourcemaps.ts

@@ -1,67 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as path from 'path';
-import * as es from 'event-stream';
-import * as Vinyl from 'vinyl';
-import * as vfs from 'vinyl-fs';
-import * as util from '../lib/util';
-// @ts-ignore
-import * as deps from '../lib/dependencies';
-const azure = require('gulp-azure-storage');
-
-const root = path.dirname(path.dirname(__dirname));
-const commit = util.getVersion(root);
-
-// optionally allow to pass in explicit base/maps to upload
-const [, , base, maps] = process.argv;
-
-function src(base: string, maps = `${base}/**/*.map`) {
-	return vfs.src(maps, { base })
-		.pipe(es.mapSync((f: Vinyl) => {
-			f.path = `${f.base}/core/${f.relative}`;
-			return f;
-		}));
-}
-
-function main() {
-	const sources = [];
-
-	// vscode client maps (default)
-	if (!base) {
-		const vs = src('out-vscode-min'); // client source-maps only
-		sources.push(vs);
-
-		const productionDependencies: { name: string, path: string, version: string }[] = deps.getProductionDependencies(root);
-		const productionDependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => `./${d}/**/*.map`);
-		const nodeModules = vfs.src(productionDependenciesSrc, { base: '.' })
-			.pipe(util.cleanNodeModules(path.join(root, 'build', '.moduleignore')));
-		sources.push(nodeModules);
-
-		const extensionsOut = vfs.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' });
-		sources.push(extensionsOut);
-	}
-
-	// specific client base/maps
-	else {
-		sources.push(src(base, maps));
-	}
-
-	return es.merge(...sources)
-		.pipe(es.through(function (data: Vinyl) {
-			console.log('Uploading Sourcemap', data.relative); // debug
-			this.emit('data', data);
-		}))
-		.pipe(azure.upload({
-			account: process.env.AZURE_STORAGE_ACCOUNT,
-			key: process.env.AZURE_STORAGE_ACCESS_KEY,
-			container: 'sourcemaps',
-			prefix: commit + '/'
-		}));
-}
-
-main();

build/azure-pipelines/web/build/Dockerfile

@@ -1,29 +0,0 @@
-#Download base image ubuntu 21.04
-FROM ubuntu:21.04
-ENV TZ=America/Los_Angeles
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-# Update Software repository
-RUN apt-get update && apt-get upgrade -y
-
-RUN apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 \
-	libkrb5-dev git apt-transport-https ca-certificates curl gnupg-agent software-properties-common \
-	libnss3 libasound2 make gcc libx11-dev fakeroot rpm libgconf-2-4 libunwind8 g++ python
-
-# Set the Chrome repo and install Chrome.
-RUN curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \
-	&& echo "deb https://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
-	&& apt-get update && apt-get install -y google-chrome-stable
-
-#docker
-RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
-RUN apt-key fingerprint 0EBFCD88
-RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-RUN apt-get update
-RUN apt-get -y install docker-ce docker-ce-cli containerd.io
-
-# This image needs to be built on a linux host; some weird stuff happens and the xvfb service won't start
-# if built on a windows host.
-ADD ./xvfb.init /etc/init.d/xvfb
-RUN chmod +x /etc/init.d/xvfb
-RUN update-rc.d xvfb defaults

build/azure-pipelines/web/build/xvfb.init

@@ -1,53 +0,0 @@
-#!/bin/bash
-#
-# /etc/rc.d/init.d/xvfbd
-#
-# chkconfig: 345 95 28
-# description: Starts/Stops X Virtual Framebuffer server
-# processname: Xvfb
-#
-### BEGIN INIT INFO
-# Provides:          xvfb
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start xvfb at boot time
-# Description:       Enable xvfb provided by daemon.
-### END INIT INFO
-
-[ "${NETWORKING}" = "no" ] && exit 0
-
-PROG="/usr/bin/Xvfb"
-PROG_OPTIONS=":10 -ac -screen 0 1024x768x24"
-PROG_OUTPUT="/tmp/Xvfb.out"
-
-case "$1" in
-	start)
-		echo "Starting : X Virtual Frame Buffer "
-		$PROG $PROG_OPTIONS>>$PROG_OUTPUT 2>&1 &
-		disown -ar
-	;;
-	stop)
-		echo "Shutting down : X Virtual Frame Buffer"
-		killproc $PROG
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && /bin/rm -f /var/lock/subsys/Xvfb
-		/var/run/Xvfb.pid
-		echo
-	;;
-	restart|reload)
-		$0 stop
-		$0 start
-		RETVAL=$?
-	;;
-	status)
-		status Xvfb
-		RETVAL=$?
-	;;
-	*)
-		echo $"Usage: $0 (start|stop|restart|reload|status)"
-		exit 1
-esac
-
-exit $RETVAL

build/azure-pipelines/web/createDrop.sh

@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-set -e
-REPO="$(pwd)"
-ROOT="$REPO/.."
-
-# Publish tarball
-mkdir -p $REPO/.build/linux/{archive,server}
-PLATFORM_LINUX="linux-x64"
-BUILDNAME="azuredatastudio-$PLATFORM_LINUX"
-BUILD="$ROOT/$BUILDNAME"
-TARBALL_FILENAME="azuredatastudio-$PLATFORM_LINUX.tar.gz"
-TARBALL_PATH="$REPO/.build/linux/archive/$TARBALL_FILENAME"
-
-rm -rf $ROOT/code-*.tar.*
-(cd $ROOT && tar -czf $TARBALL_PATH $BUILDNAME)
-
-# # Publish Remote Extension Host
-# LEGACY_SERVER_BUILD_NAME="azuredatastudio-reh-$PLATFORM_LINUX"
-# SERVER_BUILD_NAME="azuredatastudio-server-$PLATFORM_LINUX"
-# SERVER_TARBALL_FILENAME="azuredatastudio-server-$PLATFORM_LINUX.tar.gz"
-# SERVER_TARBALL_PATH="$REPO/.build/linux/server/$SERVER_TARBALL_FILENAME"
-
-# rm -rf $ROOT/azuredatastudio-server-*.tar.*
-# (cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME)
-
-# Publish Remote Extension Host (Web)
-LEGACY_SERVER_BUILD_NAME_WEB="azuredatastudio-reh-web-$PLATFORM_LINUX"
-SERVER_BUILD_NAME_WEB="azuredatastudio-server-$PLATFORM_LINUX-web"
-SERVER_TARBALL_FILENAME_WEB="azuredatastudio-server-$PLATFORM_LINUX-web.tar.gz"
-SERVER_TARBALL_PATH_WEB="$REPO/.build/linux/server/$SERVER_TARBALL_FILENAME_WEB"
-
-rm -rf $ROOT/azuredatastudio-server-*.tar.*
-(cd $ROOT && mv vscode-reh-web-linux-x64 $SERVER_BUILD_NAME_WEB && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH_WEB $SERVER_BUILD_NAME_WEB)
-
-node build/azure-pipelines/common/copyArtifacts.js

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

@@ -1,7 +1,7 @@
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "14.x"
+      versionSpec: "12.18.3"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
     inputs:
@@ -60,7 +60,6 @@ steps:
     displayName: Extract node_modules cache
 
   - script: |
-      set -e
       npx https://aka.ms/enablesecurefeed standAlone
     timeoutInMinutes: 5
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
@@ -119,19 +118,13 @@ steps:
 
   - script: |
       set -e
-      REPO="$(pwd)"
-      ROOT="$REPO/.."
-
-      WEB_BUILD_NAME="vscode-web"
-      WEB_TARBALL_FILENAME="vscode-web.tar.gz"
-      WEB_TARBALL_PATH="$ROOT/$WEB_TARBALL_FILENAME"
-
-      rm -rf $ROOT/vscode-web.tar.*
-
-      cd $ROOT && tar --owner=0 --group=0 -czf $WEB_TARBALL_PATH $WEB_BUILD_NAME
-    displayName: Prepare for publish
+      AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
+      AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+      ./build/azure-pipelines/web/publish.sh
+    displayName: Publish
 
   - publish: $(Agent.BuildDirectory)/vscode-web.tar.gz
-    artifact: vscode_web_linux_standalone_archive-unsigned
+    artifact: vscode-web-standalone
     displayName: Publish web archive
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))

build/azure-pipelines/web/publish.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -e
+REPO="$(pwd)"
+ROOT="$REPO/.."
+
+# Publish Web Client
+WEB_BUILD_NAME="vscode-web"
+WEB_TARBALL_FILENAME="vscode-web.tar.gz"
+WEB_TARBALL_PATH="$ROOT/$WEB_TARBALL_FILENAME"
+
+rm -rf $ROOT/vscode-web.tar.*
+
+(cd $ROOT && tar --owner=0 --group=0 -czf $WEB_TARBALL_PATH $WEB_BUILD_NAME)
+
+node build/azure-pipelines/common/createAsset.js web-standalone archive-unsigned "$WEB_TARBALL_FILENAME" "$WEB_TARBALL_PATH"

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

@@ -1,3 +1,4 @@
+
 steps:
 - task: NodeTool@0
   inputs:
@@ -12,6 +13,17 @@ steps:
   inputs:
     azureSubscription: 'ClientToolsInfra_670062 (88d5392f-a34f-4769-b405-f597fc533613)'
     KeyVaultName: ado-secrets
+    SecretsFilter: 'github-distro-mixin-password'
+
+- task: DownloadPipelineArtifact@2
+  inputs:
+    artifact: Compilation
+  displayName: Download compilation output
+
+- script: |
+    set -e
+    tar -xzf $(Pipeline.Workspace)/compilation.tar.gz
+  displayName: Extract compilation output
 
 - script: |
     set -e
@@ -32,46 +44,33 @@ steps:
     git merge $(node -p "require('./package.json').distro")
   displayName: Merge distro
 
-- script: |
-    mkdir -p .build
-    node build/azure-pipelines/common/sql-computeNodeModulesCacheKey.js > .build/yarnlockhash
-  displayName: Prepare yarn cache key
-
-- task: Cache@2
-  inputs:
-    key: 'nodeModules | $(Agent.OS) | .build/yarnlockhash'
-    path: .build/node_modules_cache
-    cacheHitVar: NODE_MODULES_RESTORED
-  displayName: Restore Cache - Node Modules
-
-- script: |
-    set -e
-    tar -xzf .build/node_modules_cache/cache.tgz
-  condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
-  displayName: Extract node_modules archive
+# - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+#   displayName: Restore Cache - Node Modules
+#   inputs:
+#     keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+#     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+#     vstsFeed: 'npm-vscode'
 
 - script: |
     set -e
     CHILD_CONCURRENCY=1 yarn --frozen-lockfile
   displayName: Install dependencies
-  condition: and(succeeded(), ne(variables['NODE_MODULES_RESTORED'], 'true'))
+  # condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-- script: |
-    set -e
-    node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
-    mkdir -p .build/node_modules_cache
-    tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
-  condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-  displayName: Create node_modules archive
+# - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+#   displayName: Save Cache - Node Modules
+#   inputs:
+#     keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+#     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+#     vstsFeed: 'npm-vscode'
+#   condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-- script: |
-    set -e
-    yarn postinstall
-  displayName: Run postinstall scripts
-  condition: and(succeeded(), eq(variables['NODE_MODULES_RESTORED'], 'true'))
+# - script: |
+#     set -e
+#     yarn postinstall
+#   displayName: Run postinstall scripts
+#   condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
 
-# Mixin must run before optimize, because the CSS loader will
-# inline small SVGs
 - script: |
     set -e
     node build/azure-pipelines/mixin
@@ -79,143 +78,24 @@ steps:
 
 - script: |
     set -e
-    yarn sqllint
-    yarn extensions-lint
-    yarn gulp hygiene
-    yarn strict-vscode
-    yarn valid-layers-check
-  displayName: Run hygiene, eslint
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+      yarn gulp vscode-web-min-ci
+  displayName: Build
 
+  # upload only the workbench.web.api.js source maps because
+  # we just compiled these bits in the previous step and the
+  # general task to upload source maps has already been run
 - script: |
     set -e
-    yarn gulp compile-build
-    yarn gulp compile-extensions-build
-    yarn gulp minify-vscode
-    yarn gulp vscode-linux-x64-min-ci
-    yarn gulp vscode-web-min-ci
-    yarn gulp vscode-reh-linux-x64-min
-    yarn gulp vscode-reh-web-linux-x64-yarnrc-extensions
-    yarn gulp vscode-reh-web-linux-x64-min
-  displayName: Compile
-
-- script: |
-    set -e
-    yarn gulp compile-extensions
-  displayName: Compile Extensions
-
-- script: |
-    set -e
-    node ./node_modules/playwright/install.js
-    APP_ROOT=$(Agent.BuildDirectory)/vscode-reh-web-linux-x64
-    xvfb-run yarn smoketest --build "$(Agent.BuildDirectory)/vscode-reh-web-linux-x64" --web --headless --screenshots "$(Build.ArtifactStagingDirectory)/smokeshots"
-  displayName: Run smoke tests (Browser)
-  continueOnError: true
-  condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+    AZURE_STORAGE_ACCOUNT="$(sourcemap-storage-account)" \
+    AZURE_STORAGE_ACCESS_KEY="$(sourcemap-storage-key)" \
+      node build/azure-pipelines/upload-sourcemaps out-vscode-web-min out-vscode-web-min/vs/workbench/workbench.web.api.js.map
+  displayName: Upload sourcemaps (Web)
 
 # - script: |
 #     set -e
-#     AZURE_STORAGE_ACCOUNT="$(sourcemap-storage-account)" \
-#     AZURE_STORAGE_ACCESS_KEY="$(sourcemap-storage-key)" \
-#       node build/azure-pipelines/upload-sourcemaps
-#   displayName: Upload sourcemaps
-
-- script: |
-    set -e
-
-    VERSION=$(node -p "require(\"./package.json\").version")
-
-    echo -e "{  \"version\": \"$VERSION\", \"quality\": \"$VSCODE_QUALITY\", \"commit\": \"$BUILD_SOURCEVERSION\" }" > ".build/version.json"
-
-    node build/azure-pipelines/common/copyArtifacts.js
-  displayName: Write Version Information
-
-- task: PublishBuildArtifacts@1
-  displayName: 'Publish Artifact: drop'
-
-- script: |
-    set -e
-    tar -czf $(Build.ArtifactStagingDirectory)/compilation.tar.gz .build out-*
-  displayName: Compress compilation artifact
-
-- task: PublishPipelineArtifact@1
-  inputs:
-    targetPath: $(Build.ArtifactStagingDirectory)/compilation.tar.gz
-    artifactName: Compilation
-  displayName: Publish compilation artifact
-
-- script: |
-    set -e
-    yarn gulp package-rebuild-extensions
-    yarn gulp compile-extensions
-    yarn gulp package-external-extensions
-  displayName: Package External extensions
-
-- script: |
-    set -e
-    yarn gulp package-langpacks
-  displayName: Package Langpacks
-
-- script: |
-    set -e
-    yarn gulp vscode-linux-x64-build-deb
-  displayName: Build Deb
-
-- script: |
-    set -e
-    yarn gulp vscode-linux-x64-build-rpm
-  displayName: Build Rpm
-
-- task: UseDotNet@2
-  displayName: 'Install .NET Core sdk for signing'
-  inputs:
-    packageType: sdk
-    version: 2.1.x
-    installationPath: $(Agent.ToolsDirectory)/dotnet
-
-- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-  inputs:
-    ConnectedServiceName: 'Code Signing'
-    FolderPath: '$(Build.SourcesDirectory)/.build'
-    Pattern: 'extensions/*.vsix,langpacks/*.vsix'
-    signConfigType: inlineSignParams
-    inlineOperation: |
-      [
-        {
-          "keyCode": "CP-233016",
-          "operationSetCode": "OpcSign",
-          "parameters": [
-            {
-              "parameterName": "FileDigest",
-              "parameterValue": "/fd \"SHA256\""
-            }
-          ],
-          "toolName": "sign",
-          "toolVersion": "1.0"
-        },
-        {
-          "keyCode": "CP-233016",
-          "operationSetCode": "OpcVerify",
-          "parameters": [],
-          "toolName": "sign",
-          "toolVersion": "1.0"
-        }
-      ]
-    SessionTimeout: 120
-  displayName: 'Signing Extensions and Langpacks'
-  condition: and(succeeded(), eq(variables['signed'], true))
-
-- script: |
-    set -e
-    ./build/azure-pipelines/web/createDrop.sh
-  displayName: Create Drop
-
-- task: PublishBuildArtifacts@1
-  displayName: 'Publish Artifact: drop'
-  continueOnError: true
-  condition: succeededOrFailed()
-
-- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-  displayName: 'Component Detection'
-  inputs:
-    failOnAlert: true
+#     AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
+#     AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
+#     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+#     ./build/azure-pipelines/web/publish.sh
+#   displayName: Publish

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

@@ -1,7 +1,7 @@
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "14.x"
+      versionSpec: "12.18.3"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
     inputs:
@@ -65,10 +65,8 @@ steps:
     condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
     displayName: Extract node_modules cache
 
-  - powershell: |
-      . build/azure-pipelines/win32/exec.ps1
-      $ErrorActionPreference = "Stop"
-      exec { npx https://aka.ms/enablesecurefeed standAlone }
+  - script: |
+      npx https://aka.ms/enablesecurefeed standAlone
     timeoutInMinutes: 5
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
     displayName: Switch to Terrapin packages
@@ -78,7 +76,6 @@ steps:
       . build/azure-pipelines/win32/retry.ps1
       $ErrorActionPreference = "Stop"
       $env:npm_config_arch="$(VSCODE_ARCH)"
-      $env:npm_config_build_from_source="true"
       $env:CHILD_CONCURRENCY="1"
       retry { exec { yarn --frozen-lockfile } }
     env:
@@ -180,7 +177,7 @@ steps:
       $ErrorActionPreference = "Stop"
       exec { $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH)"; .\resources\server\test\test-web-integration.bat --browser firefox }
     displayName: Run integration tests (Browser)
-    timeoutInMinutes: 10
+    timeoutInMinutes: 7
     condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
   - powershell: |
@@ -295,31 +292,35 @@ steps:
       $env:AZURE_STORAGE_ACCESS_KEY_2 = "$(vscode-storage-key)"
       $env:AZURE_DOCUMENTDB_MASTERKEY = "$(builds-docdb-key-readwrite)"
       $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
-      .\build\azure-pipelines\win32\prepare-publish.ps1
+      .\build\azure-pipelines\win32\publish.ps1
     displayName: Publish
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
-  - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\archive\$(ARCHIVE_NAME)
-    artifact: vscode_client_win32_$(VSCODE_ARCH)_archive
+  - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\archive\VSCode-win32-$(VSCODE_ARCH).zip
+    artifact: vscode-win32-$(VSCODE_ARCH)
     displayName: Publish archive
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
-  - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\system-setup\$(SYSTEM_SETUP_NAME)
-    artifact: vscode_client_win32_$(VSCODE_ARCH)_setup
+  - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\system-setup\VSCodeSetup.exe
+    artifact: vscode-win32-$(VSCODE_ARCH)-setup
     displayName: Publish system setup
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
-  - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\user-setup\$(USER_SETUP_NAME)
-    artifact: vscode_client_win32_$(VSCODE_ARCH)_user-setup
+  - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\user-setup\VSCodeSetup.exe
+    artifact: vscode-win32-$(VSCODE_ARCH)-user-setup
     displayName: Publish user setup
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(System.DefaultWorkingDirectory)\.build\vscode-server-win32-$(VSCODE_ARCH).zip
-    artifact: vscode_server_win32_$(VSCODE_ARCH)_archive
+    artifact: vscode-server-win32-$(VSCODE_ARCH)
     displayName: Publish server archive
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
   - publish: $(System.DefaultWorkingDirectory)\.build\vscode-server-win32-$(VSCODE_ARCH)-web.zip
-    artifact: vscode_web_win32_$(VSCODE_ARCH)_archive
+    artifact: vscode-server-win32-$(VSCODE_ARCH)-web
     displayName: Publish web server archive
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
+
+  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+    displayName: "Component Detection"
+    continueOnError: true

build/azure-pipelines/win32/publish.ps1

@@ -13,31 +13,24 @@ $Zip = "$Repo\.build\win32-$Arch\archive\VSCode-win32-$Arch.zip"
 $LegacyServer = "$Root\vscode-reh-win32-$Arch"
 $Server = "$Root\vscode-server-win32-$Arch"
 $ServerZip = "$Repo\.build\vscode-server-win32-$Arch.zip"
-$LegacyWeb = "$Root\vscode-reh-web-win32-$Arch"
-$Web = "$Root\vscode-server-win32-$Arch-web"
-$WebZip = "$Repo\.build\vscode-server-win32-$Arch-web.zip"
 $Build = "$Root\VSCode-win32-$Arch"
 
 # Create server archive
 if ("$Arch" -ne "arm64") {
 	exec { xcopy $LegacyServer $Server /H /E /I }
 	exec { .\node_modules\7zip\7zip-lite\7z.exe a -tzip $ServerZip $Server -r }
-	exec { xcopy $LegacyWeb $Web /H /E /I }
-	exec { .\node_modules\7zip\7zip-lite\7z.exe a -tzip $WebZip $Web -r }
 }
 
 # get version
 $PackageJson = Get-Content -Raw -Path "$Build\resources\app\package.json" | ConvertFrom-Json
 $Version = $PackageJson.version
 
-$ARCHIVE_NAME = "VSCode-win32-$Arch-$Version.zip"
-$SYSTEM_SETUP_NAME = "VSCodeSetup-$Arch-$Version.exe"
-$USER_SETUP_NAME = "VSCodeUserSetup-$Arch-$Version.exe"
+$AssetPlatform = if ("$Arch" -eq "ia32") { "win32" } else { "win32-$Arch" }
 
-# Set variables for upload
-Move-Item $Zip "$Repo\.build\win32-$Arch\archive\$ARCHIVE_NAME"
-Write-Host "##vso[task.setvariable variable=ARCHIVE_NAME]$ARCHIVE_NAME"
-Move-Item $SystemExe "$Repo\.build\win32-$Arch\system-setup\$SYSTEM_SETUP_NAME"
-Write-Host "##vso[task.setvariable variable=SYSTEM_SETUP_NAME]$SYSTEM_SETUP_NAME"
-Move-Item $UserExe "$Repo\.build\win32-$Arch\user-setup\$USER_SETUP_NAME"
-Write-Host "##vso[task.setvariable variable=USER_SETUP_NAME]$USER_SETUP_NAME"
+exec { node build/azure-pipelines/common/createAsset.js "$AssetPlatform-archive" archive "VSCode-win32-$Arch-$Version.zip" $Zip }
+exec { node build/azure-pipelines/common/createAsset.js "$AssetPlatform" setup "VSCodeSetup-$Arch-$Version.exe" $SystemExe }
+exec { node build/azure-pipelines/common/createAsset.js "$AssetPlatform-user" setup "VSCodeUserSetup-$Arch-$Version.exe" $UserExe }
+
+if ("$Arch" -ne "arm64") {
+	exec { node build/azure-pipelines/common/createAsset.js "server-$AssetPlatform" archive "vscode-server-win32-$Arch.zip" $ServerZip }
+}

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

@@ -16,7 +16,7 @@ steps:
     inputs:
       azureSubscription: 'ClientToolsInfra_670062 (88d5392f-a34f-4769-b405-f597fc533613)'
       KeyVaultName: ado-secrets
-      SecretsFilter: 'github-distro-mixin-password,standalone-extensions-uri'
+      SecretsFilter: 'github-distro-mixin-password'
     displayName: 'Azure Key Vault: Get Secrets'
 
   - task: DownloadPipelineArtifact@2
@@ -102,6 +102,8 @@ steps:
       $ErrorActionPreference = "Stop"
       exec { yarn gulp "package-rebuild-extensions" }
       exec { yarn gulp "vscode-win32-x64-min-ci" }
+      exec { yarn gulp "vscode-reh-win32-x64-min" }
+      exec { yarn gulp "vscode-reh-web-win32-x64-min" }
       exec { yarn gulp "vscode-win32-x64-code-helper" }
       exec { yarn gulp "vscode-win32-x64-inno-updater" }
     displayName: Build
@@ -119,19 +121,6 @@ steps:
       vstsPackageVersion: '*'
     condition: and(succeeded(), eq(variables['VSCODE_QUALITY'], 'saw'))
 
-  - powershell: |
-      # Install TSGOps specific extensions
-      $ErrorActionPreference = "Stop"
-      $tempFilePath = (New-TemporaryFile).FullName
-      $zipFilePath = $tempFilePath + ".zip"
-      $extensionUri = "$(standalone-extensions-uri)"
-      $adsExtensionPath = "$(agent.builddirectory)\azuredatastudio-win32-x64\resources\app\extensions"
-      Invoke-WebRequest -Uri $extensionUri -OutFile $tempFilePath
-      Move-Item $tempFilePath $zipFilePath
-      Expand-Archive $zipFilePath -DestinationPath $adsExtensionPath
-    displayName: Install SAW Extensions
-    condition: and(succeeded(), eq(variables['VSCODE_QUALITY'], 'saw'))
-
   # - powershell: | @anthonydresser unit tests timeout never existing the node process
   #     . build/azure-pipelines/win32/exec.ps1
   #     $ErrorActionPreference = "Stop"

build/builtin/main.js

@@ -23,17 +23,7 @@ ipcMain.handle('pickdir', async () => {
 });
 
 app.once('ready', () => {
-	window = new BrowserWindow({
-		width: 800,
-		height: 600,
-		webPreferences: {
-			nodeIntegration: true,
-			contextIsolation: false,
-			webviewTag: true,
-			enableWebSQL: false,
-			nativeWindowOpen: true
-		}
-	});
+	window = new BrowserWindow({ width: 800, height: 600, webPreferences: { nodeIntegration: true, webviewTag: true, enableWebSQL: false, nativeWindowOpen: true } });
 	window.setMenuBarVisibility(false);
 	window.loadURL(url.format({ pathname: path.join(__dirname, 'index.html'), protocol: 'file:', slashes: true }));
 	// window.webContents.openDevTools();

build/darwin/create-universal-app.js

@@ -16,8 +16,8 @@ async function main() {
         throw new Error('$AGENT_BUILDDIRECTORY not set');
     }
     const appName = product.nameLong + '.app';
-    const x64AppPath = path.join(buildDir, 'VSCode-darwin-x64', appName);
-    const arm64AppPath = path.join(buildDir, 'VSCode-darwin-arm64', appName);
+    const x64AppPath = path.join(buildDir, 'vscode-x64', appName);
+    const arm64AppPath = path.join(buildDir, 'vscode-arm64', appName);
     const x64AsarPath = path.join(x64AppPath, 'Contents', 'Resources', 'app', 'node_modules.asar');
     const arm64AsarPath = path.join(arm64AppPath, 'Contents', 'Resources', 'app', 'node_modules.asar');
     const outAppPath = path.join(buildDir, `VSCode-darwin-${arch}`, appName);
@@ -33,7 +33,6 @@ async function main() {
             'Credits.rtf',
             'CodeResources',
             'fsevents.node',
-            'Info.plist',
             '.npmrc'
         ],
         outAppPath,

build/darwin/create-universal-app.ts

@@ -20,8 +20,8 @@ async function main() {
 	}
 
 	const appName = product.nameLong + '.app';
-	const x64AppPath = path.join(buildDir, 'VSCode-darwin-x64', appName);
-	const arm64AppPath = path.join(buildDir, 'VSCode-darwin-arm64', appName);
+	const x64AppPath = path.join(buildDir, 'vscode-x64', appName);
+	const arm64AppPath = path.join(buildDir, 'vscode-arm64', appName);
 	const x64AsarPath = path.join(x64AppPath, 'Contents', 'Resources', 'app', 'node_modules.asar');
 	const arm64AsarPath = path.join(arm64AppPath, 'Contents', 'Resources', 'app', 'node_modules.asar');
 	const outAppPath = path.join(buildDir, `VSCode-darwin-${arch}`, appName);
@@ -38,7 +38,6 @@ async function main() {
 			'Credits.rtf',
 			'CodeResources',
 			'fsevents.node',
-			'Info.plist', // TODO@deepak1556: regressed with 11.4.2 internal builds
 			'.npmrc'
 		],
 		outAppPath,

build/darwin/sign.js

@@ -5,9 +5,7 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const codesign = require("electron-osx-sign");
-const fs = require("fs-extra");
 const path = require("path");
-const plist = require("plist");
 const util = require("../lib/util");
 const product = require("../../product.json");
 async function main() {
@@ -27,7 +25,6 @@ async function main() {
     const helperAppBaseName = product.nameShort;
     const gpuHelperAppName = helperAppBaseName + ' Helper (GPU).app';
     const rendererHelperAppName = helperAppBaseName + ' Helper (Renderer).app';
-    const infoPlistPath = path.resolve(appRoot, appName, 'Contents', 'Info.plist');
     const defaultOpts = {
         app: path.join(appRoot, appName),
         platform: 'darwin',
@@ -49,14 +46,6 @@ async function main() {
         } });
     const gpuHelperOpts = Object.assign(Object.assign({}, defaultOpts), { app: path.join(appFrameworkPath, gpuHelperAppName), entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-gpu-entitlements.plist'), 'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-gpu-entitlements.plist') });
     const rendererHelperOpts = Object.assign(Object.assign({}, defaultOpts), { app: path.join(appFrameworkPath, rendererHelperAppName), entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-renderer-entitlements.plist'), 'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-renderer-entitlements.plist') });
-    let infoPlistString = await fs.readFile(infoPlistPath, 'utf8');
-    let infoPlistJson = plist.parse(infoPlistString);
-    Object.assign(infoPlistJson, {
-        NSAppleEventsUsageDescription: 'An application in Visual Studio Code wants to use AppleScript.',
-        NSMicrophoneUsageDescription: 'An application in Visual Studio Code wants to use the Microphone.',
-        NSCameraUsageDescription: 'An application in Visual Studio Code wants to use the Camera.'
-    });
-    await fs.writeFile(infoPlistPath, plist.build(infoPlistJson), 'utf8');
     await codesign.signAsync(gpuHelperOpts);
     await codesign.signAsync(rendererHelperOpts);
     await codesign.signAsync(appOpts);

build/darwin/sign.ts

@@ -6,9 +6,7 @@
 'use strict';
 
 import * as codesign from 'electron-osx-sign';
-import * as fs from 'fs-extra';
 import * as path from 'path';
-import * as plist from 'plist';
 import * as util from '../lib/util';
 import * as product from '../../product.json';
 
@@ -32,7 +30,6 @@ async function main(): Promise<void> {
 	const helperAppBaseName = product.nameShort;
 	const gpuHelperAppName = helperAppBaseName + ' Helper (GPU).app';
 	const rendererHelperAppName = helperAppBaseName + ' Helper (Renderer).app';
-	const infoPlistPath = path.resolve(appRoot, appName, 'Contents', 'Info.plist');
 
 	const defaultOpts: codesign.SignOptions = {
 		app: path.join(appRoot, appName),
@@ -71,15 +68,6 @@ async function main(): Promise<void> {
 		'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-renderer-entitlements.plist'),
 	};
 
-	let infoPlistString = await fs.readFile(infoPlistPath, 'utf8');
-	let infoPlistJson = plist.parse(infoPlistString);
-	Object.assign(infoPlistJson, {
-		NSAppleEventsUsageDescription: 'An application in Visual Studio Code wants to use AppleScript.',
-		NSMicrophoneUsageDescription: 'An application in Visual Studio Code wants to use the Microphone.',
-		NSCameraUsageDescription: 'An application in Visual Studio Code wants to use the Camera.'
-	});
-	await fs.writeFile(infoPlistPath, plist.build(infoPlistJson), 'utf8');
-
 	await codesign.signAsync(gpuHelperOpts);
 	await codesign.signAsync(rendererHelperOpts);
 	await codesign.signAsync(appOpts as any);

build/filters.js

@@ -51,10 +51,8 @@ module.exports.indentationFilter = [
 	'!test/monaco/out/**',
 	'!test/smoke/out/**',
 	'!extensions/typescript-language-features/test-workspace/**',
-	'!extensions/markdown-math/notebook-out/**',
 	'!extensions/vscode-api-tests/testWorkspace/**',
 	'!extensions/vscode-api-tests/testWorkspace2/**',
-	'!extensions/vscode-custom-editor-tests/test-workspace/**',
 	'!build/monaco/**',
 	'!build/win32/**',
 
@@ -88,8 +86,6 @@ module.exports.indentationFilter = [
 	'!**/*.Dockerfile',
 	'!**/*.dockerfile',
 	'!extensions/markdown-language-features/media/*.js',
-	'!extensions/markdown-language-features/notebook-out/*.js',
-	'!extensions/markdown-math/notebook-out/*.js',
 	'!extensions/simple-browser/media/*.js',
 ];
 
@@ -119,7 +115,6 @@ module.exports.copyrightFilter = [
 	'!resources/completions/**',
 	'!extensions/configuration-editing/build/inline-allOf.ts',
 	'!extensions/markdown-language-features/media/highlight.css',
-	'!extensions/markdown-math/notebook-out/**',
 	'!extensions/html-language-features/server/src/modes/typescript/*',
 	'!extensions/*/server/bin/*',
 	'!src/vs/editor/test/node/classification/typescript-test.ts',

build/gulpfile.editor.js

@@ -14,7 +14,7 @@ const i18n = require('./lib/i18n');
 const standalone = require('./lib/standalone');
 const cp = require('child_process');
 const compilation = require('./lib/compilation');
-const monacoapi = require('./lib/monaco-api');
+const monacoapi = require('./monaco/api');
 const fs = require('fs');
 
 let root = path.dirname(__dirname);
@@ -49,7 +49,7 @@ let BUNDLED_FILE_HEADER = [
 	' * Copyright (c) Microsoft Corporation. All rights reserved.',
 	' * Version: ' + headerVersion,
 	' * Released under the Source EULA',
-	' * https://github.com/microsoft/vscode/blob/main/LICENSE.txt',
+	' * https://github.com/Microsoft/vscode/blob/master/LICENSE.txt',
 	' *-----------------------------------------------------------*/',
 	''
 ].join('\n');
@@ -279,7 +279,7 @@ const finalEditorResourcesTask = task.define('final-editor-resources', () => {
 		// version.txt
 		gulp.src('build/monaco/version.txt')
 			.pipe(es.through(function (data) {
-				data.contents = Buffer.from(`monaco-editor-core: https://github.com/microsoft/vscode/tree/${sha1}`);
+				data.contents = Buffer.from(`monaco-editor-core: https://github.com/Microsoft/vscode/tree/${sha1}`);
 				this.emit('data', data);
 			}))
 			.pipe(gulp.dest('out-monaco-editor-core')),

build/gulpfile.extensions.js

@@ -19,59 +19,22 @@ const glob = require('glob');
 const root = path.dirname(__dirname);
 const commit = util.getVersion(root);
 const plumber = require('gulp-plumber');
+const fancyLog = require('fancy-log');
+const ansiColors = require('ansi-colors');
 const ext = require('./lib/extensions');
 
 const extensionsPath = path.join(path.dirname(__dirname), 'extensions');
-
-// {{SQL CARBON EDIT}} - TODO: Import needs to be updated to work with langpacks.
+// {{SQL CARBON EDIT}}
 const sqlLocalizedExtensions = [
-	'import',
+	'dacpac',
+	'schema-compare'
 ];
+// {{SQL CARBON EDIT}}
 
-// {{SQL CARBON EDIT}} Not doing this for us right now
-// To save 250ms for each gulp startup, we are caching the result here
 const compilations = glob.sync('**/tsconfig.json', {
 	cwd: extensionsPath,
 	ignore: ['**/out/**', '**/node_modules/**']
 });
-// const compilations = [
-// 	'configuration-editing/build/tsconfig.json',
-// 	'configuration-editing/tsconfig.json',
-// 	'css-language-features/client/tsconfig.json',
-// 	'css-language-features/server/tsconfig.json',
-// 	'debug-auto-launch/tsconfig.json',
-// 	'debug-server-ready/tsconfig.json',
-// 	'emmet/tsconfig.json',
-// 	'extension-editing/tsconfig.json',
-// 	'git/tsconfig.json',
-// 	'github-authentication/tsconfig.json',
-// 	'github/tsconfig.json',
-// 	'grunt/tsconfig.json',
-// 	'gulp/tsconfig.json',
-// 	'html-language-features/client/tsconfig.json',
-// 	'html-language-features/server/tsconfig.json',
-// 	'image-preview/tsconfig.json',
-// 	'jake/tsconfig.json',
-// 	'json-language-features/client/tsconfig.json',
-// 	'json-language-features/server/tsconfig.json',
-// 	'markdown-language-features/preview-src/tsconfig.json',
-// 	'markdown-language-features/tsconfig.json',
-// 	'markdown-math/tsconfig.json',
-// 	'merge-conflict/tsconfig.json',
-// 	'microsoft-authentication/tsconfig.json',
-// 	'npm/tsconfig.json',
-// 	'php-language-features/tsconfig.json',
-// 	'search-result/tsconfig.json',
-// 	'simple-browser/tsconfig.json',
-// 	'testing-editor-contributions/tsconfig.json',
-// 	'typescript-language-features/test-workspace/tsconfig.json',
-// 	'typescript-language-features/tsconfig.json',
-// 	'vscode-api-tests/tsconfig.json',
-// 	'vscode-colorize-tests/tsconfig.json',
-// 	'vscode-custom-editor-tests/tsconfig.json',
-// 	'vscode-notebook-tests/tsconfig.json',
-// 	'vscode-test-resolver/tsconfig.json'
-// ];
 
 const getBaseUrl = out => `https://sqlopsbuilds.blob.core.windows.net/sourcemaps/${commit}/${out}`;
 
@@ -203,22 +166,7 @@ exports.watchExtensionsTask = watchExtensionsTask;
 const compileExtensionsBuildLegacyTask = task.define('compile-extensions-build-legacy', task.parallel(...tasks.map(t => t.compileBuildTask)));
 gulp.task(compileExtensionsBuildLegacyTask);
 
-//#region Extension media
-
-const compileExtensionMediaTask = task.define('compile-extension-media', () => ext.buildExtensionMedia(false));
-gulp.task(compileExtensionMediaTask);
-exports.compileExtensionMediaTask = compileExtensionMediaTask;
-
-const watchExtensionMedia = task.define('watch-extension-media', () => ext.buildExtensionMedia(true));
-gulp.task(watchExtensionMedia);
-exports.watchExtensionMedia = watchExtensionMedia;
-
-const compileExtensionMediaBuildTask = task.define('compile-extension-media-build', () => ext.buildExtensionMedia(false, '.build/extensions'));
-gulp.task(compileExtensionMediaBuildTask);
-
-//#endregion
-
-//#region Azure Pipelines
+// Azure Pipelines
 
 const cleanExtensionsBuildTask = task.define('clean-extensions-build', util.rimraf('.build/extensions'));
 const compileExtensionsBuildTask = task.define('compile-extensions-build', task.series(
@@ -228,55 +176,10 @@ const compileExtensionsBuildTask = task.define('compile-extensions-build', task.
 ));
 
 gulp.task(compileExtensionsBuildTask);
-gulp.task(task.define('extensions-ci', task.series(compileExtensionsBuildTask, compileExtensionMediaBuildTask)));
+gulp.task(task.define('extensions-ci', task.series(compileExtensionsBuildTask)));
 
 exports.compileExtensionsBuildTask = compileExtensionsBuildTask;
 
-//#endregion
-
-// {{SQL CARBON EDIT}}
-//#region XLF Creation
-
-//Get every extension in 'extensions' to create XLF files.
-const exportCompilations = glob.sync('**/package.json', {
-	cwd: extensionsPath,
-	ignore: ['**/out/**', '**/node_modules/**', 'package.json']
-});
-
-//Run the localization packaging task on all extensions in ADS.
-const exportTasks = exportCompilations.map(function (packageFile) {
-	const locFunc = require('./lib/locFunc');
-	const relativeDirname = path.dirname(packageFile);
-
-	const extensionName = relativeDirname.replace(/\//g, '-');
-	const packageTask = task.define(`localization-package-extension:${extensionName}`, task.series(() => {
-		return locFunc.packageSingleExtensionStream(extensionName)
-			.pipe(gulp.dest('.build'));
-	}));
-
-	// Tasks
-	gulp.task(packageTask);
-
-	return { packageTask };
-});
-
-const packageLocalizationExtensionsTask = task.define('package-localization-extensions-task', task.series(...exportTasks.map(t => t.packageTask)));
-gulp.task(packageLocalizationExtensionsTask);
-
-//Builds all ADS extensions including external/excluded extensions (only for creating XLF files, not for compiling extensions for shipping)
-const compileLocalizationExtensionsBuildTask = task.define('compile-localization-extensions-build', task.series(
-	cleanExtensionsBuildTask,
-	compileExtensionsTask,
-	task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build'))),
-	packageLocalizationExtensionsTask,
-));
-
-gulp.task(compileLocalizationExtensionsBuildTask);
-exports.compileLocalizationExtensionsBuildTask = compileLocalizationExtensionsBuildTask;
-
-//#endregion
-// {{SQL CARBON EDIT}} end
-
 const compileWebExtensionsTask = task.define('compile-web', () => buildWebExtensions(false));
 gulp.task(compileWebExtensionsTask);
 exports.compileWebExtensionsTask = compileWebExtensionsTask;
@@ -286,9 +189,69 @@ gulp.task(watchWebExtensionsTask);
 exports.watchWebExtensionsTask = watchWebExtensionsTask;
 
 async function buildWebExtensions(isWatch) {
+	const webpack = require('webpack');
+
 	const webpackConfigLocations = await nodeUtil.promisify(glob)(
 		path.join(extensionsPath, '**', 'extension-browser.webpack.config.js'),
 		{ ignore: ['**/node_modules'] }
 	);
-	return ext.webpackExtensions('packaging web extension', isWatch, webpackConfigLocations.map(configPath => ({ configPath })));
+
+	const webpackConfigs = [];
+
+	for (const webpackConfigPath of webpackConfigLocations) {
+		const configOrFnOrArray = require(webpackConfigPath);
+		function addConfig(configOrFn) {
+			if (typeof configOrFn === 'function') {
+				webpackConfigs.push(configOrFn({}, {}));
+			} else {
+				webpackConfigs.push(configOrFn);
+			}
+		}
+		addConfig(configOrFnOrArray);
+	}
+	function reporter(fullStats) {
+		if (Array.isArray(fullStats.children)) {
+			for (const stats of fullStats.children) {
+				const outputPath = stats.outputPath;
+				if (outputPath) {
+					const relativePath = path.relative(extensionsPath, outputPath).replace(/\\/g, '/');
+					const match = relativePath.match(/[^\/]+(\/server|\/client)?/);
+					fancyLog(`Finished ${ansiColors.green('packaging web extension')} ${ansiColors.cyan(match[0])} with ${stats.errors.length} errors.`);
+				}
+				if (Array.isArray(stats.errors)) {
+					stats.errors.forEach(error => {
+						fancyLog.error(error);
+					});
+				}
+				if (Array.isArray(stats.warnings)) {
+					stats.warnings.forEach(warning => {
+						fancyLog.warn(warning);
+					});
+				}
+			}
+		}
+	}
+	return new Promise((resolve, reject) => {
+		if (isWatch) {
+			webpack(webpackConfigs).watch({}, (err, stats) => {
+				if (err) {
+					reject();
+				} else {
+					reporter(stats.toJson());
+				}
+			});
+		} else {
+			webpack(webpackConfigs).run((err, stats) => {
+				if (err) {
+					fancyLog.error(err);
+					reject();
+				} else {
+					reporter(stats.toJson());
+					resolve();
+				}
+			});
+		}
+	});
 }
+
+

build/gulpfile.js

@@ -13,7 +13,7 @@ const util = require('./lib/util');
 const task = require('./lib/task');
 const compilation = require('./lib/compilation');
 const { monacoTypecheckTask/* , monacoTypecheckWatchTask */ } = require('./gulpfile.editor');
-const { compileExtensionsTask, watchExtensionsTask, compileExtensionMediaTask } = require('./gulpfile.extensions');
+const { compileExtensionsTask, watchExtensionsTask } = require('./gulpfile.extensions');
 
 // Fast compile for development time
 const compileClientTask = task.define('compile-client', task.series(util.rimraf('out'), compilation.compileTask('src', 'out', false)));
@@ -23,7 +23,7 @@ const watchClientTask = task.define('watch-client', task.series(util.rimraf('out
 gulp.task(watchClientTask);
 
 // All
-const compileTask = task.define('compile', task.parallel(monacoTypecheckTask, compileClientTask, compileExtensionsTask, compileExtensionMediaTask));
+const compileTask = task.define('compile', task.parallel(monacoTypecheckTask, compileClientTask, compileExtensionsTask));
 gulp.task(compileTask);
 
 gulp.task(task.define('watch', task.parallel(/* monacoTypecheckWatchTask, */ watchClientTask, watchExtensionsTask)));

build/gulpfile.reh.js

@@ -6,36 +6,21 @@
 'use strict';
 
 const gulp = require('gulp');
+
 const path = require('path');
 const es = require('event-stream');
 const util = require('./lib/util');
 const task = require('./lib/task');
-const common = require('./lib/optimize');
-const product = require('../product.json');
-const rename = require('gulp-rename');
-const replace = require('gulp-replace');
-const filter = require('gulp-filter');
-const _ = require('underscore');
-const { getProductionDependencies } = require('./lib/dependencies');
 const vfs = require('vinyl-fs');
-const packageJson = require('../package.json');
 const flatmap = require('gulp-flatmap');
 const gunzip = require('gulp-gunzip');
 const File = require('vinyl');
 const fs = require('fs');
-const glob = require('glob');
-const { compileBuildTask } = require('./gulpfile.compile');
-const { compileExtensionsBuildTask } = require('./gulpfile.extensions');
-const { vscodeWebEntryPoints, vscodeWebResourceIncludes, createVSCodeWebFileContentMapper } = require('./gulpfile.vscode.web');
+const rename = require('gulp-rename');
+const filter = require('gulp-filter');
 const cp = require('child_process');
-const { rollupAngular } = require('./lib/rollup');
 
 const REPO_ROOT = path.dirname(__dirname);
-const commit = util.getVersion(REPO_ROOT);
-const BUILD_ROOT = path.dirname(REPO_ROOT);
-const REMOTE_FOLDER = path.join(REPO_ROOT, 'remote');
-
-// Targets
 
 const BUILD_TARGETS = [
 	{ platform: 'win32', arch: 'ia32', pkgTarget: 'node8-win-x86' },
@@ -48,96 +33,21 @@ const BUILD_TARGETS = [
 	{ platform: 'linux', arch: 'alpine', pkgTarget: 'node8-linux-alpine' },
 ];
 
-const serverResources = [
+const noop = () => { return Promise.resolve(); };
 
-	// Bootstrap
-	'out-build/bootstrap.js',
-	'out-build/bootstrap-fork.js',
-	'out-build/bootstrap-amd.js',
-	'out-build/bootstrap-node.js',
-	'out-build/paths.js',
+gulp.task('vscode-reh-win32-ia32-min', noop);
+gulp.task('vscode-reh-win32-x64-min', noop);
+gulp.task('vscode-reh-darwin-min', noop);
+gulp.task('vscode-reh-linux-x64-min', noop);
+gulp.task('vscode-reh-linux-armhf-min', noop);
+gulp.task('vscode-reh-linux-arm64-min', noop);
+gulp.task('vscode-reh-linux-alpine-min', noop);
 
-	// Performance
-	'out-build/vs/base/common/performance.js',
-
-	// main entry points
-	'out-build/vs/server/cli.js',
-	'out-build/vs/server/main.js',
-
-	// Watcher
-	'out-build/vs/platform/files/**/*.exe',
-	'out-build/vs/platform/files/**/*.md',
-
-	// Uri transformer
-	'out-build/vs/server/uriTransformer.js',
-
-	// Process monitor
-	'out-build/vs/base/node/cpuUsage.sh',
-	'out-build/vs/base/node/ps.sh',
-
-	'!**/test/**'
-];
-
-let serverWithWebResources = undefined;
-try {
-	serverWithWebResources = [
-
-		// Include all of server...
-		...serverResources,
-
-		// ...and all of web
-		...vscodeWebResourceIncludes
-	];
-} catch (err) {
-	serverWithWebResources = [
-		// Include all of server...
-		...serverResources
-	];
-}
-
-const serverEntryPoints = [
-	{
-		name: 'vs/server/remoteExtensionHostAgent',
-		exclude: ['vs/css', 'vs/nls']
-	},
-	{
-		name: 'vs/server/remoteCli',
-		exclude: ['vs/css', 'vs/nls']
-	},
-	{
-		name: 'vs/server/remoteExtensionHostProcess',
-		exclude: ['vs/css', 'vs/nls']
-	},
-	{
-		name: 'vs/platform/files/node/watcher/unix/watcherApp',
-		exclude: ['vs/css', 'vs/nls']
-	},
-	{
-		name: 'vs/platform/files/node/watcher/nsfw/watcherApp',
-		exclude: ['vs/css', 'vs/nls']
-	},
-	{
-		name: 'vs/platform/terminal/node/ptyHostMain',
-		exclude: ['vs/css', 'vs/nls']
-	}
-];
-
-let serverWithWebEntryPoints = undefined;
-try {
-	serverWithWebEntryPoints = [
-
-		// Include all of server
-		...serverEntryPoints,
-
-		// Include workbench web
-		...vscodeWebEntryPoints
-		];
-} catch (err) {
-	serverWithWebEntryPoints = [
-		// Include all of server
-		...serverEntryPoints
-	];
-}
+gulp.task('vscode-reh-web-win32-ia32-min', noop);
+gulp.task('vscode-reh-web-win32-x64-min', noop);
+gulp.task('vscode-reh-web-darwin-min', noop);
+gulp.task('vscode-reh-web-linux-x64-min', noop);
+gulp.task('vscode-reh-web-linux-alpine-min', noop);
 
 function getNodeVersion() {
 	const yarnrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8');
@@ -206,308 +116,6 @@ function nodejs(platform, arch) {
 		.pipe(rename('node'));
 }
 
-function packageTask(type, platform, arch, sourceFolderName, destinationFolderName) {
-	const destination = path.join(BUILD_ROOT, destinationFolderName);
-
-	return () => {
-		const json = require('gulp-json-editor');
-
-		const src = gulp.src(sourceFolderName + '/**', { base: '.' })
-			.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + sourceFolderName), 'out'); }))
-			.pipe(util.setExecutableBit(['**/*.sh']))
-			.pipe(filter(['**', '!**/*.js.map']));
-
-		const workspaceExtensionPoints = ['debuggers', 'jsonValidation'];
-		const isUIExtension = (manifest) => {
-			switch (manifest.extensionKind) {
-				case 'ui': return true;
-				case 'workspace': return false;
-				default: {
-					if (manifest.main) {
-						return false;
-					}
-					if (manifest.contributes && Object.keys(manifest.contributes).some(key => workspaceExtensionPoints.indexOf(key) !== -1)) {
-						return false;
-					}
-					// Default is UI Extension
-					return true;
-				}
-			}
-		};
-		const localWorkspaceExtensions = glob.sync('extensions/*/package.json')
-			.filter((extensionPath) => {
-				if (type === 'reh-web') {
-					return true; // web: ship all extensions for now
-				}
-
-				const manifest = JSON.parse(fs.readFileSync(path.join(REPO_ROOT, extensionPath)).toString());
-				return !isUIExtension(manifest);
-			}).map((extensionPath) => path.basename(path.dirname(extensionPath)))
-			.filter(name => name !== 'vscode-api-tests' && name !== 'vscode-test-resolver'); // Do not ship the test extensions
-		const marketplaceExtensions = JSON.parse(fs.readFileSync(path.join(REPO_ROOT, 'product.json'), 'utf8')).builtInExtensions
-			.filter(entry => !entry.platforms || new Set(entry.platforms).has(platform))
-			.filter(entry => !entry.clientOnly)
-			.map(entry => entry.name);
-		const extensionPaths = [...localWorkspaceExtensions, ...marketplaceExtensions]
-			.map(name => `.build/extensions/${name}/**`);
-
-		const extensions = gulp.src(extensionPaths, { base: '.build', dot: true });
-		const extensionsCommonDependencies = gulp.src('.build/extensions/node_modules/**', { base: '.build', dot: true });
-		const sources = es.merge(src, extensions, extensionsCommonDependencies)
-			.pipe(filter(['**', '!**/*.js.map'], { dot: true }));
-
-		let version = packageJson.version;
-		const quality = product.quality;
-
-		if (quality && quality !== 'stable') {
-			version += '-' + quality;
-		}
-
-		const name = product.nameShort;
-		const packageJsonStream = gulp.src(['remote/package.json'], { base: 'remote' })
-			.pipe(json({ name, version }));
-
-		const date = new Date().toISOString();
-
-		const productJsonStream = gulp.src(['product.json'], { base: '.' })
-			.pipe(json({ commit, date }));
-
-		const license = gulp.src(['remote/LICENSE'], { base: 'remote' });
-
-		const jsFilter = util.filter(data => !data.isDirectory() && /\.js$/.test(data.path));
-
-		const productionDependencies = getProductionDependencies(REMOTE_FOLDER);
-		const dependenciesSrc = _.flatten(productionDependencies.map(d => path.relative(REPO_ROOT, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!${d}/.bin/**`]));
-		const deps = gulp.src(dependenciesSrc, { base: 'remote', dot: true })
-			// filter out unnecessary files, no source maps in server build
-			.pipe(filter(['**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.js.map']))
-			.pipe(util.cleanNodeModules(path.join(__dirname, '.moduleignore')))
-			.pipe(jsFilter)
-			.pipe(util.stripSourceMappingURL())
-			.pipe(jsFilter.restore);
-
-		const nodePath = `.build/node/v${nodeVersion}/${platform}-${platform === 'darwin' ? 'x64' : arch}`;
-		const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true });
-
-		let web = [];
-		if (type === 'reh-web') {
-			web = [
-				'resources/server/favicon.ico',
-				'resources/server/code-192.png',
-				'resources/server/code-512.png',
-				'resources/server/manifest.json'
-			].map(resource => gulp.src(resource, { base: '.' }).pipe(rename(resource)));
-		}
-
-		let all = es.merge(
-			packageJsonStream,
-			productJsonStream,
-			license,
-			sources,
-			deps,
-			node,
-			...web
-		);
-
-		let result = all
-			.pipe(util.skipDirectories())
-			.pipe(util.fixWin32DirectoryPermissions());
-
-		if (platform === 'win32') {
-			result = es.merge(result,
-				gulp.src('resources/server/bin/code.cmd', { base: '.' })
-					.pipe(replace('@@VERSION@@', version))
-					.pipe(replace('@@COMMIT@@', commit))
-					.pipe(replace('@@APPNAME@@', product.applicationName))
-					.pipe(rename(`bin/${product.applicationName}.cmd`)),
-				// gulp.src('resources/server/bin/helpers/browser.cmd', { base: '.' })
-				// 	.pipe(replace('@@VERSION@@', version))
-				// 	.pipe(replace('@@COMMIT@@', commit))
-				// 	.pipe(replace('@@APPNAME@@', product.applicationName))
-				// 	.pipe(rename(`bin/helpers/browser.cmd`)),
-				gulp.src('resources/server/bin/server.cmd', { base: '.' })
-					.pipe(rename(`server.cmd`))
-			);
-		} else if (platform === 'linux' || platform === 'darwin') {
-			result = es.merge(result,
-				gulp.src('resources/server/bin/code.sh', { base: '.' })
-					.pipe(replace('@@VERSION@@', version))
-					.pipe(replace('@@COMMIT@@', commit))
-					.pipe(replace('@@APPNAME@@', product.applicationName))
-					.pipe(rename(`bin/${product.applicationName}`))
-					.pipe(util.setExecutableBit()),
-				// gulp.src('resources/server/bin/helpers/browser.sh', { base: '.' })
-				// 	.pipe(replace('@@VERSION@@', version))
-				// 	.pipe(replace('@@COMMIT@@', commit))
-				// 	.pipe(replace('@@APPNAME@@', product.applicationName))
-				// 	.pipe(rename(`bin/helpers/browser.sh`))
-				// 	.pipe(util.setExecutableBit()),
-				gulp.src('resources/server/bin/server.sh', { base: '.' })
-					.pipe(rename(`server.sh`))
-					.pipe(util.setExecutableBit())
-			);
-		}
-
-		return result.pipe(vfs.dest(destination));
-	};
-}
-
-function copyConfigTask(folder) {
-	const destination = path.join(BUILD_ROOT, folder);
-	return () => {
-		const json = require('gulp-json-editor');
-
-		return gulp.src(['remote/pkg-package.json'], { base: 'remote' })
-		.pipe(rename(path => path.basename += '.' + folder))
-		.pipe(json(obj => {
-			const pkg = obj.pkg;
-			pkg.scripts = pkg.scripts && pkg.scripts.map(p => path.join(destination, p));
-			pkg.assets = pkg.assets && pkg.assets.map(p => path.join(destination, p));
-			return obj;
-		}))
-		.pipe(vfs.dest('out-vscode-reh-pkg'));
-	};
-}
-
-function copyNativeTask(folder) {
-	const destination = path.join(BUILD_ROOT, folder);
-	return () => {
-		const nativeLibraries = gulp.src(['remote/node_modules/**/*.node']);
-		const license = gulp.src(['remote/LICENSE']);
-
-		const result = es.merge(
-			nativeLibraries,
-			license
-		);
-
-		return result
-			.pipe(rename({ dirname: '' }))
-			.pipe(vfs.dest(destination));
-	};
-}
-
-function packagePkgTask(platform, arch, pkgTarget) {
-	const folder = path.join(BUILD_ROOT, 'vscode-reh') + (platform ? '-' + platform : '') + (arch ? '-' + arch : '');
-	return () => {
-		const cwd = process.cwd();
-		const config = path.join(cwd, 'out-vscode-reh-pkg', 'pkg-package.vscode-reh-' + platform + '-' + arch + '.json');
-		process.chdir(folder);
-		console.log(`TODO`, pkgTarget, config);
-		return null;
-		// return pkg.exec(['-t', pkgTarget, '-d', '-c', config, '-o', path.join(folder + '-pkg', platform === 'win32' ? 'vscode-reh.exe' : 'vscode-reh'), './out/remoteExtensionHostAgent.js'])
-		// 	.then(() => process.chdir(cwd));
-	};
-}
-
-['reh', 'reh-web'].forEach(type => {
-	const optimizeTask = task.define(`optimize-vscode-${type}`, task.series(
-		util.rimraf(`out-vscode-${type}`),
-		common.optimizeTask({
-			src: 'out-build',
-			entryPoints: _.flatten(type === 'reh' ? serverEntryPoints : serverWithWebEntryPoints),
-			otherSources: [],
-			resources: type === 'reh' ? serverResources : serverWithWebResources,
-			loaderConfig: common.loaderConfig(),
-			out: `out-vscode-${type}`,
-			inlineAmdImages: true,
-			bundleInfo: undefined,
-			fileContentMapper: createVSCodeWebFileContentMapper ? createVSCodeWebFileContentMapper('.build/extensions') : undefined
-		})
-	));
-
-	const minifyTask = task.define(`minify-vscode-${type}`, task.series(
-		optimizeTask,
-		util.rimraf(`out-vscode-${type}-min`),
-		common.minifyTask(`out-vscode-${type}`, `https://ticino.blob.core.windows.net/sourcemaps/${commit}/core`)
-	));
-	gulp.task(minifyTask);
-
-	BUILD_TARGETS.forEach(buildTarget => {
-		const dashed = (str) => (str ? `-${str}` : ``);
-		const platform = buildTarget.platform;
-		const arch = buildTarget.arch;
-		const pkgTarget = buildTarget.pkgTarget;
-
-		const copyPkgConfigTask = task.define(`copy-pkg-config${dashed(platform)}${dashed(arch)}`, task.series(
-			util.rimraf(`out-vscode-${type}-pkg`),
-			copyConfigTask(`vscode-${type}${dashed(platform)}${dashed(arch)}`)
-		));
-
-		const copyPkgNativeTask = task.define(`copy-pkg-native${dashed(platform)}${dashed(arch)}`, task.series(
-			util.rimraf(path.join(BUILD_ROOT, `vscode-${type}${dashed(platform)}${dashed(arch)}-pkg`)),
-			copyNativeTask(`vscode-${type}${dashed(platform)}${dashed(arch)}-pkg`)
-		));
-
-		['', 'min'].forEach(minified => {
-			const sourceFolderName = `out-vscode-${type}${dashed(minified)}`;
-			const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`;
-
-			const rollupAngularTask = task.define(`vscode-web-${type}${dashed(platform)}${dashed(arch)}-angular-rollup`, () => {
-				return rollupAngular(REMOTE_FOLDER);
-			});
-			gulp.task(rollupAngularTask);
-
-			// rebuild extensions that contain native npm modules or have conditional webpack rules
-			// when building with the web .yarnrc settings (e.g. runtime=node, etc.)
-			// this is needed to have correct module set published with desired ABI
-			const rebuildExtensions = ['big-data-cluster', 'mssql', 'notebook'];
-			const EXTENSIONS = path.join(REPO_ROOT, 'extensions');
-			function exec(cmdLine, cwd) {
-				console.log(cmdLine);
-				cp.execSync(cmdLine, { stdio: 'inherit', cwd: cwd });
-			}
-			const tasks = [];
-			rebuildExtensions.forEach(scope => {
-				const root = path.join(EXTENSIONS, scope);
-				tasks.push(
-					() => gulp.src(path.join(REMOTE_FOLDER, '.yarnrc')).pipe(gulp.dest(root)),
-					util.rimraf(path.join(root, 'node_modules')),
-					() => exec('yarn', root)
-				);
-			});
-			const yarnrcExtensions = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}-yarnrc-extensions`, task.series(...tasks));
-			gulp.task(yarnrcExtensions);
-
-			const cleanupExtensions = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}-cleanup-extensions`, () => {
-				return Promise.all(rebuildExtensions.map(scope => {
-					const root = path.join(EXTENSIONS, scope);
-					return util.rimraf(path.join(root, '.yarnrc'))();
-				}));
-			});
-			gulp.task(cleanupExtensions);
-
-			const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series(
-				gulp.task(`node-${platform}-${platform === 'darwin' ? 'x64' : arch}`),
-				yarnrcExtensions,
-				compileExtensionsBuildTask,
-				cleanupExtensions,
-				rollupAngularTask,
-				util.rimraf(path.join(BUILD_ROOT, destinationFolderName)),
-				packageTask(type, platform, arch, sourceFolderName, destinationFolderName)
-			));
-			gulp.task(serverTaskCI);
-
-			const serverTask = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}`, task.series(
-				compileBuildTask,
-				compileExtensionsBuildTask,
-				minified ? minifyTask : optimizeTask,
-				serverTaskCI
-			));
-			gulp.task(serverTask);
-
-			const serverPkgTask = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-pkg`, task.series(
-				task.parallel(
-					serverTask,
-					copyPkgConfigTask,
-					copyPkgNativeTask
-				),
-				packagePkgTask(platform, arch, pkgTarget)
-			));
-			gulp.task(serverPkgTask);
-		});
-	});
-});
-
 function mixinServer(watch) {
 	const packageJSONPath = path.join(path.dirname(__dirname), 'package.json');
 	function exec(cmdLine) {

build/gulpfile.sql.js

@@ -10,13 +10,10 @@ const es = require('event-stream');
 const filter = require('gulp-filter');
 const path = require('path');
 const ext = require('./lib/extensions');
-const loc = require('./lib/locFunc');
 const task = require('./lib/task');
 const glob = require('glob');
 const vsce = require('vsce');
 const mkdirp = require('mkdirp');
-const rename = require('gulp-rename');
-const fs = require('fs');
 
 gulp.task('fmt', () => formatStagedFiles());
 const formatFiles = (some) => {
@@ -96,78 +93,14 @@ const root = path.dirname(__dirname);
 
 gulp.task('package-external-extensions', task.series(
 	task.define('bundle-external-extensions-build', () => ext.packageExternalExtensionsStream().pipe(gulp.dest('.build/external'))),
-	task.define('create-external-extension-vsix-build', async () => {
+	task.define('create-external-extension-vsix-build', () => {
 		const vsixes = glob.sync('.build/external/extensions/*/package.json').map(manifestPath => {
 			const extensionPath = path.dirname(path.join(root, manifestPath));
 			const extensionName = path.basename(extensionPath);
 			return { name: extensionName, path: extensionPath };
-		})
-		.filter(element => ext.vscodeExternalExtensions.indexOf(element.name) === -1) // VS Code external extensions are bundled into ADS so no need to create a normal VSIX for them
-		.map(element => {
-			const pkgJson = require(path.join(element.path, 'package.json'));
-			const vsixDirectory = path.join(root, '.build', 'extensions');
-			mkdirp.sync(vsixDirectory);
-			const packagePath = path.join(vsixDirectory, `${pkgJson.name}-${pkgJson.version}.vsix`);
-			console.info('Creating vsix for ' + element.path + ' result:' + packagePath);
-			return vsce.createVSIX({
-				cwd: element.path,
-				packagePath: packagePath,
-				useYarn: true
-			});
-		});
-		// Wait for all the initial VSIXes to be completed before making the VS Code ones since we'll be overwriting
-		// values in the package.json for those.
-		await Promise.all(vsixes);
-
-		// Go through and find the extensions which build separate versions of themselves for VS Code.
-		// This is currently a pretty simplistic process, essentially just replacing certain values in
-		// the package.json. It doesn't handle more complex tasks such as replacing localized strings.
-		const vscodeVsixes = glob.sync('.build/external/extensions/*/package.vscode.json')
-			.map(async vscodeManifestRelativePath => {
-				const vscodeManifestFullPath = path.join(root, vscodeManifestRelativePath);
-				const packageDir = path.dirname(vscodeManifestFullPath);
-				const packageManifestPath = path.join(packageDir, 'package.json');
-				const json = require('gulp-json-editor');
-				const packageJsonStream = gulp.src(packageManifestPath) // Create stream for the original package.json
-					.pipe(json(data => { // And now use gulp-json-editor to modify the contents
-						const updateData = JSON.parse(fs.readFileSync(vscodeManifestFullPath)); // Read in the set of values to replace from package.vscode.json
-						Object.keys(updateData).forEach(key => {
-							data[key] = updateData[key];
-						});
-						// Remove ADS-only menus. This is a subset of the menus listed in https://github.com/microsoft/azuredatastudio/blob/main/src/vs/workbench/api/common/menusExtensionPoint.ts
-						// More can be added to the list as needed.
-						['objectExplorer/item/context', 'dataExplorer/context', 'dashboard/toolbar'].forEach(menu => {
-							delete data.contributes.menus[menu];
-						});
-						return data;
-					}, { beautify: false }))
-					.pipe(gulp.dest(packageDir));
-				await new Promise(resolve => packageJsonStream.on('finish', resolve)); // Wait for the files to finish being updated before packaging
-				const pkgJson = JSON.parse(fs.readFileSync(packageManifestPath));
-				const vsixDirectory = path.join(root, '.build', 'extensions');
-				const packagePath = path.join(vsixDirectory, `${pkgJson.name}-${pkgJson.version}.vsix`);
-				console.info('Creating vsix for ' + packageDir + ' result:' + packagePath);
-				return vsce.createVSIX({
-					cwd: packageDir,
-					packagePath: packagePath,
-					useYarn: true
-				});
-			});
-
-		return Promise.all(vscodeVsixes);
-	})
-));
-
-gulp.task('package-langpacks', task.series(
-	task.define('bundle-external-langpack-build', () => loc.packageLangpacksStream().pipe(gulp.dest('.build/external'))),
-	task.define('create-external-langpack-vsix-build', () => {
-		const vsixes = glob.sync('.build/external/langpacks/*/package.json').map(manifestPath => {
-			const extensionPath = path.dirname(path.join(root, manifestPath));
-			const extensionName = path.basename(extensionPath);
-			return { name: extensionName, path: extensionPath };
 		}).map(element => {
 			const pkgJson = require(path.join(element.path, 'package.json'));
-			const vsixDirectory = path.join(root, '.build', 'langpacks');
+			const vsixDirectory = path.join(root, '.build', 'extensions');
 			mkdirp.sync(vsixDirectory);
 			const packagePath = path.join(vsixDirectory, `${pkgJson.name}-${pkgJson.version}.vsix`);
 			console.info('Creating vsix for ' + element.path + ' result:' + packagePath);
@@ -182,14 +115,7 @@ gulp.task('package-langpacks', task.series(
 	})
 ));
 
-
 gulp.task('package-rebuild-extensions', task.series(
 	task.define('clean-rebuild-extensions', () => ext.cleanRebuildExtensions('.build/extensions')),
 	task.define('rebuild-extensions-build', () => ext.packageRebuildExtensionsStream().pipe(gulp.dest('.build'))),
 ));
-
-gulp.task('update-langpacks', task.series(
-	task.define('rename-vscode-packs', () => loc.renameVscodeLangpacks()),
-	task.define('refresh-langpack-resources', () => loc.refreshLangpacks())
-));
-

build/gulpfile.vscode.js

@@ -30,7 +30,7 @@ const { getProductionDependencies } = require('./lib/dependencies');
 const { config } = require('./lib/electron');
 const createAsar = require('./lib/asar').createAsar;
 const { compileBuildTask } = require('./gulpfile.compile');
-const { compileExtensionsBuildTask, compileLocalizationExtensionsBuildTask } = require('./gulpfile.extensions');  // {{SQL CARBON EDIT}} Must handle localization code.
+const { compileExtensionsBuildTask } = require('./gulpfile.extensions');
 
 // Build
 const vscodeEntryPoints = _.flatten([
@@ -51,6 +51,7 @@ const vscodeResources = [
 	'out-build/bootstrap-amd.js',
 	'out-build/bootstrap-node.js',
 	'out-build/bootstrap-window.js',
+	'out-build/paths.js',
 	'out-build/vs/**/*.{svg,png,html,jpg}',
 	'!out-build/vs/code/browser/**/*.html',
 	'!out-build/vs/editor/standalone/**/*.svg',
@@ -59,7 +60,6 @@ const vscodeResources = [
 	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh,ps.sh}',
 	'out-build/vs/base/browser/ui/codicons/codicon/**',
 	'out-build/vs/base/parts/sandbox/electron-browser/preload.js',
-	'out-build/vs/platform/environment/node/userDataPath.js',
 	'out-build/vs/workbench/browser/media/*-theme.css',
 	'out-build/vs/workbench/contrib/debug/**/*.json',
 	'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt',
@@ -108,49 +108,6 @@ const optimizeVSCodeTask = task.define('optimize-vscode', task.series(
 ));
 gulp.task(optimizeVSCodeTask);
 
-// {{SQL CARBON EDIT}} Gulp task that imports any relevant ADS XLF found in vscode-translations-export to resources/xlf/en folder.
-
-// List of ADS extension XLF files that we want to put into the English resource folder.
-const extensionsFilter = filter([
-	'**/admin-tool-ext-win.xlf',
-	'**/agent.xlf',
-	'**/arc.xlf',
-	'**/asde-deployment.xlf',
-	'**/azurecore.xlf',
-	'**/azurehybridtoolkit.xlf',
-	'**/big-data-cluster.xlf',
-	'**/cms.xlf',
-	'**/dacpac.xlf',
-	'**/data-workspace.xlf',
-	'**/import.xlf',
-	'**/kusto.xlf',
-	'**/machine-learning.xlf',
-	'**/Microsoft.sqlservernotebook.xlf',
-	'**/mssql.xlf',
-	'**/notebook.xlf',
-	'**/profiler.xlf',
-	'**/query-history.xlf',
-	'**/resource-deployment.xlf',
-	'**/schema-compare.xlf',
-	'**/server-report.xlf',
-	'**/sql-assessment.xlf',
-	'**/sql-database-projects.xlf',
-	'**/sql-migration.xlf',
-	'**/xml-language-features.xlf'
-]);
-
-// Copy ADS extension XLFs into English resource folder.
-const importExtensionsTask = task.define('import-extensions-xlfs', function () {
-	return es.merge(
-		gulp.src(`./vscode-translations-export/vscode-extensions/*.xlf`)
-			.pipe(extensionsFilter),
-		gulp.src(`./vscode-translations-export/ads-core/*.xlf`)
-	)
-	.pipe(vfs.dest(`./resources/xlf/en`));
-});
-gulp.task(importExtensionsTask);
-// {{SQL CARBON EDIT}} end
-
 const sourceMappingURLBase = `https://sqlopsbuilds.blob.core.windows.net/sourcemaps/${commit}`;
 const minifyVSCodeTask = task.define('minify-vscode', task.series(
 	optimizeVSCodeTask,
@@ -276,20 +233,11 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		const productionDependencies = getProductionDependencies(root);
 		const dependenciesSrc = _.flatten(productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]));
 
+		// {{SQL CARBON EDIT}} - fix runtime module load break
 		const deps = gulp.src(dependenciesSrc, { base: '.', dot: true })
-			.pipe(filter(['**', `!**/${config.version}/**`, '!**/bin/darwin-arm64-87/**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.js.map']))
+			.pipe(filter(['**', '!**/package-lock.json']))
 			.pipe(util.cleanNodeModules(path.join(__dirname, '.moduleignore')))
-			.pipe(jsFilter)
-			.pipe(util.rewriteSourceMappingURL(sourceMappingURLBase))
-			.pipe(jsFilter.restore)
-			.pipe(createAsar(path.join(process.cwd(), 'node_modules'), [
-				'**/*.node',
-				'**/vscode-ripgrep/bin/*',
-				'**/node-pty/build/Release/*',
-				'**/node-pty/lib/worker/conoutSocketWorker.js',
-				'**/node-pty/lib/shared/conout.js',
-				'**/*.wasm'
-			], 'node_modules.asar'));
+			.pipe(createAsar(path.join(process.cwd(), 'node_modules'), ['**/*.node', '**/vscode-ripgrep/bin/*', '**/node-pty/build/Release/*', '**/*.wasm'], 'node_modules.asar'));
 
 		let all = es.merge(
 			packageJsonStream,
@@ -323,7 +271,6 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 			.pipe(fileLengthFilter.restore)
 			.pipe(util.skipDirectories())
 			.pipe(util.fixWin32DirectoryPermissions())
-			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
 			.pipe(electron(_.extend({}, config, { platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: true })))
 			.pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version'], { dot: true }));
 
@@ -445,6 +392,8 @@ BUILD_TARGETS.forEach(buildTarget => {
 	}
 });
 
+// Transifex Localizations
+
 const innoSetupConfig = {
 	'zh-cn': { codePage: 'CP936', defaultInfo: { name: 'Simplified Chinese', id: '$0804', } },
 	'zh-tw': { codePage: 'CP950', defaultInfo: { name: 'Traditional Chinese', id: '$0404' } },
@@ -460,8 +409,6 @@ const innoSetupConfig = {
 	'tr': { codePage: 'CP1254' }
 };
 
-// Transifex Localizations
-
 const apiHostname = process.env.TRANSIFEX_API_URL;
 const apiName = process.env.TRANSIFEX_API_NAME;
 const apiToken = process.env.TRANSIFEX_API_TOKEN;
@@ -487,38 +434,25 @@ gulp.task(task.define(
 	)
 ));
 
-// {{SQL CARBON EDIT}} Allow for gulp task to be added to update-english-xlfs.
-const vscodeTranslationsExport = task.define(
+gulp.task(task.define(
 	'vscode-translations-export',
 	task.series(
 		compileBuildTask,
-		compileLocalizationExtensionsBuildTask, // {{SQL CARBON EDIT}} now include all extensions in ADS, not just a subset. (replaces 'compileExtensionsBuildTask' here).
+		compileExtensionsBuildTask,
 		optimizeVSCodeTask,
 		function () {
 			const pathToMetadata = './out-vscode/nls.metadata.json';
 			const pathToExtensions = '.build/extensions/*';
-			const pathToSetup = 'build/win32/i18n/messages.en.isl';
+			const pathToSetup = 'build/win32/**/{Default.isl,messages.en.isl}';
 
 			return es.merge(
 				gulp.src(pathToMetadata).pipe(i18n.createXlfFilesForCoreBundle()),
 				gulp.src(pathToSetup).pipe(i18n.createXlfFilesForIsl()),
 				gulp.src(pathToExtensions).pipe(i18n.createXlfFilesForExtensions())
-			).pipe(vfs.dest('./vscode-translations-export')); // {{SQL CARBON EDIT}} move vscode-translations-export into ADS (for safely deleting after use).
+			).pipe(vfs.dest('../vscode-translations-export'));
 		}
 	)
-);
-gulp.task(vscodeTranslationsExport);
-
-// {{SQL CARBON EDIT}} Localization gulp task, runs vscodeTranslationsExport and imports a subset of the generated XLFs into the folder.
-gulp.task(task.define(
-	'update-english-xlfs',
-	task.series(
-		vscodeTranslationsExport,
-		importExtensionsTask,
-		task.define('delete-vscode-translations-export', util.rimraf('./vscode-translations-export'))
-	)
 ));
-// {{SQL CARBON EDIT}} end
 
 gulp.task('vscode-translations-pull', function () {
 	return es.merge([...i18n.defaultLanguages, ...i18n.extraLanguages].map(language => {
@@ -601,7 +535,7 @@ gulp.task(task.define(
 
 			if (!shouldSetupSettingsSearch()) {
 				const branch = process.env.BUILD_SOURCEBRANCH;
-				console.log(`Only runs on main and release branches, not ${branch}`);
+				console.log(`Only runs on master and release branches, not ${branch}`);
 				return;
 			}
 
@@ -627,21 +561,21 @@ gulp.task(task.define(
 
 function shouldSetupSettingsSearch() {
 	const branch = process.env.BUILD_SOURCEBRANCH;
-	return branch && (/\/main$/.test(branch) || branch.indexOf('/release/') >= 0);
+	return branch && (/\/master$/.test(branch) || branch.indexOf('/release/') >= 0);
 }
 
 function getSettingsSearchBuildId(packageJson) {
 	try {
 		const branch = process.env.BUILD_SOURCEBRANCH;
 		const branchId = branch.indexOf('/release/') >= 0 ? 0 :
-			/\/main$/.test(branch) ? 1 :
+			/\/master$/.test(branch) ? 1 :
 				2; // Some unexpected branch
 
 		const out = cp.execSync(`git rev-list HEAD --count`);
 		const count = parseInt(out.toString());
 
 		// <version number><commit count><branchId (avoid unlikely conflicts)>
-		// 1.25.1, 1,234,567 commits, main = 1250112345671
+		// 1.25.1, 1,234,567 commits, master = 1250112345671
 		return util.versionStringToNumber(packageJson.version) * 1e8 + count * 10 + branchId;
 	} catch (e) {
 		throw new Error('Could not determine build number: ' + e.toString());

build/lib/builtInExtensions.js

@@ -18,8 +18,8 @@ const ansiColors = require("ansi-colors");
 const mkdirp = require('mkdirp');
 const root = path.dirname(path.dirname(__dirname));
 const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8'));
-const builtInExtensions = productjson.builtInExtensions || [];
-const webBuiltInExtensions = productjson.webBuiltInExtensions || [];
+const builtInExtensions = productjson.builtInExtensions;
+const webBuiltInExtensions = productjson.webBuiltInExtensions;
 const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
 const ENABLE_LOGGING = !process.env['VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE'];
 function log(...messages) {