Merge 89c2eb9 into ce8696d

microsoft · May 9, 2024 · b5f09d2 · b5f09d2
2 parents ce8696d + 89c2eb9
commit b5f09d2
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 133 deletions.
diff --git a/pipelines/Create ESRP service connection.yml b/pipelines/Create ESRP service connection.yml
diff --git a/pipelines/canary-release.yaml b/pipelines/canary-release.yaml
@@ -19,7 +19,10 @@ variables:
 trigger: none
 
 pool:
-    vmImage: ubuntu-latest
+    name: $(a11yInsightsPool)
+    vmImage: $(linuxImage)
+    demands:
+        - ImageOverride -equals $(linuxImage)
 
 resources:
     pipelines:

diff --git a/pipelines/generate-vs-marketplace-token.yaml b/pipelines/generate-vs-marketplace-token.yaml
@@ -0,0 +1,17 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+steps:
+    - task: AzureCLI@2
+      displayName: Get accessToken
+      name: getAccessToken
+      inputs:
+          azureSubscription: a11y-insights-action-prod
+          scriptType: pscore
+          scriptLocation: 'inlineScript'
+          ## The guid after --resource in the following command maps to the Azure DevOps Services
+          ## REST API (https://learn.microsoft.com/en-us/rest/api/azure/devops/tokens/)
+          inlineScript: |
+              $accessToken = az account get-access-token --resource 499b84ac-1321-427f-aa17-267ca6975798 --query "accessToken" --output tsv
+              write-host "##vso[task.setsecret]$accessToken"
+              write-host "##vso[task.setendpoint id=$(MARKETPLACE_RESOURCE_ID);field=authParameter;key=password]$accessToken"
diff --git a/pipelines/package-vsix-file.yaml b/pipelines/package-vsix-file.yaml
@@ -35,7 +35,7 @@ steps:
           runId: $(resources.pipeline.accessibility-insights-action-ci.runID)
           artifact: ado-extension-drop
           path: '$(System.DefaultWorkingDirectory)/ado-extension-drop'
-
+    - template: generate-vs-marketplace-token.yaml
     - task: QueryAzureDevOpsExtensionVersion@4
       name: QueryVersion
       inputs:
@@ -81,16 +81,21 @@ steps:
           outputPath: '$(Build.ArtifactStagingDirectory)/${{ parameters.environment }}.vsix'
 
     - task: UseDotNet@2
-      displayName: 'Use .NET Core sdk 2.1.x'
+      displayName: 'Use .NET Core sdk 6.0.x'
       inputs:
           packageType: 'sdk'
-          version: '2.1.x'
+          version: '6.0.x'
 
-    - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+    - task: EsrpCodeSigning@5
       condition: and(succeeded(), eq('${{ parameters.shouldSign }}', 'true'))
       displayName: 'ESRP: Sign VSIX file '
       inputs:
-          ConnectedServiceName: 'a11y-insights-esrp-code-signing'
+          ConnectedServiceName: 'a11y-insights-esrp-code-signing-mi'
+          AppRegistrationClientId: $(esrp-app-registration-client-id)
+          AppRegistrationTenantId: $(esrp-app-registration-tenant-id)
+          AuthAKVName: 'a11y-insights-esrp-certs'
+          AuthCertName: 'a11y-insights-action-esrp-auth-cert'
+          AuthSignCertName: 'a11y-insights-action-esrp-cert'
           FolderPath: '$(Build.ArtifactStagingDirectory)'
           Pattern: '${{ parameters.environment }}.vsix'
           signConfigType: inlineSignParams

diff --git a/pipelines/prod-release.yaml b/pipelines/prod-release.yaml
@@ -14,7 +14,10 @@ parameters:
 trigger: none
 
 pool:
-    vmImage: ubuntu-latest
+    name: $(a11yInsightsPool)
+    vmImage: $(linuxImage)
+    demands:
+        - ImageOverride -equals $(linuxImage)
 
 resources:
     pipelines:

diff --git a/pipelines/publish-vsix-file.yaml b/pipelines/publish-vsix-file.yaml
@@ -20,6 +20,7 @@ steps:
           downloadType: 'single'
           artifactName: '${{ parameters.environment }}-vsix'
           downloadPath: '$(System.DefaultWorkingDirectory)'
+    - template: generate-vs-marketplace-token.yaml
     - task: PublishAzureDevOpsExtension@3
       inputs:
           connectTo: 'VsTeam'

diff --git a/pipelines/release-template.yaml b/pipelines/release-template.yaml
@@ -14,6 +14,11 @@ parameters:
 
 jobs:
     - job: package_job
+      pool:
+          name: $(a11yInsightsPool)
+          vmImage: $(linuxImage)
+          demands:
+              - ImageOverride -equals $(linuxImage)
       steps:
           - template: package-vsix-file.yaml
             parameters: