Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix service connection for ESRP codesigning for utils nuget package #4597

Merged
merged 3 commits into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/actions/spelling/expect.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ admx
AFAIK
aicli
AICLIC
AKV
allusers
alreadyinstalled
AMap
Expand Down Expand Up @@ -40,7 +41,7 @@ azurewebsites
bcp
BEFACEF
BFirst
bght
bght
bigcatalog
BITMAPINFOHEADER
bitspace
Expand Down Expand Up @@ -74,7 +75,7 @@ CODEOWNERS
COINIT
COMGLB
commandline
compressapi
compressapi
concurrencysal
contactsupport
contentfiles
Expand Down Expand Up @@ -342,6 +343,7 @@ PCCERT
PCs
pcwsz
PDWORD
Peet
peetdev
PEGI
PFM
Expand Down Expand Up @@ -401,7 +403,7 @@ roy
runspace
runtimeclass
ryfu
rzkzqaqjwj
rzkzqaqjwj
sacl
SARL
SASURL
Expand Down
14 changes: 12 additions & 2 deletions azure-pipelines.nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading