VS Code merge to df8fe74bd55313de0dd2303bc47a4aab0ca56b0e (#17979)

* Merge from vscode 504f934659740e9d41501cad9f162b54d7745ad9 * delete unused folders * distro * Bump build node version * update chokidar * FIx hygiene errors * distro * Fix extension lint issues * Remove strict-vscode * Add copyright header exemptions * Bump vscode-extension-telemetry to fix webpacking issue with zone.js * distro * Fix failing tests (revert marked.js back to current one until we decide to update) * Skip searchmodel test * Fix mac build * temp debug script loading * Try disabling coverage * log error too * Revert "log error too" This reverts commit af0183e5d4ab458fdf44b88fbfab9908d090526f. * Revert "temp debug script loading" This reverts commit 3d687d541c76db2c5b55626c78ae448d3c25089c. * Add comments explaining coverage disabling * Fix ansi_up loading issue * Merge latest from ads * Use newer option * Fix compile * add debug logging warn * Always log stack * log more * undo debug * Update to use correct base path (+cleanup) * distro * fix compile errors * Remove strict-vscode * Fix sql editors not showing * Show db dropdown input & fix styling * Fix more info in gallery * Fix gallery asset requests * Delete unused workflow * Fix tapable resolutions for smoke test compile error * Fix smoke compile * Disable crash reporting * Disable interactive Co-authored-by: ADS Merger <karlb@microsoft.com>
2026-02-16 18:46:40 -05:00 · 2022-01-06 09:06:56 -08:00
parent fd2736b6a6
commit 2bc6a0cd01
2099 changed files with 79520 additions and 43813 deletions
--- a/build/azure-pipelines/darwin/continuous-build-darwin.yml
+++ b/build/azure-pipelines/darwin/continuous-build-darwin.yml
@@ -1,39 +1,39 @@
 steps:
  - task: NodeTool@0
    inputs:
-      versionSpec: "12.18.3"
+      versionSpec: "14.x"

- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3 # {{SQL CARBON EDIT}} update version
-  inputs:
-    versionSpec: "1.x"
+  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3 # {{SQL CARBON EDIT}} update version
+    inputs:
+      versionSpec: "1.x"

- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  displayName: Restore Cache - Node Modules # {{SQL CARBON EDIT}}
-  inputs:
-    keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
-    vstsFeed: 'npm-cache' # {{SQL CARBON EDIT}} update build cache
+  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+    displayName: Restore Cache - Node Modules # {{SQL CARBON EDIT}}
+    inputs:
+      keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
+      targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
+      vstsFeed: 'npm-cache' # {{SQL CARBON EDIT}} update build cache

  - script: |
      CHILD_CONCURRENCY=1 yarn --frozen-lockfile
    displayName: Install Dependencies
    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))

- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-  displayName: Save Cache - Node Modules # {{SQL CARBON EDIT}}
-  inputs:
-    keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
-    vstsFeed: 'npm-cache' # {{SQL CARBON EDIT}} update build cache
-  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+    displayName: Save Cache - Node Modules # {{SQL CARBON EDIT}}
+    inputs:
+      keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
+      targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
+      vstsFeed: 'npm-cache' # {{SQL CARBON EDIT}} update build cache
+    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))

- script: |
-    yarn electron x64
-  displayName: Download Electron
+  - script: |
+      yarn electron x64
+    displayName: Download Electron

-# - script: | {{SQL CARBON EDIT}} remove editor checks
-#     yarn monaco-compile-check
-#   displayName: Run Monaco Editor Checks
+  # - script: | {{SQL CARBON EDIT}} remove editor checks
+  #     yarn monaco-compile-check
+  #   displayName: Run Monaco Editor Checks

  - script: |
      yarn valid-layers-check
@@ -43,21 +43,21 @@ steps:
      yarn compile
    displayName: Compile Sources

-# - script: | {{SQL CARBON EDIT}} remove step
-#     yarn download-builtin-extensions
-#   displayName: Download Built-in Extensions
+  # - script: | {{SQL CARBON EDIT}} remove step
+  #     yarn download-builtin-extensions
+  #   displayName: Download Built-in Extensions

  - script: |
      ./scripts/test.sh --tfs "Unit Tests"
    displayName: Run Unit Tests (Electron)

-# - script: | {{SQL CARBON EDIT}} disable
-#     yarn test-browser --browser chromium --browser webkit --browser firefox --tfs "Browser Unit Tests"
-#   displayName: Run Unit Tests (Browser)
+  # - script: | {{SQL CARBON EDIT}} disable
+  #     yarn test-browser --browser chromium --browser webkit --browser firefox --tfs "Browser Unit Tests"
+  #   displayName: Run Unit Tests (Browser)

-# - script: | {{SQL CARBON EDIT}} disable
-#     ./scripts/test-integration.sh --tfs "Integration Tests"
-#   displayName: Run Integration Tests (Electron)
+  # - script: | {{SQL CARBON EDIT}} disable
+  #     ./scripts/test-integration.sh --tfs "Integration Tests"
+  #   displayName: Run Integration Tests (Electron)

  - task: PublishPipelineArtifact@0
    inputs:
--- a/build/azure-pipelines/darwin/product-build-darwin-sign.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin-sign.yml
@@ -8,6 +8,7 @@ steps:
    inputs:
      azureSubscription: "vscode-builds-subscription"
      KeyVaultName: vscode
