Merge branch 'main' into dev/joyceerhl/gothic-wallaby

Author: alexdima

.github/workflows/pr-chat.yml

@@ -8,7 +8,7 @@ steps:
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
-      KeyVaultName: vscode
+      KeyVaultName: vscode-build-secrets
       SecretsFilter: "ESRP-PKI,esrp-aad-username,esrp-aad-password"
 
   - task: UseDotNet@2
@@ -20,16 +20,16 @@ steps:
     displayName: "Use ESRP client"
 
   - ${{ each target in parameters.VSCODE_CLI_ARTIFACTS }}:
-    - task: DownloadPipelineArtifact@2
-      displayName: Download artifacts
-      inputs:
-        artifact: ${{ target }}
-        path: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}
+      - task: DownloadPipelineArtifact@2
+        displayName: Download artifacts
+        inputs:
+          artifact: ${{ target }}
+          path: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}
 
-    - task: ExtractFiles@1
-      inputs:
-        archiveFilePatterns: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}/*.zip
-        destinationFolder: $(Build.ArtifactStagingDirectory)/sign/${{ target }}
+      - task: ExtractFiles@1
+        inputs:
+          archiveFilePatterns: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}/*.zip
+          destinationFolder: $(Build.ArtifactStagingDirectory)/sign/${{ target }}
 
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
@@ -49,17 +49,17 @@ steps:
     displayName: "Code sign"
 
   - ${{ each target in parameters.VSCODE_CLI_ARTIFACTS }}:
-    - powershell: |
-        $ASSET_ID = "${{ target }}".replace("unsigned_", "");
-        echo "##vso[task.setvariable variable=ASSET_ID]$ASSET_ID"
-      displayName: Set asset id variable
+      - powershell: |
+          $ASSET_ID = "${{ target }}".replace("unsigned_", "");
+          echo "##vso[task.setvariable variable=ASSET_ID]$ASSET_ID"
+        displayName: Set asset id variable
 
-    - task: ArchiveFiles@2
-      inputs:
-        rootFolderOrFile: $(Build.ArtifactStagingDirectory)/sign/${{ target }}/code.exe
-        includeRootFolder: false
-        archiveType: zip
-        archiveFile: $(Build.ArtifactStagingDirectory)/$(ASSET_ID).zip
+      - task: ArchiveFiles@2
+        inputs:
+          rootFolderOrFile: $(Build.ArtifactStagingDirectory)/sign/${{ target }}/code.exe
+          includeRootFolder: false
+          archiveType: zip
+          archiveFile: $(Build.ArtifactStagingDirectory)/$(ASSET_ID).zip
 
-    - publish: $(Build.ArtifactStagingDirectory)/$(ASSET_ID).zip
-      artifact: $(ASSET_ID)
+      - publish: $(Build.ArtifactStagingDirectory)/$(ASSET_ID).zip
+        artifact: $(ASSET_ID)

build/azure-pipelines/cli/cli-win32-sign.yml

@@ -13,7 +13,7 @@ steps:
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
-      KeyVaultName: vscode
+      KeyVaultName: vscode-build-secrets
       SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"
 
   - script: |

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

@@ -7,7 +7,7 @@ steps:
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
-      KeyVaultName: vscode
+      KeyVaultName: vscode-build-secrets
       SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"
 
   - script: |

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

@@ -7,7 +7,7 @@ steps:
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
-      KeyVaultName: vscode
+      KeyVaultName: vscode-build-secrets
       SecretsFilter: "github-distro-mixin-password,macos-developer-certificate,macos-developer-certificate-key"
 
   - script: |

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

@@ -27,7 +27,7 @@ steps:
         displayName: "Azure Key Vault: Get Secrets"
         inputs:
           azureSubscription: "vscode-builds-subscription"
-          KeyVaultName: vscode
+          KeyVaultName: vscode-build-secrets
           SecretsFilter: "github-distro-mixin-password,macos-developer-certificate,macos-developer-certificate-key"
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:

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

@@ -15,7 +15,7 @@ steps:
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
-      KeyVaultName: vscode
+      KeyVaultName: vscode-build-secrets
       SecretsFilter: "github-distro-mixin-password"
 
   - script: |

build/azure-pipelines/distro-build.yml

@@ -13,7 +13,7 @@ steps:
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
-      KeyVaultName: vscode
+      KeyVaultName: vscode-build-secrets
       SecretsFilter: "github-distro-mixin-password"
 
   - script: |

build/azure-pipelines/exploration-build.yml

@@ -7,7 +7,7 @@ steps:
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
-      KeyVaultName: vscode
+      KeyVaultName: vscode-build-secrets
       SecretsFilter: "github-distro-mixin-password"
 
   - task: DownloadPipelineArtifact@2

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

@@ -27,7 +27,7 @@ steps:
         displayName: "Azure Key Vault: Get Secrets"
         inputs:
           azureSubscription: "vscode-builds-subscription"
-          KeyVaultName: vscode
+          KeyVaultName: vscode-build-secrets
           SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: