Skip to content

Commit 49e4da7

Browse files
DavoudEshteharidauinsight
authored andcommitted
Merged PR 4673: eng | Upgrade ESRP to v5.0
- [Sample run](https://dev.azure.com/SqlClientDrivers/ADO.Net/_build/results?buildId=91327&view=results) Related work items: #30897
1 parent 55f48c5 commit 49e4da7

File tree

2 files changed

+43
-10
lines changed

2 files changed

+43
-10
lines changed

eng/pipelines/common/templates/steps/esrp-code-signing-step.yml

Lines changed: 39 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,37 @@ parameters:
1717
type: string
1818
default: $(artifactDirectory)
1919

20+
- name: appRegistrationClientId
21+
type: string
22+
default: $(appRegistrationClientId)
23+
24+
- name: appRegistrationTenantId
25+
type: string
26+
default: $(appRegistrationTenantId)
27+
2028
steps:
2129
- ${{ if eq(parameters.artifactType, 'dll') }}:
22-
- task: SFP.build-tasks.custom-build-task-2.EsrpMalwareScanning@4
30+
- task: EsrpMalwareScanning@5
2331
displayName: 'ESRP MalwareScanning'
2432
inputs:
25-
ConnectedServiceName: 'SqlClient ESRP Malware Scanning'
33+
ConnectedServiceName: 'ESRP Workload Identity federation service-ADO.Net'
34+
AppRegistrationClientId: '${{parameters.appRegistrationClientId }}'
35+
AppRegistrationTenantId: '${{parameters.appRegistrationTenantId }}'
36+
AuthAKVName: SqlClientDrivers
37+
AuthCertName: 'ESRP-Release-Auth'
2638
FolderPath: '${{parameters.sourceRoot }}'
2739
Pattern: '*.dll'
28-
Region: US
29-
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@4
40+
CleanupTempStorage: 1
41+
VerboseLogin: 1
42+
- task: EsrpCodeSigning@5
3043
displayName: 'ESRP CodeSigning'
3144
inputs:
32-
ConnectedServiceName: 'SqlClient ESRP Code Signing'
45+
ConnectedServiceName: 'ESRP Workload Identity federation service-ADO.Net'
46+
AppRegistrationClientId: '${{parameters.appRegistrationClientId }}'
47+
AppRegistrationTenantId: '${{parameters.appRegistrationTenantId }}'
48+
AuthAKVName: SqlClientDrivers
49+
AuthCertName: 'ESRP-Release-Auth'
50+
AuthSignCertName: 'ESRP-Release-Sign2'
3351
FolderPath: '${{parameters.sourceRoot }}'
3452
Pattern: '*.dll'
3553
signConfigType: inlineSignParams
@@ -73,17 +91,28 @@ steps:
7391
]
7492
7593
- ${{ if eq(parameters.artifactType, 'pkg') }}:
76-
- task: SFP.build-tasks.custom-build-task-2.EsrpMalwareScanning@4
94+
- task: EsrpMalwareScanning@5
7795
displayName: 'ESRP MalwareScanning Nuget Package'
7896
inputs:
79-
ConnectedServiceName: 'SqlClient ESRP Malware Scanning'
97+
ConnectedServiceName: 'ESRP Workload Identity federation service-ADO.Net'
98+
AppRegistrationClientId: '${{parameters.appRegistrationClientId }}'
99+
AppRegistrationTenantId: '${{parameters.appRegistrationTenantId }}'
100+
AuthAKVName: SqlClientDrivers
101+
AuthCertName: 'ESRP-Release-Auth'
80102
FolderPath: '${{parameters.artifactDirectory }}'
81103
Pattern: '*.*nupkg'
82-
Region: US
83-
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@4
104+
CleanupTempStorage: 1
105+
VerboseLogin: 1
106+
- task: EsrpCodeSigning@5
84107
displayName: 'ESRP CodeSigning Nuget Package'
85108
inputs:
86-
ConnectedServiceName: 'SqlClient ESRP Code Signing'
109+
inputs:
110+
ConnectedServiceName: 'ESRP Workload Identity federation service-ADO.Net'
111+
AppRegistrationClientId: '${{parameters.appRegistrationClientId }}'
112+
AppRegistrationTenantId: '${{parameters.appRegistrationTenantId }}'
113+
AuthAKVName: SqlClientDrivers
114+
AuthCertName: 'ESRP-Release-Auth'
115+
AuthSignCertName: 'ESRP-Release-Sign2'
87116
FolderPath: '${{parameters.artifactDirectory }}'
88117
Pattern: '*.*nupkg'
89118
signConfigType: inlineSignParams

eng/pipelines/libraries/common-variables.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@ variables:
1717
value: $(REPOROOT)/symbols
1818
- name: artifactDirectory
1919
value: '$(REPOROOT)/packages'
20+
- name: appRegistrationClientId
21+
value: 'a0d18a38-fde1-4ba7-92e1-15be16cb6a8e'
22+
- name: appRegistrationTenantId
23+
value: '72f988bf-86f1-41af-91ab-2d7cd011db47'

0 commit comments

Comments
 (0)