chore(vscode): update to 1.54.2

2021-03-11 10:27:10 -07:00
parent 44a4a0bc20 e8cd17a97d
commit 0cd3e39492
1459 changed files with 53404 additions and 51004 deletions
--- a/lib/vscode/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/lib/vscode/build/azure-pipelines/darwin/product-build-darwin.yml
@ -71,6 +71,7 @@ steps:
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

  - script: |
+      set -e
      npx https://aka.ms/enablesecurefeed standAlone
    timeoutInMinutes: 5
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
@ -180,14 +181,14 @@ steps:
      set -e
      ./scripts/test.sh --build --tfs "Unit Tests"
    displayName: Run unit tests (Electron)
-    timeoutInMinutes: 5
+    timeoutInMinutes: 7
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

  - script: |
      set -e
      yarn test-browser --build --browser chromium --browser webkit --browser firefox --tfs "Browser Unit Tests"
    displayName: Run unit tests (Browser)
-    timeoutInMinutes: 5
+    timeoutInMinutes: 7
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

  - script: |
@ -207,7 +208,7 @@ steps:
      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin" \
      ./scripts/test-integration.sh --build --tfs "Integration Tests"
    displayName: Run integration tests (Electron)
-    timeoutInMinutes: 5
+    timeoutInMinutes: 10
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

  - script: |
@ -215,7 +216,7 @@ steps:
      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
      ./resources/server/test/test-web-integration.sh --browser webkit
    displayName: Run integration tests (Browser)
-    timeoutInMinutes: 5
+    timeoutInMinutes: 7
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

  - script: |
@ -226,7 +227,7 @@ steps:
      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin" \
      ./resources/server/test/test-remote-integration.sh
    displayName: Run remote integration tests (Electron)
-    timeoutInMinutes: 5
+    timeoutInMinutes: 7
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

  - script: |
@ -244,6 +245,16 @@ steps:
    displayName: Run smoke tests (Electron)
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

+  - script: |
+      set -e
+      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      APP_NAME="`ls $APP_ROOT | head -n 1`"
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin" \
+      yarn smoketest-no-compile --build "$APP_ROOT/$APP_NAME" --remote
+    timeoutInMinutes: 5
+    displayName: Run smoke tests (Remote)
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
  - script: |
      set -e
      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
@ -377,7 +388,3 @@ steps:
    displayName: Upload configuration (for Bing settings search)
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
    continueOnError: true
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: "Component Detection"
-    continueOnError: true
--- a/lib/vscode/build/azure-pipelines/distro-build.yml
+++ b/lib/vscode/build/azure-pipelines/distro-build.yml
@ -1,9 +1,9 @@
 trigger:
  branches:
-    include: ["master", "release/*"]
+    include: ["main", "release/*"]
 pr:
  branches:
-    include: ["master", "release/*"]
+    include: ["main", "release/*"]

 steps:
  - task: NodeTool@0
@ -31,8 +31,8 @@ steps:
      git remote add distro "https://github.com/$VSCODE_MIXIN_REPO.git"
      git fetch distro

