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

(cherry picked from commit d797ef433a)

.devcontainer/README.md

@@ -32,17 +32,17 @@ Next: **[Try it out!](#try-it)**
 
 ## Quick start - GitHub Codespaces
 
-> **IMPORTANT:** You need to use a "Standard" sized codespace or larger (4-core, 8GB) since VS Code needs 6GB of RAM to compile. This is now the default for GitHub Codespaces, but do not downgrade to "Basic" unless you do not intend to compile.
+> **IMPORTANT:** The current free user beta for GitHub Codespaces uses a "Basic" sized codespace which does not have enough RAM to run a full build of VS Code and will be considerably slower during codespace start and running VS Code. You'll soon be able to use a "Standard" sized codespace (4-core, 8GB) that will be better suited for this purpose (along with even larger sizes should you need it).
 
 1. From the [microsoft/vscode GitHub repository](https://github.com/microsoft/vscode), click on the **Code** dropdown, select **Open with Codespaces**, and the **New codespace**
 
     > Note that you will not see these options if you are not in the beta yet.
 
-2. After the codespace is up and running in your browser, press <kbd>F1</kbd> and select **Ports: Focus on Ports View**.
+2. After the codespace is up and running in your browser, press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> and select **View: Show Remote Explorer**.
 
 3. You should see port `6080` under **Forwarded Ports**. Select the line and click on the globe icon to open it in a browser tab.
 
-    > If you do not see port `6080`, press <kbd>F1</kbd>, select **Forward a Port** and enter port `6080`.
+    > 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.
 
@@ -58,7 +58,7 @@ You will likely see better performance when accessing the codespace you created
 
 2. Set up [VS Code for use with GitHub Codespaces](https://docs.github.com/github/developing-online-with-codespaces/using-codespaces-in-visual-studio-code)
 
-3. After the VS Code is up and running, press <kbd>F1</kbd>, choose **Codespaces: Connect to Codespace**, and select the codespace you created.
+3. After the VS Code is up and running, press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd>, choose **Codespaces: Connect to Codespace**, and select the codespace you created.
 
 4. After you've connected to the codespace, use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password.
 

.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,7 +2,7 @@
 	"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",

.eslintignore

@@ -13,6 +13,5 @@
 **/extensions/**/out/**
 **/extensions/**/build/**
 **/extensions/markdown-language-features/media/**
-**/extensions/markdown-language-features/notebook-out/**
 **/extensions/typescript-basics/test/colorize-fixtures/**
 **/extensions/**/dist/**

.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. -->
+<!-- Please 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 -->
+<!-- Also please test using the latest insiders build to make sure your issue has not already been fixed. -->
-<!-- 💡 Instead of creating your report here, use 'Report Issue' from the 'Help' menu in Azure Data Studio to pre-fill useful information. -->
+
+<!-- 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/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,296 +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
-
+        name: Setup Build Environment
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v1
         with:
           node-version: 12
-      # {{SQL CARBON EDIT}} Skip caching for now
+      # TODO: cache node modules
-      # - name: Compute node modules cache key
+      # Increase timeout to get around latency issues when fetching certain packages
-      #   id: nodeModulesCacheKey
+      - run: |
-      #   run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
+          yarn config set network-timeout 300000
-      # - name: Cache node modules
+          yarn --frozen-lockfile
-      #   id: cacheNodeModules
+        name: Install Dependencies
-      #   uses: actions/cache@v2
+      - run: yarn electron x64
-      #   with:
+        name: Download Electron
-      #     path: "**/node_modules"
+      - run: yarn gulp hygiene
-      #     key: ${{ runner.os }}-cacheNodeModules13-${{ steps.nodeModulesCacheKey.outputs.value }}
+        name: Run Hygiene Checks
-      #     restore-keys: ${{ runner.os }}-cacheNodeModules13-
+      - run: yarn strict-vscode # {{SQL CARBON EDIT}} add step
-      # - name: Get yarn cache directory path
+        name: Run Strict Compile Options
-      #   id: yarnCacheDirPath
+      # - run: yarn monaco-compile-check {{SQL CARBON EDIT}} remove step
-      #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+      #   name: Run Monaco Editor Checks
-      #   run: echo "::set-output name=dir::$(yarn cache dir)"
+      - run: yarn valid-layers-check
-      # - name: Cache yarn directory
+        name: Run Valid Layers Checks
-      #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+      - run: yarn compile
-      #   uses: actions/cache@v2
+        name: Compile Sources
-      #   with:
+      # - run: yarn download-builtin-extensions {{SQL CARBON EDIT}} remove step
-      #     path: ${{ steps.yarnCacheDirPath.outputs.dir }}
+      #   name: Download Built-in Extensions
-      #     key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+      - run: DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests" --coverage --runGlob "**/sql/**/*.test.js"
-      #     restore-keys: ${{ runner.os }}-yarnCacheDir-
+        name: Run Unit Tests (Electron)
-      - name: Execute yarn
+      - run: DISPLAY=:10 ./scripts/test-extensions-unit.sh
-        # if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} {{SQL CARBON EDIT}} Skip caching for now
+        name: Run Extension Unit Tests (Electron)
-        env:
+        # {{SQL CARBON EDIT}} Add coveralls. We merge first to get around issue where parallel builds weren't being combined correctly
-          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+      - run: node test/combineCoverage
-          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+        name: Combine code coverage files
-        run: yarn --frozen-lockfile --network-timeout 180000
-
-      - name: Compile and Download
-        run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
-
-      - name: Run Unit Tests (Electron)
-        id: electron-unit-tests
-        run: DISPLAY=:10 ./scripts/test.sh --coverage --runGlob "**/sql/**/*.test.js" # {{SQL CARBON EDIT}} Run only our tests with coverage
-
-      - name: Run Extension Unit Tests (Electron)
-        id: electron-extension-unit-tests
-        run: DISPLAY=:10 ./scripts/test-extensions-unit.sh
-
-      # {{SQL CARBON EDIT}} Add coveralls. We merge first to get around issue where parallel builds weren't being combined correctly
-      - name: Combine code coverage files
-        run: node test/combineCoverage
       - name: Upload Code Coverage
         uses: coverallsapp/github-action@v1.1.1
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path-to-lcov: "test/coverage/lcov.info"
 
-      # - name: Run Unit Tests (Browser) {{SQL CARBON EDIT}} Skip for now
+    # Fails with cryptic error (e.g. https://github.com/microsoft/vscode/pull/90292/checks?check_run_id=433681926#step:13:9)
-      #   id: browser-unit-tests
+    # - run: DISPLAY=:10 yarn test-browser --browser chromium
-      #   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
+  windows:
-      #   id: electron-integration-tests
+    runs-on: windows-2016
-      #   run: DISPLAY=:10 ./scripts/test-integration.sh
-
-  darwin:
-    name: macOS
-    runs-on: macos-latest
-    timeout-minutes: 30
     env:
+      CHILD_CONCURRENCY: "1"
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v2.2.0
-
+      - uses: actions/setup-node@v1
-      - uses: actions/setup-node@v2
         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
+  darwin:
-      # - name: Compute node modules cache key
+    runs-on: macos-latest
-      #   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
-
-      - name: Run Unit Tests (Electron)
-        run: DISPLAY=:10 ./scripts/test.sh
-
-      # - name: Run Unit Tests (Browser) {{SQL CARBON EDIT}} Skip for now
-      #   run: DISPLAY=:10 yarn test-browser --browser chromium
-
-      # - name: Run Integration Tests (Electron) {{SQL CARBON EDIT}} Skip for now
-      #   run: DISPLAY=:10 ./scripts/test-integration.sh
-
-  hygiene:
-    name: Hygiene and Layering
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
     env:
+      CHILD_CONCURRENCY: "1"
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.2.0
-
+      - uses: actions/setup-node@v1
-      - uses: actions/setup-node@v2
         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
+  # monaco:
-        id: nodeModulesCacheKey
+  #   runs-on: ubuntu-latest
-        run: echo "::set-output name=value::$(node build/azure-pipelines/common/sql-computeNodeModulesCacheKey.js)"
+  #   env:
-      - name: Cache node modules
+  #     CHILD_CONCURRENCY: "1"
-        id: cacheNodeModules
+  #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        uses: actions/cache@v2
+  #   steps:
-        with:
+  #   - uses: actions/checkout@v2.2.0
-          path: "**/node_modules"
+  #   # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
-          key: ${{ runner.os }}-cacheNodeModules13-${{ steps.nodeModulesCacheKey.outputs.value }}
+  #   - run: |
-          restore-keys: ${{ runner.os }}-cacheNodeModules13-
+  #       sudo apt-get update
-      - name: Get yarn cache directory path
+  #       sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libgbm1
-        id: yarnCacheDirPath
+  #       sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+  #       sudo chmod +x /etc/init.d/xvfb
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+  #       sudo update-rc.d xvfb defaults
-      - name: Cache yarn directory
+  #       sudo service xvfb start
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+  #     name: Setup Build Environment
-        uses: actions/cache@v2
+  #   - uses: actions/setup-node@v1
-        with:
+  #     with:
-          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
+  #       node-version: 10
-          key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+  #   - run: yarn --frozen-lockfile
-          restore-keys: ${{ runner.os }}-yarnCacheDir-
+  #     name: Install Dependencies
-      - name: Setup Build Environment # {{SQL CARBON EDIT}} Add step to install required packages if we need to run yarn
+  #   - run: yarn monaco-compile-check
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+  #     name: Run Monaco Editor Checks
-        run: |
+  #   - run: yarn gulp editor-esm-bundle
-          sudo apt-get update
+  #     name: Editor Distro & ESM Bundle
-          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: Run Trusted Types Checks
-        run: yarn tsec-compile-check
-
-      # - name: Editor Distro & ESM Bundle {{SQL CARBON EDIT}} Remove Monaco checks
-      #   run: yarn gulp editor-esm-bundle
-
-      # - name: Typings validation prep {{SQL CARBON EDIT}} Remove Monaco checks
-      #   run: |
-      #     mkdir typings-test
-
-      # - name: Typings validation {{SQL CARBON EDIT}} Remove Monaco checks
-      #   working-directory: ./typings-test
-      #   run: |
-      #     yarn init -yp
-      #     ../node_modules/.bin/tsc --init
-      #     echo "import '../out-monaco-editor-core';" > a.ts
-      #     ../node_modules/.bin/tsc --noEmit
-
-      # - name: Webpack Editor {{SQL CARBON EDIT}} Remove Monaco checks
-      #   working-directory: ./test/monaco
-      #   run: yarn run bundle
-
-      # - name: Compile Editor Tests {{SQL CARBON EDIT}} Remove Monaco checks
-      #   working-directory: ./test/monaco
-      #   run: yarn run compile
-
-      # - name: Download Playwright {{SQL CARBON EDIT}} Remove Monaco checks
-      #   run: yarn playwright-install
-
-      # - name: Run Editor Tests {{SQL CARBON EDIT}} Remove Monaco checks
-      #   timeout-minutes: 5
-      #   working-directory: ./test/monaco
-      #   run: yarn test

.github/workflows/codeql.yml

@@ -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}}

.vscode/launch.json

@@ -66,147 +66,10 @@
 			}
 		},
 		{
-			"type": "extensionHost",
+			"type": "chrome",
-			"request": "launch",
-			"name": "VS Code Emmet Tests",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"${workspaceFolder}/extensions/emmet/test-fixtures",
-				"--extensionDevelopmentPath=${workspaceFolder}/extensions/emmet",
-				"--extensionTestsPath=${workspaceFolder}/extensions/emmet/out/test"
-			],
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"group": "5_tests",
-				"order": 6
-			}
-		},
-		{
-			"type": "extensionHost",
-			"request": "launch",
-			"name": "VS Code Git Tests",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"/tmp/my4g9l",
-				"--extensionDevelopmentPath=${workspaceFolder}/extensions/git",
-				"--extensionTestsPath=${workspaceFolder}/extensions/git/out/test"
-			],
-			"outFiles": [
-				"${workspaceFolder}/extensions/git/out/**/*.js"
-			],
-			"presentation": {
-				"group": "5_tests",
-				"order": 6
-			}
-		},
-		{
-			"type": "extensionHost",
-			"request": "launch",
-			"name": "VS Code API Tests (single folder)",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				// "${workspaceFolder}", // Uncomment for running out of sources.
-				"${workspaceFolder}/extensions/vscode-api-tests/testWorkspace",
-				"--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode-api-tests",
-				"--extensionTestsPath=${workspaceFolder}/extensions/vscode-api-tests/out/singlefolder-tests",
-				"--disable-extensions"
-			],
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"group": "5_tests",
-				"order": 3
-			}
-		},
-		{
-			"type": "extensionHost",
-			"request": "launch",
-			"name": "VS Code API Tests (workspace)",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"${workspaceFolder}/extensions/vscode-api-tests/testworkspace.code-workspace",
-				"--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode-api-tests",
-				"--extensionTestsPath=${workspaceFolder}/extensions/vscode-api-tests/out/workspace-tests"
-			],
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"group": "5_tests",
-				"order": 4
-			}
-		},
-		{
-			"type": "extensionHost",
-			"request": "launch",
-			"name": "VS Code Tokenizer Tests",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"${workspaceFolder}/extensions/vscode-colorize-tests/test",
-				"--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode-colorize-tests",
-				"--extensionTestsPath=${workspaceFolder}/extensions/vscode-colorize-tests/out"
-			],
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"group": "5_tests",
-				"order": 5
-			}
-		},
-		{
-			"type": "extensionHost",
-			"request": "launch",
-			"name": "VS Code Notebook Tests",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"${workspaceFolder}/extensions/vscode-notebook-tests/test",
-				"--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode-notebook-tests",
-				"--extensionTestsPath=${workspaceFolder}/extensions/vscode-notebook-tests/out"
-			],
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"group": "5_tests",
-				"order": 6
-			}
-		},
-		{
-			"type": "extensionHost",
-			"request": "launch",
-			"name": "VS Code Custom Editor Tests",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"${workspaceFolder}/extensions/vscode-custom-editor-tests/test-workspace",
-				"--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode-custom-editor-tests",
-				"--extensionTestsPath=${workspaceFolder}/extensions/vscode-custom-editor-tests/out/test"
-			],
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"group": "5_tests",
-				"order": 6
-			}
-		},
-		{
-			"type": "pwa-chrome",
 			"request": "attach",
 			"name": "Attach to azuredatastudio",
-			"browserAttachLocation": "workspace",
+			"port": 9222
-			"port": 9222,
-			"trace": true,
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"resolveSourceMapLocations": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"perScriptSourcemaps": "yes"
 		},
 		{
 			"type": "pwa-chrome",

.vscode/notebooks/api.github-issues

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

.vscode/notebooks/inbox.github-issues

@@ -18,9 +18,9 @@
     "editable": true
   },
   {
-    "kind": 2,
+    "kind": 1,
-    "language": "github-issues",
+    "language": "markdown",
-    "value": "$inbox=repo:microsoft/vscode is:open no:assignee -label:feature-request -label:testplan-item -label:plan-item ",
+    "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:\"April 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"
+    "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

@@ -8,7 +8,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog\n\n// current milestone name\n$milestone=milestone:\"April 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
   },
   {
@@ -21,7 +21,7 @@
     "kind": 2,
     "language": "github-issues",
     "value": "$repos $milestone assignee:@me is:open",
-    "editable": true
+    "editable": false
   },
   {
     "kind": 1,
@@ -81,7 +81,7 @@
     "kind": 2,
     "language": "github-issues",
     "value": "$repos assignee:@me is:open milestone:\"Backlog Candidates\"",
-    "editable": true
+    "editable": false
   },
   {
     "kind": 1,
@@ -111,6 +111,6 @@
     "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",
+	"typescript.tsc.autoDetect": "off"
-	"notebook.experimental.useMarkdownRenderer": true,
-	"testing.autoRun.mode": "rerun",
 }

