From 4505e94ef5541098014a4dc1002a051fc4a31e5c Mon Sep 17 00:00:00 2001 From: Ryan <69221034+ryfu-msft@users.noreply.github.com> Date: Fri, 28 Jun 2024 12:54:59 -0700 Subject: [PATCH] Fix service connection for ESRP codesigning for utils nuget package (#4597) --- .github/actions/spelling/expect.txt | 2 ++ azure-pipelines.nuget.yml | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt index 216c39952b..5542cb8220 100644 --- 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 index 6d80fc8759..27b46300b5 100644 --- 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