Revert "Merge from vscode merge-base (#22769)" (#22779)

This reverts commit 6bd0a17d3c.

.eslintrc.json

@@ -770,7 +770,6 @@
 					"chart.js",
 					"plotly.js",
 					"angular2-grid",
-					"kburtram-query-plan",
 					"html-to-image",
 					"turndown",
 					"gridstack",
@@ -1147,7 +1146,6 @@
 				"extensions/azuremonitor/src/prompts/**",
 				"extensions/azuremonitor/src/typings/findRemove.d.ts",
 				"extensions/kusto/src/prompts/**",
-				"extensions/mssql/src/hdfs/webhdfs.ts",
 				"extensions/mssql/src/prompts/**",
 				"extensions/mssql/src/typings/bufferStreamReader.d.ts",
 				"extensions/mssql/src/typings/findRemove.d.ts",

.github/pull_request_template.md

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

.github/workflows/bad-tag.yml

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

.github/workflows/basic.yml

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

.github/workflows/ci.yml

@@ -1,29 +1,27 @@
 name: CI
 
-on: workflow_dispatch
+on:
-
+  push:
-# on:
+    branches:
-#   push:
+      - main
-#     branches:
+      - release/*
-#       - main
+  pull_request:
-#       - release/*
+    branches:
-#   pull_request:
+      - main
-#     branches:
+      - release/*
-#       - main
-#       - release/*
 
 jobs:
   windows:
     name: Windows
-    runs-on: windows-2022
+    runs-on: windows-2019
-    timeout-minutes: 60
+    timeout-minutes: 30
     env:
       CHILD_CONCURRENCY: "1"
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v2
         with:
           node-version: 16
 
@@ -250,8 +248,8 @@ jobs:
         uses: actions/cache@v2
         with:
           path: "**/node_modules"
-          key: ${{ runner.os }}-cacheNodeModules23-${{ steps.nodeModulesCacheKey.outputs.value }}
+          key: ${{ runner.os }}-cacheNodeModules14-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-cacheNodeModules23-
+          restore-keys: ${{ runner.os }}-cacheNodeModules14-
       - name: Get yarn cache directory path
         id: yarnCacheDirPath
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -275,98 +273,24 @@ jobs:
           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: Compile Integration Tests
-        run: yarn --cwd test/integration/browser compile
-
-      # This is required for keytar unittests, otherwise we hit
-      # https://github.com/atom/node-keytar/issues/76
-      - name: Create temporary keychain
-        run: |
-          security create-keychain -p pwd $RUNNER_TEMP/buildagent.keychain
-          security default-keychain -s $RUNNER_TEMP/buildagent.keychain
-          security unlock-keychain -p pwd $RUNNER_TEMP/buildagent.keychain
-
-      - name: Run Unit Tests (Electron)
-        run: DISPLAY=:10 ./scripts/test.sh
-
-      - name: Run Unit Tests (node.js)
-        run: yarn test-node
-
-      - name: Run Unit Tests (Browser, Chromium)
-        run: DISPLAY=:10 yarn test-browser-no-install --browser chromium
-
-      - name: Run Integration Tests (Electron)
-        run: DISPLAY=:10 ./scripts/test-integration.sh
-
-      - name: Run Integration Tests (Browser, Webkit)
-        run: DISPLAY=:10 ./scripts/test-web-integration.sh --browser webkit
-
-      - name: Run Integration Tests (Remote)
-        timeout-minutes: 15
-        run: DISPLAY=:10 ./scripts/test-remote-integration.sh
-
-  hygiene:
-    name: Hygiene and Layering
-    runs-on: ubuntu-latest
-    timeout-minutes: 40
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-
-      - name: Compute node modules cache key
-        id: nodeModulesCacheKey
-        run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
-      - name: Cache node modules
-        id: cacheNodeModules
-        uses: actions/cache@v2
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-cacheNodeModules23-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-cacheNodeModules23-
-      - name: Get yarn cache directory path
-        id: yarnCacheDirPath
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Cache yarn directory
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        uses: actions/cache@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: Download Playwright
-        run: yarn playwright-install
-
       - name: Run Hygiene Checks
         run: yarn gulp hygiene
 
       - name: Run Valid Layers Checks
         run: yarn valid-layers-check
 
+      # - name: Run Monaco Editor Checks {{SQL CARBON EDIT}} Remove Monaco checks
+      #   run: yarn monaco-compile-check
+
       - name: Compile /build/
         run: yarn --cwd build compile
 
-      - name: Check clean git state
-        run: ./.github/workflows/check-clean-git-state.sh
-
       - name: Run eslint
         run: yarn eslint
 
+      # {{SQL CARBON EDIT}} Don't need this
+      # - name: Run Monaco Editor Checks
+      #   run: yarn monaco-compile-check
 
       # {{SQL CARBON EDIT}} Don't need this
       # - name: Run vscode-dts Compile Checks

.github/workflows/pr-chat.yml

@@ -1,26 +0,0 @@
-name: PR Chat
-on:
-  pull_request_target:
-    types: [opened, ready_for_review, closed]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    if: ${{ !github.event.pull_request.draft }}
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v2
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Run Code Review Chat
-        uses: ./actions/code-review-chat
-        with:
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          slack_token: ${{ secrets.SLACK_TOKEN }}
-          slack_user_token: ${{ secrets.SLACK_USER_TOKEN }}
-          slack_bot_name: "VSCodeBot"
-          notification_channel: codereview

.nvmrc

@@ -1 +0,0 @@
-16.14

.vscode/extensions.json

@@ -4,6 +4,6 @@
 	"recommendations": [
 		"dbaeumer.vscode-eslint",
 		"EditorConfig.EditorConfig",
-		"ms-vscode.vscode-selfhost-test-provider"
+		"redhat.vscode-yaml"
 	]
 }

.vscode/launch.json

@@ -13,182 +13,14 @@
 		},	
 		{
 			"type": "node",
-			"timeout": 0,
-			"port": 5870,
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js",
-				"${workspaceFolder}/extensions/*/out/**/*.js"
-			]
-		},
-		{
-			"type": "pwa-chrome",
-			"request": "attach",
-			"name": "Attach to Shared Process",
-			"timeout": 30000,
-			"port": 9222,
-			"urlFilter": "*sharedProcess.html*",
-			"presentation": {
-				"hidden": true
-			}
-		},
-		{
-			"type": "node",
-			"request": "attach",
-			"name": "Attach to Search Process",
-			"port": 5876,
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			]
-		},
-		{
-			"type": "node",
-			"request": "attach",
-			"name": "Attach to Pty Host Process",
-			"port": 5877,
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			]
-		},
-		{
-			"type": "node",
-			"request": "attach",
-			"name": "Attach to CLI Process",
-			"port": 5874,
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			]
-		},
-		{
-			"type": "node",
-			"request": "attach",
-			"name": "Attach to Main Process",
-			"timeout": 30000,
-			"port": 5875,
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"hidden": true,
-			}
-		},
-		{
-			"type": "extensionHost",
 			"request": "launch",
-			"name": "VS Code Emmet Tests",
+			"name": "Launch Azure Data Studio",
-			"runtimeExecutable": "${execPath}",
+			"runtimeExecutable": "${workspaceFolder}/scripts/sql.sh",
-			"args": [
+			"windows": {
-				"${workspaceFolder}/extensions/emmet/test-workspace",
+				"runtimeExecutable": "${workspaceFolder}/scripts/sql.bat",
-				"--extensionDevelopmentPath=${workspaceFolder}/extensions/emmet",
+			},
-				"--extensionTestsPath=${workspaceFolder}/extensions/emmet/out/test"
+			"runtimeArgs": [
-			],
+				"--no-cached-data"
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"group": "5_tests",
-				"order": 6
-			}
-		},
-		{
-			"type": "extensionHost",
-			"request": "launch",
-			"name": "VS Code Configuration Editing Tests",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"--extensionDevelopmentPath=${workspaceFolder}/extensions/configuration-editing",
-				"--extensionTestsPath=${workspaceFolder}/extensions/configuration-editing/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 Github Tests",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"${workspaceFolder}/extensions/github/testWorkspace",
-				"--extensionDevelopmentPath=${workspaceFolder}/extensions/github",
-				"--extensionTestsPath=${workspaceFolder}/extensions/github/out/test"
-			],
-			"outFiles": [
-				"${workspaceFolder}/extensions/github/out/**/*.js"
-			],
-			"presentation": {
-				"group": "5_tests",
-				"order": 6
-			}
-		},
-		{
-			"type": "extensionHost",
-			"request": "launch",
-			"name": "VS Code API Tests (single folder)",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				// "${workspaceFolder}", // Uncomment for running out of sources.
-				"${workspaceFolder}/extensions/vscode-api-tests/testWorkspace",
-				"--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode-api-tests",
-				"--extensionTestsPath=${workspaceFolder}/extensions/vscode-api-tests/out/singlefolder-tests",
-				"--disable-extensions"
-			],
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"group": "5_tests",
-				"order": 3
-			}
-		},
-		{
-			"type": "extensionHost",
-			"request": "launch",
-			"name": "VS Code API Tests (workspace)",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"${workspaceFolder}/extensions/vscode-api-tests/testworkspace.code-workspace",
-				"--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode-api-tests",
-				"--extensionTestsPath=${workspaceFolder}/extensions/vscode-api-tests/out/workspace-tests"
-			],
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"group": "5_tests",
-				"order": 4
-			}
-		},
-		{
-			"type": "extensionHost",
-			"request": "launch",
-			"name": "VS Code Tokenizer Tests",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"${workspaceFolder}/extensions/vscode-colorize-tests/test",
-				"--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode-colorize-tests",
-				"--extensionTestsPath=${workspaceFolder}/extensions/vscode-colorize-tests/out"
 			],
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
@@ -221,9 +53,6 @@
 			"runtimeArgs": [
 				"--inspect=5875",
 				"--no-cached-data",
-				"--crash-reporter-directory=${workspaceFolder}/.profile-oss/crashes",
-				// for general runtime freezes: https://github.com/microsoft/vscode/issues/127861#issuecomment-904144910
-				"--disable-features=CalculateNativeWinOcclusion",
 			],
 			"webRoot": "${workspaceFolder}",
 			"cascadeTerminateToConfigurations": [

.vscode/notebooks/api.github-issues

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

.vscode/notebooks/endgame.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-unpkg\n\n$MILESTONE=milestone:\"July 2022\""
+    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-unpkg\n\n$MILESTONE=milestone:\"April 2022\""
   },
   {
     "kind": 1,

.vscode/notebooks/inbox.github-issues

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

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

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal\n\n$MILESTONE=milestone:\"July 2022\"\n\n$MINE=assignee:@me"
+    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal\n\n$MILESTONE=milestone:\"April 2022\"\n\n$MINE=assignee:@me"
   },
   {
     "kind": 1,
@@ -147,7 +147,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed author:@me sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:triage-needed -label:verification-found"
+    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed author:@me sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:needs-triage -label:verification-found"
   },
   {
     "kind": 1,

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

@@ -7,7 +7,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 repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce\n\n// current milestone name\n$milestone=milestone:\"July 2022\""
+    "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 repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce\n\n// current milestone name\n$milestone=milestone:\"May 2022\""
   },
   {
     "kind": 1,
@@ -114,7 +114,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos assignee:@me is:open label:\"needs more info\""
+    "value": "$repos assignee:@me is:open label:\"needs more info\"",
   },
   {
     "kind": 1,

.vscode/notebooks/verification.github-issues

@@ -12,7 +12,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-jupyter repo:microsoft/vscode-python\n$milestone=milestone:\"May 2022\""
+    "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-jupyter repo:microsoft/vscode-python\n$milestone=milestone:\"March 2022\""
   },
   {
     "kind": 1,

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

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

.vscode/settings.json

@@ -67,13 +67,6 @@
 		}
 	],
 	"git.ignoreLimitWarning": true,
-	"git.branchProtection": [
-		"main",
-		"release/*"
-	],
-	"git.branchProtectionPrompt": "alwaysCommitToNewBranch",
-	"git.branchRandomName.enable": true,
-	"git.mergeEditor": true,
 	"remote.extensionKind": {
 		"msjsdiag.debugger-for-chrome": "workspace"
 	},

build/.cachesalt

@@ -1 +1 @@
-2022-07-19T07:55:26.168Z
+2022-10-06T02:27:18.022Z

build/.gitignore

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

build/.moduleignore

@@ -139,14 +139,6 @@ vscode-encrypt/binding.gyp
 vscode-encrypt/README.md
 !vscode-encrypt/build/Release/vscode-encrypt-native.node
 
-vscode-policy-watcher/build/**
-vscode-policy-watcher/.husky/**
-vscode-policy-watcher/src/**
-vscode-policy-watcher/binding.gyp
-vscode-policy-watcher/README.md
-vscode-policy-watcher/index.d.ts
-!vscode-policy-watcher/build/Release/vscode-policy-watcher.node
-
 vscode-windows-ca-certs/**/*
 !vscode-windows-ca-certs/package.json
 !vscode-windows-ca-certs/**/*.node

build/azure-pipelines/common/computeNodeModulesCacheKey.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
@@ -14,7 +14,7 @@ shasum.update(fs.readFileSync(path.join(ROOT, 'build/.cachesalt')));
 shasum.update(fs.readFileSync(path.join(ROOT, '.yarnrc')));
 shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc')));
 // Add `package.json` and `yarn.lock` files
-for (const dir of dirs) {
+for (let dir of dirs) {
     const packageJsonPath = path.join(ROOT, dir, 'package.json');
     const packageJson = JSON.parse(fs.readFileSync(packageJsonPath).toString());
     const relevantPackageJsonSections = {

build/azure-pipelines/common/computeNodeModulesCacheKey.ts

@@ -3,6 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import * as fs from 'fs';
 import * as path from 'path';
 import * as crypto from 'crypto';
@@ -17,7 +19,7 @@ shasum.update(fs.readFileSync(path.join(ROOT, '.yarnrc')));
 shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc')));
 
 // Add `package.json` and `yarn.lock` files
-for (const dir of dirs) {
+for (let dir of dirs) {
 	const packageJsonPath = path.join(ROOT, dir, 'package.json');
 	const packageJson = JSON.parse(fs.readFileSync(packageJsonPath).toString());
 	const relevantPackageJsonSections = {

build/azure-pipelines/common/createAsset.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const crypto = require("crypto");

build/azure-pipelines/common/createAsset.ts

@@ -3,6 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import * as fs from 'fs';
 import { Readable } from 'stream';
 import * as crypto from 'crypto';

build/azure-pipelines/common/createBuild.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const identity_1 = require("@azure/identity");
 const cosmos_1 = require("@azure/cosmos");

build/azure-pipelines/common/createBuild.ts

@@ -3,6 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import { ClientSecretCredential } from '@azure/identity';
 import { CosmosClient } from '@azure/cosmos';
 import { retry } from './retry';

build/azure-pipelines/common/listNodeModules.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");

build/azure-pipelines/common/listNodeModules.ts

@@ -3,6 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import * as fs from 'fs';
 import * as path from 'path';
 

build/azure-pipelines/common/releaseBuild.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const identity_1 = require("@azure/identity");
 const cosmos_1 = require("@azure/cosmos");

build/azure-pipelines/common/releaseBuild.ts

@@ -3,6 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import { ClientSecretCredential } from '@azure/identity';
 import { CosmosClient } from '@azure/cosmos';
 import { retry } from './retry';

build/azure-pipelines/common/retry.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.retry = void 0;
 async function retry(fn) {

build/azure-pipelines/common/retry.ts

@@ -3,6 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 export async function retry<T>(fn: () => Promise<T>): Promise<T> {
 	let lastError: Error | undefined;
 

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

@@ -35,66 +35,25 @@ steps:
       git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
     displayName: Merge distro
 
-  - script: |
-      mkdir -p .build
-      node build/azure-pipelines/common/computeNodeModulesCacheKey.js x64 $ENABLE_TERRAPIN > .build/yarnlockhash
-    displayName: Prepare yarn cache flags
-
-  - task: Cache@2
-    inputs:
-      key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
-      path: .build/node_modules_cache
-      cacheHitVar: NODE_MODULES_RESTORED
-    displayName: Restore node_modules cache
-
-  - script: |
-      set -e
-      tar -xzf .build/node_modules_cache/cache.tgz
-    displayName: Extract node_modules cache
-    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
-
-  - script: |
-      set -e
-      npm install -g node-gyp@latest
-      node-gyp --version
-    displayName: Update node-gyp
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-
   - script: |
       set -e
       npx https://aka.ms/enablesecurefeed standAlone
     timeoutInMinutes: 5
     retryCountOnTaskFailure: 3
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
+    condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true'))
     displayName: Switch to Terrapin packages
 
   - script: |
       set -e
-      export npm_config_arch=$(VSCODE_ARCH)
-      export npm_config_node_gyp=$(which node-gyp)
-
       for i in {1..3}; do # try 3 times, for Terrapin
-        yarn --frozen-lockfile --check-files && break
+        yarn --cwd build --frozen-lockfile --check-files && break
         if [ $i -eq 3 ]; then
           echo "Yarn failed too many times" >&2
           exit 1
         fi
         echo "Yarn failed $i, trying again..."
       done
-    env:
+    displayName: Install build dependencies
-      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-      GITHUB_TOKEN: "$(github-distro-mixin-password)"
-    displayName: Install dependencies
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-
-  - script: |
-      set -e
-      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
-      mkdir -p .build/node_modules_cache
-      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-    displayName: Create node_modules archive
 
   - download: current
     artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive

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

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

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

@@ -51,50 +51,6 @@ steps:
       set -e
       tar -xzf .build/node_modules_cache/cache.tgz
     displayName: Extract node_modules cache
-    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
-
-  - script: |
-      set -e
-      npm install -g node-gyp@latest
-      node-gyp --version
-    displayName: Update node-gyp
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-
-  - script: |
-      set -e
-      npx https://aka.ms/enablesecurefeed standAlone
-    timeoutInMinutes: 5
-    retryCountOnTaskFailure: 3
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
-    displayName: Switch to Terrapin packages
-
-  - script: |
-      set -e
-      export npm_config_arch=$(VSCODE_ARCH)
-      export npm_config_node_gyp=$(which node-gyp)
-
-      for i in {1..3}; do # try 3 times, for Terrapin
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
-          exit 1
-        fi
-        echo "Yarn failed $i, trying again..."
-      done
-    env:
-      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-      GITHUB_TOKEN: "$(github-distro-mixin-password)"
-    displayName: Install dependencies
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-
-  - script: |
-      set -e
-      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
-      mkdir -p .build/node_modules_cache
-      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-    displayName: Create node_modules archive
 
   - script: |
       set -e

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

@@ -1,73 +1,50 @@
-parameters:
-  - name: VSCODE_PUBLISH
-    type: boolean
-  - name: VSCODE_QUALITY
-    type: string
-  - name: VSCODE_RUN_UNIT_TESTS
-    type: boolean
-  - name: VSCODE_RUN_INTEGRATION_TESTS
-    type: boolean
-  - name: VSCODE_RUN_SMOKE_TESTS
-    type: boolean
-
 steps:
-  - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-    - checkout: self
-      fetchDepth: 1
-      retryCountOnTaskFailure: 3
-
   - task: NodeTool@0
     inputs:
       versionSpec: "16.x"
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - 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: "vscode-builds-subscription"
+      KeyVaultName: vscode
-        KeyVaultName: vscode
+      SecretsFilter: "github-distro-mixin-password,macos-developer-certificate,macos-developer-certificate-key"
-        SecretsFilter: "github-distro-mixin-password,macos-developer-certificate,macos-developer-certificate-key"
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - task: DownloadPipelineArtifact@2
-    - task: DownloadPipelineArtifact@2
+    inputs:
-      inputs:
+      artifact: Compilation
-        artifact: Compilation
+      path: $(Build.ArtifactStagingDirectory)
-        path: $(Build.ArtifactStagingDirectory)
+    displayName: Download compilation output
-      displayName: Download compilation output
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
-        tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
+    displayName: Extract compilation output
-      displayName: Extract compilation output
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      cat << EOF > ~/.netrc
-        cat << EOF > ~/.netrc
+      machine github.com
-        machine github.com
+      login vscode
-        login vscode
+      password $(github-distro-mixin-password)
-        password $(github-distro-mixin-password)
+      EOF
-        EOF
 
-        git config user.email "vscode@microsoft.com"
+      git config user.email "vscode@microsoft.com"
-        git config user.name "VSCode"
+      git config user.name "VSCode"
-      displayName: Prepare tooling
+    displayName: Prepare tooling
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
-        git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
+      echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
-        echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
+      git checkout FETCH_HEAD
-        git checkout FETCH_HEAD
+    condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
-      condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
+    displayName: Checkout override commit
-      displayName: Checkout override commit
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
-        git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
+    displayName: Merge distro
-      displayName: Merge distro
 
   - script: |
       mkdir -p .build
@@ -87,6 +64,13 @@ steps:
     condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
     displayName: Extract node_modules cache
 
+  - script: |
+      set -e
+      npm install -g node-gyp@latest
+      node-gyp --version
+    displayName: Update node-gyp
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+
   - script: |
       set -e
       npx https://aka.ms/enablesecurefeed standAlone
@@ -123,142 +107,115 @@ steps:
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
     displayName: Create node_modules archive
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  # This script brings in the right resources (images, icons, etc) based on the quality (insiders, stable, exploration)
-    # This script brings in the right resources (images, icons, etc) based on the quality (insiders, stable, exploration)
+  - script: |
-    - script: |
+      set -e
-        set -e
+      node build/azure-pipelines/mixin
-        node build/azure-pipelines/mixin
+    displayName: Mix in quality
-      displayName: Mix in quality
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
-          yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
+    displayName: Build client
-      displayName: Build client
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      node build/azure-pipelines/mixin --server
-        node build/azure-pipelines/mixin --server
+    displayName: Mix in server quality
-      displayName: Mix in server quality
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn gulp vscode-reh-darwin-$(VSCODE_ARCH)-min-ci
-          yarn gulp vscode-reh-darwin-$(VSCODE_ARCH)-min-ci
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn gulp vscode-reh-web-darwin-$(VSCODE_ARCH)-min-ci
-          yarn gulp vscode-reh-web-darwin-$(VSCODE_ARCH)-min-ci
+    displayName: Build Server
-      displayName: Build Server
 
-  - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
+  # 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)" \
+  - script: |
-          yarn gulp "transpile-client" "transpile-extensions"
+      set -e
-      displayName: Transpile
+      security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+      security default-keychain -s $(agent.tempdirectory)/buildagent.keychain
+      security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+      echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12
+      security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
+      security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
+      VSCODE_ARCH=$(VSCODE_ARCH) DEBUG=electron-osx-sign* node build/darwin/sign.js
+    displayName: Set Hardened Entitlements
 
-  - ${{ if or(eq(parameters.VSCODE_RUN_UNIT_TESTS, true), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
+  - script: |
-    - template: product-build-darwin-test.yml
+      set -e
-      parameters:
+      pushd $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) && zip -r -X -y $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip * && popd
-        VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
+    displayName: Archive build
-        VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }}
-        VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
-        VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }}
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - script: |
-    # Setting hardened entitlements is a requirement for:
+      set -e
-    # * Apple notarization
-    # * Running tests on Big Sur (because Big Sur has additional security precautions)
-    - script: |
-        set -e
-        security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
-        security default-keychain -s $(agent.tempdirectory)/buildagent.keychain
-        security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
-        echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12
-        security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
-        security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
-        VSCODE_ARCH=$(VSCODE_ARCH) DEBUG=electron-osx-sign* node build/darwin/sign.js
-      displayName: Set Hardened Entitlements
 
-  - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
+      # package Remote Extension Host
-    - script: |
+      pushd .. && mv vscode-reh-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH) && zip -Xry vscode-server-darwin-$(VSCODE_ARCH).zip vscode-server-darwin-$(VSCODE_ARCH) && popd
-        set -e
-        pushd $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) && zip -r -X -y $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip * && popd
-      displayName: Archive build
 
-  - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
+      # package Remote Extension Host (Web)
-    - script: |
+      pushd .. && mv vscode-reh-web-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH)-web && zip -Xry vscode-server-darwin-$(VSCODE_ARCH)-web.zip vscode-server-darwin-$(VSCODE_ARCH)-web && popd
-        set -e
+    displayName: Prepare to publish servers
 
-        # package Remote Extension Host
+  - publish: $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
-        pushd .. && mv vscode-reh-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH) && zip -Xry vscode-server-darwin-$(VSCODE_ARCH).zip vscode-server-darwin-$(VSCODE_ARCH) && popd
+    artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
+    displayName: Publish client archive
 
-        # package Remote Extension Host (Web)
+  - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH).zip
-        pushd .. && mv vscode-reh-web-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH)-web && zip -Xry vscode-server-darwin-$(VSCODE_ARCH)-web.zip vscode-server-darwin-$(VSCODE_ARCH)-web && popd
+    artifact: vscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned
-      displayName: Prepare to publish servers
+    displayName: Publish server archive
 