+      SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"

  - script: |
      set -e
@@ -27,12 +28,10 @@ steps:
    displayName: Merge distro

  - script: |
-      pushd build \
-      && yarn \
-      && npm install -g typescript \
-      && tsc azure-pipelines/common/createAsset.ts \
-      && popd
-    displayName: Restore modules for just build folder and compile it
+      set -e
+      yarn --cwd build
+      yarn --cwd build compile
+    displayName: Compile build tools

  - download: current
    artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
@@ -44,28 +43,16 @@ steps:
      mv $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
    displayName: Unzip & move

-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  - task: UseDotNet@2
    inputs:
-      ConnectedServiceName: "ESRP CodeSign"
-      FolderPath: "$(agent.builddirectory)"
-      Pattern: "VSCode-darwin-$(VSCODE_ARCH).zip"
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-          {
-            "keyCode": "CP-401337-Apple",
-            "operationSetCode": "MacAppDeveloperSign",
-            "parameters": [
-              {
-                "parameterName": "Hardening",
-                "parameterValue": "--options=runtime"
-              }
-            ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          }
-        ]
-      SessionTimeout: 60
+      version: 2.x
+
+  - task: EsrpClientTool@1
+    displayName: Download ESRPClient
+
+  - script: |
+      set -e
+      node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" darwin-sign $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(agent.builddirectory) VSCode-darwin-$(VSCODE_ARCH).zip
    displayName: Codesign

  - script: |
@@ -75,29 +62,10 @@ steps:
      echo "##vso[task.setvariable variable=BundleIdentifier]$BUNDLE_IDENTIFIER"
    displayName: Export bundle identifier

-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-    inputs:
-      ConnectedServiceName: "ESRP CodeSign"
-      FolderPath: "$(agent.builddirectory)"
-      Pattern: "VSCode-darwin-$(VSCODE_ARCH).zip"
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-          {
-            "keyCode": "CP-401337-Apple",
-            "operationSetCode": "MacAppNotarize",
-            "parameters": [
-              {
-                "parameterName": "BundleId",
-                "parameterValue": "$(BundleIdentifier)"
-              }
-            ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          }
-        ]
-      SessionTimeout: 60
-    displayName: Notarization
+  - script: |
+      set -e
+      node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" darwin-notarize $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(agent.builddirectory) VSCode-darwin-$(VSCODE_ARCH).zip
+    displayName: Notarize

  - script: |
      set -e
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -8,6 +8,7 @@ steps:
    inputs:
      azureSubscription: "vscode-builds-subscription"
      KeyVaultName: vscode
+      SecretsFilter: 'github-distro-mixin-password,macos-developer-certificate,macos-developer-certificate-key,ticino-storage-key'

  - task: DownloadPipelineArtifact@2
    inputs:
@@ -54,7 +55,7 @@ steps:

  - task: Cache@2
    inputs:
-      key: 'nodeModules | $(Agent.OS) | .build/yarnlockhash'
+      key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
      path: .build/node_modules_cache
      cacheHitVar: NODE_MODULES_RESTORED
    displayName: Restore node_modules cache
@@ -97,6 +98,7 @@ steps:
    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'))

@@ -185,12 +187,6 @@ steps:
    timeoutInMinutes: 7
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

-  - script: |
-      set -e
-      yarn --cwd test/integration/browser compile
-    displayName: Compile integration tests
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
  - script: |
      # Figure out the full absolute path of the product we just built
      # including the remote server and configure the integration tests
@@ -224,17 +220,11 @@ steps:
    timeoutInMinutes: 7
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

-  - script: |
-      set -e
-      yarn --cwd test/smoke compile
-    displayName: Compile smoke tests
-    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`"
-      yarn smoketest-no-compile --build "$APP_ROOT/$APP_NAME"
+      yarn smoketest-no-compile --build "$APP_ROOT/$APP_NAME" --screenshots .build/logs/smoke-tests
    timeoutInMinutes: 5
    displayName: Run smoke tests (Electron)
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
@@ -244,7 +234,7 @@ steps:
      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
+      yarn smoketest-no-compile --build "$APP_ROOT/$APP_NAME" --remote --screenshots .build/logs/smoke-tests
    timeoutInMinutes: 5
    displayName: Run smoke tests (Remote)
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
@@ -265,6 +255,14 @@ steps:
    continueOnError: true
    condition: failed()

+  - task: PublishPipelineArtifact@0
+    inputs:
+      artifactName: logs-macos-$(VSCODE_ARCH)-$(System.JobAttempt)
+      targetPath: .build/logs
+    displayName: "Publish Log Files"
+    continueOnError: true
+    condition: and(succeededOrFailed(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
  - task: PublishTestResults@2
    displayName: Publish Tests Results
    inputs:
--- a/build/azure-pipelines/darwin/sql-product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/sql-product-build-darwin.yml
@@ -17,7 +17,7 @@ steps:

  - task: NodeTool@0
    inputs:
-      versionSpec: "12.13.0"
+      versionSpec: "14.x"

  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
    inputs:
@@ -106,7 +106,7 @@ steps:

  - script: |
      set -e
-      ./scripts/test.sh --build --coverage --reporter mocha-junit-reporter --tfs "Unit Tests"
+      ./scripts/test.sh --build --tfs "Unit Tests" # Disable code coverage since it's currently broken --coverage
    displayName: Run unit tests
    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))