Fix service connection for ESRP codesigning for utils nuget package (#…

…4597)
microsoft · Jun 28, 2024 · 4505e94 · 4505e94
1 parent 8dee4d8
commit 4505e94
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
@@ -8,6 +8,7 @@ admx
 AFAIK
 aicli
 AICLIC
+AKV
 allusers
 alreadyinstalled
 AMap
@@ -342,6 +343,7 @@ PCCERT
 PCs
 pcwsz
 PDWORD
+Peet
 peetdev
 PEGI
 PFM

diff --git a/azure-pipelines.nuget.yml b/azure-pipelines.nuget.yml
@@ -81,10 +81,15 @@ jobs:
           solution: "$(solution)"
           configuration: "$(buildConfiguration)"
 
-      - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
+      - task: EsrpCodeSigning@5
         displayName: "ESRP CodeSigning - Package contents"
         inputs:
           ConnectedServiceName: "WindowsPackageManager ESRP CodeSigning"
+          AppRegistrationClientId: '32216f16-efc9-4013-9fae-c6a2c54a3fc0'
+          AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
+          AuthAKVName: 'PeetDevOpsKeyVault'
+          AuthCertName: 'ESRPAuth'
+          AuthSignCertName: 'ESRPRequestSigning'
           FolderPath: src
           Pattern: |
             *\$(buildConfiguration)\WinGetUtil\WinGetUtil.dll
@@ -161,10 +166,15 @@ jobs:
           packDestination: '$(Build.ArtifactStagingDirectory)'
           basePath: $(Pipeline.Workspace)
 
-      - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
+      - task: EsrpCodeSigning@5
         displayName: "ESRP CodeSigning - NuGet package"
         inputs:
           ConnectedServiceName: "WindowsPackageManager ESRP CodeSigning"
+          AppRegistrationClientId: '32216f16-efc9-4013-9fae-c6a2c54a3fc0'
+          AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
+          AuthAKVName: 'PeetDevOpsKeyVault'
+          AuthCertName: 'ESRPAuth'
+          AuthSignCertName: 'ESRPRequestSigning'
           FolderPath: "$(Build.ArtifactStagingDirectory)"
           Pattern: "$(packageName).$(version).nupkg"
           signConfigType: inlineSignParams