-  - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
+  - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH)-web.zip
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+    artifact: vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned
-      displayName: Generate SBOM (client)
+    displayName: Publish web server archive
-      inputs:
-        BuildDropPath: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-        PackageName: Visual Studio Code
 
-  - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
+  - task: AzureCLI@2
-    - publish: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)/_manifest
+    inputs:
-      displayName: Publish SBOM (client)
+      azureSubscription: "vscode-builds-subscription"
-      artifact: vscode_client_darwin_$(VSCODE_ARCH)_sbom
+      scriptType: pscore
+      scriptLocation: inlineScript
+      addSpnToEnvironment: true
+      inlineScript: |
+        Write-Host "##vso[task.setvariable variable=AZURE_TENANT_ID]$env:tenantId"
+        Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_ID]$env:servicePrincipalId"
+        Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey"
 
-  - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
+  - script: |
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+      set -e
-      displayName: Generate SBOM (server)
+      AZURE_STORAGE_ACCOUNT="ticino" \
-      inputs:
+      AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
-        BuildDropPath: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)
+      AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
-        PackageName: Visual Studio Code Server
+      AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \
+      VSCODE_ARCH="$(VSCODE_ARCH)" \
+        node build/azure-pipelines/upload-configuration
+    displayName: Upload configuration (for Bing settings search)
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
+    continueOnError: true
 
-  - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
+  - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-    - publish: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)/_manifest
+    displayName: Generate SBOM (client)
-      displayName: Publish SBOM (server)
+    inputs:
-      artifact: vscode_server_darwin_$(VSCODE_ARCH)_sbom
+      BuildDropPath: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      PackageName: Visual Studio Code
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
-  - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
+  - publish: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)/_manifest
-    - publish: $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
+    displayName: Publish SBOM (client)
-      artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
+    artifact: vscode_client_darwin_$(VSCODE_ARCH)_sbom
-      displayName: Publish client archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
-  - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
+  - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-    - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH).zip
+    displayName: Generate SBOM (server)
-      artifact: vscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned
+    inputs:
-      displayName: Publish server archive
+      BuildDropPath: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)
+      PackageName: Visual Studio Code Server
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
-  - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
+  - publish: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)/_manifest
-    - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH)-web.zip
+    displayName: Publish SBOM (server)
-      artifact: vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned
+    artifact: vscode_server_darwin_$(VSCODE_ARCH)_sbom
-      displayName: Publish web server archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
-  - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-    - task: AzureCLI@2
-      inputs:
-        azureSubscription: "vscode-builds-subscription"
-        scriptType: pscore
-        scriptLocation: inlineScript
-        addSpnToEnvironment: true
-        inlineScript: |
-          Write-Host "##vso[task.setvariable variable=AZURE_TENANT_ID]$env:tenantId"
-          Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_ID]$env:servicePrincipalId"
-          Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey"
-
-  - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-    - script: |
-        set -e
-        AZURE_STORAGE_ACCOUNT="ticino" \
-        AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
-        AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
-        AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \
-        VSCODE_ARCH="$(VSCODE_ARCH)" \
-          node build/azure-pipelines/upload-configuration
-      displayName: Upload configuration (for Bing settings search)
-      condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
-      continueOnError: true

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

@@ -112,19 +112,18 @@ steps:
     displayName: Run unit tests
     condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
-# {{SQL CARBON TODO}} Reenable "Run Core Integration Tests"
+  - script: |
-  # - script: |
+      # Figure out the full absolute path of the product we just built
-  #     # Figure out the full absolute path of the product we just built
+      # including the remote server and configure the integration tests
-  #     # including the remote server and configure the integration tests
+      # to run with these builds instead of running out of sources.
-  #     # to run with these builds instead of running out of sources.
+      set -e
-  #     set -e
+      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-x64
-  #     APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-x64
+      APP_NAME="`ls $APP_ROOT | head -n 1`"
-  #     APP_NAME="`ls $APP_ROOT | head -n 1`"
+      INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
-  #     INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/azuredatastudio-reh-darwin" \
-  #     VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/azuredatastudio-reh-darwin" \
+      ./scripts/test-integration.sh --build --tfs "Integration Tests"
-  #     ./scripts/test-integration.sh --build --tfs "Integration Tests"
+    displayName: Run core integration tests
-  #   displayName: Run core integration tests
+    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
-  #   condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
   - script: |
       set -e

build/azure-pipelines/distro-build.yml

@@ -4,7 +4,9 @@ pool:
 trigger:
   branches:
     include: ["main", "release/*"]
-pr: none
+pr:
+  branches:
+    include: ["main", "release/*"]
 
 steps:
   - task: NodeTool@0

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

@@ -118,9 +118,7 @@ steps:
 
   - script: |
       set -e
-      docker run -e VSCODE_QUALITY -e GITHUB_TOKEN -v $(pwd):/root/vscode -v ~/.netrc:/root/.netrc vscodehub.azurecr.io/vscode-linux-build-agent:alpine-$(VSCODE_ARCH) /root/vscode/build/azure-pipelines/linux/scripts/install-remote-dependencies.sh
+      docker run -e VSCODE_QUALITY -v $(pwd):/root/vscode -v ~/.netrc:/root/.netrc vscodehub.azurecr.io/vscode-linux-build-agent:alpine-$(VSCODE_ARCH) /root/vscode/build/azure-pipelines/linux/scripts/install-remote-dependencies.sh
-    env:
-      GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Prebuild
 
   - script: |

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

@@ -1,272 +0,0 @@
-parameters:
-  - name: VSCODE_QUALITY
-    type: string
-  - name: VSCODE_RUN_UNIT_TESTS
-    type: boolean
-  - name: VSCODE_RUN_INTEGRATION_TESTS
-    type: boolean
-  - name: VSCODE_RUN_SMOKE_TESTS
-    type: boolean
-
-steps:
-  - script: |
-      set -e
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-        yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
-    displayName: Download Electron and Playwright
-
-  - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        sudo apt-get update
-        sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libgbm1
-        sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
-        sudo chmod +x /etc/init.d/xvfb
-        sudo update-rc.d xvfb defaults
-        sudo service xvfb start
-      displayName: Setup build environment
-
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
-        ELECTRON_ROOT=.build/electron
-        sudo chown root $APP_ROOT/chrome-sandbox
-        sudo chown root $ELECTRON_ROOT/chrome-sandbox
-        sudo chmod 4755 $APP_ROOT/chrome-sandbox
-        sudo chmod 4755 $ELECTRON_ROOT/chrome-sandbox
-        stat $APP_ROOT/chrome-sandbox
-        stat $ELECTRON_ROOT/chrome-sandbox
-      displayName: Change setuid helper binary permission
-
-  - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}:
-    - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: |
-          set -e
-          DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
-        displayName: Run unit tests (Electron)
-        timeoutInMinutes: 15
-
-      - script: |
-          set -e
-          yarn test-node
-        displayName: Run unit tests (node.js)
-        timeoutInMinutes: 15
-
-      - script: |
-          set -e
-          DEBUG=*browser* yarn test-browser-no-install --browser chromium --tfs "Browser Unit Tests"
-        displayName: Run unit tests (Browser, Chromium)
-        timeoutInMinutes: 15
-
-    - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: |
-          set -e
-          ./scripts/test.sh --build --tfs "Unit Tests"
-        displayName: Run unit tests (Electron)
-        timeoutInMinutes: 15
-
-      - script: |
-          set -e
-          yarn test-node --build
-        displayName: Run unit tests (node.js)
-        timeoutInMinutes: 15
-
-      - script: |
-          set -e
-          DEBUG=*browser* yarn test-browser-no-install --build --browser chromium --tfs "Browser Unit Tests"
-        displayName: Run unit tests (Browser, Chromium)
-        timeoutInMinutes: 15
-
-  - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
-    - script: |
-        set -e
-        yarn gulp \
-          compile-extension:configuration-editing \
-          compile-extension:css-language-features-server \
-          compile-extension:emmet \
-          compile-extension:git \
-          compile-extension:github-authentication \
-          compile-extension:html-language-features-server \
-          compile-extension:ipynb \
-          compile-extension:json-language-features-server \
-          compile-extension:markdown-language-features-server \
-          compile-extension:markdown-language-features \
-          compile-extension-media \
-          compile-extension:microsoft-authentication \
-          compile-extension:typescript-language-features \
-          compile-extension:vscode-api-tests \
-          compile-extension:vscode-colorize-tests \
-          compile-extension:vscode-notebook-tests \
-          compile-extension:vscode-test-resolver
-      displayName: Build integration tests
-
-  - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
-    - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: |
-          set -e
-          DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests"
-        displayName: Run integration tests (Electron)
-        timeoutInMinutes: 20
-
-      - script: |
-          set -e
-          ./scripts/test-web-integration.sh --browser chromium
-        displayName: Run integration tests (Browser, Chromium)
-        timeoutInMinutes: 20
-
-      - script: |
-          set -e
-          ./scripts/test-remote-integration.sh
-        displayName: Run integration tests (Remote)
-        timeoutInMinutes: 20
-
-    - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: |
-          # Figure out the full absolute path of the product we just built
-          # including the remote server and configure the integration tests
-          # to run with these builds instead of running out of sources.
-          set -e
-          APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
-          APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
-          INTEGRATION_TEST_APP_NAME="$APP_NAME" \
-          INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
-          VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
-          ./scripts/test-integration.sh --build --tfs "Integration Tests"
-        displayName: Run integration tests (Electron)
-        timeoutInMinutes: 20
-
-      - script: |
-          set -e
-          VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-$(VSCODE_ARCH)" \
-          ./scripts/test-web-integration.sh --browser chromium
-        displayName: Run integration tests (Browser, Chromium)
-        timeoutInMinutes: 20
-
-      - script: |
-          set -e
-          APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
-          APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
-          INTEGRATION_TEST_APP_NAME="$APP_NAME" \
-          INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
-          VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
-          ./scripts/test-remote-integration.sh
-        displayName: Run integration tests (Remote)
-        timeoutInMinutes: 20
-
-  - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}:
-    - script: |
-        set -e
-        ps -ef
-        cat /proc/sys/fs/inotify/max_user_watches
-        lsof | wc -l
-      displayName: Diagnostics before smoke test run (processes, max_user_watches, number of opened file handles)
-      continueOnError: true
-      condition: succeededOrFailed()
-
-    - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: |
-          set -e
-          yarn --cwd test/smoke compile
-        displayName: Compile smoke tests
-
-      - script: |
-          set -e
-          yarn smoketest-no-compile --tracing
-        timeoutInMinutes: 20
-        displayName: Run smoke tests (Electron)
-
-      - script: |
-          set -e
-          yarn smoketest-no-compile --web --tracing --headless --electronArgs="--disable-dev-shm-usage"
-        timeoutInMinutes: 20
-        displayName: Run smoke tests (Browser, Chromium)
-
-      - script: |
-          set -e
-          yarn gulp compile-extension:vscode-test-resolver
-          yarn smoketest-no-compile --remote --tracing
-        timeoutInMinutes: 20
-        displayName: Run smoke tests (Remote)
-
-    - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: |
-          set -e
-          APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
-          yarn smoketest-no-compile --tracing --build "$APP_PATH"
-        timeoutInMinutes: 20
-        displayName: Run smoke tests (Electron)
-
-      - script: |
-          set -e
-          VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-$(VSCODE_ARCH)" \
-          yarn smoketest-no-compile --web --tracing --headless --electronArgs="--disable-dev-shm-usage"
-        timeoutInMinutes: 20
-        displayName: Run smoke tests (Browser, Chromium)
-
-      - script: |
-          set -e
-          yarn gulp compile-extension:vscode-test-resolver
-          APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
-          VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
-          yarn smoketest-no-compile --tracing --remote --build "$APP_PATH"
-        timeoutInMinutes: 20
-        displayName: Run smoke tests (Remote)
-
-    - script: |
-        set -e
-        ps -ef
-        cat /proc/sys/fs/inotify/max_user_watches
-        lsof | wc -l
-      displayName: Diagnostics after smoke test run (processes, max_user_watches, number of opened file handles)
-      continueOnError: true
-      condition: succeededOrFailed()
-
-  - ${{ if or(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-    - task: PublishPipelineArtifact@0
-      inputs:
-        targetPath: .build/crashes
-        ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-          artifactName: crash-dump-linux-$(VSCODE_ARCH)-integration-$(System.JobAttempt)
-        ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-          artifactName: crash-dump-linux-$(VSCODE_ARCH)-smoke-$(System.JobAttempt)
-        ${{ else }}:
-          artifactName: crash-dump-linux-$(VSCODE_ARCH)-$(System.JobAttempt)
-      displayName: "Publish Crash Reports"
-      continueOnError: true
-      condition: failed()
-
-    # In order to properly symbolify above crash reports
-    # (if any), we need the compiled native modules too
-    - task: PublishPipelineArtifact@0
-      inputs:
-        targetPath: node_modules
-        ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-          artifactName: node-modules-linux-$(VSCODE_ARCH)-integration-$(System.JobAttempt)
-        ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-          artifactName: node-modules-linux-$(VSCODE_ARCH)-smoke-$(System.JobAttempt)
-        ${{ else }}:
-          artifactName: node-modules-linux-$(VSCODE_ARCH)-$(System.JobAttempt)
-      displayName: "Publish Node Modules"
-      continueOnError: true
-      condition: failed()
-
-    - task: PublishPipelineArtifact@0
-      inputs:
-        targetPath: .build/logs
-        ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-          artifactName: logs-linux-$(VSCODE_ARCH)-integration-$(System.JobAttempt)
-        ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-          artifactName: logs-linux-$(VSCODE_ARCH)-smoke-$(System.JobAttempt)
-        ${{ else }}:
-          artifactName: logs-linux-$(VSCODE_ARCH)-$(System.JobAttempt)
-      displayName: "Publish Log Files"
-      continueOnError: true
-      condition: succeededOrFailed()
-
-  - task: PublishTestResults@2
-    displayName: Publish Tests Results
-    inputs:
-      testResultsFiles: "*-results.xml"
-      searchFolder: "$(Build.ArtifactStagingDirectory)/test-results"
-    condition: succeededOrFailed()

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

@@ -1,113 +1,79 @@
-parameters:
-  - name: VSCODE_PUBLISH
-    type: boolean
-  - name: VSCODE_QUALITY
-    type: string
-  - name: VSCODE_RUN_UNIT_TESTS
-    type: boolean
-  - name: VSCODE_RUN_INTEGRATION_TESTS
-    type: boolean
-  - name: VSCODE_RUN_SMOKE_TESTS
-    type: boolean
-
 steps:
-  - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-    - checkout: self
-      fetchDepth: 1
-      retryCountOnTaskFailure: 3
-
   - task: NodeTool@0
     inputs:
       versionSpec: "16.x"
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - 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: "vscode-builds-subscription"
+      KeyVaultName: vscode
-        KeyVaultName: vscode
+      SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"
-        SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - task: DownloadPipelineArtifact@2
-    - task: DownloadPipelineArtifact@2
+    inputs:
-      inputs:
+      artifact: Compilation
-        artifact: Compilation
+      path: $(Build.ArtifactStagingDirectory)
-        path: $(Build.ArtifactStagingDirectory)
+    displayName: Download compilation output
-      displayName: Download compilation output
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - task: DownloadPipelineArtifact@2
-    - task: DownloadPipelineArtifact@2
+    inputs:
-      inputs:
+      artifact: reh_node_modules-$(VSCODE_ARCH)
-        artifact: reh_node_modules-$(VSCODE_ARCH)
+      path: $(Build.ArtifactStagingDirectory)
-        path: $(Build.ArtifactStagingDirectory)
+    displayName: Download server build dependencies
-      displayName: Download server build dependencies
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'armhf'))
-      condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'armhf'))
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      # Start X server
-        # Start X server
+      /etc/init.d/xvfb start
-        /etc/init.d/xvfb start
+      # Start dbus session
-        # Start dbus session
+      DBUS_LAUNCH_RESULT=$(sudo dbus-daemon --config-file=/usr/share/dbus-1/system.conf --print-address)
-        DBUS_LAUNCH_RESULT=$(sudo dbus-daemon --config-file=/usr/share/dbus-1/system.conf --print-address)
+      echo "##vso[task.setvariable variable=DBUS_SESSION_BUS_ADDRESS]$DBUS_LAUNCH_RESULT"
-        echo "##vso[task.setvariable variable=DBUS_SESSION_BUS_ADDRESS]$DBUS_LAUNCH_RESULT"
+    displayName: Setup system services
-      displayName: Setup system services
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
-      condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
-        tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
+    displayName: Extract compilation output
-      displayName: Extract compilation output
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      cat << EOF > ~/.netrc
-        cat << EOF > ~/.netrc
+      machine github.com
-        machine github.com
+      login vscode
-        login vscode
+      password $(github-distro-mixin-password)
-        password $(github-distro-mixin-password)
+      EOF
-        EOF
 
-        git config user.email "vscode@microsoft.com"
+      git config user.email "vscode@microsoft.com"
-        git config user.name "VSCode"
+      git config user.name "VSCode"
-      displayName: Prepare tooling
+    displayName: Prepare tooling
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
-        git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
+      echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
-        echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
+      git checkout FETCH_HEAD
-        git checkout FETCH_HEAD
+    condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
-      condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
+    displayName: Checkout override commit
-      displayName: Checkout override commit
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
-        git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
+    displayName: Merge distro
-      displayName: Merge distro
 
   - script: |
       mkdir -p .build
       node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash
     displayName: Prepare yarn cache flags
 