.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",
+				"reveal": "never"
-				"group": "buildWatchers"
 			},
 			"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",
+				"reveal": "never"
-				"group": "buildWatchers"
 			},
 			"problemMatcher": {
 				"owner": "typescript",
@@ -56,38 +54,10 @@
 			}
 		},
 		{
-			"type": "npm",
+			"label": "Build VS Code",
-			"script": "watch-extension-mediad",
-			"label": "Ext Media - Build",
-			"isBackground": true,
-			"presentation": {
-				"reveal": "never",
-				"group": "buildWatchers"
-			},
-			"problemMatcher": {
-				"owner": "typescript",
-				"applyTo": "closedDocuments",
-				"fileLocation": [
-					"absolute"
-				],
-				"pattern": {
-					"regexp": "Error: ([^(]+)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\): (.*)$",
-					"file": 1,
-					"location": 2,
-					"message": 3
-				},
-				"background": {
-					"beginsPattern": "Starting compilation",
-					"endsPattern": "Finished compilation"
-				}
-			}
-		},
-		{
-			"label": "VS Code - Build",
 			"dependsOn": [
-				"Core - Build",
+				"Build VS Code Core",
-				"Ext - Build",
+				"Build VS Code Extensions"
-				"Ext Media - Build",
 			],
 			"group": {
 				"kind": "build",
@@ -98,42 +68,28 @@
 		{
 			"type": "npm",
 			"script": "kill-watch-clientd",
-			"label": "Kill Core - Build",
+			"label": "Kill Build VS Code Core",
 			"group": "build",
 			"presentation": {
-				"reveal": "never",
+				"reveal": "never"
-				"group": "buildKillers"
 			},
 			"problemMatcher": "$tsc"
 		},
 		{
 			"type": "npm",
 			"script": "kill-watch-extensionsd",
-			"label": "Kill Ext - Build",
+			"label": "Kill Build VS Code Extensions",
 			"group": "build",
 			"presentation": {
-				"reveal": "never",
+				"reveal": "never"
-				"group": "buildKillers"
 			},
 			"problemMatcher": "$tsc"
 		},
 		{
-			"type": "npm",
+			"label": "Kill Build VS Code",
-			"script": "kill-watch-extension-mediad",
-			"label": "Kill Ext Media - Build",
-			"group": "build",
-			"presentation": {
-				"reveal": "never",
-				"group": "buildKillers"
-			},
-			"problemMatcher": "$tsc"
-		},
-		{
-			"label": "Kill VS Code - Build",
 			"dependsOn": [
-				"Kill Core - Build",
+				"Kill Build VS Code Core",
-				"Kill Ext - Build",
+				"Kill Build VS Code Extensions"
-				"Kill Ext Media - Build",
 			],
 			"group": "build",
 			"problemMatcher": []
@@ -155,7 +111,7 @@
 		{
 			"type": "npm",
 			"script": "watch-webd",
-			"label": "Web Ext - Build",
+			"label": "Build Web Extensions",
 			"group": "build",
 			"isBackground": true,
 			"presentation": {
@@ -182,7 +138,7 @@
 		{
 			"type": "npm",
 			"script": "kill-watch-webd",
-			"label": "Kill Web Ext - Build",
+			"label": "Kill Build Web Extensions",
 			"group": "build",
 			"presentation": {
 				"reveal": "never"

.yarnrc

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

CHANGELOG.md

@@ -1,31 +1,5 @@
 # Change Log
 
-## 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
@@ -603,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=2165736
+[win-user]: https://go.microsoft.com/fwlink/?linkid=2160781
-[win-system]: https://go.microsoft.com/fwlink/?linkid=2165737
+[win-system]: https://go.microsoft.com/fwlink/?linkid=2160780
-[win-zip]: https://go.microsoft.com/fwlink/?linkid=2165838
+[win-zip]: https://go.microsoft.com/fwlink/?linkid=2160923
-[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2165942
+[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2160874
-[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2165841
+[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2160782
-[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2165842
+[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2160875
-[linux-deb]: https://go.microsoft.com/fwlink/?linkid=2165738
+[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
@@ -494,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)

build/.cachesalt

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

build/.moduleignore

@@ -104,11 +104,13 @@ kerberos/build/**
 
 # END SQL Modules
 
-nsfw/binding.gyp
+vscode-nsfw/binding.gyp
-nsfw/build/**
+vscode-nsfw/build/**
-nsfw/src/**
+vscode-nsfw/src/**
-nsfw/includes/**
+vscode-nsfw/openpa/**
-!nsfw/build/Release/*.node
+vscode-nsfw/includes/**
+!vscode-nsfw/build/Release/*.node
+!vscode-nsfw/**/*.a
 
 vsda/build/**
 vsda/ci/**

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

@@ -83,7 +83,7 @@ async function main() {
     console.log('Asset:', JSON.stringify(asset, null, '  '));
     const client = new cosmos_1.CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT'], key: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
     const scripts = client.database('builds').container(quality).scripts;
-    await (0, retry_1.retry)(() => scripts.storedProcedure('createAsset').execute('', [commit, asset, true]));
+    await retry_1.retry(() => scripts.storedProcedure('createAsset').execute('', [commit, asset, true]));
 }
 main().then(() => {
     console.log('Asset successfully created');

build/azure-pipelines/common/createBuild.js

@@ -40,7 +40,7 @@ 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 (0, retry_1.retry)(() => scripts.storedProcedure('createBuild').execute('', [Object.assign(Object.assign({}, build), { _partitionKey: '' })]));
+    await retry_1.retry(() => scripts.storedProcedure('createBuild').execute('', [Object.assign(Object.assign({}, build), { _partitionKey: '' })]));
 }
 main().then(() => {
     console.log('Build successfully created');

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

@@ -39,7 +39,7 @@ async function publish(commit, files) {
         .withFilter(new azure.ExponentialRetryPolicyFilter(20));
     await assertContainer(blobService, commit);
     for (const file of files) {
-        const blobName = (0, path_1.basename)(file);
+        const blobName = path_1.basename(file);
         const blobExists = await doesBlobExist(blobService, commit, blobName);
         if (blobExists) {
             console.log(`Blob ${commit}, ${blobName} already exists, not publishing again.`);
@@ -58,7 +58,7 @@ function main() {
     }
     const opts = minimist(process.argv.slice(2));
     const [directory] = opts._;
-    const files = fileNames.map(fileName => (0, path_1.join)(directory, fileName));
+    const files = fileNames.map(fileName => path_1.join(directory, fileName));
     publish(commit, files).catch(err => {
         console.error(err);
         process.exit(1);

build/azure-pipelines/common/releaseBuild.js

@@ -39,7 +39,7 @@ async function main() {
     }
     console.log(`Releasing build ${commit}...`);
     const scripts = client.database('builds').container(quality).scripts;
-    await (0, retry_1.retry)(() => scripts.storedProcedure('releaseBuild').execute('', [commit]));
+    await retry_1.retry(() => scripts.storedProcedure('releaseBuild').execute('', [commit]));
 }
 main().then(() => {
     console.log('Build successfully released');

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

@@ -62,7 +62,7 @@ async function sync(commit, quality) {
             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 (0, retry_1.retry)(() => container.scripts.storedProcedure('setAssetMooncakeUrl')
+            await retry_1.retry(() => container.scripts.storedProcedure('setAssetMooncakeUrl')
                 .execute('', [commit, asset.platform, asset.type, mooncakeUrl]));
             log(`  Done ✔️`);
         }

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,129 +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: vscode-darwin-$(VSCODE_ARCH)
-    displayName: Download $(VSCODE_ARCH) artifact
-
-  - script: |
-      set -e
-      unzip $(Pipeline.Workspace)/vscode-darwin-$(VSCODE_ARCH)/VSCode-darwin-$(VSCODE_ARCH).zip -d $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-      mv $(Pipeline.Workspace)/vscode-darwin-$(VSCODE_ARCH)/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: |
-      set -e
-
-      # 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
-
-      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)" \
-      node build/azure-pipelines/common/createAsset.js \
-        "$ASSET_ID" \
-        archive \
-        "VSCode-$ASSET_ID.zip" \
-        ../VSCode-darwin-$(VSCODE_ARCH).zip
-    displayName: Publish Clients

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,34 +104,19 @@ 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
-      node build/azure-pipelines/mixin
+      export npm_config_arch=$(VSCODE_ARCH)
-    displayName: Mix in quality
+      export npm_config_node_gyp=$(which node-gyp)
-
+      export npm_config_build_from_source=true
-  - script: |
+      export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
-      set -e
+      ls /Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+      yarn electron-rebuild
-        yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
+      # remove once https://github.com/prebuild/prebuild-install/pull/140 is merged and found in keytar
-    displayName: Build client
+      cd ./node_modules/keytar
-    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))
+      node-gyp rebuild
-
+    displayName: Rebuild native modules for ARM64
-  - script: |
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
-      set -e
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-        yarn gulp vscode-reh-darwin-min-ci
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-        yarn gulp vscode-reh-web-darwin-min-ci
-    displayName: Build Server
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
-
-  - script: |
-      set -e
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-        yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
-    displayName: Download Electron and Playwright
-    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - download: current
     artifact: vscode-darwin-x64
@@ -149,17 +130,40 @@ steps:
 
   - script: |
       set -e
-      cp $(Pipeline.Workspace)/vscode-darwin-x64/VSCode-darwin-x64.zip $(agent.builddirectory)/VSCode-darwin-x64.zip
+      node build/azure-pipelines/mixin
-      cp $(Pipeline.Workspace)/vscode-darwin-arm64/VSCode-darwin-arm64.zip $(agent.builddirectory)/VSCode-darwin-arm64.zip
+    displayName: Mix in quality
-      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
+  - script: |
+      set -e
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
+    displayName: Build
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))
+
+  - script: |
+      set -e
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn gulp vscode-reh-darwin-min-ci
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn gulp vscode-reh-web-darwin-min-ci
+    displayName: Build Server
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
+
+  - script: |
+      set -e
+      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'))
 
-  # Setting hardened entitlements is a requirement for:
+  - script: |
-  # * Apple notarization
+      set -e
-  # * Running tests on Big Sur (because Big Sur has additional security precautions)
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
+    displayName: Download Electron and Playwright
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
   - script: |
       set -e
       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,19 +283,91 @@ 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'))
+
   - 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-server.sh
+      VSCODE_ARCH="$(VSCODE_ARCH)" \
-    displayName: Publish Servers
+      ./build/azure-pipelines/darwin/publish.sh
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
+    displayName: Publish
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
     artifact: vscode-darwin-$(VSCODE_ARCH)
-    displayName: Publish client archive
+    displayName: Publish archive
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(Agent.BuildDirectory)/vscode-server-darwin.zip
@@ -308,5 +385,9 @@ steps:
       VSCODE_ARCH="$(VSCODE_ARCH)" \
       yarn gulp upload-vscode-configuration
     displayName: Upload configuration (for Bing settings search)
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
+    continueOnError: true
+
+  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+    displayName: "Component Detection"
     continueOnError: true

build/azure-pipelines/darwin/publish.sh

@@ -1,6 +1,20 @@
 #!/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

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
+- task: AzureKeyVault@1
-    displayName: "Azure Key Vault: Get Secrets"
+  displayName: 'Azure Key Vault: Get Secrets'
-    inputs:
+  inputs:
-      azureSubscription: "vscode-builds-subscription"
+    azureSubscription: 'azuredatastudio-adointegration'
-      KeyVaultName: vscode
+    KeyVaultName: ado-secrets
 
   - script: |
       set -e
 
-      cat << EOF > ~/.netrc
+    cat << EOF > ~/.netrc
-      machine github.com
+    machine github.com
-      login vscode
+    login azuredatastudio
-      password $(github-distro-mixin-password)
+    password $(github-distro-mixin-password)
-      EOF
+    EOF
 
-      git config user.email "vscode@microsoft.com"
+    git config user.email "sqltools@service.microsoft.com"
-      git config user.name "VSCode"
+    git config user.name "AzureDataStudio"
 
-      git remote add distro "https://github.com/$VSCODE_MIXIN_REPO.git"
+    git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
-      git fetch distro
+    git fetch distro
 
-      # Push main branch into oss/main
+    # Push main branch into oss/master
-      git push distro origin/main:refs/heads/oss/main
+    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
+#Download base image ubuntu 16.04
-FROM ubuntu:21.04
+FROM ubuntu:16.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 update
 
-RUN apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 \
+RUN apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus libgtk-3-0
-        libkrb5-dev git apt-transport-https ca-certificates curl gnupg-agent software-properties-common \
-        libnss3 libasound2 make gcc libx11-dev fakeroot rpm libgconf-2-4 libunwind8 g++  python3-dev python3-pip
 
 ADD ./ /opt/ads-server
 

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 checkout origin/electron-11.x.y
-      git merge origin/main
+      git merge origin/master
 
-      # Push main branch into exploration branch
+      # Push master branch into exploration branch
-      git push origin HEAD:electron-12.x.y
+      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
+#Download base image ubuntu 16.04
-FROM ubuntu:18.04
+FROM ubuntu:16.04
 
 # Update Software repository
 RUN apt-get update && apt-get upgrade -y

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'))
@@ -133,3 +132,7 @@ steps:
     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
@@ -275,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/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,7 +48,7 @@ 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)" \

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
@@ -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
@@ -254,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
@@ -271,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
@@ -291,15 +273,6 @@ 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(variables['VSCODE_PUBLISH'], true), eq(parameters.VSCODE_COMPILE_ONLY, false)) }}:
     - stage: Mooncake

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: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  - task: Cache@2
     inputs:
-      key: 'genericNodeModules | $(Agent.OS) | .build/yarnlockhash'
+      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      path: .build/node_modules_cache
+      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      cacheHitVar: NODE_MODULES_RESTORED
+      vstsFeed: "npm-vscode"
-    displayName: Restore node_modules cache
 
   - script: |
       set -e
-      tar -xzf .build/node_modules_cache/cache.tgz
+      export npm_config_arch=$(NPM_ARCH)
-    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
-    displayName: Extract node_modules cache
 
-  - script: |
+      if [ -z "$CC" ] || [ -z "$CXX" ]; then
-      set -e
+        export CC=$(which gcc-5)
-      npx https://aka.ms/enablesecurefeed standAlone
+        export CXX=$(which g++-5)
-    timeoutInMinutes: 5
+      fi
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
-    displayName: Switch to Terrapin packages
 
-  - script: |
+      if [ "$VSCODE_ARCH" == "x64" ]; then
-      set -e
+        export VSCODE_REMOTE_CC=$(which gcc-4.8)
-      sudo apt update -y
+        export VSCODE_REMOTE_CXX=$(which g++-4.8)
-      sudo apt install -y build-essential pkg-config libx11-dev libx11-xcb-dev libxkbfile-dev libsecret-1-dev libnotify-bin
+        export VSCODE_REMOTE_NODE_GYP=$(which node-gyp)
-    displayName: Install build tools
+      fi
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
-  - 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: |
+  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-      set -e
+    inputs:
-      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      mkdir -p .build/node_modules_cache
+      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
+      vstsFeed: "npm-vscode"
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-    displayName: Create node_modules archive
 
   # 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
+      yarn gulp compile-build
-    displayName: Compile & Hygiene
+      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,19 +106,6 @@ 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
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
   - script: |
       set -e
       VERSION=`node -p "require(\"./package.json\").version"`
@@ -137,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/publish-types/publish-types.yml

@@ -9,7 +9,7 @@ pr: none
 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,7 +61,7 @@ steps:
       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:"
+      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."
 

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

@@ -60,7 +60,7 @@ function getNewFileHeader(tag) {
         `/*---------------------------------------------------------------------------------------------`,
         ` *  Copyright (c) Microsoft Corporation. All rights reserved.`,
         ` *  Licensed under the Source EULA.`,
-        ` *  See https://github.com/Microsoft/vscode/blob/main/LICENSE.txt for license information.`,
+        ` *  See https://github.com/Microsoft/vscode/blob/master/LICENSE.txt for license information.`,
         ` *--------------------------------------------------------------------------------------------*/`,
         ``,
         `/**`,

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

@@ -72,7 +72,7 @@ function getNewFileHeader(tag: string) {
 		`/*---------------------------------------------------------------------------------------------`,
 		` *  Copyright (c) Microsoft Corporation. All rights reserved.`,
 		` *  Licensed under the Source EULA.`,
-		` *  See https://github.com/Microsoft/vscode/blob/main/LICENSE.txt for license information.`,
+		` *  See https://github.com/Microsoft/vscode/blob/master/LICENSE.txt for license information.`,
 		` *--------------------------------------------------------------------------------------------*/`,
 		``,
 		`/**`,

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", "azdata", "azurecore", "cms", "dacpac", "data-workspace", "import", "machine-learning", "notebook", "resource-deployment", "schema-compare", "sql-database-projects"]
+      extensionsToUnitTest: ["admin-tool-ext-win", "agent", "azdata", "azurecore", "cms", "dacpac", "import", "schema-compare", "notebook", "resource-deployment", "machine-learning", "sql-database-projects", "data-workspace"]
-  timeoutInMinutes: 90
+  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

@@ -91,6 +91,8 @@ steps:
     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: |

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

@@ -1,29 +0,0 @@
-resources:
-  containers:
-  - container: linux-x64
-    image: sqltoolscontainers.azurecr.io/web-build-image:1
-    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

@@ -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:

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 path = require('path');
-const es = require("event-stream");
+const es = require('event-stream');
-const vfs = require("vinyl-fs");
-const util = require("../lib/util");
-// @ts-ignore
-const deps = require("../lib/dependencies");
 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 })
+const fetch = function (base, maps = `${base}/**/*.map`) {
-        .pipe(es.mapSync((f) => {
+	return vfs.src(maps, { base })
-        f.path = `${f.base}/core/${f.relative}`;
+		.pipe(es.mapSync(f => {
-        return f;
+			f.path = `${f.base}/core/${f.relative}`;
-    }));
+			return f;
-}
+		}));
+};
+
 function main() {
-    const sources = [];
+	const sources = [];
-    // vscode client maps (default)
+
-    if (!base) {
+	// vscode client maps (default)
-        const vs = src('out-vscode-min'); // client source-maps only
+	if (!base) {
-        sources.push(vs);
+		const vs = fetch('out-vscode-min'); // client source-maps only
-        const productionDependencies = deps.getProductionDependencies(root);
+		sources.push(vs);
-        const productionDependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => `./${d}/**/*.map`);
+
-        const nodeModules = vfs.src(productionDependenciesSrc, { base: '.' })
+		const extensionsOut = vfs.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' });
-            .pipe(util.cleanNodeModules(path.join(root, 'build', '.moduleignore')));
+		sources.push(extensionsOut);
-        sources.push(nodeModules);
+	}
-        const extensionsOut = vfs.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' });
+
-        sources.push(extensionsOut);
+	// specific client base/maps
-    }
+	else {
-    // specific client base/maps
+		sources.push(fetch(base, maps));
-    else {
+	}
-        sources.push(src(base, maps));
+
-    }
+	return es.merge(...sources)
-    return es.merge(...sources)
+		.pipe(es.through(function (data) {
-        .pipe(es.through(function (data) {
+			console.log('Uploading Sourcemap', data.relative); // debug
-        console.log('Uploading Sourcemap', data.relative); // debug
+			this.emit('data', data);
-        this.emit('data', data);
+		}))
-    }))
+		.pipe(azure.upload({
-        .pipe(azure.upload({
+			account: process.env.AZURE_STORAGE_ACCOUNT,
-        account: process.env.AZURE_STORAGE_ACCOUNT,
+			key: process.env.AZURE_STORAGE_ACCESS_KEY,
-        key: process.env.AZURE_STORAGE_ACCESS_KEY,
+			container: 'sourcemaps',
-        container: 'sourcemaps',
+			prefix: commit + '/'
-        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,24 +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
-
-#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'))

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: |
+# - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    mkdir -p .build
+#   displayName: Restore Cache - Node Modules
-    node build/azure-pipelines/common/sql-computeNodeModulesCacheKey.js > .build/yarnlockhash
+#   inputs:
-  displayName: Prepare yarn cache key
+#     keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-
+#     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-- task: Cache@2
+#     vstsFeed: 'npm-vscode'
-  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
 
 - 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: |
+# - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    set -e
+#   displayName: Save Cache - Node Modules
-    node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+#   inputs:
-    mkdir -p .build/node_modules_cache
+#     keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
+#     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-  condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+#     vstsFeed: 'npm-vscode'
-  displayName: Create node_modules archive
+#   condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-- script: |
+# - script: |
-    set -e
+#     set -e
-    yarn postinstall
+#     yarn postinstall
-  displayName: Run postinstall scripts
+#   displayName: Run postinstall scripts
-  condition: and(succeeded(), eq(variables['NODE_MODULES_RESTORED'], 'true'))
+#   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,128 +78,24 @@ steps:
 
 - script: |
     set -e
-    yarn sqllint
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-    yarn gulp hygiene
+      yarn gulp vscode-web-min-ci
-    yarn strict-vscode
+  displayName: Build
-    yarn valid-layers-check
-  displayName: Run hygiene, eslint
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
+  # 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
+    AZURE_STORAGE_ACCOUNT="$(sourcemap-storage-account)" \
-    yarn gulp compile-extensions-build
+    AZURE_STORAGE_ACCESS_KEY="$(sourcemap-storage-key)" \
-    yarn gulp minify-vscode
+      node build/azure-pipelines/upload-sourcemaps out-vscode-web-min out-vscode-web-min/vs/workbench/workbench.web.api.js.map
-    yarn gulp vscode-linux-x64-min-ci
+  displayName: Upload sourcemaps (Web)
-    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
-#     AZURE_STORAGE_ACCOUNT="$(sourcemap-storage-account)" \
+#     AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-#     AZURE_STORAGE_ACCESS_KEY="$(sourcemap-storage-key)" \
+#     AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-#       node build/azure-pipelines/upload-sourcemaps
+#     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-#   displayName: Upload sourcemaps
+#     ./build/azure-pipelines/web/publish.sh
-
+#   displayName: Publish
-- 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

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: |
+  - script: |
-      . build/azure-pipelines/win32/exec.ps1
+      npx https://aka.ms/enablesecurefeed standAlone
-      $ErrorActionPreference = "Stop"
-      exec { 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: |
@@ -323,3 +320,7 @@ steps:
     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/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({
+	window = new BrowserWindow({ width: 800, height: 600, webPreferences: { nodeIntegration: true, webviewTag: true, enableWebSQL: false, nativeWindowOpen: true } });
-		width: 800,
-		height: 600,
-		webPreferences: {
-			nodeIntegration: true,
-			contextIsolation: false,
-			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,14 +16,14 @@ 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 x64AppPath = path.join(buildDir, 'vscode-x64', appName);
-    const arm64AppPath = path.join(buildDir, 'VSCode-darwin-arm64', 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);
     const productJsonPath = path.resolve(outAppPath, 'Contents', 'Resources', 'app', 'product.json');
     const infoPlistPath = path.resolve(outAppPath, 'Contents', 'Info.plist');
-    await (0, vscode_universal_1.makeUniversalApp)({
+    await vscode_universal_1.makeUniversalApp({
         x64AppPath,
         arm64AppPath,
         x64AsarPath,
@@ -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 x64AppPath = path.join(buildDir, 'vscode-x64', appName);
-	const arm64AppPath = path.join(buildDir, 'VSCode-darwin-arm64', 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/notebook-markdown-extensions/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/notebook-markdown-extensions/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/notebook-markdown-extensions/notebook-out/**',
 	'!extensions/html-language-features/server/src/modes/typescript/*',
 	'!extensions/*/server/bin/*',
 	'!src/vs/editor/test/node/classification/typescript-test.ts',

build/gulpfile.extensions.js

@@ -8,7 +8,6 @@ require('events').EventEmitter.defaultMaxListeners = 100;
 
 const gulp = require('gulp');
 const path = require('path');
-const child_process = require('child_process');
 const nodeUtil = require('util');
 const es = require('event-stream');
 const filter = require('gulp-filter');
@@ -25,55 +24,17 @@ const ansiColors = require('ansi-colors');
 const ext = require('./lib/extensions');
 
 const extensionsPath = path.join(path.dirname(__dirname), 'extensions');
-
+// {{SQL CARBON EDIT}}
-// {{SQL CARBON EDIT}} - TODO: Import needs to be updated to work with langpacks.
 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',
-// 	'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}`;
 
@@ -205,50 +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
+// Azure Pipelines
-
-// Additional projects to webpack. These typically build code for webviews
-const webpackMediaConfigFiles = [
-	'markdown-language-features/webpack.config.js',
-	'simple-browser/webpack.config.js',
-];
-
-// Additional projects to run esbuild on. These typically build code for webviews
-const esbuildMediaScripts = [
-	'markdown-language-features/esbuild.js',
-	'notebook-markdown-extensions/esbuild.js',
-];
-
-const compileExtensionMediaTask = task.define('compile-extension-media', () => buildExtensionMedia(false));
-gulp.task(compileExtensionMediaTask);
-exports.compileExtensionMediaTask = compileExtensionMediaTask;
-
-const watchExtensionMedia = task.define('watch-extension-media', () => buildExtensionMedia(true));
-gulp.task(watchExtensionMedia);
-exports.watchExtensionMedia = watchExtensionMedia;
-
-const compileExtensionMediaBuildTask = task.define('compile-extension-media-build', () => buildExtensionMedia(false, '.build/extensions'));
-gulp.task(compileExtensionMediaBuildTask);
-
-async function buildExtensionMedia(isWatch, outputRoot) {
-	const webpackConfigLocations = webpackMediaConfigFiles.map(p => {
-		return {
-			configPath: path.join(extensionsPath, p),
-			outputRoot: outputRoot ? path.join(root, outputRoot, path.dirname(p)) : undefined
-		};
-	});
-	return Promise.all([
-		webpackExtensions('webpacking extension media', isWatch, webpackConfigLocations),
-		esbuildExtensions('esbuilding extension media', isWatch, esbuildMediaScripts.map(p => ({
-			script: path.join(extensionsPath, p),
-			outputRoot: outputRoot ? path.join(root, outputRoot, path.dirname(p)) : undefined
-		}))),
-	]);
-}
-
-//#endregion
-
-//#region Azure Pipelines
 
 const cleanExtensionsBuildTask = task.define('clean-extensions-build', util.rimraf('.build/extensions'));
 const compileExtensionsBuildTask = task.define('compile-extensions-build', task.series(
@@ -258,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;
@@ -316,39 +189,23 @@ 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 webpackExtensions('packaging web extension', isWatch, webpackConfigLocations.map(configPath => ({ configPath })));
-}
-
-/**
- * @param {string} taskName
- * @param {boolean} isWatch
- * @param {{ configPath: string, outputRoot?: boolean}} webpackConfigLocations
- */
-async function webpackExtensions(taskName, isWatch, webpackConfigLocations) {
-	const webpack = require('webpack');
 
 	const webpackConfigs = [];
 
-	for (const { configPath, outputRoot } of webpackConfigLocations) {
+	for (const webpackConfigPath of webpackConfigLocations) {
-		const configOrFnOrArray = require(configPath);
+		const configOrFnOrArray = require(webpackConfigPath);
 		function addConfig(configOrFn) {
-			let config;
 			if (typeof configOrFn === 'function') {
-				config = configOrFn({}, {});
+				webpackConfigs.push(configOrFn({}, {}));
-				webpackConfigs.push(config);
 			} else {
-				config = configOrFn;
+				webpackConfigs.push(configOrFn);
 			}
-
-			if (outputRoot) {
-				config.output.path = path.join(outputRoot, path.relative(path.dirname(configPath), config.output.path));
-			}
-
-			webpackConfigs.push(configOrFn);
 		}
 		addConfig(configOrFnOrArray);
 	}
@@ -359,7 +216,7 @@ async function webpackExtensions(taskName, isWatch, webpackConfigLocations) {
 				if (outputPath) {
 					const relativePath = path.relative(extensionsPath, outputPath).replace(/\\/g, '/');
 					const match = relativePath.match(/[^\/]+(\/server|\/client)?/);
-					fancyLog(`Finished ${ansiColors.green(taskName)} ${ansiColors.cyan(match[0])} with ${stats.errors.length} errors.`);
+					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 => {
@@ -397,44 +254,4 @@ async function webpackExtensions(taskName, isWatch, webpackConfigLocations) {
 	});
 }
 
-/**
- * @param {string} taskName
- * @param {boolean} isWatch
- * @param {{ script: string, outputRoot?: string }}} scripts
- */
-async function esbuildExtensions(taskName, isWatch, scripts) {
-	function reporter(/** @type {string} */ stdError, /** @type {string} */script) {
-		const matches = (stdError || '').match(/\> (.+): error: (.+)?/g);
-		fancyLog(`Finished ${ansiColors.green(taskName)} ${script} with ${matches ? matches.length : 0} errors.`);
-		for (const match of matches || []) {
-			fancyLog.error(match);
-		}
-	}
 
-	const tasks = scripts.map(({ script, outputRoot }) => {
-		return new Promise((resolve, reject) => {
-			const args = [script];
-			if (isWatch) {
-				args.push('--watch');
-			}
-			if (outputRoot) {
-				args.push('--outputRoot', outputRoot);
-			}
-			const proc = child_process.execFile(process.argv[0], args, {}, (error, _stdout, stderr) => {
-				if (error) {
-					return reject(error);
-				}
-				reporter(stderr, script);
-				if (stderr) {
-					return reject();
-				}
-				return resolve();
-			});
-
-			proc.stdout.on('data', (data) => {
-				fancyLog(`${ansiColors.green(taskName)}: ${data.toString('utf8')}`);
-			});
-		});
-	});
-	return Promise.all(tasks);
-}

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 rename = require('gulp-rename');
-const { compileBuildTask } = require('./gulpfile.compile');
+const filter = require('gulp-filter');
-const { compileExtensionsBuildTask } = require('./gulpfile.extensions');
-const { vscodeWebEntryPoints, vscodeWebResourceIncludes, createVSCodeWebFileContentMapper } = require('./gulpfile.vscode.web');
 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
+gulp.task('vscode-reh-win32-ia32-min', noop);
-	'out-build/bootstrap.js',
+gulp.task('vscode-reh-win32-x64-min', noop);
-	'out-build/bootstrap-fork.js',
+gulp.task('vscode-reh-darwin-min', noop);
-	'out-build/bootstrap-amd.js',
+gulp.task('vscode-reh-linux-x64-min', noop);
-	'out-build/bootstrap-node.js',
+gulp.task('vscode-reh-linux-armhf-min', noop);
-	'out-build/paths.js',
+gulp.task('vscode-reh-linux-arm64-min', noop);
+gulp.task('vscode-reh-linux-alpine-min', noop);
 
-	// Performance
+gulp.task('vscode-reh-web-win32-ia32-min', noop);
-	'out-build/vs/base/common/performance.js',
+gulp.task('vscode-reh-web-win32-x64-min', noop);
-
+gulp.task('vscode-reh-web-darwin-min', noop);
-	// main entry points
+gulp.task('vscode-reh-web-linux-x64-min', noop);
-	'out-build/vs/server/cli.js',
+gulp.task('vscode-reh-web-linux-alpine-min', noop);
-	'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
-	];
-}
 
 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,7 +10,6 @@ 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');
@@ -116,38 +115,7 @@ gulp.task('package-external-extensions', task.series(
 	})
 ));
 
-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');
-			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
-			});
-		});
-
-		return Promise.all(vsixes);
-	})
-));
-
-
 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,50 +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",
-	"**/azdata.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,
@@ -277,12 +233,10 @@ 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/*', '**/*.wasm'], 'node_modules.asar'));
 
 		let all = es.merge(
@@ -317,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 }));
 
@@ -481,12 +434,11 @@ gulp.task(task.define(
 	)
 ));
 
-// {{SQL CARBON EDIT}} Allow for gulp task to be added to update-english-xlfs.
+gulp.task(task.define(
-const vscodeTranslationsExport = 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';
@@ -497,22 +449,10 @@ const vscodeTranslationsExport = task.define(
 				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 => {
@@ -595,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;
 			}
 
@@ -621,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.ts

@@ -17,7 +17,7 @@ import { Stream } from 'stream';
 
 const mkdirp = require('mkdirp');
 
-export interface IExtensionDefinition {
+interface IExtensionDefinition {
 	name: string;
 	version: string;
 	repo: string;

build/lib/builtInExtensionsCG.js

@@ -1,79 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-const got_1 = require("got");
-const fs = require("fs");
-const path = require("path");
-const url = require("url");
-const ansiColors = require("ansi-colors");
-const root = path.dirname(path.dirname(__dirname));
-const rootCG = path.join(root, 'extensionsCG');
-const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8'));
-const builtInExtensions = productjson.builtInExtensions;
-const webBuiltInExtensions = productjson.webBuiltInExtensions;
-const token = process.env['VSCODE_MIXIN_PASSWORD'] || process.env['GITHUB_TOKEN'] || undefined;
-const contentBasePath = 'raw.githubusercontent.com';
-const contentFileNames = ['package.json', 'package-lock.json', 'yarn.lock'];
-async function downloadExtensionDetails(extension) {
-    var _a, _b, _c;
-    const extensionLabel = `${extension.name}@${extension.version}`;
-    const repository = url.parse(extension.repo).path.substr(1);
-    const repositoryContentBaseUrl = `https://${token ? `${token}@` : ''}${contentBasePath}/${repository}/v${extension.version}`;
-    const promises = [];
-    for (const fileName of contentFileNames) {
-        promises.push(new Promise(resolve => {
-            (0, got_1.default)(`${repositoryContentBaseUrl}/${fileName}`)
-                .then(response => {
-                resolve({ fileName, body: response.rawBody });
-            })
-                .catch(error => {
-                if (error.response.statusCode === 404) {
-                    resolve({ fileName, body: undefined });
-                }
-                else {
-                    resolve({ fileName, body: null });
-                }
-            });
-        }));
-    }
-    console.log(extensionLabel);
-    const results = await Promise.all(promises);
-    for (const result of results) {
-        if (result.body) {
-            const extensionFolder = path.join(rootCG, extension.name);
-            fs.mkdirSync(extensionFolder, { recursive: true });
-            fs.writeFileSync(path.join(extensionFolder, result.fileName), result.body);
-            console.log(`  - ${result.fileName} ${ansiColors.green('✔︎')}`);
-        }
-        else if (result.body === undefined) {
-            console.log(`  - ${result.fileName} ${ansiColors.yellow('⚠️')}`);
-        }
-        else {
-            console.log(`  - ${result.fileName} ${ansiColors.red('🛑')}`);
-        }
-    }
-    // Validation
-    if (!((_a = results.find(r => r.fileName === 'package.json')) === null || _a === void 0 ? void 0 : _a.body)) {
-        // throw new Error(`The "package.json" file could not be found for the built-in extension - ${extensionLabel}`);
-    }
-    if (!((_b = results.find(r => r.fileName === 'package-lock.json')) === null || _b === void 0 ? void 0 : _b.body) &&
-        !((_c = results.find(r => r.fileName === 'yarn.lock')) === null || _c === void 0 ? void 0 : _c.body)) {
-        // throw new Error(`The "package-lock.json"/"yarn.lock" could not be found for the built-in extension - ${extensionLabel}`);
-    }
-}
-async function main() {
-    for (const extension of [...builtInExtensions, ...webBuiltInExtensions]) {
-        await downloadExtensionDetails(extension);
-    }
-}
-main().then(() => {
-    console.log(`Built-in extensions component data downloaded ${ansiColors.green('✔︎')}`);
-    process.exit(0);
-}, err => {
-    console.log(`Built-in extensions component data could not be downloaded ${ansiColors.red('🛑')}`);
-    console.error(err);
-    process.exit(1);
-});

build/lib/builtInExtensionsCG.ts

@@ -1,83 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import got from 'got';
-import * as fs from 'fs';
-import * as path from 'path';
-import * as url from 'url';
-import ansiColors = require('ansi-colors');
-import { IExtensionDefinition } from './builtInExtensions';
-
-const root = path.dirname(path.dirname(__dirname));
-const rootCG = path.join(root, 'extensionsCG');
-const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8'));
-const builtInExtensions = <IExtensionDefinition[]>productjson.builtInExtensions;
-const webBuiltInExtensions = <IExtensionDefinition[]>productjson.webBuiltInExtensions;
-const token = process.env['VSCODE_MIXIN_PASSWORD'] || process.env['GITHUB_TOKEN'] || undefined;
-
-const contentBasePath = 'raw.githubusercontent.com';
-const contentFileNames = ['package.json', 'package-lock.json', 'yarn.lock'];
-
-async function downloadExtensionDetails(extension: IExtensionDefinition): Promise<void> {
-	const extensionLabel = `${extension.name}@${extension.version}`;
-	const repository = url.parse(extension.repo).path!.substr(1);
-	const repositoryContentBaseUrl = `https://${token ? `${token}@` : ''}${contentBasePath}/${repository}/v${extension.version}`;
-
-	const promises = [];
-	for (const fileName of contentFileNames) {
-		promises.push(new Promise<{ fileName: string, body: Buffer | undefined | null }>(resolve => {
-			got(`${repositoryContentBaseUrl}/${fileName}`)
-				.then(response => {
-					resolve({ fileName, body: response.rawBody });
-				})
-				.catch(error => {
-					if (error.response.statusCode === 404) {
-						resolve({ fileName, body: undefined });
-					} else {
-						resolve({ fileName, body: null });
-					}
-				});
-		}));
-	}
-
-	console.log(extensionLabel);
-	const results = await Promise.all(promises);
-	for (const result of results) {
-		if (result.body) {
-			const extensionFolder = path.join(rootCG, extension.name);
-			fs.mkdirSync(extensionFolder, { recursive: true });
-			fs.writeFileSync(path.join(extensionFolder, result.fileName), result.body);
-			console.log(`  - ${result.fileName} ${ansiColors.green('✔︎')}`);
-		} else if (result.body === undefined) {
-			console.log(`  - ${result.fileName} ${ansiColors.yellow('⚠️')}`);
-		} else {
-			console.log(`  - ${result.fileName} ${ansiColors.red('🛑')}`);
-		}
-	}
-
-	// Validation
-	if (!results.find(r => r.fileName === 'package.json')?.body) {
-		// throw new Error(`The "package.json" file could not be found for the built-in extension - ${extensionLabel}`);
-	}
-	if (!results.find(r => r.fileName === 'package-lock.json')?.body &&
-		!results.find(r => r.fileName === 'yarn.lock')?.body) {
-		// throw new Error(`The "package-lock.json"/"yarn.lock" could not be found for the built-in extension - ${extensionLabel}`);
-	}
-}
-
-async function main(): Promise<void> {
-	for (const extension of [...builtInExtensions, ...webBuiltInExtensions]) {
-		await downloadExtensionDetails(extension);
-	}
-}
-
-main().then(() => {
-	console.log(`Built-in extensions component data downloaded ${ansiColors.green('✔︎')}`);
-	process.exit(0);
-}, err => {
-	console.log(`Built-in extensions component data could not be downloaded ${ansiColors.red('🛑')}`);
-	console.error(err);
-	process.exit(1);
-});

build/lib/compilation.js

@@ -17,7 +17,7 @@ const fancyLog = require("fancy-log");
 const ansiColors = require("ansi-colors");
 const os = require("os");
 const watch = require('./watch');
-const reporter = (0, reporter_1.createReporter)();
+const reporter = reporter_1.createReporter();
 function getTypeScriptCompilerOptions(src) {
     const rootDir = path.join(__dirname, `../../${src}`);
     let options = {};

build/lib/electron.js

@@ -28,7 +28,7 @@ exports.config = {
     version: util.getElectronVersion(),
     productAppName: product.nameLong,
     companyName: 'Microsoft Corporation',
-    copyright: 'Copyright (C) 2021 Microsoft. All rights reserved',
+    copyright: 'Copyright (C) 2019 Microsoft. All rights reserved',
     darwinIcon: 'resources/darwin/code.icns',
     darwinBundleIdentifier: product.darwinBundleIdentifier,
     darwinApplicationCategoryType: 'public.app-category.developer-tools',

build/lib/electron.ts

@@ -32,7 +32,7 @@ export const config = {
 	version: util.getElectronVersion(),
 	productAppName: product.nameLong,
 	companyName: 'Microsoft Corporation',
-	copyright: 'Copyright (C) 2021 Microsoft. All rights reserved',
+	copyright: 'Copyright (C) 2019 Microsoft. All rights reserved',
 	darwinIcon: 'resources/darwin/code.icns',
 	darwinBundleIdentifier: product.darwinBundleIdentifier,
 	darwinApplicationCategoryType: 'public.app-category.developer-tools',

build/lib/eslint/code-import-patterns.js

@@ -21,7 +21,7 @@ module.exports = new class {
         const configs = context.options;
         for (const config of configs) {
             if (minimatch(context.getFilename(), config.target)) {
-                return (0, utils_1.createImportRuleListener)((node, value) => this._checkImport(context, config, node, value));
+                return utils_1.createImportRuleListener((node, value) => this._checkImport(context, config, node, value));
             }
         }
         return {};
@@ -29,7 +29,7 @@ module.exports = new class {
     _checkImport(context, config, node, path) {
         // resolve relative paths
         if (path[0] === '.') {
-            path = (0, path_1.join)(context.getFilename(), path);
+            path = path_1.join(context.getFilename(), path);
         }
         let restrictions;
         if (typeof config.restrictions === 'string') {

build/lib/eslint/code-layering.js

@@ -17,7 +17,7 @@ module.exports = new class {
         };
     }
     create(context) {
-        const fileDirname = (0, path_1.dirname)(context.getFilename());
+        const fileDirname = path_1.dirname(context.getFilename());
         const parts = fileDirname.split(/\\|\//);
         const ruleArgs = context.options[0];
         let config;
@@ -39,11 +39,11 @@ module.exports = new class {
             // nothing
             return {};
         }
-        return (0, utils_1.createImportRuleListener)((node, path) => {
+        return utils_1.createImportRuleListener((node, path) => {
             if (path[0] === '.') {
-                path = (0, path_1.join)((0, path_1.dirname)(context.getFilename()), path);
+                path = path_1.join(path_1.dirname(context.getFilename()), path);
             }
-            const parts = (0, path_1.dirname)(path).split(/\\|\//);
+            const parts = path_1.dirname(path).split(/\\|\//);
             for (let i = parts.length - 1; i >= 0; i--) {
                 const part = parts[i];
                 if (config.allowed.has(part)) {

build/lib/eslint/code-no-nls-in-standalone-editor.js

@@ -20,10 +20,10 @@ module.exports = new class NoNlsInStandaloneEditorRule {
             || /vs(\/|\\)editor(\/|\\)editor.api/.test(fileName)
             || /vs(\/|\\)editor(\/|\\)editor.main/.test(fileName)
             || /vs(\/|\\)editor(\/|\\)editor.worker/.test(fileName)) {
-            return (0, utils_1.createImportRuleListener)((node, path) => {
+            return utils_1.createImportRuleListener((node, path) => {
                 // resolve relative paths
                 if (path[0] === '.') {
-                    path = (0, path_1.join)(context.getFilename(), path);
+                    path = path_1.join(context.getFilename(), path);
                 }
                 if (/vs(\/|\\)nls/.test(path)) {
                     context.report({

build/lib/eslint/code-no-standalone-editor.js

@@ -21,10 +21,10 @@ module.exports = new class NoNlsInStandaloneEditorRule {
             // the vs/editor folder is allowed to use the standalone editor
             return {};
         }
-        return (0, utils_1.createImportRuleListener)((node, path) => {
+        return utils_1.createImportRuleListener((node, path) => {
             // resolve relative paths
             if (path[0] === '.') {
-                path = (0, path_1.join)(context.getFilename(), path);
+                path = path_1.join(context.getFilename(), path);
             }
             if (/vs(\/|\\)editor(\/|\\)standalone(\/|\\)/.test(path)
                 || /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(path)

build/lib/eslint/code-translation-remind.js

@@ -15,7 +15,7 @@ module.exports = new (_a = class TranslationRemind {
             };
         }
         create(context) {
-            return (0, utils_1.createImportRuleListener)((node, path) => this._checkImport(context, node, path));
+            return utils_1.createImportRuleListener((node, path) => this._checkImport(context, node, path));
         }
         _checkImport(context, node, path) {
             if (path !== TranslationRemind.NLS_MODULE) {
@@ -31,7 +31,7 @@ module.exports = new (_a = class TranslationRemind {
             let resourceDefined = false;
             let json;
             try {
-                json = (0, fs_1.readFileSync)('./build/lib/i18n.resources.json', 'utf8');
+                json = fs_1.readFileSync('./build/lib/i18n.resources.json', 'utf8');
             }
             catch (e) {
                 console.error('[translation-remind rule]: File with resources to pull from Transifex was not found. Aborting translation resource check for newly defined workbench part/service.');

build/lib/extensions.js

@@ -4,7 +4,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.translatePackageJSON = exports.packageRebuildExtensionsStream = exports.cleanRebuildExtensions = exports.packageExternalExtensionsStream = exports.scanBuiltinExtensions = exports.packageMarketplaceExtensionsStream = exports.packageLocalExtensionsStream = exports.fromMarketplace = exports.fromLocalNormal = exports.fromLocal = void 0;
+exports.translatePackageJSON = exports.packageRebuildExtensionsStream = exports.cleanRebuildExtensions = exports.packageExternalExtensionsStream = exports.scanBuiltinExtensions = exports.packageMarketplaceExtensionsStream = exports.packageLocalExtensionsStream = exports.fromMarketplace = void 0;
 const es = require("event-stream");
 const fs = require("fs");
 const glob = require("glob");
@@ -71,7 +71,6 @@ function fromLocal(extensionPath, forWeb) {
     }
     return input;
 }
-exports.fromLocal = fromLocal;
 function fromLocalWebpack(extensionPath, webpackConfigFileName) {
     const result = es.through();
     const packagedDependencies = [];
@@ -144,7 +143,7 @@ function fromLocalWebpack(extensionPath, webpackConfigFileName) {
         console.error(packagedDependencies);
         result.emit('error', err);
     });
-    return result.pipe((0, stats_1.createStatsStream)(path.basename(extensionPath)));
+    return result.pipe(stats_1.createStatsStream(path.basename(extensionPath)));
 }
 function fromLocalNormal(extensionPath) {
     const result = es.through();
@@ -162,9 +161,8 @@ function fromLocalNormal(extensionPath) {
         es.readArray(files).pipe(result);
     })
         .catch(err => result.emit('error', err));
-    return result.pipe((0, stats_1.createStatsStream)(path.basename(extensionPath)));
+    return result.pipe(stats_1.createStatsStream(path.basename(extensionPath)));
 }
-exports.fromLocalNormal = fromLocalNormal;
 const baseHeaders = {
     'X-Market-Client-Id': 'VSCode Build',
     'User-Agent': 'VSCode Build',
@@ -214,10 +212,8 @@ const externalExtensions = [
     'agent',
     'arc',
     'asde-deployment',
-    'azcli',
     'azdata',
     'azurehybridtoolkit',
-    'azuremonitor',
     'cms',
     'dacpac',
     'import',

build/lib/extensions.ts

@@ -54,7 +54,7 @@ function updateExtensionPackageJSON(input: Stream, update: (data: any) => any):
 		.pipe(packageJsonFilter.restore);
 }
 
-export function fromLocal(extensionPath: string, forWeb: boolean): Stream { // {{SQL CARBON EDIT}} - Needed in locFunc
+function fromLocal(extensionPath: string, forWeb: boolean): Stream {
 	const webpackConfigFileName = forWeb ? 'extension-browser.webpack.config.js' : 'extension.webpack.config.js';
 
 	const isWebPacked = fs.existsSync(path.join(extensionPath, webpackConfigFileName));
@@ -171,7 +171,7 @@ function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string):
 	return result.pipe(createStatsStream(path.basename(extensionPath)));
 }
 
-export function fromLocalNormal(extensionPath: string): Stream { // {{SQL CARBON EDIT}} - Needed in locFunc
+function fromLocalNormal(extensionPath: string): Stream {
 	const result = es.through();
 
 	const vsce = require('vsce') as typeof import('vsce');
@@ -249,10 +249,8 @@ const externalExtensions = [
 	'agent',
 	'arc',
 	'asde-deployment',
-	'azcli',
 	'azdata',
 	'azurehybridtoolkit',
-	'azuremonitor',
 	'cms',
 	'dacpac',
 	'import',

build/lib/i18n.js

@@ -4,7 +4,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareIslFiles = exports.prepareI18nPackFiles = exports.pullI18nPackFiles = exports.i18nPackVersion = exports.createI18nFile = exports.prepareI18nFiles = exports.pullSetupXlfFiles = exports.pullCoreAndExtensionsXlfFiles = exports.findObsoleteResources = exports.pushXlfFiles = exports.createXlfFilesForIsl = exports.createXlfFilesForExtensions = exports.createXlfFilesForCoreBundle = exports.getResource = exports.processNlsFiles = exports.Limiter = exports.XLF = exports.Line = exports.externalExtensionsWithTranslations = exports.extraLanguages = exports.defaultLanguages = void 0;
+exports.prepareIslFiles = exports.prepareI18nPackFiles = exports.pullI18nPackFiles = exports.prepareI18nFiles = exports.pullSetupXlfFiles = exports.pullCoreAndExtensionsXlfFiles = exports.findObsoleteResources = exports.pushXlfFiles = exports.createXlfFilesForIsl = exports.createXlfFilesForExtensions = exports.createXlfFilesForCoreBundle = exports.getResource = exports.processNlsFiles = exports.Limiter = exports.XLF = exports.Line = exports.externalExtensionsWithTranslations = exports.extraLanguages = exports.defaultLanguages = void 0;
 const path = require("path");
 const fs = require("fs");
 const event_stream_1 = require("event-stream");
@@ -237,14 +237,14 @@ XLF.parse = function (xlfString) {
                         }
                         let val = unit.target[0];
                         if (typeof val !== 'string') {
-                            // We allow empty source values so support them for translations as well.
+                            val = val._;
-                            val = val._ ? val._ : '';
                         }
-                        if (!key) {
+                        if (key && val) {
-                            reject(new Error(`XLF parsing error: trans-unit ${JSON.stringify(unit, undefined, 0)} defined in file ${originalFilePath} is missing the ID attribute.`));
+                            messages[key] = decodeEntities(val);
-                            return;
+                        }
+                        else {
+                            reject(new Error(`XLF parsing error: XLIFF file ${originalFilePath} does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present.`));
                         }
-                        messages[key] = decodeEntities(val);
                     });
                     files.push({ messages: messages, originalFilePath: originalFilePath, language: language.toLowerCase() });
                 }
@@ -463,7 +463,7 @@ function processCoreBundleFormat(fileHeader, languages, json, emitter) {
     });
 }
 function processNlsFiles(opts) {
-    return (0, event_stream_1.through)(function (file) {
+    return event_stream_1.through(function (file) {
         let fileName = path.basename(file.path);
         if (fileName === 'nls.metadata.json') {
             let json = null;
@@ -484,7 +484,7 @@ function processNlsFiles(opts) {
 exports.processNlsFiles = processNlsFiles;
 const editorProject = 'vscode-editor', workbenchProject = 'vscode-workbench', extensionsProject = 'vscode-extensions', setupProject = 'vscode-setup';
 // {{SQL CARBON EDIT}}
-const adsProject = 'ads-core';
+const sqlopsProject = 'sqlops-core';
 function getResource(sourceFile) {
     let resource;
     if (/^vs\/platform/.test(sourceFile)) {
@@ -515,13 +515,13 @@ function getResource(sourceFile) {
     }
     // {{SQL CARBON EDIT}}
     else if (/^sql/.test(sourceFile)) {
-        return { name: 'sql', project: adsProject };
+        return { name: 'sql', project: sqlopsProject };
     }
     throw new Error(`Could not identify the XLF bundle for ${sourceFile}`);
 }
 exports.getResource = getResource;
 function createXlfFilesForCoreBundle() {
-    return (0, event_stream_1.through)(function (file) {
+    return event_stream_1.through(function (file) {
         const basename = path.basename(file.path);
         if (basename === 'nls.metadata.json') {
             if (file.isBuffer()) {
@@ -572,7 +572,7 @@ function createXlfFilesForExtensions() {
     let counter = 0;
     let folderStreamEnded = false;
     let folderStreamEndEmitted = false;
-    return (0, event_stream_1.through)(function (extensionFolder) {
+    return event_stream_1.through(function (extensionFolder) {
         const folderStream = this;
         const stat = fs.statSync(extensionFolder.path);
         if (!stat.isDirectory()) {
@@ -590,7 +590,7 @@ function createXlfFilesForExtensions() {
             }
             return _xlf;
         }
-        gulp.src([`.build/extensions/${extensionName}/package.nls.json`, `.build/extensions/${extensionName}/**/nls.metadata.json`], { allowEmpty: true }).pipe((0, event_stream_1.through)(function (file) {
+        gulp.src([`.build/extensions/${extensionName}/package.nls.json`, `.build/extensions/${extensionName}/**/nls.metadata.json`], { allowEmpty: true }).pipe(event_stream_1.through(function (file) {
             if (file.isBuffer()) {
                 const buffer = file.contents;
                 const basename = path.basename(file.path);
@@ -649,7 +649,7 @@ function createXlfFilesForExtensions() {
 }
 exports.createXlfFilesForExtensions = createXlfFilesForExtensions;
 function createXlfFilesForIsl() {
-    return (0, event_stream_1.through)(function (file) {
+    return event_stream_1.through(function (file) {
         let projectName, resourceFile;
         if (path.basename(file.path) === 'Default.isl') {
             projectName = setupProject;
@@ -703,7 +703,7 @@ exports.createXlfFilesForIsl = createXlfFilesForIsl;
 function pushXlfFiles(apiHostname, username, password) {
     let tryGetPromises = [];
     let updateCreatePromises = [];
-    return (0, event_stream_1.through)(function (file) {
+    return event_stream_1.through(function (file) {
         const project = path.dirname(file.relative);
         const fileName = path.basename(file.path);
         const slug = fileName.substr(0, fileName.length - '.xlf'.length);
@@ -765,7 +765,7 @@ function getAllResources(project, apiHostname, username, password) {
 function findObsoleteResources(apiHostname, username, password) {
     let resourcesByProject = Object.create(null);
     resourcesByProject[extensionsProject] = [].concat(exports.externalExtensionsWithTranslations); // clone
-    return (0, event_stream_1.through)(function (file) {
+    return event_stream_1.through(function (file) {
         const project = path.dirname(file.relative);
         const fileName = path.basename(file.path);
         const slug = fileName.substr(0, fileName.length - '.xlf'.length);
@@ -942,7 +942,7 @@ function pullXlfFiles(apiHostname, username, password, language, resources) {
     const credentials = `${username}:${password}`;
     let expectedTranslationsCount = resources.length;
     let translationsRetrieved = 0, called = false;
-    return (0, event_stream_1.readable)(function (_count, callback) {
+    return event_stream_1.readable(function (_count, callback) {
         // Mark end of stream when all resources were retrieved
         if (translationsRetrieved === expectedTranslationsCount) {
             return this.emit('end');
@@ -1000,7 +1000,7 @@ function retrieveResource(language, resource, apiHostname, credentials) {
 }
 function prepareI18nFiles() {
     let parsePromises = [];
-    return (0, event_stream_1.through)(function (xlf) {
+    return event_stream_1.through(function (xlf) {
         let stream = this;
         let parsePromise = XLF.parse(xlf.contents.toString());
         parsePromises.push(parsePromise);
@@ -1038,8 +1038,7 @@ function createI18nFile(originalFilePath, messages) {
         contents: Buffer.from(content, 'utf8')
     });
 }
-exports.createI18nFile = createI18nFile;
+const i18nPackVersion = '1.0.0';
-exports.i18nPackVersion = '1.0.0'; // {{SQL CARBON EDIT}} Needed in locfunc.
 function pullI18nPackFiles(apiHostname, username, password, language, resultingTranslationPaths) {
     return pullCoreAndExtensionsXlfFiles(apiHostname, username, password, language, exports.externalExtensionsWithTranslations)
         .pipe(prepareI18nPackFiles(exports.externalExtensionsWithTranslations, resultingTranslationPaths, language.id === 'ps'));
@@ -1047,10 +1046,10 @@ function pullI18nPackFiles(apiHostname, username, password, language, resultingT
 exports.pullI18nPackFiles = pullI18nPackFiles;
 function prepareI18nPackFiles(externalExtensions, resultingTranslationPaths, pseudo = false) {
     let parsePromises = [];
-    let mainPack = { version: exports.i18nPackVersion, contents: {} };
+    let mainPack = { version: i18nPackVersion, contents: {} };
     let extensionsPacks = {};
     let errors = [];
-    return (0, event_stream_1.through)(function (xlf) {
+    return event_stream_1.through(function (xlf) {
         let project = path.basename(path.dirname(xlf.relative));
         let resource = path.basename(xlf.relative, '.xlf');
         let contents = xlf.contents.toString();
@@ -1063,7 +1062,7 @@ function prepareI18nPackFiles(externalExtensions, resultingTranslationPaths, pse
                 if (project === extensionsProject) {
                     let extPack = extensionsPacks[resource];
                     if (!extPack) {
-                        extPack = extensionsPacks[resource] = { version: exports.i18nPackVersion, contents: {} };
+                        extPack = extensionsPacks[resource] = { version: i18nPackVersion, contents: {} };
                     }
                     const externalId = externalExtensions[resource];
                     if (!externalId) { // internal extension: remove 'extensions/extensionId/' segnent
@@ -1111,7 +1110,7 @@ function prepareI18nPackFiles(externalExtensions, resultingTranslationPaths, pse
 exports.prepareI18nPackFiles = prepareI18nPackFiles;
 function prepareIslFiles(language, innoSetupConfig) {
     let parsePromises = [];
-    return (0, event_stream_1.through)(function (xlf) {
+    return event_stream_1.through(function (xlf) {
         let stream = this;
         let parsePromise = XLF.parse(xlf.contents.toString());
         parsePromises.push(parsePromise);

build/lib/i18n.resources.json

@@ -30,6 +30,10 @@
 			"name": "vs/workbench/api/common",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/backup",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/bulkEdit",
 			"project": "vscode-workbench"
@@ -214,10 +218,6 @@
 			"name": "vs/workbench/contrib/webviewPanel",
 			"project": "vscode-workbench"
 		},
-		{
-			"name": "vs/workbench/contrib/workspace",
-			"project": "vscode-workbench"
-		},
 		{
 			"name": "vs/workbench/contrib/workspaces",
 			"project": "vscode-workbench"
@@ -254,10 +254,6 @@
 			"name": "vs/workbench/services/authToken",
 			"project": "vscode-workbench"
 		},
-		{
-			"name": "vs/workbench/services/backup",
-			"project": "vscode-workbench"
-		},
 		{
 			"name": "vs/workbench/services/bulkEdit",
 			"project": "vscode-workbench"
@@ -298,10 +294,6 @@
 			"name": "vs/workbench/services/files",
 			"project": "vscode-workbench"
 		},
-		{
-			"name": "vs/workbench/services/history",
-			"project": "vscode-workbench"
-		},
 		{
 			"name": "vs/workbench/services/log",
 			"project": "vscode-workbench"
@@ -397,10 +389,6 @@
 		{
 			"name": "vs/workbench/services/gettingStarted",
 			"project": "vscode-workbench"
-		},
-		{
-			"name": "vs/workbench/services/host",
-			"project": "vscode-workbench"
 		}
 	]
 }

build/lib/i18n.ts

@@ -64,7 +64,7 @@ export const externalExtensionsWithTranslations = {
 };
 
 
-export interface Map<V> {	// {{SQL CARBON EDIT}} Needed in locfunc.
+interface Map<V> {
 	[key: string]: V;
 }
 
@@ -79,7 +79,7 @@ export interface Resource {
 	project: string;
 }
 
-export interface ParsedXLF {	// {{SQL CARBON EDIT}} Needed in locfunc.
+interface ParsedXLF {
 	messages: Map<string>;
 	originalFilePath: string;
 	language: string;
@@ -339,14 +339,13 @@ export class XLF {
 
 							let val = unit.target[0];
 							if (typeof val !== 'string') {
-								// We allow empty source values so support them for translations as well.
+								val = val._;
-								val = val._ ? val._ : '';
 							}
-							if (!key) {
+							if (key && val) {
-								reject(new Error(`XLF parsing error: trans-unit ${JSON.stringify(unit, undefined, 0)} defined in file ${originalFilePath} is missing the ID attribute.`));
+								messages[key] = decodeEntities(val);
-								return;
+							} else {
+								reject(new Error(`XLF parsing error: XLIFF file ${originalFilePath} does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present.`));
 							}
-							messages[key] = decodeEntities(val);
 						});
 						files.push({ messages: messages, originalFilePath: originalFilePath, language: language.toLowerCase() });
 					}
@@ -611,7 +610,7 @@ const editorProject: string = 'vscode-editor',
 	setupProject: string = 'vscode-setup';
 
 // {{SQL CARBON EDIT}}
-const adsProject: string = 'ads-core';
+const sqlopsProject: string = 'sqlops-core';
 
 export function getResource(sourceFile: string): Resource {
 	let resource: string;
@@ -638,7 +637,7 @@ export function getResource(sourceFile: string): Resource {
 
 	// {{SQL CARBON EDIT}}
 	else if (/^sql/.test(sourceFile)) {
-		return { name: 'sql', project: adsProject };
+		return { name: 'sql', project: sqlopsProject };
 	}
 
 	throw new Error(`Could not identify the XLF bundle for ${sourceFile}`);
@@ -1167,7 +1166,7 @@ export function prepareI18nFiles(): ThroughStream {
 	});
 }
 
-export function createI18nFile(originalFilePath: string, messages: any): File { // {{SQL CARBON EDIT}} Needed for locfunc.
+function createI18nFile(originalFilePath: string, messages: any): File {
 	let result = Object.create(null);
 	result[''] = [
 		'--------------------------------------------------------------------------------------------',
@@ -1190,14 +1189,14 @@ export function createI18nFile(originalFilePath: string, messages: any): File {
 	});
 }
 
-export interface I18nPack {	// {{SQL CARBON EDIT}} Needed in locfunc.
+interface I18nPack {
 	version: string;
 	contents: {
 		[path: string]: Map<string>;
 	};
 }
 
-export const i18nPackVersion = '1.0.0'; // {{SQL CARBON EDIT}} Needed in locfunc.
+const i18nPackVersion = '1.0.0';
 
 export interface TranslationPath {
 	id: string;

build/lib/layersChecker.js

@@ -56,9 +56,7 @@ const CORE_TYPES = [
 const NATIVE_TYPES = [
     'NativeParsedArgs',
     'INativeEnvironmentService',
-    'AbstractNativeEnvironmentService',
+    'INativeWindowConfiguration'
-    'INativeWindowConfiguration',
-    'ICommonNativeHostService'
 ];
 const RULES = [
     // Tests: skip
@@ -81,9 +79,19 @@ const RULES = [
             '@types/node' // no node.js
         ]
     },
-    // Common: vs/platform/environment/common/*
+    // Common: vs/platform/environment/common/argv.ts
     {
-        target: '**/{vs,sql}/platform/environment/common/*.ts',
+        target: '**/{vs,sql}/platform/environment/common/argv.ts',
+        disallowedTypes: [ /* Ignore native types that are defined from here */],
+        allowedTypes: CORE_TYPES,
+        disallowedDefinitions: [
+            'lib.dom.d.ts',
+            '@types/node' // no node.js
+        ]
+    },
+    // Common: vs/platform/environment/common/environment.ts
+    {
+        target: '**/{vs,sql}/platform/environment/common/environment.ts',
         disallowedTypes: [ /* Ignore native types that are defined from here */],
         allowedTypes: CORE_TYPES,
         disallowedDefinitions: [
@@ -101,16 +109,6 @@ const RULES = [
             '@types/node' // no node.js
         ]
     },
-    // Common: vs/platform/native/common/native.ts
-    {
-        target: '**/vs/platform/native/common/native.ts',
-        disallowedTypes: [ /* Ignore native types that are defined from here */],
-        allowedTypes: CORE_TYPES,
-        disallowedDefinitions: [
-            'lib.dom.d.ts',
-            '@types/node' // no node.js
-        ]
-    },
     // Common: vs/workbench/api/common/extHostExtensionService.ts
     {
         target: '**/{vs,sql}/workbench/api/common/extHostExtensionService.ts',
@@ -199,7 +197,7 @@ const RULES = [
         ]
     }
 ];
-const TS_CONFIG_PATH = (0, path_1.join)(__dirname, '../../', 'src', 'tsconfig.json');
+const TS_CONFIG_PATH = path_1.join(__dirname, '../../', 'src', 'tsconfig.json');
 let hasErrors = false;
 function checkFile(program, sourceFile, rule) {
     checkNode(sourceFile);
@@ -250,8 +248,8 @@ function checkFile(program, sourceFile, rule) {
 }
 function createProgram(tsconfigPath) {
     const tsConfig = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
-    const configHostParser = { fileExists: fs_1.existsSync, readDirectory: ts.sys.readDirectory, readFile: file => (0, fs_1.readFileSync)(file, 'utf8'), useCaseSensitiveFileNames: process.platform === 'linux' };
+    const configHostParser = { fileExists: fs_1.existsSync, readDirectory: ts.sys.readDirectory, readFile: file => fs_1.readFileSync(file, 'utf8'), useCaseSensitiveFileNames: process.platform === 'linux' };
-    const tsConfigParsed = ts.parseJsonConfigFileContent(tsConfig.config, configHostParser, (0, path_1.resolve)((0, path_1.dirname)(tsconfigPath)), { noEmit: true });
+    const tsConfigParsed = ts.parseJsonConfigFileContent(tsConfig.config, configHostParser, path_1.resolve(path_1.dirname(tsconfigPath)), { noEmit: true });
     const compilerHost = ts.createCompilerHost(tsConfigParsed.options, true);
     return ts.createProgram(tsConfigParsed.fileNames, tsConfigParsed.options, compilerHost);
 }
@@ -261,7 +259,7 @@ function createProgram(tsconfigPath) {
 const program = createProgram(TS_CONFIG_PATH);
 for (const sourceFile of program.getSourceFiles()) {
     for (const rule of RULES) {
-        if ((0, minimatch_1.match)([sourceFile.fileName], rule.target).length > 0) {
+        if (minimatch_1.match([sourceFile.fileName], rule.target).length > 0) {
             if (!rule.skip) {
                 checkFile(program, sourceFile, rule);
             }