-      # Push master branch into oss/master
-      git push distro origin/master:refs/heads/oss/master
+      # Push main branch into oss/main
+      git push distro origin/main:refs/heads/oss/main

      # Push every release branch into oss/release
      git for-each-ref --format="%(refname:short)" refs/remotes/origin/release/* | sed 's/^origin\/\(.*\)$/\0:refs\/heads\/oss\/\1/' | xargs git push distro
--- a/lib/vscode/build/azure-pipelines/exploration-build.yml
+++ b/lib/vscode/build/azure-pipelines/exploration-build.yml
@ -28,9 +28,9 @@ steps:
      git config user.name "VSCode"

      git checkout origin/electron-11.x.y
-      git merge origin/master
+      git merge origin/main

-      # Push master branch into exploration branch
+      # Push main branch into exploration branch
      git push origin HEAD:electron-11.x.y

    displayName: Sync & Merge Exploration
--- a/lib/vscode/build/azure-pipelines/linux/product-build-alpine.yml
+++ b/lib/vscode/build/azure-pipelines/linux/product-build-alpine.yml
@ -69,6 +69,7 @@ steps:
    displayName: Extract node_modules cache

  - script: |
+      set -e
      npx https://aka.ms/enablesecurefeed standAlone
    timeoutInMinutes: 5
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
@ -132,7 +133,3 @@ steps:
    artifact: vscode-server-linux-alpine-web
    displayName: Publish web server archive
    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: "Component Detection"
-    continueOnError: true
--- a/lib/vscode/build/azure-pipelines/linux/product-build-linux.yml
+++ b/lib/vscode/build/azure-pipelines/linux/product-build-linux.yml
@ -67,6 +67,7 @@ steps:
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['VSCODE_ARCH'], 'x64'))

  - script: |
+      set -e
      npx https://aka.ms/enablesecurefeed standAlone
    timeoutInMinutes: 5
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
@ -144,14 +145,14 @@ steps:
      set -e
      DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
    displayName: Run unit tests (Electron)
-    timeoutInMinutes: 5
+    timeoutInMinutes: 7
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

  - script: |
      set -e
      DISPLAY=:10 yarn test-browser --build --browser chromium --tfs "Browser Unit Tests"
    displayName: Run unit tests (Browser)
-    timeoutInMinutes: 5
+    timeoutInMinutes: 7
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

  - script: |
@ -172,7 +173,7 @@ steps:
      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
      DISPLAY=:10 ./scripts/test-integration.sh --build --tfs "Integration Tests"
    displayName: Run integration tests (Electron)
-    timeoutInMinutes: 5
+    timeoutInMinutes: 10
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

  - script: |
@ -180,7 +181,7 @@ steps:
      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-$(VSCODE_ARCH)" \
      DISPLAY=:10 ./resources/server/test/test-web-integration.sh --browser chromium
    displayName: Run integration tests (Browser)
-    timeoutInMinutes: 5
+    timeoutInMinutes: 7
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

  - script: |
@ -192,7 +193,7 @@ steps:
      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
      DISPLAY=:10 ./resources/server/test/test-remote-integration.sh
    displayName: Run remote integration tests (Electron)
-    timeoutInMinutes: 5
+    timeoutInMinutes: 7
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

  - task: PublishPipelineArtifact@0
@ -286,7 +287,3 @@ steps:
      artifactName: "snap-$(VSCODE_ARCH)"
      targetPath: .build/linux/snap-tarball
    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: "Component Detection"
-    continueOnError: true
--- a/lib/vscode/build/azure-pipelines/product-build.yml
+++ b/lib/vscode/build/azure-pipelines/product-build.yml
@ -5,7 +5,7 @@ schedules:
    displayName: Mon-Fri at 7:00
    branches:
      include:
-        - master
+        - main

 parameters:
  - name: VSCODE_QUALITY
--- a/lib/vscode/build/azure-pipelines/product-compile.yml
+++ b/lib/vscode/build/azure-pipelines/product-compile.yml
@ -50,6 +50,7 @@ steps:
    displayName: Extract node_modules cache

  - script: |
+      set -e
      npx https://aka.ms/enablesecurefeed standAlone
    timeoutInMinutes: 5
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
@ -136,3 +137,15 @@ steps:
      targetPath: $(Build.ArtifactStagingDirectory)/compilation.tar.gz
      artifactName: Compilation
    displayName: Publish compilation artifact
+
+  - script: |
+      set -e
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn download-builtin-extensions-cg
+    displayName: Built-in extensions component details
+
+  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+    displayName: "Component Detection"
+    inputs:
+      sourceScanPath: $(Build.SourcesDirectory)
+    continueOnError: true
--- a/lib/vscode/build/azure-pipelines/publish-types/publish-types.yml
+++ b/lib/vscode/build/azure-pipelines/publish-types/publish-types.yml
@ -61,7 +61,7 @@ steps:
      TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
      CHANNEL="G1C14HJ2F"

-      MESSAGE="DefinitelyTyped/DefinitelyTyped#vscode-types-$TAG_VERSION created. Endgame master, please open this link, examine changes and create a PR:"
+      MESSAGE="DefinitelyTyped/DefinitelyTyped#vscode-types-$TAG_VERSION created. Endgame champion, please open this link, examine changes and create a PR:"
      LINK="https://github.com/DefinitelyTyped/DefinitelyTyped/compare/vscode-types-$TAG_VERSION?quick_pull=1&body=Updating%20VS%20Code%20Extension%20API.%20See%20https%3A%2F%2Fgithub.com%2Fmicrosoft%2Fvscode%2Fissues%2F70175%20for%20details."
      MESSAGE2="[@eamodio, @jrieken, @kmaetzel, @egamma]. Please review and merge PR to publish @types/vscode."

--- a/lib/vscode/build/azure-pipelines/publish-types/update-types.ts
+++ b/lib/vscode/build/azure-pipelines/publish-types/update-types.ts
@ -72,7 +72,7 @@ function getNewFileHeader(tag: string) {
 		`/*---------------------------------------------------------------------------------------------`,
 		` *  Copyright (c) Microsoft Corporation. All rights reserved.`,
 		` *  Licensed under the MIT License.`,
-		` *  See https://github.com/microsoft/vscode/blob/master/LICENSE.txt for license information.`,
+		` *  See https://github.com/microsoft/vscode/blob/main/LICENSE.txt for license information.`,
 		` *--------------------------------------------------------------------------------------------*/`,
 		``,
 		`/**`,
--- a/lib/vscode/build/azure-pipelines/web/product-build-web.yml
+++ b/lib/vscode/build/azure-pipelines/web/product-build-web.yml
@ -60,6 +60,7 @@ steps:
    displayName: Extract node_modules cache

  - script: |
+      set -e
      npx https://aka.ms/enablesecurefeed standAlone
    timeoutInMinutes: 5
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
--- a/lib/vscode/build/azure-pipelines/win32/product-build-win32.yml
+++ b/lib/vscode/build/azure-pipelines/win32/product-build-win32.yml
@ -65,8 +65,10 @@ steps:
    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
    displayName: Extract node_modules cache

-  - script: |
-      npx https://aka.ms/enablesecurefeed standAlone
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      exec { npx https://aka.ms/enablesecurefeed standAlone }
    timeoutInMinutes: 5
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
    displayName: Switch to Terrapin packages
@ -320,7 +322,3 @@ steps:
    artifact: vscode-server-win32-$(VSCODE_ARCH)-web
    displayName: Publish web server archive
    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: "Component Detection"
-    continueOnError: true