-  - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
+  - task: Cache@2
-    - task: Cache@2
+    inputs:
-      inputs:
+      key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
-        key: "genericNodeModules | $(Agent.OS) | .build/yarnlockhash"
+      path: .build/node_modules_cache
-        path: .build/node_modules_cache
+      cacheHitVar: NODE_MODULES_RESTORED
-        cacheHitVar: NODE_MODULES_RESTORED
+    displayName: Restore node_modules cache
-      displayName: Restore node_modules cache
-
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - task: Cache@2
-      inputs:
-        key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
-        path: .build/node_modules_cache
-        cacheHitVar: NODE_MODULES_RESTORED
-      displayName: Restore node_modules cache
 
   - script: |
       set -e
@@ -125,7 +91,6 @@ steps:
 
   - script: |
       set -e
-      node build/npm/setupBuildYarnrc
       for i in {1..3}; do # try 3 times, for Terrapin
         yarn --cwd build --frozen-lockfile --check-files && break
         if [ $i -eq 3 ]; then
@@ -138,16 +103,7 @@ steps:
 
   - script: |
       set -e
-      if [ "$NPM_ARCH" = "armv7l" ]; then
+      export npm_config_arch=$(NPM_ARCH)
-        # There is no target_arch="armv7l" supported by node_gyp,
-        # arm versions for compilation are decided based on the CC
-        # macros.
-        # Mapping value is based on
-        # https://github.com/nodejs/node/blob/0903515e126c2697042d6546c6aa4b72e1a4b33e/configure.py#L49-L50
-        export npm_config_arch="arm"
-      else
-        export npm_config_arch=$(NPM_ARCH)
-      fi
 
       if [ -z "$CC" ] || [ -z "$CXX" ]; then
         # Download clang based on chromium revision used by vscode
@@ -187,13 +143,12 @@ steps:
     displayName: Install dependencies
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      rm -rf remote/node_modules
-        rm -rf remote/node_modules
+      tar -xzf $(Build.ArtifactStagingDirectory)/reh_node_modules-$(VSCODE_ARCH).tar.gz --directory $(Build.SourcesDirectory)/remote
-        tar -xzf $(Build.ArtifactStagingDirectory)/reh_node_modules-$(VSCODE_ARCH).tar.gz --directory $(Build.SourcesDirectory)/remote
+    displayName: Extract server node_modules output
-      displayName: Extract server node_modules output
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'armhf'))
-      condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'armhf'))
 
   - script: |
       set -e
@@ -203,136 +158,267 @@ steps:
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
     displayName: Create node_modules archive
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      node build/azure-pipelines/mixin
-        node build/azure-pipelines/mixin
+    displayName: Mix in quality
-      displayName: Mix in quality
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn gulp vscode-linux-$(VSCODE_ARCH)-min-ci
-          yarn gulp vscode-linux-$(VSCODE_ARCH)-min-ci
+    displayName: Build
-      displayName: Build
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      node build/azure-pipelines/mixin --server
-        node build/azure-pipelines/mixin --server
+    displayName: Mix in server quality
-      displayName: Mix in server quality
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci
-          yarn gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci
-          yarn gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci
+    displayName: Build Server
-      displayName: Build Server
 
-  - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
-          yarn gulp "transpile-client" "transpile-extensions"
+    displayName: Download Electron and Playwright
-      displayName: Transpile
 
-  - ${{ if or(eq(parameters.VSCODE_RUN_UNIT_TESTS, true), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
+  - script: |
-    - template: product-build-linux-client-test.yml
+      set -e
-      parameters:
+      APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
-        VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
+      ELECTRON_ROOT=.build/electron
-        VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }}
+      sudo chown root $APP_ROOT/chrome-sandbox
-        VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
+      sudo chown root $ELECTRON_ROOT/chrome-sandbox
-        VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }}
+      sudo chmod 4755 $APP_ROOT/chrome-sandbox
+      sudo chmod 4755 $ELECTRON_ROOT/chrome-sandbox
+      stat $APP_ROOT/chrome-sandbox
+      stat $ELECTRON_ROOT/chrome-sandbox
+    displayName: Change setuid helper binary permission
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      ./scripts/test.sh --build --tfs "Unit Tests"
-        yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-deb"
+    displayName: Run unit tests (Electron)
-        yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-rpm"
+    timeoutInMinutes: 15
-      displayName: Build deb, rpm packages
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      yarn test-node --build
-        yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
+    displayName: Run unit tests (node.js)
-      displayName: Prepare snap package
+    timeoutInMinutes: 15
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - script: |
-    - task: UseDotNet@2
+      set -e
-      inputs:
+      DEBUG=*browser* yarn test-browser-no-install --build --browser chromium --tfs "Browser Unit Tests"
-        version: 2.x
+    displayName: Run unit tests (Browser, Chromium)
+    timeoutInMinutes: 15
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - script: |
-    - task: EsrpClientTool@1
+      # Figure out the full absolute path of the product we just built
-      displayName: Download ESRPClient
+      # including the remote server and configure the integration tests
+      # to run with these builds instead of running out of sources.
+      set -e
+      APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
+      APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
+      INTEGRATION_TEST_APP_NAME="$APP_NAME" \
+      INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
+      ./scripts/test-integration.sh --build --tfs "Integration Tests"
+    displayName: Run integration tests (Electron)
+    timeoutInMinutes: 20
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-$(VSCODE_ARCH)" \
-        node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" rpm $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) .build/linux/rpm '*.rpm'
+      ./scripts/test-web-integration.sh --browser chromium
-      displayName: Codesign rpm
+    displayName: Run integration tests (Browser, Chromium)
+    timeoutInMinutes: 20
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
-        VSCODE_ARCH="$(VSCODE_ARCH)" \
+      APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
-        ./build/azure-pipelines/linux/prepare-publish.sh
+      INTEGRATION_TEST_APP_NAME="$APP_NAME" \
-      displayName: Prepare for Publish
+      INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
+      ./scripts/test-remote-integration.sh
+    displayName: Run integration tests (Remote)
+    timeoutInMinutes: 20
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - script: |
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+      set -e
-      displayName: Generate SBOM (client)
+      ps -ef
-      inputs:
+      cat /proc/sys/fs/inotify/max_user_watches
-        BuildDropPath: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
+      lsof | wc -l
-        PackageName: Visual Studio Code
+    displayName: Diagnostics before smoke test run (processes, max_user_watches, number of opened file handles)
+    continueOnError: true
+    condition: and(succeededOrFailed(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - script: |
-    - publish: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/_manifest
+      set -e
-      displayName: Publish SBOM (client)
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-$(VSCODE_ARCH)" \
-      artifact: vscode_client_linux_$(VSCODE_ARCH)_sbom
+      yarn smoketest-no-compile --web --tracing --headless --electronArgs="--disable-dev-shm-usage"
+    timeoutInMinutes: 10
+    displayName: Run smoke tests (Browser, Chromium)
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - script: |
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+      set -e
-      displayName: Generate SBOM (server)
+      APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
-      inputs:
+      yarn smoketest-no-compile --tracing --build "$APP_PATH"
-        BuildDropPath: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)
+    timeoutInMinutes: 20
-        PackageName: Visual Studio Code Server
+    displayName: Run smoke tests (Electron)
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - script: |
-    - publish: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)/_manifest
+      set -e
-      displayName: Publish SBOM (server)
+      APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
-      artifact: vscode_server_linux_$(VSCODE_ARCH)_sbom
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
+      yarn smoketest-no-compile --tracing --remote --build "$APP_PATH"
+    timeoutInMinutes: 20
+    displayName: Run smoke tests (Remote)
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - script: |
-    - publish: $(DEB_PATH)
+      set -e
-      artifact: vscode_client_linux_$(VSCODE_ARCH)_deb-package
+      ps -ef
-      displayName: Publish deb package
+      cat /proc/sys/fs/inotify/max_user_watches
+      lsof | wc -l
+    displayName: Diagnostics after smoke test run (processes, max_user_watches, number of opened file handles)
+    continueOnError: true
+    condition: and(succeededOrFailed(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - task: PublishPipelineArtifact@0
-    - publish: $(RPM_PATH)
+    inputs:
-      artifact: vscode_client_linux_$(VSCODE_ARCH)_rpm-package
+      artifactName: crash-dump-linux-$(VSCODE_ARCH)
-      displayName: Publish rpm package
+      targetPath: .build/crashes
+    displayName: "Publish Crash Reports"
+    continueOnError: true
+    condition: failed()
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  # In order to properly symbolify above crash reports
-    - publish: $(TARBALL_PATH)
+  # (if any), we need the compiled native modules too
-      artifact: vscode_client_linux_$(VSCODE_ARCH)_archive-unsigned
+  - task: PublishPipelineArtifact@0
-      displayName: Publish client archive
+    inputs:
+      artifactName: node-modules-linux-$(VSCODE_ARCH)
+      targetPath: node_modules
+    displayName: "Publish Node Modules"
+    continueOnError: true
+    condition: failed()
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - task: PublishPipelineArtifact@0
-    - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH).tar.gz
+    inputs:
-      artifact: vscode_server_linux_$(VSCODE_ARCH)_archive-unsigned
+      artifactName: logs-linux-$(VSCODE_ARCH)-$(System.JobAttempt)
-      displayName: Publish server archive
+      targetPath: .build/logs
+    displayName: "Publish Log Files"
+    continueOnError: true
+    condition: and(failed(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - task: PublishTestResults@2
-    - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH)-web.tar.gz
+    displayName: Publish Tests Results
-      artifact: vscode_web_linux_$(VSCODE_ARCH)_archive-unsigned
+    inputs:
-      displayName: Publish web server archive
+      testResultsFiles: "*-results.xml"
+      searchFolder: "$(Build.ArtifactStagingDirectory)/test-results"
+    condition: and(succeededOrFailed(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - script: |
-    - task: PublishPipelineArtifact@0
+      set -e
-      displayName: "Publish Pipeline Artifact"
+      yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-deb"
-      inputs:
+      yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-rpm"
-        artifactName: "snap-$(VSCODE_ARCH)"
+    displayName: Build deb, rpm packages
-        targetPath: .build/linux/snap-tarball
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - script: |
+      set -e
+      yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
+    displayName: Prepare snap package
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - task: UseDotNet@2
+    inputs:
+      version: 2.x
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - task: EsrpClientTool@1
+    displayName: Download ESRPClient
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - script: |
+      set -e
+      node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" rpm $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) .build/linux/rpm '*.rpm'
+    displayName: Codesign rpm
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - script: |
+      set -e
+      VSCODE_ARCH="$(VSCODE_ARCH)" \
+      ./build/azure-pipelines/linux/prepare-publish.sh
+    displayName: Prepare for Publish
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(DEB_PATH)
+    artifact: vscode_client_linux_$(VSCODE_ARCH)_deb-package
+    displayName: Publish deb package
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(RPM_PATH)
+    artifact: vscode_client_linux_$(VSCODE_ARCH)_rpm-package
+    displayName: Publish rpm package
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(TARBALL_PATH)
+    artifact: vscode_client_linux_$(VSCODE_ARCH)_archive-unsigned
+    displayName: Publish client archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH).tar.gz
+    artifact: vscode_server_linux_$(VSCODE_ARCH)_archive-unsigned
+    displayName: Publish server archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH)-web.tar.gz
+    artifact: vscode_web_linux_$(VSCODE_ARCH)_archive-unsigned
+    displayName: Publish web server archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - task: PublishPipelineArtifact@0
+    displayName: "Publish Pipeline Artifact"
+    inputs:
+      artifactName: "snap-$(VSCODE_ARCH)"
+      targetPath: .build/linux/snap-tarball
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+    displayName: Generate SBOM (client)
+    inputs:
+      BuildDropPath: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
+      PackageName: Visual Studio Code
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/_manifest
+    displayName: Publish SBOM (client)
+    artifact: vscode_client_linux_$(VSCODE_ARCH)_sbom
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+    displayName: Generate SBOM (server)
+    inputs:
+      BuildDropPath: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)
+      PackageName: Visual Studio Code Server
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)/_manifest
+    displayName: Publish SBOM (server)
+    artifact: vscode_server_linux_$(VSCODE_ARCH)_sbom
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))

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

@@ -1,58 +1,49 @@
-parameters:
-  - name: VSCODE_QUALITY
-    type: string
-
 steps:
   - task: NodeTool@0
     inputs:
       versionSpec: "16.x"
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - 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: "vscode-builds-subscription"
+      KeyVaultName: vscode
-        KeyVaultName: vscode
+      SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"
-        SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - task: Docker@1
-    - task: Docker@1
+    displayName: "Pull Docker image"
-      displayName: "Pull Docker image"
+    inputs:
-      inputs:
+      azureSubscriptionEndpoint: "vscode-builds-subscription"
-        azureSubscriptionEndpoint: "vscode-builds-subscription"
+      azureContainerRegistry: vscodehub.azurecr.io
-        azureContainerRegistry: vscodehub.azurecr.io
+      command: "Run an image"
-        command: "Run an image"
+      imageName: "vscode-linux-build-agent:centos7-devtoolset8-arm64"
-        imageName: "vscode-linux-build-agent:centos7-devtoolset8-arm64"
+      containerCommand: uname
-        containerCommand: uname
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
-      condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      cat << EOF > ~/.netrc
-        cat << EOF > ~/.netrc
+      machine github.com
-        machine github.com
+      login vscode
-        login vscode
+      password $(github-distro-mixin-password)
-        password $(github-distro-mixin-password)
+      EOF
-        EOF
 
-        git config user.email "vscode@microsoft.com"
+      git config user.email "vscode@microsoft.com"
-        git config user.name "VSCode"
+      git config user.name "VSCode"
-      displayName: Prepare tooling
+    displayName: Prepare tooling
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
-        git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
+      echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
-        echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
+      git checkout FETCH_HEAD
-        git checkout FETCH_HEAD
+    condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
-      condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
+    displayName: Checkout override commit
-      displayName: Checkout override commit
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
-        git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
+    displayName: Merge distro
-      displayName: Merge distro
 
   - script: |
       set -e
@@ -70,19 +61,17 @@ steps:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-    - script: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+    displayName: Register Docker QEMU
-      displayName: Register Docker QEMU
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
-      condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      docker run -e VSCODE_QUALITY -e GITHUB_TOKEN -v $(pwd):/root/vscode -v ~/.netrc:/root/.netrc vscodehub.azurecr.io/vscode-linux-build-agent:centos7-devtoolset8-arm64 /root/vscode/build/azure-pipelines/linux/scripts/install-remote-dependencies.sh
-        docker run -e VSCODE_QUALITY -e GITHUB_TOKEN -v $(pwd):/root/vscode -v ~/.netrc:/root/.netrc vscodehub.azurecr.io/vscode-linux-build-agent:centos7-devtoolset8-arm64 /root/vscode/build/azure-pipelines/linux/scripts/install-remote-dependencies.sh
+    displayName: Install dependencies via qemu
-      displayName: Install dependencies via qemu
+    env:
-      env:
+      GITHUB_TOKEN: "$(github-distro-mixin-password)"
-        GITHUB_TOKEN: "$(github-distro-mixin-password)"
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
-      condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
 
   - script: |
       set -e

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

@@ -136,56 +136,54 @@ steps:
     displayName: Run core integration tests
     condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'), ne(variables['EXTENSIONS_ONLY'], 'true'))
 
-# {{SQL CARBON TODO}} Reenable "Run Extension Unit Tests (Continue on Error)" and "Run Extension Unit Tests (Fail on Error)" and "Archive Logs"
+  - script: |
-  # - script: |
+      # Figure out the full absolute path of the product we just built
-  #     # Figure out the full absolute path of the product we just built
+      # including the remote server and configure the unit tests
-  #     # including the remote server and configure the unit tests
+      # to run with these builds instead of running out of sources.
-  #     # to run with these builds instead of running out of sources.
+      set -e
-  #     set -e
+      APP_ROOT=$(agent.builddirectory)/azuredatastudio-linux-x64
-  #     APP_ROOT=$(agent.builddirectory)/azuredatastudio-linux-x64
+      APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
-  #     APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
+      INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
-  #     INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
+      NO_CLEANUP=1 \
-  #     NO_CLEANUP=1 \
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/azuredatastudio-reh-linux-x64" \
-  #     VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/azuredatastudio-reh-linux-x64" \
+      DISPLAY=:10 ./scripts/test-extensions-unit.sh --build --tfs "Extension Unit Tests"
-  #     DISPLAY=:10 ./scripts/test-extensions-unit.sh --build --tfs "Extension Unit Tests"
+    displayName: Run Extension Unit Tests (Continue on Error)
-  #   displayName: Run Extension Unit Tests (Continue on Error)
+    continueOnError: true
-  #   continueOnError: true
+    condition: and(succeeded(), and(eq(variables['RUN_TESTS'], 'true'), eq(variables['EXTENSION_UNIT_TESTS_FAIL_ON_ERROR'], 'false')))
-  #   condition: and(succeeded(), and(eq(variables['RUN_TESTS'], 'true'), eq(variables['EXTENSION_UNIT_TESTS_FAIL_ON_ERROR'], 'false')))
 
-  # - script: |
+  - script: |
-  #     # Figure out the full absolute path of the product we just built
+      # Figure out the full absolute path of the product we just built
-  #     # including the remote server and configure the unit tests
+      # including the remote server and configure the unit tests
-  #     # to run with these builds instead of running out of sources.
+      # to run with these builds instead of running out of sources.
-  #     set -e
+      set -e
-  #     APP_ROOT=$(agent.builddirectory)/azuredatastudio-linux-x64
+      APP_ROOT=$(agent.builddirectory)/azuredatastudio-linux-x64
-  #     APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
+      APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
-  #     INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
+      INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
-  #     NO_CLEANUP=1 \
+      NO_CLEANUP=1 \
-  #     VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/azuredatastudio-reh-linux-x64" \
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/azuredatastudio-reh-linux-x64" \
-  #     DISPLAY=:10 ./scripts/test-extensions-unit.sh --build --tfs "Extension Unit Tests"
+      DISPLAY=:10 ./scripts/test-extensions-unit.sh --build --tfs "Extension Unit Tests"
-  #   displayName: Run Extension Unit Tests (Fail on Error)
+    displayName: Run Extension Unit Tests (Fail on Error)
-  #   condition: and(succeeded(), and(eq(variables['RUN_TESTS'], 'true'), ne(variables['EXTENSION_UNIT_TESTS_FAIL_ON_ERROR'], 'false')))
+    condition: and(succeeded(), and(eq(variables['RUN_TESTS'], 'true'), ne(variables['EXTENSION_UNIT_TESTS_FAIL_ON_ERROR'], 'false')))
 
-  # - bash: |
+  - bash: |
-  #     set -e
+      set -e
-  #     mkdir -p $(Build.ArtifactStagingDirectory)/logs/linux-x64
+      mkdir -p $(Build.ArtifactStagingDirectory)/logs/linux-x64
-  #     cd /tmp
+      cd /tmp
-  #     for folder in adsuser*/
+      for folder in adsuser*/
-  #     do
+      do
-  #     folder=${folder%/}
+      folder=${folder%/}
-  #     # Only archive directories we want for debugging purposes
+      # Only archive directories we want for debugging purposes
-  #     tar -czvf $(Build.ArtifactStagingDirectory)/logs/linux-x64/$folder.tar.gz $folder/User $folder/logs
+      tar -czvf $(Build.ArtifactStagingDirectory)/logs/linux-x64/$folder.tar.gz $folder/User $folder/logs
-  #     done
+      done
-  #   displayName: Archive Logs
+    displayName: Archive Logs
-  #   continueOnError: true
+    continueOnError: true
-  #   condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
-  # {{SQL CARBON TODO}} - Reenable
+  - script: |
-  # - script: |
+      set -e
-  #     set -e
+      yarn gulp vscode-linux-x64-build-deb
-  #     yarn gulp vscode-linux-x64-build-deb
+    displayName: Build Deb
-  #   displayName: Build Deb
+    condition: and(succeeded(), ne(variables['EXTENSIONS_ONLY'], 'true'))
-  #   condition: and(succeeded(), ne(variables['EXTENSIONS_ONLY'], 'true'))
 
   - script: |
       set -e

build/azure-pipelines/mixin.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const json = require("gulp-json-editor");
 const buffer = require('gulp-buffer');

build/azure-pipelines/mixin.ts

@@ -3,6 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import * as json from 'gulp-json-editor';
 const buffer = require('gulp-buffer');
 import * as filter from 'gulp-filter';

build/azure-pipelines/product-build-pr-cache.yml

@@ -1,59 +0,0 @@
-steps:
-  - checkout: self
-    fetchDepth: 1
-    retryCountOnTaskFailure: 3
-
-  - task: NodeTool@0
-    inputs:
-      versionSpec: "16.x"
-
-  - script: |
-      mkdir -p .build
-      node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash
-    displayName: Prepare yarn cache flags
-
-  - task: Cache@2
-    inputs:
-      key: "genericNodeModules | $(Agent.OS) | .build/yarnlockhash"
-      path: .build/node_modules_cache
-      cacheHitVar: NODE_MODULES_RESTORED
-    displayName: Restore node_modules cache
-
-  - script: |
-      set -e
-      tar -xzf .build/node_modules_cache/cache.tgz
-    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
-    displayName: Extract node_modules cache
-
-  - script: |
-      set -e
-      npx https://aka.ms/enablesecurefeed standAlone
-    timeoutInMinutes: 5
-    retryCountOnTaskFailure: 3
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
-    displayName: Switch to Terrapin packages
-
-  - script: |
-      set -e
-      for i in {1..3}; do # try 3 times, for Terrapin
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
-          exit 1
-        fi
-        echo "Yarn failed $i, trying again..."
-      done
-    env:
-      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-      GITHUB_TOKEN: "$(github-distro-mixin-password)"
-    displayName: Install dependencies
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-
-  - script: |
-      set -e
-      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
-      mkdir -p .build/node_modules_cache
-      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-    displayName: Create node_modules archive

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

@@ -1,189 +0,0 @@
-trigger:
-  - main
-  - release/*
-
-pr:
-  branches:
-    include: ["main", "release/*"]
-
-variables:
-  - name: Codeql.SkipTaskAutoInjection
-    value: true
-  - name: skipComponentGovernanceDetection
-    value: true
-  - name: ENABLE_TERRAPIN
-    value: false
-  - name: VSCODE_CIBUILD
-    value: ${{ in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI') }}
-  - name: VSCODE_PUBLISH
-    value: false
-  - name: VSCODE_QUALITY
-    value: oss
-  - name: VSCODE_STEP_ON_IT
-    value: false
-
-jobs:
-  - ${{ if ne(variables['VSCODE_CIBUILD'], true) }}:
-    - job: Compile
-      displayName: Compile & Hygiene
-      pool: vscode-1es-vscode-linux-20.04
-      timeoutInMinutes: 30
-      variables:
-        VSCODE_ARCH: x64
-      steps:
-        - template: product-compile.yml
-          parameters:
-            VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-
-    - job: Linuxx64UnitTest
-      displayName: Linux (Unit Tests)
-      pool: vscode-1es-vscode-linux-20.04
-      timeoutInMinutes: 30
-      variables:
-        VSCODE_ARCH: x64
-        NPM_ARCH: x64
-        DISPLAY: ":10"
-      steps:
-        - template: linux/product-build-linux-client.yml
-          parameters:
-            VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-            VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-            VSCODE_RUN_UNIT_TESTS: true
-            VSCODE_RUN_INTEGRATION_TESTS: false
-            VSCODE_RUN_SMOKE_TESTS: false
-
-    - job: Linuxx64IntegrationTest
-      displayName: Linux (Integration Tests)
-      pool: vscode-1es-vscode-linux-20.04
-      timeoutInMinutes: 30
-      variables:
-        VSCODE_ARCH: x64
-        NPM_ARCH: x64
-        DISPLAY: ":10"
-      steps:
-        - template: linux/product-build-linux-client.yml
-          parameters:
-            VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-            VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-            VSCODE_RUN_UNIT_TESTS: false
-            VSCODE_RUN_INTEGRATION_TESTS: true
-            VSCODE_RUN_SMOKE_TESTS: false
-
-    - job: Linuxx64SmokeTest
-      displayName: Linux (Smoke Tests)
-      pool: vscode-1es-vscode-linux-20.04
-      timeoutInMinutes: 30
-      variables:
-        VSCODE_ARCH: x64
-        NPM_ARCH: x64
-        DISPLAY: ":10"
-      steps:
-        - template: linux/product-build-linux-client.yml
-          parameters:
-            VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-            VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-            VSCODE_RUN_UNIT_TESTS: false
-            VSCODE_RUN_INTEGRATION_TESTS: false
-            VSCODE_RUN_SMOKE_TESTS: true
-
-  - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
-    - job: Linuxx64MaintainNodeModulesCache
-      displayName: Linux (Maintain node_modules cache)
-      pool: vscode-1es-vscode-linux-20.04
-      timeoutInMinutes: 30
-      variables:
-        VSCODE_ARCH: x64
-      steps:
-        - template: product-build-pr-cache.yml
-
-  # - job: macOSUnitTest
-  #   displayName: macOS (Unit Tests)
-  #   pool:
-  #     vmImage: macOS-latest
-  #   timeoutInMinutes: 60
-  #   variables:
-  #     BUILDSECMON_OPT_IN: true
-  #     VSCODE_ARCH: x64
-  #   steps:
-  #     - template: darwin/product-build-darwin.yml
-  #       parameters:
-  #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-  #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-  #         VSCODE_RUN_UNIT_TESTS: true
-  #         VSCODE_RUN_INTEGRATION_TESTS: false
-  #         VSCODE_RUN_SMOKE_TESTS: false
-  # - job: macOSIntegrationTest
-  #   displayName: macOS (Integration Tests)
-  #   pool:
-  #     vmImage: macOS-latest
-  #   timeoutInMinutes: 60
-  #   variables:
-  #     BUILDSECMON_OPT_IN: true
-  #     VSCODE_ARCH: x64
-  #   steps:
-  #     - template: darwin/product-build-darwin.yml
-  #       parameters:
-  #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-  #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-  #         VSCODE_RUN_UNIT_TESTS: false
-  #         VSCODE_RUN_INTEGRATION_TESTS: true
-  #         VSCODE_RUN_SMOKE_TESTS: false
-  # - job: macOSSmokeTest
-  #   displayName: macOS (Smoke Tests)
-  #   pool:
-  #     vmImage: macOS-latest
-  #   timeoutInMinutes: 60
-  #   variables:
-  #     BUILDSECMON_OPT_IN: true
-  #     VSCODE_ARCH: x64
-  #   steps:
-  #     - template: darwin/product-build-darwin.yml
-  #       parameters:
-  #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-  #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-  #         VSCODE_RUN_UNIT_TESTS: false
-  #         VSCODE_RUN_INTEGRATION_TESTS: false
-  #         VSCODE_RUN_SMOKE_TESTS: true
-
-  # - job: WindowsUnitTests
-  #   displayName: Windows (Unit Tests)
-  #   pool: vscode-1es-vscode-windows-2019
-  #   timeoutInMinutes: 60
-  #   variables:
-  #     VSCODE_ARCH: x64
-  #   steps:
-  #     - template: win32/product-build-win32.yml
-  #       parameters:
-  #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-  #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-  #         VSCODE_RUN_UNIT_TESTS: true
-  #         VSCODE_RUN_INTEGRATION_TESTS: false
-  #         VSCODE_RUN_SMOKE_TESTS: false
-  # - job: WindowsIntegrationTests
-  #   displayName: Windows (Integration Tests)
-  #   pool: vscode-1es-vscode-windows-2019
-  #   timeoutInMinutes: 60
-  #   variables:
-  #     VSCODE_ARCH: x64
-  #   steps:
-  #     - template: win32/product-build-win32.yml
-  #       parameters:
-  #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-  #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-  #         VSCODE_RUN_UNIT_TESTS: false
-  #         VSCODE_RUN_INTEGRATION_TESTS: true
-  #         VSCODE_RUN_SMOKE_TESTS: false
-  # - job: WindowsSmokeTests
-  #   displayName: Windows (Smoke Tests)
-  #   pool: vscode-1es-vscode-windows-2019
-  #   timeoutInMinutes: 60
-  #   variables:
-  #     VSCODE_ARCH: x64
-  #   steps:
-  #     - template: win32/product-build-win32.yml
-  #       parameters:
-  #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-  #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-  #         VSCODE_RUN_UNIT_TESTS: false
-  #         VSCODE_RUN_INTEGRATION_TESTS: false
-  #         VSCODE_RUN_SMOKE_TESTS: true

build/azure-pipelines/product-build.yml

@@ -8,10 +8,6 @@ schedules:
         - main
         - joao/web
 
-trigger:
-  branches:
-    include: ["main", "release/*"]
-
 parameters:
   - name: VSCODE_DISTRO_REF
     displayName: Distro Ref (Private build)
@@ -108,11 +104,9 @@ variables:
   - name: VSCODE_BUILD_STAGE_WINDOWS
     value: ${{ or(eq(parameters.VSCODE_BUILD_WIN32, true), eq(parameters.VSCODE_BUILD_WIN32_32BIT, true), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}
   - name: VSCODE_BUILD_STAGE_LINUX
-    value: ${{ or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true)) }}
+    value: ${{ or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true), eq(parameters.VSCODE_BUILD_WEB, true)) }}
   - name: VSCODE_BUILD_STAGE_MACOS
     value: ${{ or(eq(parameters.VSCODE_BUILD_MACOS, true), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}
-  - name: VSCODE_BUILD_STAGE_WEB
-    value: ${{ eq(parameters.VSCODE_BUILD_WEB, true) }}
   - name: VSCODE_CIBUILD
     value: ${{ in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI') }}
   - name: VSCODE_PUBLISH
@@ -168,8 +162,6 @@ stages:
           VSCODE_ARCH: x64
         steps:
           - template: product-compile.yml
-            parameters:
-              VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
 
   - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_WINDOWS'], true)) }}:
       - stage: Windows
@@ -177,60 +169,13 @@ stages:
           - Compile
         pool: vscode-1es-windows
         jobs:
-          - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
+          - ${{ if eq(parameters.VSCODE_BUILD_WIN32, true) }}:
-              - job: WindowsUnitTests
-                displayName: Unit Tests
-                timeoutInMinutes: 60
-                variables:
-                  VSCODE_ARCH: x64
-                steps:
-                  - template: win32/product-build-win32.yml
-                    parameters:
-                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_UNIT_TESTS: true
-                      VSCODE_RUN_INTEGRATION_TESTS: false
-                      VSCODE_RUN_SMOKE_TESTS: false
-              - job: WindowsIntegrationTests
-                displayName: Integration Tests
-                timeoutInMinutes: 60
-                variables:
-                  VSCODE_ARCH: x64
-                steps:
-                  - template: win32/product-build-win32.yml
-                    parameters:
-                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_UNIT_TESTS: false
-                      VSCODE_RUN_INTEGRATION_TESTS: true
-                      VSCODE_RUN_SMOKE_TESTS: false
-              - job: WindowsSmokeTests
-                displayName: Smoke Tests
-                timeoutInMinutes: 60
-                variables:
-                  VSCODE_ARCH: x64
-                steps:
-                  - template: win32/product-build-win32.yml
-                    parameters:
-                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_UNIT_TESTS: false
-                      VSCODE_RUN_INTEGRATION_TESTS: false
-                      VSCODE_RUN_SMOKE_TESTS: true
-
-          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WIN32, true)) }}:
               - job: Windows
                 timeoutInMinutes: 120
                 variables:
                   VSCODE_ARCH: x64
                 steps:
                   - template: win32/product-build-win32.yml
-                    parameters:
-                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
-                      VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
-                      VSCODE_RUN_SMOKE_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
 
           - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WIN32_32BIT, true)) }}:
               - job: Windows32
@@ -239,12 +184,6 @@ stages:
                   VSCODE_ARCH: ia32
                 steps:
                   - template: win32/product-build-win32.yml
-                    parameters:
-                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
-                      VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
-                      VSCODE_RUN_SMOKE_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
 
           - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
               - job: WindowsARM64
@@ -253,12 +192,6 @@ stages:
                   VSCODE_ARCH: arm64
                 steps:
                   - template: win32/product-build-win32.yml
-                    parameters:
-                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_UNIT_TESTS: false
-                      VSCODE_RUN_INTEGRATION_TESTS: false
-                      VSCODE_RUN_SMOKE_TESTS: false
 
   - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_LINUX'], true)) }}:
       - stage: LinuxServerDependencies
@@ -273,17 +206,13 @@ stages:
                   NPM_ARCH: x64
                 steps:
                   - template: linux/product-build-linux-server.yml
-                    parameters:
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
 
-          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true)) }}:
+          - ${{ if eq(parameters.VSCODE_BUILD_LINUX, true) }}:
               - job: arm64
                 variables:
                   VSCODE_ARCH: arm64
                 steps:
                   - template: linux/product-build-linux-server.yml
-                    parameters:
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
 
   - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_LINUX'], true)) }}:
       - stage: Linux
@@ -292,54 +221,7 @@ stages:
           - LinuxServerDependencies
         pool: vscode-1es-linux
         jobs:
-          - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
+          - ${{ if eq(parameters.VSCODE_BUILD_LINUX, true) }}:
-              - job: Linuxx64UnitTest
-                displayName: Unit Tests
-                container: vscode-bionic-x64
-                variables:
-                  VSCODE_ARCH: x64
-                  NPM_ARCH: x64
-                  DISPLAY: ":10"
-                steps:
-                  - template: linux/product-build-linux-client.yml
-                    parameters:
-                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_UNIT_TESTS: true
-                      VSCODE_RUN_INTEGRATION_TESTS: false
-                      VSCODE_RUN_SMOKE_TESTS: false
-              - job: Linuxx64IntegrationTest
-                displayName: Integration Tests
-                container: vscode-bionic-x64
-                variables:
-                  VSCODE_ARCH: x64
-                  NPM_ARCH: x64
-                  DISPLAY: ":10"
-                steps:
-                  - template: linux/product-build-linux-client.yml
-                    parameters:
-                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_UNIT_TESTS: false
-                      VSCODE_RUN_INTEGRATION_TESTS: true
-                      VSCODE_RUN_SMOKE_TESTS: false
-              - job: Linuxx64SmokeTest
-                displayName: Smoke Tests
-                container: vscode-bionic-x64
-                variables:
-                  VSCODE_ARCH: x64
-                  NPM_ARCH: x64
-                  DISPLAY: ":10"
-                steps:
-                  - template: linux/product-build-linux-client.yml
-                    parameters:
-                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_UNIT_TESTS: false
-                      VSCODE_RUN_INTEGRATION_TESTS: false
-                      VSCODE_RUN_SMOKE_TESTS: true
-
-          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX, true)) }}:
               - job: Linuxx64
                 container: vscode-bionic-x64
                 variables:
@@ -348,12 +230,6 @@ stages:
                   DISPLAY: ":10"
                 steps:
                   - template: linux/product-build-linux-client.yml
-                    parameters:
-                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
-                      VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
-                      VSCODE_RUN_SMOKE_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
 
           - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX, true), ne(variables['VSCODE_PUBLISH'], 'false')) }}:
               - job: LinuxSnap
@@ -373,12 +249,6 @@ stages:
                   NPM_ARCH: armv7l
                 steps:
                   - template: linux/product-build-linux-client.yml
-                    parameters:
-                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_UNIT_TESTS: false
-                      VSCODE_RUN_INTEGRATION_TESTS: false
-                      VSCODE_RUN_SMOKE_TESTS: false
 
           # TODO@joaomoreno: We don't ship ARM snaps for now
           - ${{ if and(false, eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true)) }}:
@@ -399,12 +269,6 @@ stages:
                   NPM_ARCH: arm64
                 steps:
                   - template: linux/product-build-linux-client.yml
-                    parameters:
-                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_UNIT_TESTS: false
-                      VSCODE_RUN_INTEGRATION_TESTS: false
-                      VSCODE_RUN_SMOKE_TESTS: false
 
           # TODO@joaomoreno: We don't ship ARM snaps for now
           - ${{ if and(false, eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true)) }}:
@@ -432,6 +296,13 @@ stages:
                 steps:
                   - template: linux/product-build-alpine.yml
 
+          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WEB, true)) }}:
+              - job: LinuxWeb
+                variables:
+                  VSCODE_ARCH: x64
+                steps:
+                  - template: web/product-build-web.yml
+
   - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_MACOS'], true)) }}:
       - stage: macOS
         dependsOn:
@@ -441,76 +312,20 @@ stages:
         variables:
           BUILDSECMON_OPT_IN: true
         jobs:
-          - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
+          - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}:
-              - job: macOSUnitTest
+              - job: macOSTest
-                displayName: Unit Tests
                 timeoutInMinutes: 90
                 variables:
                   VSCODE_ARCH: x64
                 steps:
-                  - template: darwin/product-build-darwin.yml
+                  - template: darwin/product-build-darwin-test.yml
-                    parameters:
+              - ${{ if eq(variables['VSCODE_CIBUILD'], false) }}:
-                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                  - job: macOS
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_UNIT_TESTS: true
-                      VSCODE_RUN_INTEGRATION_TESTS: false
-                      VSCODE_RUN_SMOKE_TESTS: false
-              - job: macOSIntegrationTest
-                displayName: Integration Tests
-                timeoutInMinutes: 90
-                variables:
-                  VSCODE_ARCH: x64
-                steps:
-                  - template: darwin/product-build-darwin.yml
-                    parameters:
-                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_UNIT_TESTS: false
-                      VSCODE_RUN_INTEGRATION_TESTS: true
-                      VSCODE_RUN_SMOKE_TESTS: false
-              - job: macOSSmokeTest
-                displayName: Smoke Tests
-                timeoutInMinutes: 90
-                variables:
-                  VSCODE_ARCH: x64
-                steps:
-                  - template: darwin/product-build-darwin.yml
-                    parameters:
-                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_UNIT_TESTS: false
-                      VSCODE_RUN_INTEGRATION_TESTS: false
-                      VSCODE_RUN_SMOKE_TESTS: true
-
-          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_MACOS, true)) }}:
-              - job: macOS
-                timeoutInMinutes: 90
-                variables:
-                  VSCODE_ARCH: x64
-                steps:
-                  - template: darwin/product-build-darwin.yml
-                    parameters:
-                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_UNIT_TESTS: false
-                      VSCODE_RUN_INTEGRATION_TESTS: false
-                      VSCODE_RUN_SMOKE_TESTS: false
-
-              - ${{ if eq(parameters.VSCODE_STEP_ON_IT, false) }}:
-                  - job: macOSTest
                     timeoutInMinutes: 90
                     variables:
                       VSCODE_ARCH: x64
                     steps:
                       - template: darwin/product-build-darwin.yml
-                        parameters:
-                          VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                          VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                          VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
-                          VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
-                          VSCODE_RUN_SMOKE_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
-
-              - ${{ if eq(variables['VSCODE_PUBLISH'], true) }}:
                   - job: macOSSign
                     dependsOn:
                       - macOS
@@ -527,14 +342,7 @@ stages:
                   VSCODE_ARCH: arm64
                 steps:
                   - template: darwin/product-build-darwin.yml
-                    parameters:
+              - ${{ if eq(variables['VSCODE_CIBUILD'], false) }}:
-                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_UNIT_TESTS: false
-                      VSCODE_RUN_INTEGRATION_TESTS: false
-                      VSCODE_RUN_SMOKE_TESTS: false
-
-              - ${{ if eq(variables['VSCODE_PUBLISH'], true) }}:
                   - job: macOSARM64Sign
                     dependsOn:
                       - macOSARM64
@@ -554,8 +362,7 @@ stages:
                   VSCODE_ARCH: universal
                 steps:
                   - template: darwin/product-build-darwin-universal.yml
-
+              - ${{ if eq(variables['VSCODE_CIBUILD'], false) }}:
-              - ${{ if eq(variables['VSCODE_PUBLISH'], true) }}:
                   - job: macOSUniversalSign
                     dependsOn:
                       - macOSUniversal
@@ -565,19 +372,6 @@ stages:
                     steps:
                       - template: darwin/product-build-darwin-sign.yml
 
-  - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_WEB'], true)) }}:
-      - stage: Web
-        dependsOn:
-          - Compile
-        pool: vscode-1es-linux
-        jobs:
-          - ${{ if eq(parameters.VSCODE_BUILD_WEB, true) }}:
-              - job: Web
-                variables:
-                  VSCODE_ARCH: x64
-                steps:
-                  - template: web/product-build-web.yml
-
   - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), ne(variables['VSCODE_PUBLISH'], 'false')) }}:
       - stage: Publish
         dependsOn:

build/azure-pipelines/product-compile.yml

@@ -1,47 +1,39 @@
-parameters:
-  - name: VSCODE_QUALITY
-    type: string
-
 steps:
   - task: NodeTool@0
     inputs:
       versionSpec: "16.x"
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - 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: "vscode-builds-subscription"
+      KeyVaultName: vscode
-        KeyVaultName: vscode
+      SecretsFilter: "github-distro-mixin-password"
-        SecretsFilter: "github-distro-mixin-password"
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      cat << EOF > ~/.netrc
-        cat << EOF > ~/.netrc
+      machine github.com
-        machine github.com
+      login vscode
-        login vscode
+      password $(github-distro-mixin-password)
-        password $(github-distro-mixin-password)
+      EOF
-        EOF
 
-        git config user.email "vscode@microsoft.com"
+      git config user.email "vscode@microsoft.com"
-        git config user.name "VSCode"
+      git config user.name "VSCode"
-      displayName: Prepare tooling
+    displayName: Prepare tooling
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
-        git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
+      echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
-        echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
+      git checkout FETCH_HEAD
-        git checkout FETCH_HEAD
+    condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
-      condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
+    displayName: Checkout override commit
-      displayName: Checkout override commit
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
-        git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
+    displayName: Merge distro
-      displayName: Merge distro
 
   - script: |
       mkdir -p .build
@@ -102,12 +94,11 @@ steps:
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
     displayName: Create node_modules archive
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  # Mixin must run before optimize, because the CSS loader will inline small SVGs
-    # Mixin must run before optimize, because the CSS loader will inline small SVGs
+  - script: |
-    - script: |
+      set -e
-        set -e
+      node build/azure-pipelines/mixin
-        node build/azure-pipelines/mixin
+    displayName: Mix in quality
-      displayName: Mix in quality
 
   - script: |
       set -e
@@ -116,65 +107,59 @@ steps:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Compile & Hygiene
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      yarn --cwd test/smoke compile
-        yarn --cwd test/smoke compile
+      yarn --cwd test/integration/browser compile
-        yarn --cwd test/integration/browser compile
+    displayName: Compile test suites
-      displayName: Compile test suites
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-      condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - task: AzureCLI@2
-    - task: AzureCLI@2
+    inputs:
-      inputs:
+      azureSubscription: "vscode-builds-subscription"
-        azureSubscription: "vscode-builds-subscription"
+      scriptType: pscore
-        scriptType: pscore
+      scriptLocation: inlineScript
-        scriptLocation: inlineScript
+      addSpnToEnvironment: true
-        addSpnToEnvironment: true
+      inlineScript: |
-        inlineScript: |
+        Write-Host "##vso[task.setvariable variable=AZURE_TENANT_ID]$env:tenantId"
-          Write-Host "##vso[task.setvariable variable=AZURE_TENANT_ID]$env:tenantId"
+        Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_ID]$env:servicePrincipalId"
-          Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_ID]$env:servicePrincipalId"
+        Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey"
-          Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey"
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      AZURE_STORAGE_ACCOUNT="ticino" \
-        AZURE_STORAGE_ACCOUNT="ticino" \
+      AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
-        AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
+      AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
-        AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
+      AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \
-        AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \
+        node build/azure-pipelines/upload-sourcemaps
-          node build/azure-pipelines/upload-sourcemaps
+    displayName: Upload sourcemaps
-      displayName: Upload sourcemaps
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -
-        set -
+      ./build/azure-pipelines/common/extract-telemetry.sh
-        ./build/azure-pipelines/common/extract-telemetry.sh
+    displayName: Extract Telemetry
-      displayName: Extract Telemetry
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      tar -cz --ignore-failed-read -f $(Build.ArtifactStagingDirectory)/compilation.tar.gz .build out-* test/integration/browser/out test/smoke/out test/automation/out
-        tar -cz --ignore-failed-read -f $(Build.ArtifactStagingDirectory)/compilation.tar.gz .build out-* test/integration/browser/out test/smoke/out test/automation/out
+    displayName: Compress compilation artifact
-      displayName: Compress compilation artifact
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - task: PublishPipelineArtifact@1
-    - task: PublishPipelineArtifact@1
+    inputs:
-      inputs:
+      targetPath: $(Build.ArtifactStagingDirectory)/compilation.tar.gz
-        targetPath: $(Build.ArtifactStagingDirectory)/compilation.tar.gz
+      artifactName: Compilation
-        artifactName: Compilation
+    displayName: Publish compilation artifact
-      displayName: Publish compilation artifact
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - script: |
-    - script: |
+      set -e
-        set -e
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn download-builtin-extensions-cg
-          yarn download-builtin-extensions-cg
+    displayName: Built-in extensions component details
-      displayName: Built-in extensions component details
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+    displayName: "Component Detection"
-      displayName: "Component Detection"
+    inputs:
-      inputs:
+      sourceScanPath: $(Build.SourcesDirectory)
-        sourceScanPath: $(Build.SourcesDirectory)
+    continueOnError: true
-      continueOnError: true

build/azure-pipelines/product-publish.ps1

@@ -46,7 +46,6 @@ $stages = @(
 	if ($env:VSCODE_BUILD_STAGE_WINDOWS -eq 'True') { 'Windows' }
 	if ($env:VSCODE_BUILD_STAGE_LINUX -eq 'True') { 'Linux' }
 	if ($env:VSCODE_BUILD_STAGE_MACOS -eq 'True') { 'macOS' }
-	if ($env:VSCODE_BUILD_STAGE_WEB -eq 'True') { 'Web' }
 )
 
 do {

build/azure-pipelines/product-publish.yml

@@ -109,7 +109,6 @@ steps:
         if ($env:VSCODE_BUILD_STAGE_WINDOWS -eq 'True') { 'Windows' }
         if ($env:VSCODE_BUILD_STAGE_LINUX -eq 'True') { 'Linux' }
         if ($env:VSCODE_BUILD_STAGE_MACOS -eq 'True') { 'macOS' }
-        if ($env:VSCODE_BUILD_STAGE_WEB -eq 'True') { 'Web' }
       )
       Write-Host "Stages to check: $stages"
 

build/azure-pipelines/publish-types/check-version.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const cp = require("child_process");
 let tag = '';

build/azure-pipelines/publish-types/check-version.ts

@@ -3,6 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import * as cp from 'child_process';
 
 let tag = '';

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

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const cp = require("child_process");

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

@@ -3,6 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import * as fs from 'fs';
 import * as cp from 'child_process';
 import * as path from 'path';

build/azure-pipelines/upload-cdn.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const es = require("event-stream");
 const Vinyl = require("vinyl");

build/azure-pipelines/upload-cdn.ts

@@ -3,6 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import * as es from 'event-stream';
 import * as Vinyl from 'vinyl';
 import * as vfs from 'vinyl-fs';

build/azure-pipelines/upload-configuration.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSettingsSearchBuildId = exports.shouldSetupSettingsSearch = void 0;
 const path = require("path");
@@ -52,7 +52,7 @@ function generateVSCodeConfigurationTask() {
         const timer = setTimeout(() => {
             codeProc.kill();
             reject(new Error('export-default-configuration process timed out'));
-        }, 60 * 1000);
+        }, 12 * 1000);
         codeProc.on('error', err => {
             clearTimeout(timer);
             reject(err);

build/azure-pipelines/upload-configuration.ts

@@ -3,6 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import * as path from 'path';
 import * as os from 'os';
 import * as cp from 'child_process';
@@ -61,7 +63,7 @@ function generateVSCodeConfigurationTask(): Promise<string | undefined> {
 		const timer = setTimeout(() => {
 			codeProc.kill();
 			reject(new Error('export-default-configuration process timed out'));
-		}, 60 * 1000);
+		}, 12 * 1000);
 
 		codeProc.on('error', err => {
 			clearTimeout(timer);

build/azure-pipelines/upload-nlsmetadata.js

@@ -1,16 +1,14 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const es = require("event-stream");
 const vfs = require("vinyl-fs");
 const merge = require("gulp-merge-json");
 const gzip = require("gulp-gzip");
 const identity_1 = require("@azure/identity");
-const path = require("path");
-const fs_1 = require("fs");
 const azure = require('gulp-azure-storage');
 const commit = process.env['VSCODE_DISTRO_COMMIT'] || process.env['BUILD_SOURCEVERSION'];
 const credential = new identity_1.ClientSecretCredential(process.env['AZURE_TENANT_ID'], process.env['AZURE_CLIENT_ID'], process.env['AZURE_CLIENT_SECRET']);
@@ -20,8 +18,8 @@ function main() {
             .pipe(merge({
             fileName: 'combined.nls.metadata.json',
             jsonSpace: '',
-            concatArrays: true,
             edit: (parsedJson, file) => {
+                let key;
                 if (file.base === 'out-vscode-web-min') {
                     return { vscode: parsedJson };
                 }
@@ -65,11 +63,7 @@ function main() {
                         break;
                     }
                 }
-                // Get extension id and use that as the key
+                key = 'vscode.' + file.relative.split('/')[0];
-                const folderPath = path.join(file.base, file.relative.split('/')[0]);
-                const manifest = (0, fs_1.readFileSync)(path.join(folderPath, 'package.json'), 'utf-8');
-                const manifestJson = JSON.parse(manifest);
-                const key = manifestJson.publisher + '.' + manifestJson.name;
                 return { [key]: parsedJson };
             },
         }))

build/azure-pipelines/upload-nlsmetadata.ts

@@ -3,14 +3,14 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import * as es from 'event-stream';
 import * as Vinyl from 'vinyl';
 import * as vfs from 'vinyl-fs';
 import * as merge from 'gulp-merge-json';
 import * as gzip from 'gulp-gzip';
 import { ClientSecretCredential } from '@azure/identity';
-import path = require('path');
-import { readFileSync } from 'fs';
 const azure = require('gulp-azure-storage');
 
 const commit = process.env['VSCODE_DISTRO_COMMIT'] || process.env['BUILD_SOURCEVERSION'];
@@ -33,8 +33,8 @@ function main(): Promise<void> {
 			.pipe(merge({
 				fileName: 'combined.nls.metadata.json',
 				jsonSpace: '',
-				concatArrays: true,
 				edit: (parsedJson, file) => {
+					let key;
 					if (file.base === 'out-vscode-web-min') {
 						return { vscode: parsedJson };
 					}
@@ -82,12 +82,7 @@ function main(): Promise<void> {
 							break;
 						}
 					}
-
+					key = 'vscode.' + file.relative.split('/')[0];
-					// Get extension id and use that as the key
-					const folderPath = path.join(file.base, file.relative.split('/')[0]);
-					const manifest = readFileSync(path.join(folderPath, 'package.json'), 'utf-8');
-					const manifestJson = JSON.parse(manifest);
-					const key = manifestJson.publisher + '.' + manifestJson.name;
 					return { [key]: parsedJson };
 				},
 			}))
@@ -118,3 +113,4 @@ main().catch(err => {
 	console.error(err);
 	process.exit(1);
 });
+

build/azure-pipelines/upload-sourcemaps.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const es = require("event-stream");

build/azure-pipelines/upload-sourcemaps.ts

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

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

@@ -163,7 +163,6 @@ steps:
 
       cd $ROOT && tar --owner=0 --group=0 -czf $WEB_TARBALL_PATH $WEB_BUILD_NAME
     displayName: Prepare for publish
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(Agent.BuildDirectory)/vscode-web.tar.gz
     artifact: vscode_web_linux_standalone_archive-unsigned

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

@@ -1,247 +0,0 @@
-parameters:
-  - name: VSCODE_QUALITY
-    type: string
-  - name: VSCODE_RUN_UNIT_TESTS
-    type: boolean
-  - name: VSCODE_RUN_INTEGRATION_TESTS
-    type: boolean
-  - name: VSCODE_RUN_SMOKE_TESTS
-    type: boolean
-
-steps:
-  - powershell: |
-      . build/azure-pipelines/win32/exec.ps1
-      $ErrorActionPreference = "Stop"
-      $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
-      exec { yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install" }
-    displayName: Download Electron and Playwright
-
-  - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}:
-    - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - powershell: |
-          . build/azure-pipelines/win32/exec.ps1
-          $ErrorActionPreference = "Stop"
-          exec { yarn electron $(VSCODE_ARCH) }
-          exec { .\scripts\test.bat --tfs "Unit Tests" }
-        displayName: Run unit tests (Electron)
-        timeoutInMinutes: 15
-
-      - powershell: |
-          . build/azure-pipelines/win32/exec.ps1
-          $ErrorActionPreference = "Stop"
-          exec { yarn test-node }
-        displayName: Run unit tests (node.js)
-        timeoutInMinutes: 15
-
-      - powershell: |
-          . build/azure-pipelines/win32/exec.ps1
-          $ErrorActionPreference = "Stop"
-          exec { node test/unit/browser/index.js --sequential --browser chromium --browser firefox --tfs "Browser Unit Tests" }
-        displayName: Run unit tests (Browser, Chromium & Firefox)
-        timeoutInMinutes: 20
-
-    - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - powershell: |
-          . build/azure-pipelines/win32/exec.ps1
-          $ErrorActionPreference = "Stop"
-          exec { yarn electron $(VSCODE_ARCH) }
-          exec { .\scripts\test.bat --build --tfs "Unit Tests" }
-        displayName: Run unit tests (Electron)
-        timeoutInMinutes: 15
-
-      - powershell: |
-          . build/azure-pipelines/win32/exec.ps1
-          $ErrorActionPreference = "Stop"
-          exec { yarn test-node --build }
-        displayName: Run unit tests (node.js)
-        timeoutInMinutes: 15
-
-      - powershell: |
-          . build/azure-pipelines/win32/exec.ps1
-          $ErrorActionPreference = "Stop"
-          exec { yarn test-browser-no-install --sequential --build --browser chromium --browser firefox --tfs "Browser Unit Tests" }
-        displayName: Run unit tests (Browser, Chromium & Firefox)
-        timeoutInMinutes: 20
-
-  - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
-    - powershell: |
-        . build/azure-pipelines/win32/exec.ps1
-        $ErrorActionPreference = "Stop"
-        exec { yarn gulp `
-          compile-extension:configuration-editing `
-          compile-extension:css-language-features-server `
-          compile-extension:emmet `
-          compile-extension:git `
-          compile-extension:github-authentication `
-          compile-extension:html-language-features-server `
-          compile-extension:ipynb `
-          compile-extension:json-language-features-server `
-          compile-extension:markdown-language-features-server `
-          compile-extension:markdown-language-features `
-          compile-extension-media `
-          compile-extension:microsoft-authentication `
-          compile-extension:typescript-language-features `
-          compile-extension:vscode-api-tests `
-          compile-extension:vscode-colorize-tests `
-          compile-extension:vscode-notebook-tests `
-          compile-extension:vscode-test-resolver `
-        }
-      displayName: Build integration tests
-
-    - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - powershell: |
-          . build/azure-pipelines/win32/exec.ps1
-          $ErrorActionPreference = "Stop"
-          exec { .\scripts\test-integration.bat --tfs "Integration Tests" }
-        displayName: Run integration tests (Electron)
-        timeoutInMinutes: 20
-
-      - powershell: |
-          . build/azure-pipelines/win32/exec.ps1
-          $ErrorActionPreference = "Stop"
-          exec { .\scripts\test-web-integration.bat --browser firefox }
-        displayName: Run integration tests (Browser, Firefox)
-        timeoutInMinutes: 20
-
-      - powershell: |
-          . build/azure-pipelines/win32/exec.ps1
-          $ErrorActionPreference = "Stop"
-          exec { .\scripts\test-remote-integration.bat }
-        displayName: Run integration tests (Remote)
-        timeoutInMinutes: 20
-
-    - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - powershell: |
-          # Figure out the full absolute path of the product we just built
-          # including the remote server and configure the integration tests
-          # to run with these builds instead of running out of sources.
-          . build/azure-pipelines/win32/exec.ps1
-          $ErrorActionPreference = "Stop"
-          $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
-          $AppProductJson = Get-Content -Raw -Path "$AppRoot\resources\app\product.json" | ConvertFrom-Json
-          $AppNameShort = $AppProductJson.nameShort
-          exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"; .\scripts\test-integration.bat --build --tfs "Integration Tests" }
-        displayName: Run integration tests (Electron)
-        timeoutInMinutes: 20
-
-      - powershell: |
-          . build/azure-pipelines/win32/exec.ps1
-          $ErrorActionPreference = "Stop"
-          exec { $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH)"; .\scripts\test-web-integration.bat --browser firefox }
-        displayName: Run integration tests (Browser, Firefox)
-        timeoutInMinutes: 20
-
-      - powershell: |
-          . build/azure-pipelines/win32/exec.ps1
-          $ErrorActionPreference = "Stop"
-          $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
-          $AppProductJson = Get-Content -Raw -Path "$AppRoot\resources\app\product.json" | ConvertFrom-Json
-          $AppNameShort = $AppProductJson.nameShort
-          exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"; .\scripts\test-remote-integration.bat }
-        displayName: Run integration tests (Remote)
-        timeoutInMinutes: 20
-
-  - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}:
-    - powershell: |
-        . build/azure-pipelines/win32/exec.ps1
-        exec {.\build\azure-pipelines\win32\listprocesses.bat }
-      displayName: Diagnostics before smoke test run
-      continueOnError: true
-      condition: succeededOrFailed()
-
-    - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - powershell: |
-          . build/azure-pipelines/win32/exec.ps1
-          $ErrorActionPreference = "Stop"
-          exec { yarn --cwd test/smoke compile }
-        displayName: Compile smoke tests
-
-      - powershell: |
-          . build/azure-pipelines/win32/exec.ps1
-          $ErrorActionPreference = "Stop"
-          exec { yarn smoketest-no-compile --tracing }
-        displayName: Run smoke tests (Electron)
-        timeoutInMinutes: 20
-
-    - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - powershell: |
-          . build/azure-pipelines/win32/exec.ps1
-          $ErrorActionPreference = "Stop"
-          $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
-          exec { yarn smoketest-no-compile --tracing --build "$AppRoot" }
-        displayName: Run smoke tests (Electron)
-        timeoutInMinutes: 20
-
-      - powershell: |
-          . build/azure-pipelines/win32/exec.ps1
-          $ErrorActionPreference = "Stop"
-          $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH)"
-          exec { yarn smoketest-no-compile --web --tracing --headless }
-        displayName: Run smoke tests (Browser, Chromium)
-        timeoutInMinutes: 20
-
-      - powershell: |
-          . build/azure-pipelines/win32/exec.ps1
-          $ErrorActionPreference = "Stop"
-          $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
-          $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"
-          exec { yarn gulp compile-extension:vscode-test-resolver }
-          exec { yarn smoketest-no-compile --tracing --remote --build "$AppRoot" }
-        displayName: Run smoke tests (Remote)
-        timeoutInMinutes: 20
-
-    - powershell: |
-        . build/azure-pipelines/win32/exec.ps1
-        exec {.\build\azure-pipelines\win32\listprocesses.bat }
-      displayName: Diagnostics after smoke test run
-      continueOnError: true
-      condition: succeededOrFailed()
-
-  - ${{ if or(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-    - task: PublishPipelineArtifact@0
-      inputs:
-        targetPath: .build\crashes
-        ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-          artifactName: crash-dump-windows-$(VSCODE_ARCH)-integration-$(System.JobAttempt)
-        ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-          artifactName: crash-dump-windows-$(VSCODE_ARCH)-smoke-$(System.JobAttempt)
-        ${{ else }}:
-          artifactName: crash-dump-windows-$(VSCODE_ARCH)-$(System.JobAttempt)
-      displayName: "Publish Crash Reports"
-      continueOnError: true
-      condition: failed()
-
-    # In order to properly symbolify above crash reports
-    # (if any), we need the compiled native modules too
-    - task: PublishPipelineArtifact@0
-      inputs:
-        targetPath: node_modules
-        ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-          artifactName: node-modules-windows-$(VSCODE_ARCH)-integration-$(System.JobAttempt)
-        ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-          artifactName: node-modules-windows-$(VSCODE_ARCH)-smoke-$(System.JobAttempt)
-        ${{ else }}:
-          artifactName: node-modules-windows-$(VSCODE_ARCH)-$(System.JobAttempt)
-      displayName: "Publish Node Modules"
-      continueOnError: true
-      condition: failed()
-
-    - task: PublishPipelineArtifact@0
-      inputs:
-        targetPath: .build\logs
-        ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-          artifactName: logs-windows-$(VSCODE_ARCH)-integration-$(System.JobAttempt)
-        ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-          artifactName: logs-windows-$(VSCODE_ARCH)-smoke-$(System.JobAttempt)
-        ${{ else }}:
-          artifactName: logs-windows-$(VSCODE_ARCH)-$(System.JobAttempt)
-      displayName: "Publish Log Files"
-      continueOnError: true
-      condition: succeededOrFailed()
-
-  - task: PublishTestResults@2
-    displayName: Publish Tests Results
-    inputs:
-      testResultsFiles: "*-results.xml"
-      searchFolder: "$(Build.ArtifactStagingDirectory)/test-results"
-    condition: succeededOrFailed()

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

@@ -1,21 +1,4 @@
-parameters:
-  - name: VSCODE_PUBLISH
-    type: boolean
-  - name: VSCODE_QUALITY
-    type: string
-  - name: VSCODE_RUN_UNIT_TESTS
-    type: boolean
-  - name: VSCODE_RUN_INTEGRATION_TESTS
-    type: boolean
-  - name: VSCODE_RUN_SMOKE_TESTS
-    type: boolean
-
 steps:
-  - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-    - checkout: self
-      fetchDepth: 1
-      retryCountOnTaskFailure: 3
-
   - task: NodeTool@0
     inputs:
       versionSpec: "16.x"
@@ -25,58 +8,51 @@ steps:
       versionSpec: "3.x"
       addToPath: true
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - 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: "vscode-builds-subscription"
+      KeyVaultName: vscode
-        KeyVaultName: vscode
+      SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"
-        SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - task: DownloadPipelineArtifact@2
-    - task: DownloadPipelineArtifact@2
+    inputs:
-      inputs:
+      artifact: Compilation
-        artifact: Compilation
+      path: $(Build.ArtifactStagingDirectory)
-        path: $(Build.ArtifactStagingDirectory)
+    displayName: Download compilation output
-      displayName: Download compilation output
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - task: ExtractFiles@1
-    - task: ExtractFiles@1
+    displayName: Extract compilation output
-      displayName: Extract compilation output
+    inputs:
-      inputs:
+      archiveFilePatterns: "$(Build.ArtifactStagingDirectory)/compilation.tar.gz"
-        archiveFilePatterns: "$(Build.ArtifactStagingDirectory)/compilation.tar.gz"
+      cleanDestinationFolder: false
-        cleanDestinationFolder: false
+
-
+  - powershell: |
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+      . build/azure-pipelines/win32/exec.ps1
-    - powershell: |
+      $ErrorActionPreference = "Stop"
-        . build/azure-pipelines/win32/exec.ps1
+      "machine github.com`nlogin vscode`npassword $(github-distro-mixin-password)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII
-        $ErrorActionPreference = "Stop"
+
-        "machine github.com`nlogin vscode`npassword $(github-distro-mixin-password)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII
+      exec { git config user.email "vscode@microsoft.com" }
-
+      exec { git config user.name "VSCode" }
-        exec { git config user.email "vscode@microsoft.com" }
+    displayName: Prepare tooling
-        exec { git config user.name "VSCode" }
+
-      displayName: Prepare tooling
+  - powershell: |
-
+      . build/azure-pipelines/win32/exec.ps1
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+      $ErrorActionPreference = "Stop"
-    - powershell: |
+
-        . build/azure-pipelines/win32/exec.ps1
+      exec { git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $(VSCODE_DISTRO_REF) }
-        $ErrorActionPreference = "Stop"
+      Write-Host "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
-
+      exec { git checkout FETCH_HEAD }
-        exec { git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $(VSCODE_DISTRO_REF) }
+    condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
-        Write-Host "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
+    displayName: Checkout override commit
-        exec { git checkout FETCH_HEAD }
+
-      condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
+  - powershell: |
-      displayName: Checkout override commit
+      . build/azure-pipelines/win32/exec.ps1
-
+      $ErrorActionPreference = "Stop"
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+      exec { git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") }
-    - powershell: |
+    displayName: Merge distro
-        . build/azure-pipelines/win32/exec.ps1
-        $ErrorActionPreference = "Stop"
-        exec { git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") }
-      displayName: Merge distro
 
   - powershell: |
-      if (!(Test-Path ".build")) { New-Item -Path ".build" -ItemType Directory }
       "$(VSCODE_ARCH)" | Out-File -Encoding ascii -NoNewLine .build\arch
       "$env:ENABLE_TERRAPIN" | Out-File -Encoding ascii -NoNewLine .build\terrapin
       node build/azure-pipelines/common/computeNodeModulesCacheKey.js > .build/yarnlockhash
@@ -128,176 +104,291 @@ steps:
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
     displayName: Create node_modules archive
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - powershell: |
-    - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
-        . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
-        $ErrorActionPreference = "Stop"
+      exec { node build/azure-pipelines/mixin }
-        exec { node build/azure-pipelines/mixin }
+    displayName: Mix in quality
-      displayName: Mix in quality
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - powershell: |
-    - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
-        . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
-        $ErrorActionPreference = "Stop"
+      $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
-        exec { node build\lib\policies }
+      exec { yarn npm-run-all -lp "electron $(VSCODE_ARCH)" }
-      displayName: Generate Group Policy definitions
+    displayName: Download Electron
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
+  - powershell: |
-    - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
-        . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
-        $ErrorActionPreference = "Stop"
+      $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
-        $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
+      exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-min-ci" }
-        exec { yarn gulp "transpile-client" "transpile-extensions" }
+      echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)"
-      displayName: Transpile
+    displayName: Build
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - powershell: |
-    - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
-        . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
-        $ErrorActionPreference = "Stop"
+      $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
-        $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
+      exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-inno-updater" }
-        exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-min-ci" }
+    displayName: Prepare Package
-        echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)"
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-      displayName: Build
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - powershell: |
-    - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
-        . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
-        $ErrorActionPreference = "Stop"
+      exec { node build/azure-pipelines/mixin --server }
-        $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
+    displayName: Mix in quality
-        exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-inno-updater" }
-      displayName: Prepare Package
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - powershell: |
-    - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
-        . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
-        $ErrorActionPreference = "Stop"
+      $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
-        exec { node build/azure-pipelines/mixin --server }
+      exec { yarn gulp "vscode-reh-win32-$(VSCODE_ARCH)-min-ci" }
-      displayName: Mix in quality
+      exec { yarn gulp "vscode-reh-web-win32-$(VSCODE_ARCH)-min-ci" }
-      condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
+      echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(CodeSigningFolderPath),$(agent.builddirectory)/vscode-reh-win32-$(VSCODE_ARCH)"
+    displayName: Build Server
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
 
-  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+  - powershell: |
-    - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
-        . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
-        $ErrorActionPreference = "Stop"
+      $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
-        $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
+      exec { yarn npm-run-all -lp "playwright-install" }
-        exec { yarn gulp "vscode-reh-win32-$(VSCODE_ARCH)-min-ci" }
+    displayName: Download Playwright
-        exec { yarn gulp "vscode-reh-web-win32-$(VSCODE_ARCH)-min-ci" }
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
-        echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(CodeSigningFolderPath),$(agent.builddirectory)/vscode-reh-win32-$(VSCODE_ARCH)"
-      displayName: Build Server
-      condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
 
-  - ${{ if or(eq(parameters.VSCODE_RUN_UNIT_TESTS, true), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
+  - powershell: |
-    - template: product-build-win32-test.yml
+      . build/azure-pipelines/win32/exec.ps1
-      parameters:
+      $ErrorActionPreference = "Stop"
-        VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
+      exec { yarn electron $(VSCODE_ARCH) }
-        VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }}
+      exec { .\scripts\test.bat --build --tfs "Unit Tests" }
-        VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
+    displayName: Run unit tests (Electron)
-        VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }}
+    timeoutInMinutes: 15
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - powershell: |
-    - task: UseDotNet@2
+      . build/azure-pipelines/win32/exec.ps1
-      inputs:
+      $ErrorActionPreference = "Stop"
-        version: 3.x
+      exec { yarn test-node --build }
-      condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+    displayName: Run unit tests (node.js)
+    timeoutInMinutes: 15
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - powershell: |
-    - task: EsrpClientTool@1
+      . build/azure-pipelines/win32/exec.ps1
-      displayName: Download ESRPClient
+      $ErrorActionPreference = "Stop"
+      exec { yarn test-browser-no-install --sequential --build --browser chromium --browser firefox --tfs "Browser Unit Tests" }
+    displayName: Run unit tests (Browser, Chromium & Firefox)
+    timeoutInMinutes: 20
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - powershell: |
-    - powershell: |
+      # Figure out the full absolute path of the product we just built
-        . build/azure-pipelines/win32/exec.ps1
+      # including the remote server and configure the integration tests
-        $ErrorActionPreference = "Stop"
+      # to run with these builds instead of running out of sources.
-        $EsrpClientTool = (gci -directory -filter EsrpClientTool_* $(Agent.RootDirectory)\_tasks | Select-Object -last 1).FullName
+      . build/azure-pipelines/win32/exec.ps1
-        $EsrpCliZip = (gci -recurse -filter esrpcli.*.zip $EsrpClientTool | Select-Object -last 1).FullName
+      $ErrorActionPreference = "Stop"
-        mkdir -p $(Agent.TempDirectory)\esrpcli
+      $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
-        Expand-Archive -Path $EsrpCliZip -DestinationPath $(Agent.TempDirectory)\esrpcli
+      $AppProductJson = Get-Content -Raw -Path "$AppRoot\resources\app\product.json" | ConvertFrom-Json
-        $EsrpCliDllPath = (gci -recurse -filter esrpcli.dll $(Agent.TempDirectory)\esrpcli | Select-Object -last 1).FullName
+      $AppNameShort = $AppProductJson.nameShort
-        echo "##vso[task.setvariable variable=EsrpCliDllPath]$EsrpCliDllPath"
+      exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"; .\scripts\test-integration.bat --build --tfs "Integration Tests" }
-      displayName: Find ESRP CLI
+    displayName: Run integration tests (Electron)
+    timeoutInMinutes: 20
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - powershell: |
-    - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
-        . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
-        $ErrorActionPreference = "Stop"
+      exec { $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH)"; .\scripts\test-web-integration.bat --browser firefox }
-        exec { node build\azure-pipelines\common\sign $env:EsrpCliDllPath windows $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(CodeSigningFolderPath) '*.dll,*.exe,*.node' }
+    displayName: Run integration tests (Browser, Firefox)
-      displayName: Codesign
+    timeoutInMinutes: 20
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - powershell: |
-    - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
-        . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
-        $ErrorActionPreference = "Stop"
+      $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
-        exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-archive" }
+      $AppProductJson = Get-Content -Raw -Path "$AppRoot\resources\app\product.json" | ConvertFrom-Json
-      displayName: Package archive
+      $AppNameShort = $AppProductJson.nameShort
+      exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"; .\scripts\test-remote-integration.bat }
+    displayName: Run integration tests (Remote)
+    timeoutInMinutes: 20
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - powershell: |
-    - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
-        . build/azure-pipelines/win32/exec.ps1
+      exec {.\build\azure-pipelines\win32\listprocesses.bat }
-        $ErrorActionPreference = "Stop"
+    displayName: Diagnostics before smoke test run
-        $env:ESRPPKI = "$(ESRP-PKI)"
+    continueOnError: true
-        $env:ESRPAADUsername = "$(esrp-aad-username)"
+    condition: and(succeededOrFailed(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-        $env:ESRPAADPassword = "$(esrp-aad-password)"
-        exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-system-setup" --sign }
-        exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-user-setup" --sign }
-      displayName: Package setups
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - powershell: |
-    - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
-        . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
-        $ErrorActionPreference = "Stop"
+      $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH)"
-        .\build\azure-pipelines\win32\prepare-publish.ps1
+      exec { yarn smoketest-no-compile --web --tracing --headless }
-      displayName: Publish
+    displayName: Run smoke tests (Browser, Chromium)
+    timeoutInMinutes: 10
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - powershell: |
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+      . build/azure-pipelines/win32/exec.ps1
-      displayName: Generate SBOM (client)
+      $ErrorActionPreference = "Stop"
-      inputs:
+      $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
-        BuildDropPath: $(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)
+      exec { yarn smoketest-no-compile --tracing --build "$AppRoot" }
-        PackageName: Visual Studio Code
+    displayName: Run smoke tests (Electron)
+    timeoutInMinutes: 20
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - powershell: |
-    - publish: $(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)/_manifest
+      . build/azure-pipelines/win32/exec.ps1
-      displayName: Publish SBOM (client)
+      $ErrorActionPreference = "Stop"
-      artifact: vscode_client_win32_$(VSCODE_ARCH)_sbom
+      $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
+      $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"
+      exec { yarn smoketest-no-compile --tracing --remote --build "$AppRoot" }
+    displayName: Run smoke tests (Remote)
+    timeoutInMinutes: 20
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - powershell: |
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+      . build/azure-pipelines/win32/exec.ps1
-      displayName: Generate SBOM (server)
+      exec {.\build\azure-pipelines\win32\listprocesses.bat }
-      inputs:
+    displayName: Diagnostics after smoke test run
-        BuildDropPath: $(agent.builddirectory)/vscode-server-win32-$(VSCODE_ARCH)
+    continueOnError: true
-        PackageName: Visual Studio Code Server
+    condition: and(succeededOrFailed(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-      condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - task: PublishPipelineArtifact@0
-    - publish: $(agent.builddirectory)/vscode-server-win32-$(VSCODE_ARCH)/_manifest
+    inputs:
-      displayName: Publish SBOM (server)
+      artifactName: crash-dump-windows-$(VSCODE_ARCH)
-      artifact: vscode_server_win32_$(VSCODE_ARCH)_sbom
+      targetPath: .build\crashes
-      condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
+    displayName: "Publish Crash Reports"
+    continueOnError: true
+    condition: failed()
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  # In order to properly symbolify above crash reports
-    - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\archive\$(ARCHIVE_NAME)
+  # (if any), we need the compiled native modules too
-      artifact: vscode_client_win32_$(VSCODE_ARCH)_archive
+  - task: PublishPipelineArtifact@0
-      displayName: Publish archive
+    inputs:
+      artifactName: node-modules-windows-$(VSCODE_ARCH)
+      targetPath: node_modules
+    displayName: "Publish Node Modules"
+    continueOnError: true
+    condition: failed()
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - task: PublishPipelineArtifact@0
-    - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\system-setup\$(SYSTEM_SETUP_NAME)
+    inputs:
-      artifact: vscode_client_win32_$(VSCODE_ARCH)_setup
+      artifactName: logs-windows-$(VSCODE_ARCH)-$(System.JobAttempt)
-      displayName: Publish system setup
+      targetPath: .build\logs
+    displayName: "Publish Log Files"
+    continueOnError: true
+    condition: and(failed(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - task: PublishTestResults@2
-    - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\user-setup\$(USER_SETUP_NAME)
+    displayName: Publish Tests Results
-      artifact: vscode_client_win32_$(VSCODE_ARCH)_user-setup
+    inputs:
-      displayName: Publish user setup
+      testResultsFiles: "*-results.xml"
-      condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+      searchFolder: "$(Build.ArtifactStagingDirectory)/test-results"
+    condition: and(succeededOrFailed(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - task: UseDotNet@2
-    - publish: $(System.DefaultWorkingDirectory)\.build\vscode-server-win32-$(VSCODE_ARCH).zip
+    inputs:
-      artifact: vscode_server_win32_$(VSCODE_ARCH)_archive
+      version: 3.x
-      displayName: Publish server archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-      condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
 
-  - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
+  - task: EsrpClientTool@1
-    - publish: $(System.DefaultWorkingDirectory)\.build\vscode-server-win32-$(VSCODE_ARCH)-web.zip
+    displayName: Download ESRPClient
-      artifact: vscode_web_win32_$(VSCODE_ARCH)_archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-      displayName: Publish web server archive
+
-      condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      $EsrpClientTool = (gci -directory -filter EsrpClientTool_* $(Agent.RootDirectory)\_tasks | Select-Object -last 1).FullName
+      $EsrpCliZip = (gci -recurse -filter esrpcli.*.zip $EsrpClientTool | Select-Object -last 1).FullName
+      mkdir -p $(Agent.TempDirectory)\esrpcli
+      Expand-Archive -Path $EsrpCliZip -DestinationPath $(Agent.TempDirectory)\esrpcli
+      $EsrpCliDllPath = (gci -recurse -filter esrpcli.dll $(Agent.TempDirectory)\esrpcli | Select-Object -last 1).FullName
+      echo "##vso[task.setvariable variable=EsrpCliDllPath]$EsrpCliDllPath"
+    displayName: Find ESRP CLI
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      exec { node build\azure-pipelines\common\sign $env:EsrpCliDllPath windows $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(CodeSigningFolderPath) '*.dll,*.exe,*.node' }
+    displayName: Codesign
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-archive" }
+    displayName: Package archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      $env:ESRPPKI = "$(ESRP-PKI)"
+      $env:ESRPAADUsername = "$(esrp-aad-username)"
+      $env:ESRPAADPassword = "$(esrp-aad-password)"
+      exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-system-setup" --sign }
+      exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-user-setup" --sign }
+    displayName: Package setups
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      .\build\azure-pipelines\win32\prepare-publish.ps1
+    displayName: Publish
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\archive\$(ARCHIVE_NAME)
+    artifact: vscode_client_win32_$(VSCODE_ARCH)_archive
+    displayName: Publish archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\system-setup\$(SYSTEM_SETUP_NAME)
+    artifact: vscode_client_win32_$(VSCODE_ARCH)_setup
+    displayName: Publish system setup
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\user-setup\$(USER_SETUP_NAME)
+    artifact: vscode_client_win32_$(VSCODE_ARCH)_user-setup
+    displayName: Publish user setup
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(System.DefaultWorkingDirectory)\.build\vscode-server-win32-$(VSCODE_ARCH).zip
+    artifact: vscode_server_win32_$(VSCODE_ARCH)_archive
+    displayName: Publish server archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
+
+  - publish: $(System.DefaultWorkingDirectory)\.build\vscode-server-win32-$(VSCODE_ARCH)-web.zip
+    artifact: vscode_web_win32_$(VSCODE_ARCH)_archive
+    displayName: Publish web server archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
+
+  - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+    displayName: Generate SBOM (client)
+    inputs:
+      BuildDropPath: $(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)
+      PackageName: Visual Studio Code
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)/_manifest
+    displayName: Publish SBOM (client)
+    artifact: vscode_client_win32_$(VSCODE_ARCH)_sbom
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+    displayName: Generate SBOM (server)
+    inputs:
+      BuildDropPath: $(agent.builddirectory)/vscode-server-win32-$(VSCODE_ARCH)
+      PackageName: Visual Studio Code Server
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
+
+  - publish: $(agent.builddirectory)/vscode-server-win32-$(VSCODE_ARCH)/_manifest
+    displayName: Publish SBOM (server)
+    artifact: vscode_server_win32_$(VSCODE_ARCH)_sbom
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))

build/darwin/create-universal-app.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const vscode_universal_bundler_1 = require("vscode-universal-bundler");
 const cross_spawn_promise_1 = require("@malept/cross-spawn-promise");
@@ -71,7 +71,7 @@ async function main() {
         outAppPath,
         force: true
     });
-    const productJson = await fs.readJson(productJsonPath);
+    let productJson = await fs.readJson(productJsonPath);
     Object.assign(productJson, {
         darwinUniversalAssetId: 'darwin-universal'
     });

build/darwin/create-universal-app.ts

@@ -3,6 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import { makeUniversalApp } from 'vscode-universal-bundler';
 import { spawn } from '@malept/cross-spawn-promise';
 import * as fs from 'fs-extra';
@@ -78,7 +80,7 @@ async function main() {
 		force: true
 	});
 
-	const productJson = await fs.readJson(productJsonPath);
+	let productJson = await fs.readJson(productJsonPath);
 	Object.assign(productJson, {
 		darwinUniversalAssetId: 'darwin-universal'
 	});

build/darwin/sign.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const codesign = require("electron-osx-sign");
 const path = require("path");

build/darwin/sign.ts

@@ -3,6 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import * as codesign from 'electron-osx-sign';
 import * as path from 'path';
 import * as util from '../lib/util';

build/filters.js

@@ -52,6 +52,7 @@ module.exports.unicodeFilter = [
 	'!extensions/typescript-language-features/test-workspace/**',
 	'!extensions/vscode-api-tests/testWorkspace/**',
 	'!extensions/vscode-api-tests/testWorkspace2/**',
+	'!extensions/vscode-custom-editor-tests/test-workspace/**',
 	'!extensions/**/dist/**',
 	'!extensions/**/out/**',
 	'!extensions/**/snippets/**',
@@ -92,6 +93,7 @@ module.exports.indentationFilter = [
 	'!extensions/markdown-math/notebook-out/**',
 	'!extensions/vscode-api-tests/testWorkspace/**',
 	'!extensions/vscode-api-tests/testWorkspace2/**',
+	'!extensions/vscode-custom-editor-tests/test-workspace/**',
 	'!build/monaco/**',
 	'!build/win32/**',
 

build/gulpfile.editor.js

@@ -17,41 +17,34 @@ const compilation = require('./lib/compilation');
 const monacoapi = require('./lib/monaco-api');
 const fs = require('fs');
 
-const root = path.dirname(__dirname);
+let root = path.dirname(__dirname);
-const sha1 = util.getVersion(root);
+let sha1 = util.getVersion(root);
-const semver = require('./monaco/package.json').version;
+let semver = require('./monaco/package.json').version;
-const headerVersion = semver + '(' + sha1 + ')';
+let headerVersion = semver + '(' + sha1 + ')';
 
 // Build
 
-const editorEntryPoints = [
+let editorEntryPoints = [
 	{
 		name: 'vs/editor/editor.main',
 		include: [],
 		exclude: ['vs/css', 'vs/nls'],
-		prepend: [
+		prepend: ['out-editor-build/vs/css.js', 'out-editor-build/vs/nls.js'],
-			{ path: 'out-editor-build/vs/css.js', amdModuleId: 'vs/css' },
-			{ path: 'out-editor-build/vs/nls.js', amdModuleId: 'vs/nls' }
-		],
 	},
 	{
 		name: 'vs/base/common/worker/simpleWorker',
 		include: ['vs/editor/common/services/editorSimpleWorker'],
-		exclude: ['vs/nls'],
+		prepend: ['vs/loader.js'],
-		prepend: [
+		append: ['vs/base/worker/workerMain'],
-			{ path: 'vs/loader.js' },
-			{ path: 'vs/nls.js', amdModuleId: 'vs/nls' },
-			{ path: 'vs/base/worker/workerMain.js' }
-		],
 		dest: 'vs/base/worker/workerMain.js'
 	}
 ];
 
-const editorResources = [
+let editorResources = [
 	'out-editor-build/vs/base/browser/ui/codicons/**/*.ttf'
 ];
 
-const BUNDLED_FILE_HEADER = [
+let BUNDLED_FILE_HEADER = [
 	'/*!-----------------------------------------------------------',
 	' * Copyright (c) Microsoft Corporation. All rights reserved.',
 	' * Version: ' + headerVersion,
@@ -116,6 +109,12 @@ const createESMSourcesAndResourcesTask = task.define('extract-editor-esm', () =>
 			'inlineEntryPoint:0.ts',
 			'inlineEntryPoint:1.ts',
 			'vs/loader.js',
+			'vs/nls.ts',
+			'vs/nls.build.js',
+			'vs/nls.d.ts',
+			'vs/css.js',
+			'vs/css.build.js',
+			'vs/css.d.ts',
 			'vs/base/worker/workerMain.ts',
 		],
 		renames: {
@@ -225,7 +224,7 @@ const appendJSToESMImportsTask = task.define('append-js-to-esm-imports', () => {
 				result.push(line);
 				continue;
 			}
-			const modifiedLine = (
+			let modifiedLine = (
 				line
 					.replace(/^import(.*)\'([^']+)\'/, `import$1'$2.js'`)
 					.replace(/^export \* from \'([^']+)\'/, `export * from '$1.js'`)
@@ -240,10 +239,10 @@ const appendJSToESMImportsTask = task.define('append-js-to-esm-imports', () => {
  * @param {string} contents
  */
 function toExternalDTS(contents) {
-	const lines = contents.split(/\r\n|\r|\n/);
+	let lines = contents.split(/\r\n|\r|\n/);
 	let killNextCloseCurlyBrace = false;
 	for (let i = 0; i < lines.length; i++) {
-		const line = lines[i];
+		let line = lines[i];
 
 		if (killNextCloseCurlyBrace) {
 			if ('}' === line) {
@@ -317,7 +316,7 @@ const finalEditorResourcesTask = task.define('final-editor-resources', () => {
 		// package.json
 		gulp.src('build/monaco/package.json')
 			.pipe(es.through(function (data) {
-				const json = JSON.parse(data.contents.toString());
+				let json = JSON.parse(data.contents.toString());
 				json.private = false;
 				data.contents = Buffer.from(JSON.stringify(json, null, '  '));
 				this.emit('data', data);
@@ -361,10 +360,10 @@ const finalEditorResourcesTask = task.define('final-editor-resources', () => {
 				return;
 			}
 
-			const relativePathToMap = path.relative(path.join(data.relative), path.join('min-maps', data.relative + '.map'));
+			let relativePathToMap = path.relative(path.join(data.relative), path.join('min-maps', data.relative + '.map'));
 
 			let strContents = data.contents.toString();
-			const newStr = '//# sourceMappingURL=' + relativePathToMap.replace(/\\/g, '/');
+			let newStr = '//# sourceMappingURL=' + relativePathToMap.replace(/\\/g, '/');
 			strContents = strContents.replace(/\/\/# sourceMappingURL=[^ ]+$/, newStr);
 
 			data.contents = Buffer.from(strContents);
@@ -484,13 +483,13 @@ function createTscCompileTask(watch) {
 				cwd: path.join(__dirname, '..'),
 				// stdio: [null, 'pipe', 'inherit']
 			});
-			const errors = [];
+			let errors = [];
-			const reporter = createReporter('monaco');
+			let reporter = createReporter('monaco');
 
 			/** @type {NodeJS.ReadWriteStream | undefined} */
 			let report;
 			// eslint-disable-next-line no-control-regex
-			const magic = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g; // https://stackoverflow.com/questions/25245716/remove-all-ansi-colors-styles-from-strings
+			let magic = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g; // https://stackoverflow.com/questions/25245716/remove-all-ansi-colors-styles-from-strings
 
 			child.stdout.on('data', data => {
 				let str = String(data);
@@ -503,12 +502,12 @@ function createTscCompileTask(watch) {
 					report.end();
 
 				} else if (str) {
-					const match = /(.*\(\d+,\d+\): )(.*: )(.*)/.exec(str);
+					let match = /(.*\(\d+,\d+\): )(.*: )(.*)/.exec(str);
 					if (match) {
 						// trying to massage the message so that it matches the gulp-tsb error messages
 						// e.g. src/vs/base/common/strings.ts(663,5): error TS2322: Type '1234' is not assignable to type 'string'.
-						const fullpath = path.join(root, match[1]);
+						let fullpath = path.join(root, match[1]);
-						const message = match[3];
+						let message = match[3];
 						reporter(fullpath + message);
 					} else {
 						reporter(str);

build/gulpfile.extensions.js

@@ -56,7 +56,6 @@ const compilations = [
 	'json-language-features/client/tsconfig.json',
 	'json-language-features/server/tsconfig.json',
 	'markdown-language-features/preview-src/tsconfig.json',
-	'markdown-language-features/server/tsconfig.json',
 	'markdown-language-features/tsconfig.json',
 	'markdown-math/tsconfig.json',
 	'merge-conflict/tsconfig.json',
@@ -64,13 +63,12 @@ const compilations = [
 	'npm/tsconfig.json',
 	'php-language-features/tsconfig.json',
 	'search-result/tsconfig.json',
-	'references-view/tsconfig.json',
 	'simple-browser/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-notebook-tests/tsconfig.json',
+	'vscode-custom-editor-tests/tsconfig.json',
 	'vscode-test-resolver/tsconfig.json'
 ];
 */
@@ -95,7 +93,7 @@ const tasks = compilations.map(function (tsconfigFile) {
 	const baseUrl = getBaseUrl(out);
 
 	let headerId, headerOut;
-	const index = relativeDirname.indexOf('/');
+	let index = relativeDirname.indexOf('/');
 	if (index < 0) {
 		headerId = 'microsoft.' + relativeDirname; // {{SQL CARBON EDIT}}
 		headerOut = 'out';
@@ -104,9 +102,9 @@ const tasks = compilations.map(function (tsconfigFile) {
 		headerOut = relativeDirname.substr(index + 1) + '/out';
 	}
 
-	function createPipeline(build, emitError, transpileOnly) {
+	function createPipeline(build, emitError) {
 		const nlsDev = require('vscode-nls-dev');
-		const tsb = require('./lib/tsb');
+		const tsb = require('gulp-tsb');
 		const sourcemaps = require('gulp-sourcemaps');
 
 		const reporter = createReporter('extensions');
@@ -114,7 +112,7 @@ const tasks = compilations.map(function (tsconfigFile) {
 		overrideOptions.inlineSources = Boolean(build);
 		overrideOptions.base = path.dirname(absolutePath);
 
-		const compilation = tsb.create(absolutePath, overrideOptions, { verbose: false, transpileOnly, transpileOnlyIncludesDts: transpileOnly }, err => reporter(err.toString()));
+		const compilation = tsb.create(absolutePath, overrideOptions, false, err => reporter(err.toString()));
 
 		const pipeline = function () {
 			const input = es.through();
@@ -156,16 +154,6 @@ const tasks = compilations.map(function (tsconfigFile) {
 
 	const cleanTask = task.define(`clean-extension-${name}`, util.rimraf(out));
 
-	const transpileTask = task.define(`transpile-extension:${name}`, task.series(cleanTask, () => {
-		const pipeline = createPipeline(false, true, true);
-		const nonts = gulp.src(src, srcOpts).pipe(filter(['**', '!**/*.ts']));
-		const input = es.merge(nonts, pipeline.tsProjectSrc());
-
-		return input
-			.pipe(pipeline())
-			.pipe(gulp.dest(out));
-	}));
-
 	const compileTask = task.define(`compile-extension:${name}`, task.series(cleanTask, () => {
 		const pipeline = createPipeline(false, true);
 		const nonts = gulp.src(src, srcOpts).pipe(filter(['**', '!**/*.ts']));
@@ -198,16 +186,12 @@ const tasks = compilations.map(function (tsconfigFile) {
 	}));
 
 	// Tasks
-	gulp.task(transpileTask);
 	gulp.task(compileTask);
 	gulp.task(watchTask);
 
-	return { transpileTask, compileTask, watchTask, compileBuildTask };
+	return { compileTask, watchTask, compileBuildTask };
 });
 
-const transpileExtensionsTask = task.define('transpile-extensions', task.parallel(...tasks.map(t => t.transpileTask)));
-gulp.task(transpileExtensionsTask);
-
 const compileExtensionsTask = task.define('compile-extensions', task.parallel(...tasks.map(t => t.compileTask)));
 gulp.task(compileExtensionsTask);
 exports.compileExtensionsTask = compileExtensionsTask;
@@ -245,11 +229,7 @@ const compileExtensionsBuildTask = task.define('compile-extensions-build', task.
 ));
 
 gulp.task(compileExtensionsBuildTask);
-// {{SQL CARBON EDIT}} Needed to pass the "done" gulp callback function to fix "Did you roget to signal async completion" error
+gulp.task(task.define('extensions-ci', task.series(compileExtensionsBuildTask, compileExtensionMediaBuildTask)));
-gulp.task(task.define('extensions-ci', (done) => {
-	task.series(compileExtensionsBuildTask, compileExtensionMediaBuildTask);
-	done();
-}));
 
 exports.compileExtensionsBuildTask = compileExtensionsBuildTask;
 

build/gulpfile.hygiene.js

@@ -16,7 +16,7 @@ function checkPackageJSON(actualPath) {
 	const actual = require(path.join(__dirname, '..', actualPath));
 	const rootPackageJSON = require('../package.json');
 	const checkIncluded = (set1, set2) => {
-		for (const depName in set1) {
+		for (let depName in set1) {
 			if (depName === 'typescript') {
 				continue;
 			}

build/gulpfile.js

@@ -11,7 +11,7 @@ require('events').EventEmitter.defaultMaxListeners = 100;
 const gulp = require('gulp');
 const util = require('./lib/util');
 const task = require('./lib/task');
-const { transpileTask, compileTask, watchTask, compileApiProposalNamesTask, watchApiProposalNamesTask } = require('./lib/compilation');
+const { compileTask, watchTask, compileApiProposalNamesTask, watchApiProposalNamesTask } = require('./lib/compilation');
 const { monacoTypecheckTask/* , monacoTypecheckWatchTask */ } = require('./gulpfile.editor');
 const { compileExtensionsTask, watchExtensionsTask, compileExtensionMediaTask } = require('./gulpfile.extensions');
 
@@ -19,10 +19,6 @@ const { compileExtensionsTask, watchExtensionsTask, compileExtensionMediaTask }
 gulp.task(compileApiProposalNamesTask);
 gulp.task(watchApiProposalNamesTask);
 
-// Transpile only
-const transpileClientTask = task.define('transpile-client', task.series(util.rimraf('out'), util.buildWebNodePaths('out'), transpileTask('src', 'out')));
-gulp.task(transpileClientTask);
-
 // Fast compile for development time
 const compileClientTask = task.define('compile-client', task.series(util.rimraf('out'), util.buildWebNodePaths('out'), compileApiProposalNamesTask, compileTask('src', 'out', false)));
 gulp.task(compileClientTask);

build/gulpfile.reh.js

@@ -116,7 +116,7 @@ const serverEntryPoints = [
 		name: 'vs/workbench/api/node/extensionHostProcess',
 		exclude: ['vs/css', 'vs/nls']
 	},
-	{
+  {
 		name: 'vs/platform/files/node/watcher/watcherMain',
 		exclude: ['vs/css', 'vs/nls']
 	},
@@ -135,7 +135,7 @@ try {
 
 		// Include workbench web
 		...vscodeWebEntryPoints
-	];
+		];
 } catch (err) {
 	serverWithWebEntryPoints = [
 		// Include all of server
@@ -356,14 +356,14 @@ function copyConfigTask(folder) {
 		const json = require('gulp-json-editor');
 
 		return gulp.src(['remote/pkg-package.json'], { base: 'remote' })
-			.pipe(rename(path => path.basename += '.' + folder))
+		.pipe(rename(path => path.basename += '.' + folder))
-			.pipe(json(obj => {
+		.pipe(json(obj => {
-				const pkg = obj.pkg;
+			const pkg = obj.pkg;
-				pkg.scripts = pkg.scripts && pkg.scripts.map(p => path.join(destination, p));
+			pkg.scripts = pkg.scripts && pkg.scripts.map(p => path.join(destination, p));
-				pkg.assets = pkg.assets && pkg.assets.map(p => path.join(destination, p));
+			pkg.assets = pkg.assets && pkg.assets.map(p => path.join(destination, p));
-				return obj;
+			return obj;
-			}))
+		}))
-			.pipe(vfs.dest('out-vscode-reh-pkg'));
+		.pipe(vfs.dest('out-vscode-reh-pkg'));
 	};
 }
 

build/gulpfile.vscode.js

@@ -64,6 +64,7 @@ const vscodeResources = [
 	'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/platform/extensions/node/extensionHostStarterWorkerMain.js',
 	'out-build/vs/workbench/browser/media/*-theme.css',
 	'out-build/vs/workbench/contrib/debug/**/*.json',
 	'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt',
@@ -75,7 +76,7 @@ const vscodeResources = [
 	'out-build/vs/workbench/contrib/tasks/**/*.json',
 	'out-build/vs/platform/files/**/*.exe',
 	'out-build/vs/platform/files/**/*.md',
-	'out-build/vs/code/electron-sandbox/workbench/**',
+	'out-build/vs/code/electron-browser/workbench/**',
 	'out-build/vs/code/electron-browser/sharedProcess/sharedProcess.js',
 	'out-build/vs/code/electron-sandbox/issue/issueReporter.js',
 	'out-build/sql/**/*.{svg,png,cur,html}',
@@ -186,9 +187,9 @@ gulp.task(core);
  * @return {Object} A map of paths to checksums.
  */
 function computeChecksums(out, filenames) {
-	const result = {};
+	let result = {};
 	filenames.forEach(function (filename) {
-		const fullPath = path.join(process.cwd(), out, filename);
+		let fullPath = path.join(process.cwd(), out, filename);
 		result[filename] = computeChecksum(fullPath);
 	});
 	return result;
@@ -201,9 +202,9 @@ function computeChecksums(out, filenames) {
  * @return {string} The checksum for `filename`.
  */
 function computeChecksum(filename) {
-	const contents = fs.readFileSync(filename);
+	let contents = fs.readFileSync(filename);
 
-	const hash = crypto
+	let hash = crypto
 		.createHash('md5')
 		.update(contents)
 		.digest('base64')
@@ -229,8 +230,8 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 			'vs/workbench/workbench.desktop.main.js',
 			'vs/workbench/workbench.desktop.main.css',
 			'vs/workbench/api/node/extensionHostProcess.js',
-			'vs/code/electron-sandbox/workbench/workbench.html',
+			'vs/code/electron-browser/workbench/workbench.html',
-			'vs/code/electron-sandbox/workbench/workbench.js'
+			'vs/code/electron-browser/workbench/workbench.js'
 		]);
 
 		const src = gulp.src(out + '/**', { base: '.' })
@@ -321,7 +322,6 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 			all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' }));
 		} else if (platform === 'darwin') {
 			const shortcut = gulp.src('resources/darwin/bin/code.sh')
-				.pipe(replace('@@APPNAME@@', product.applicationName))
 				.pipe(rename('bin/code'));
 
 			all = es.merge(all, shortcut);
@@ -366,14 +366,10 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 
 			result = es.merge(result, gulp.src('resources/win32/VisualElementsManifest.xml', { base: 'resources/win32' })
 				.pipe(rename(product.nameShort + '.VisualElementsManifest.xml')));
-
-			result = es.merge(result, gulp.src('.build/policies/win32/**', { base: '.build/policies/win32' })
-				.pipe(rename(f => f.dirname = `policies/${f.dirname}`)));
-
 		} else if (platform === 'linux') {
 			result = es.merge(result, gulp.src('resources/linux/bin/code.sh', { base: '.' })
 				.pipe(replace('@@PRODNAME@@', product.nameLong))
-				.pipe(replace('@@APPNAME@@', product.applicationName))
+				.pipe(replace('@@NAME@@', product.applicationName))
 				.pipe(rename('bin/' + product.applicationName)));
 		}
 
@@ -527,7 +523,7 @@ gulp.task(task.define(
 
 gulp.task('vscode-translations-pull', function () {
 	return es.merge([...i18n.defaultLanguages, ...i18n.extraLanguages].map(language => {
-		const includeDefault = !!innoSetupConfig[language.id].defaultInfo;
+		let includeDefault = !!innoSetupConfig[language.id].defaultInfo;
 		return i18n.pullSetupXlfFiles(apiHostname, apiName, apiToken, language, includeDefault).pipe(vfs.dest(`../vscode-translations-import/${language.id}/setup`));
 	}));
 });

build/gulpfile.vscode.linux.js

@@ -16,9 +16,6 @@ const task = require('./lib/task');
 const packageJson = require('../package.json');
 const product = require('../product.json');
 const rpmDependenciesGenerator = require('./linux/rpm/dependencies-generator');
-const debianDependenciesGenerator = require('./linux/debian/dependencies-generator');
-const sysrootInstaller = require('./linux/debian/install-sysroot');
-const debianRecommendedDependencies = require('./linux/debian/dep-lists').recommendedDeps;
 const path = require('path');
 const root = path.dirname(__dirname);
 const commit = util.getVersion(root);
@@ -78,16 +75,12 @@ function prepareDebPackage(arch) {
 		let size = 0;
 		const control = code.pipe(es.through(
 			function (f) { size += f.isDirectory() ? 4096 : f.contents.length; },
-			async function () {
+			function () {
 				const that = this;
-				const sysroot = await sysrootInstaller.getSysroot(debArch);
-				const dependencies = debianDependenciesGenerator.getDependencies(binaryDir, product.applicationName, debArch, sysroot);
 				gulp.src('resources/linux/debian/control.template', { base: '.' })
 					.pipe(replace('@@NAME@@', product.applicationName))
 					.pipe(replace('@@VERSION@@', packageJson.version + '-' + linuxPackageRevision))
 					.pipe(replace('@@ARCHITECTURE@@', debArch))
-					.pipe(replace('@@DEPENDS@@', dependencies.join(', ')))
-					.pipe(replace('@@RECOMMENDS@@', debianRecommendedDependencies.join(', ')))
 					.pipe(replace('@@INSTALLEDSIZE@@', Math.ceil(size / 1024)))
 					.pipe(rename('DEBIAN/control'))
 					.pipe(es.through(function (f) { that.emit('data', f); }, function () { that.emit('end'); }));
@@ -219,7 +212,7 @@ function buildRpmPackage(arch) {
 
 	return shell.task([
 		'mkdir -p ' + destination,
-		'HOME="$(pwd)/' + destination + '" rpmbuild -bb ' + rpmBuildPath + '/SPECS/' + product.applicationName + '.spec --target=' + rpmArch,
+		'HOME="$(pwd)/' + destination + '" fakeroot rpmbuild -bb ' + rpmBuildPath + '/SPECS/' + product.applicationName + '.spec --target=' + rpmArch,
 		'cp "' + rpmOut + '/$(ls ' + rpmOut + ')" ' + destination + '/'
 	]);
 }

build/gulpfile.vscode.web.js

@@ -208,7 +208,7 @@ function packageTask(sourceFolderName, destinationFolderName) {
 			gulp.src('resources/server/code-512.png', { base: 'resources/server' })
 		);
 
-		const all = es.merge(
+		let all = es.merge(
 			packageJsonStream,
 			license,
 			sources,
@@ -218,7 +218,7 @@ function packageTask(sourceFolderName, destinationFolderName) {
 			pwaicons
 		);
 
-		const result = all
+		let result = all
 			.pipe(util.skipDirectories())
 			.pipe(util.fixWin32DirectoryPermissions());
 

build/hygiene.js

@@ -53,7 +53,7 @@ function hygiene(some, linting = true) {
 			const m = /([^\t\n\r\x20-\x7E⊃⊇✔︎✓🎯⚠️🛑🔴🚗🚙🚕🎉✨❗⇧⌥⌘×÷¦⋯…↑↓￫→←↔⟷·•●◆▼⟪⟫┌└├⏎↩√φ]+)/g.exec(line);
 			if (m) {
 				console.error(
-					file.relative + `(${i + 1},${m.index + 1}): Unexpected unicode character: "${m[0]}" (charCode: ${m[0].charCodeAt(0)}). To suppress, use // allow-any-unicode-next-line`
+					file.relative + `(${i + 1},${m.index + 1}): Unexpected unicode character: "${m[0]}". To suppress, use // allow-any-unicode-next-line`
 				);
 				errorCount++;
 			}
@@ -115,8 +115,8 @@ function hygiene(some, linting = true) {
 			})
 			.then(
 				(result) => {
-					const original = result.src.replace(/\r\n/gm, '\n');
+					let original = result.src.replace(/\r\n/gm, '\n');
-					const formatted = result.dest.replace(/\r\n/gm, '\n');
+					let formatted = result.dest.replace(/\r\n/gm, '\n');
 
 					if (original !== formatted) {
 						console.error(

build/lib/asar.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAsar = void 0;
 const path = require("path");
@@ -81,7 +81,7 @@ function createAsar(folderPath, unpackGlobs, destFilename) {
             out.push(file.contents);
         }
     }, function () {
-        const finish = () => {
+        let finish = () => {
             {
                 const headerPickle = pickle.createEmpty();
                 headerPickle.writeString(JSON.stringify(filesystem.header));

build/lib/asar.ts

@@ -3,6 +3,8 @@
  *  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';
 const pickle = require('chromium-pickle-js');
@@ -96,7 +98,7 @@ export function createAsar(folderPath: string, unpackGlobs: string[], destFilena
 		}
 	}, function () {
 
-		const finish = () => {
+		let finish = () => {
 			{
 				const headerPickle = pickle.createEmpty();
 				headerPickle.writeString(JSON.stringify(filesystem.header));

build/lib/builtInExtensions.js

@@ -98,12 +98,12 @@ function writeControlFile(control) {
     fs.writeFileSync(controlFilePath, JSON.stringify(control, null, 2));
 }
 function getBuiltInExtensions() {
-    log('Synchronizing built-in extensions...');
+    log('Syncronizing built-in extensions...');
     log(`You can manage built-in extensions with the ${ansiColors.cyan('--builtin')} flag`);
     const control = readControlFile();
     const streams = [];
     for (const extension of [...builtInExtensions, ...webBuiltInExtensions]) {
-        const controlState = control[extension.name] || 'marketplace';
+        let controlState = control[extension.name] || 'marketplace';
         control[extension.name] = controlState;
         streams.push(syncExtension(extension, controlState));
     }

build/lib/builtInExtensions.ts

@@ -136,14 +136,14 @@ function writeControlFile(control: IControlFile): void {
 }
 
 export function getBuiltInExtensions(): Promise<void> {
-	log('Synchronizing built-in extensions...');
+	log('Syncronizing built-in extensions...');
 	log(`You can manage built-in extensions with the ${ansiColors.cyan('--builtin')} flag`);
 
 	const control = readControlFile();
 	const streams: Stream[] = [];
 
 	for (const extension of [...builtInExtensions, ...webBuiltInExtensions]) {
-		const controlState = control[extension.name] || 'marketplace';
+		let controlState = control[extension.name] || 'marketplace';
 		control[extension.name] = controlState;
 
 		streams.push(syncExtension(extension, controlState));

build/lib/bundle.js

@@ -43,20 +43,14 @@ function bundle(entryPoints, config, callback) {
     if (!config.paths['vs/css']) {
         config.paths['vs/css'] = 'out-build/vs/css.build';
     }
-    config.buildForceInvokeFactory = config.buildForceInvokeFactory || {};
-    config.buildForceInvokeFactory['vs/nls'] = true;
-    config.buildForceInvokeFactory['vs/css'] = true;
     loader.config(config);
     loader(['require'], (localRequire) => {
-        const resolvePath = (entry) => {
+        const resolvePath = (path) => {
-            let r = localRequire.toUrl(entry.path);
+            const r = localRequire.toUrl(path);
-            if (!r.endsWith('.js')) {
+            if (!/\.js/.test(r)) {
-                r += '.js';
+                return r + '.js';
             }
-            // avoid packaging the build version of plugins:
+            return r;
-            r = r.replace('vs/nls.build.js', 'vs/nls.js');
-            r = r.replace('vs/css.build.js', 'vs/css.js');
-            return { path: r, amdModuleId: entry.amdModuleId };
         };
         for (const moduleId in entryPointsMap) {
             const entryPoint = entryPointsMap[moduleId];
@@ -305,17 +299,8 @@ function emitEntryPoint(modulesMap, deps, entryPoint, includedModules, prepend,
         if (module.shim) {
             mainResult.sources.push(emitShimmedModule(c, deps[c], module.shim, module.path, contents));
         }
-        else if (module.defineLocation) {
-            mainResult.sources.push(emitNamedModule(c, module.defineLocation, module.path, contents));
-        }
         else {
-            const moduleCopy = {
+            mainResult.sources.push(emitNamedModule(c, module.defineLocation, module.path, contents));
-                id: module.id,
-                path: module.path,
-                defineLocation: module.defineLocation,
-                dependencies: module.dependencies
-            };
-            throw new Error(`Cannot bundle module '${module.id}' for entry point '${entryPoint}' because it has no shim and it lacks a defineLocation: ${JSON.stringify(moduleCopy)}`);
         }
     });
     Object.keys(usedPlugins).forEach((pluginName) => {
@@ -337,13 +322,10 @@ function emitEntryPoint(modulesMap, deps, entryPoint, includedModules, prepend,
             plugin.writeFile(pluginName, entryPoint, req, write, {});
         }
     });
-    const toIFile = (entry) => {
+    const toIFile = (path) => {
-        let contents = readFileAndRemoveBOM(entry.path);
+        const contents = readFileAndRemoveBOM(path);
-        if (entry.amdModuleId) {
-            contents = contents.replace(/^define\(/m, `define("${entry.amdModuleId}",`);
-        }
         return {
-            path: entry.path,
+            path: path,
             contents: contents
         };
     };

build/lib/bundle.ts

@@ -15,7 +15,7 @@ interface IPosition {
 interface IBuildModuleInfo {
 	id: string;
 	path: string;
-	defineLocation: IPosition | null;
+	defineLocation: IPosition;
 	dependencies: string[];
 	shim: string;
 	exports: any;
@@ -42,17 +42,12 @@ interface ILoaderPluginReqFunc {
 	toUrl(something: string): string;
 }
 
-export interface IExtraFile {
-	path: string;
-	amdModuleId?: string;
-}
-
 export interface IEntryPoint {
 	name: string;
 	include?: string[];
 	exclude?: string[];
-	prepend?: IExtraFile[];
+	prepend?: string[];
-	append?: IExtraFile[];
+	append?: string[];
 	dest?: string;
 }
 
@@ -97,13 +92,6 @@ interface IPartialBundleResult {
 export interface ILoaderConfig {
 	isBuild?: boolean;
 	paths?: { [path: string]: any };
-	/*
-	 * Normally, during a build, no module factories are invoked. This can be used
-	 * to forcefully execute a module's factory.
-	 */
-	buildForceInvokeFactory: {
-		[moduleId: string]: boolean;
-	};
 }
 
 /**
@@ -144,21 +132,15 @@ export function bundle(entryPoints: IEntryPoint[], config: ILoaderConfig, callba
 	if (!config.paths['vs/css']) {
 		config.paths['vs/css'] = 'out-build/vs/css.build';
 	}
-	config.buildForceInvokeFactory = config.buildForceInvokeFactory || {};
-	config.buildForceInvokeFactory['vs/nls'] = true;
-	config.buildForceInvokeFactory['vs/css'] = true;
 	loader.config(config);
 
 	loader(['require'], (localRequire: any) => {
-		const resolvePath = (entry: IExtraFile) => {
+		const resolvePath = (path: string) => {
-			let r = localRequire.toUrl(entry.path);
+			const r = localRequire.toUrl(path);
-			if (!r.endsWith('.js')) {
+			if (!/\.js/.test(r)) {
-				r += '.js';
+				return r + '.js';
 			}
-			// avoid packaging the build version of plugins:
+			return r;
-			r = r.replace('vs/nls.build.js', 'vs/nls.js');
-			r = r.replace('vs/css.build.js', 'vs/css.js');
-			return { path: r, amdModuleId: entry.amdModuleId };
 		};
 		for (const moduleId in entryPointsMap) {
 			const entryPoint = entryPointsMap[moduleId];
@@ -421,8 +403,8 @@ function emitEntryPoint(
 	deps: IGraph,
 	entryPoint: string,
 	includedModules: string[],
-	prepend: IExtraFile[],
+	prepend: string[],
-	append: IExtraFile[],
+	append: string[],
 	dest: string | undefined
 ): IEmitEntryPointResult {
 	if (!dest) {
@@ -462,16 +444,8 @@ function emitEntryPoint(
 
 		if (module.shim) {
 			mainResult.sources.push(emitShimmedModule(c, deps[c], module.shim, module.path, contents));
-		} else if (module.defineLocation) {
-			mainResult.sources.push(emitNamedModule(c, module.defineLocation, module.path, contents));
 		} else {
-			const moduleCopy = {
+			mainResult.sources.push(emitNamedModule(c, module.defineLocation, module.path, contents));
-				id: module.id,
-				path: module.path,
-				defineLocation: module.defineLocation,
-				dependencies: module.dependencies
-			};
-			throw new Error(`Cannot bundle module '${module.id}' for entry point '${entryPoint}' because it has no shim and it lacks a defineLocation: ${JSON.stringify(moduleCopy)}`);
 		}
 	});
 
@@ -496,13 +470,10 @@ function emitEntryPoint(
 		}
 	});
 
-	const toIFile = (entry: IExtraFile): IFile => {
+	const toIFile = (path: string): IFile => {
-		let contents = readFileAndRemoveBOM(entry.path);
+		const contents = readFileAndRemoveBOM(path);
-		if (entry.amdModuleId) {
-			contents = contents.replace(/^define\(/m, `define("${entry.amdModuleId}",`);
-		}
 		return {
-			path: entry.path,
+			path: path,
 			contents: contents
 		};
 	};

build/lib/compilation.js

@@ -1,10 +1,10 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.watchApiProposalNamesTask = exports.compileApiProposalNamesTask = exports.watchTask = exports.compileTask = exports.transpileTask = void 0;
+exports.watchApiProposalNamesTask = exports.compileApiProposalNamesTask = exports.watchTask = exports.compileTask = void 0;
 const es = require("event-stream");
 const fs = require("fs");
 const gulp = require("gulp");
@@ -22,7 +22,7 @@ const watch = require('./watch');
 const reporter = (0, reporter_1.createReporter)();
 function getTypeScriptCompilerOptions(src) {
     const rootDir = path.join(__dirname, `../../${src}`);
-    const options = {};
+    let options = {};
     options.verbose = false;
     options.sourceMap = true;
     if (process.env['VSCODE_NO_SOURCEMAP']) { // To be used by developers in a hurry
@@ -34,8 +34,8 @@ function getTypeScriptCompilerOptions(src) {
     options.newLine = /\r\n/.test(fs.readFileSync(__filename, 'utf8')) ? 0 : 1;
     return options;
 }
-function createCompile(src, build, emitError, transpileOnly) {
+function createCompile(src, build, emitError) {
-    const tsb = require('./tsb');
+    const tsb = require('gulp-tsb');
     const sourcemaps = require('gulp-sourcemaps');
     const projectPath = path.join(__dirname, '../../', src, 'tsconfig.json');
     const overrideOptions = Object.assign(Object.assign({}, getTypeScriptCompilerOptions(src)), { inlineSources: Boolean(build) });
@@ -69,7 +69,7 @@ function createCompile(src, build, emitError, transpileOnly) {
             .pipe(noDeclarationsFilter)
             .pipe(build ? nls.nls() : es.through())
             .pipe(noDeclarationsFilter.restore)
-            .pipe(transpileOnly ? es.through() : sourcemaps.write('.', {
+            .pipe(sourcemaps.write('.', {
             addComment: false,
             includeContent: !!build,
             sourceRoot: overrideOptions.sourceRoot
@@ -83,24 +83,14 @@ function createCompile(src, build, emitError, transpileOnly) {
     };
     return pipeline;
 }
-function transpileTask(src, out) {
-    return function () {
-        const transpile = createCompile(src, false, true, true);
-        const srcPipe = gulp.src(`${src}/**`, { base: `${src}` });
-        return srcPipe
-            .pipe(transpile())
-            .pipe(gulp.dest(out));
-    };
-}
-exports.transpileTask = transpileTask;
 function compileTask(src, out, build) {
     return function () {
         if (os.totalmem() < 4000000000) {
             throw new Error('compilation requires 4GB of RAM');
         }
-        const compile = createCompile(src, build, true, false);
+        const compile = createCompile(src, build, true);
         const srcPipe = gulp.src(`${src}/**`, { base: `${src}` });
-        const generator = new MonacoGenerator(false);
+        let generator = new MonacoGenerator(false);
         if (src === 'src') {
             generator.execute();
         }
@@ -113,10 +103,10 @@ function compileTask(src, out, build) {
 exports.compileTask = compileTask;
 function watchTask(out, build) {
     return function () {
-        const compile = createCompile('src', build, false, false);
+        const compile = createCompile('src', build);
         const src = gulp.src('src/**', { base: 'src' });
         const watchSrc = watch('src/**', { base: 'src', readDelay: 200 });
-        const generator = new MonacoGenerator(true);
+        let generator = new MonacoGenerator(true);
         generator.execute();
         return watchSrc
             .pipe(generator.stream)
@@ -132,7 +122,7 @@ class MonacoGenerator {
         this._isWatch = isWatch;
         this.stream = es.through();
         this._watchedFiles = {};
-        const onWillReadFile = (moduleId, filePath) => {
+        let onWillReadFile = (moduleId, filePath) => {
             if (!this._isWatch) {
                 return;
             }
@@ -169,7 +159,7 @@ class MonacoGenerator {
         }, 20);
     }
     _run() {
-        const r = monacodts.run3(this._declarationResolver);
+        let r = monacodts.run3(this._declarationResolver);
         if (!r && !this._isWatch) {
             // The build must always be able to generate the monaco.d.ts
             throw new Error(`monaco.d.ts generation error - Cannot continue`);
@@ -198,15 +188,6 @@ class MonacoGenerator {
     }
 }
 function generateApiProposalNames() {
-    let eol;
-    try {
-        const src = fs.readFileSync('src/vs/workbench/services/extensions/common/extensionsApiProposals.ts', 'utf-8');
-        const match = /\r?\n/m.exec(src);
-        eol = match ? match[0] : os.EOL;
-    }
-    catch {
-        eol = os.EOL;
-    }
     const pattern = /vscode\.proposed\.([a-zA-Z]+)\.d\.ts$/;
     const proposalNames = new Set();
     const input = es.through();
@@ -233,7 +214,7 @@ function generateApiProposalNames() {
             '});',
             'export type ApiProposalName = keyof typeof allApiProposals;',
             '',
-        ].join(eol);
+        ].join(os.EOL);
         this.emit('data', new File({
             path: 'vs/workbench/services/extensions/common/extensionsApiProposals.ts',
             contents: Buffer.from(contents)

build/lib/compilation.ts

@@ -26,7 +26,7 @@ const reporter = createReporter();
 
 function getTypeScriptCompilerOptions(src: string): ts.CompilerOptions {
 	const rootDir = path.join(__dirname, `../../${src}`);
-	const options: ts.CompilerOptions = {};
+	let options: ts.CompilerOptions = {};
 	options.verbose = false;
 	options.sourceMap = true;
 	if (process.env['VSCODE_NO_SOURCEMAP']) { // To be used by developers in a hurry
@@ -39,8 +39,8 @@ function getTypeScriptCompilerOptions(src: string): ts.CompilerOptions {
 	return options;
 }
 
-function createCompile(src: string, build: boolean, emitError: boolean, transpileOnly: boolean) {
+function createCompile(src: string, build: boolean, emitError?: boolean) {
-	const tsb = require('./tsb') as typeof import('./tsb');
+	const tsb = require('gulp-tsb') as typeof import('gulp-tsb');
 	const sourcemaps = require('gulp-sourcemaps') as typeof import('gulp-sourcemaps');
 
 
@@ -80,7 +80,7 @@ function createCompile(src: string, build: boolean, emitError: boolean, transpil
 			.pipe(noDeclarationsFilter)
 			.pipe(build ? nls.nls() : es.through())
 			.pipe(noDeclarationsFilter.restore)
-			.pipe(transpileOnly ? es.through() : sourcemaps.write('.', {
+			.pipe(sourcemaps.write('.', {
 				addComment: false,
 				includeContent: !!build,
 				sourceRoot: overrideOptions.sourceRoot
@@ -96,19 +96,6 @@ function createCompile(src: string, build: boolean, emitError: boolean, transpil
 	return pipeline;
 }
 
-export function transpileTask(src: string, out: string): () => NodeJS.ReadWriteStream {
-
-	return function () {
-
-		const transpile = createCompile(src, false, true, true);
-		const srcPipe = gulp.src(`${src}/**`, { base: `${src}` });
-
-		return srcPipe
-			.pipe(transpile())
-			.pipe(gulp.dest(out));
-	};
-}
-
 export function compileTask(src: string, out: string, build: boolean): () => NodeJS.ReadWriteStream {
 
 	return function () {
@@ -117,9 +104,9 @@ export function compileTask(src: string, out: string, build: boolean): () => Nod
 			throw new Error('compilation requires 4GB of RAM');
 		}
 
-		const compile = createCompile(src, build, true, false);
+		const compile = createCompile(src, build, true);
 		const srcPipe = gulp.src(`${src}/**`, { base: `${src}` });
-		const generator = new MonacoGenerator(false);
+		let generator = new MonacoGenerator(false);
 		if (src === 'src') {
 			generator.execute();
 		}
@@ -134,12 +121,12 @@ export function compileTask(src: string, out: string, build: boolean): () => Nod
 export function watchTask(out: string, build: boolean): () => NodeJS.ReadWriteStream {
 
 	return function () {
-		const compile = createCompile('src', build, false, false);
+		const compile = createCompile('src', build);
 
 		const src = gulp.src('src/**', { base: 'src' });
 		const watchSrc = watch('src/**', { base: 'src', readDelay: 200 });
 
-		const generator = new MonacoGenerator(true);
+		let generator = new MonacoGenerator(true);
 		generator.execute();
 
 		return watchSrc
@@ -163,7 +150,7 @@ class MonacoGenerator {
 		this._isWatch = isWatch;
 		this.stream = es.through();
 		this._watchedFiles = {};
-		const onWillReadFile = (moduleId: string, filePath: string) => {
+		let onWillReadFile = (moduleId: string, filePath: string) => {
 			if (!this._isWatch) {
 				return;
 			}
@@ -205,7 +192,7 @@ class MonacoGenerator {
 	}
 
 	private _run(): monacodts.IMonacoDeclarationResult | null {
-		const r = monacodts.run3(this._declarationResolver);
+		let r = monacodts.run3(this._declarationResolver);
 		if (!r && !this._isWatch) {
 			// The build must always be able to generate the monaco.d.ts
 			throw new Error(`monaco.d.ts generation error - Cannot continue`);
@@ -238,16 +225,6 @@ class MonacoGenerator {
 }
 
 function generateApiProposalNames() {
-	let eol: string;
-
-	try {
-		const src = fs.readFileSync('src/vs/workbench/services/extensions/common/extensionsApiProposals.ts', 'utf-8');
-		const match = /\r?\n/m.exec(src);
-		eol = match ? match[0] : os.EOL;
-	} catch {
-		eol = os.EOL;
-	}
-
 	const pattern = /vscode\.proposed\.([a-zA-Z]+)\.d\.ts$/;
 	const proposalNames = new Set<string>();
 
@@ -276,7 +253,7 @@ function generateApiProposalNames() {
 				'});',
 				'export type ApiProposalName = keyof typeof allApiProposals;',
 				'',
-			].join(eol);
+			].join(os.EOL);
 
 			this.emit('data', new File({
 				path: 'vs/workbench/services/extensions/common/extensionsApiProposals.ts',

build/lib/dependencies.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProductionDependencies = void 0;
 const path = require("path");

build/lib/dependencies.ts

@@ -3,6 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import * as path from 'path';
 import * as cp from 'child_process';
 import * as _ from 'underscore';

build/lib/electron.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.config = void 0;
 const fs = require("fs");

build/lib/electron.ts

@@ -3,6 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import * as fs from 'fs';
 import * as path from 'path';
 import * as vfs from 'vinyl-fs';

build/lib/eslint/code-no-look-behind-regex.js

@@ -1,8 +1,8 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 //------------------------------------------------------------------------------
 // Rule Definition

build/lib/eslint/code-no-look-behind-regex.ts

@@ -3,6 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import * as eslint from 'eslint';
 import { TSESTree } from '@typescript-eslint/experimental-utils';
 import * as ESTree from 'estree';

build/lib/eslint/code-no-unexternalized-strings.js

@@ -41,7 +41,7 @@ module.exports = new (_a = class NoUnexternalizedStrings {
                     key = keyNode.value;
                 }
                 else if (keyNode.type === experimental_utils_1.AST_NODE_TYPES.ObjectExpression) {
-                    for (const property of keyNode.properties) {
+                    for (let property of keyNode.properties) {
                         if (property.type === experimental_utils_1.AST_NODE_TYPES.Property && !property.computed) {
                             if (property.key.type === experimental_utils_1.AST_NODE_TYPES.Identifier && property.key.name === 'key') {
                                 if (isStringLiteral(property.value)) {
@@ -83,7 +83,7 @@ module.exports = new (_a = class NoUnexternalizedStrings {
                     // (2)
                     // report all invalid NLS keys
                     if (!key.match(NoUnexternalizedStrings._rNlsKeys)) {
-                        for (const value of values) {
+                        for (let value of values) {
                             context.report({ loc: value.call.loc, messageId: 'badKey', data: { key } });
                         }
                     }

build/lib/eslint/code-no-unexternalized-strings.ts

@@ -51,7 +51,7 @@ export = new class NoUnexternalizedStrings implements eslint.Rule.RuleModule {
 				key = keyNode.value;
 
 			} else if (keyNode.type === AST_NODE_TYPES.ObjectExpression) {
-				for (const property of keyNode.properties) {
+				for (let property of keyNode.properties) {
 					if (property.type === AST_NODE_TYPES.Property && !property.computed) {
 						if (property.key.type === AST_NODE_TYPES.Identifier && property.key.name === 'key') {
 							if (isStringLiteral(property.value)) {
@@ -97,7 +97,7 @@ export = new class NoUnexternalizedStrings implements eslint.Rule.RuleModule {
 				// (2)
 				// report all invalid NLS keys
 				if (!key.match(NoUnexternalizedStrings._rNlsKeys)) {
-					for (const value of values) {
+					for (let value of values) {
 						context.report({ loc: value.call.loc, messageId: 'badKey', data: { key } });
 					}
 				}

build/lib/eslint/code-no-unused-expressions.js

@@ -1,8 +1,14 @@
-"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+// FORKED FROM https://github.com/eslint/eslint/blob/b23ad0d789a909baf8d7c41a35bc53df932eaf30/lib/rules/no-unused-expressions.js
+// and added support for `OptionalCallExpression`, see https://github.com/facebook/create-react-app/issues/8107 and https://github.com/eslint/eslint/issues/12642
+/**
+ * @fileoverview Flag expressions in statement position that do not side effect
+ * @author Michael Ficarra
+ */
+'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 //------------------------------------------------------------------------------
 // Rule Definition

build/lib/eslint/code-no-unused-expressions.ts

@@ -11,6 +11,8 @@
  * @author Michael Ficarra
  */
 
+'use strict';
+
 import * as eslint from 'eslint';
 import { TSESTree } from '@typescript-eslint/experimental-utils';
 import * as ESTree from 'estree';

build/lib/eslint/vscode-dts-cancellation.js

@@ -16,7 +16,7 @@ module.exports = new class ApiProviderNaming {
         return {
             ['TSInterfaceDeclaration[id.name=/.+Provider/] TSMethodSignature[key.name=/^(provide|resolve).+/]']: (node) => {
                 let found = false;
-                for (const param of node.params) {
+                for (let param of node.params) {
                     if (param.type === experimental_utils_1.AST_NODE_TYPES.Identifier) {
                         found = found || param.name === 'token';
                     }