Skip to content

Commit 2f5c61c

Browse files
authored
Use PME identity for DAC signing (#113997)
1 parent 0676e1c commit 2f5c61c

File tree

4 files changed

+37
-23
lines changed

4 files changed

+37
-23
lines changed

eng/native/signing/auth.json

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
{
22
"Version" : "1.0.0",
33
"AuthenticationType" : "AAD_CERT",
4-
"TenantId" : "72f988bf-86f1-41af-91ab-2d7cd011db47",
5-
"ClientId" : "2234cdec-a13f-4bb2-aa63-04c57fd7a1f9",
4+
"TenantId" : "975f013f-7f24-47e8-a7d3-abc4752bf346",
5+
"ClientId" : "22346933-af99-4e94-97d5-7fa1dcf4bba6",
66
"AuthCert" :
77
{
8-
"SubjectName" : "CN=2234cdec-a13f-4bb2-aa63-04c57fd7a1f9.microsoft.com",
8+
"SubjectName" : "CN=22346933-af99-4e94-97d5-7fa1dcf4bba6.microsoft.com",
99
"StoreLocation" : "CurrentUser",
1010
"StoreName": "My",
11-
"SendX5c" : "true"
11+
"SendX5c" : "true",
12+
"WithAzureRegion": false
1213
},
13-
"RequestSigningCert" : {
14-
"SubjectName" : "CN=2234cdec-a13f-4bb2-aa63-04c57fd7a1f9",
15-
"StoreLocation" : "CurrentUser",
16-
"StoreName" : "My"
17-
}
14+
"RequestSigningCert" :
15+
{
16+
"GetCertFromKeyVault" : true,
17+
"KeyVaultName": "clrdiag-esrp-pme",
18+
"KeyVaultCertName": "dac-dnceng-esrpclient-cert",
19+
"SendX5c": false,
20+
"WithAzureRegion": false
21+
},
22+
"OAuthToken": null
1823
}

eng/native/signing/config.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Version" : "1.0.0",
3-
"MaxDegreeOfParallelism" : "50",
4-
"ExponentialRetryCount" : "5",
5-
"EsrpSessionTimeoutInSec" : "1800"
3+
"MaxDegreeOfParallelism" : 50,
4+
"ExponentialRetryCount" : 5,
5+
"EsrpSessionTimeoutInSec" : 1800
66
}

eng/pipelines/coreclr/templates/install-diagnostic-certs.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,23 @@ steps:
1414
SecretsFilter: ${{ join(',', parameters.certNames) }}
1515
displayName: 'Download secrets: Diagnostic Certificates'
1616

17-
- task: EsrpClientTool@2
18-
displayName: Download ESRPClient
17+
- task: NuGetCommand@2
18+
displayName: Install ESRPClient Tool
19+
inputs:
20+
command: 'custom'
21+
arguments: 'install microsoft.esrpclient
22+
-Source https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
23+
-DependencyVersion Highest -OutputDirectory $(Build.StagingDirectory)'
1924

2025
- powershell: |
2126
eng/pipelines/install-diagnostic-certs.ps1 "${{ join(',', parameters.certNames) }}"
22-
$signArgs = '/p:DotNetEsrpToolPath=$(esrpclient.toolpath)\$(esrpclient.toolname)'
27+
$esrpclient = Get-ChildItem -Path '$(Build.StagingDirectory)\microsoft.esrpclient*' -Filter esrpclient.exe -Recurse | Select-Object -First 1 | select -ExpandProperty FullName
28+
29+
if ($esrpclient -eq $null) {
30+
throw "Failed to find esrpclient.exe in $(Build.StagingDirectory)"
31+
}
32+
33+
$signArgs = "/p:DotNetEsrpToolPath=$esrpclient"
2334
echo "##vso[task.setvariable variable=_SignDiagnosticFilesArgs;]$signArgs"
2435
displayName: 'Install diagnostic certificates'
2536
workingDirectory: ${{ parameters.scriptRoot }}

eng/pipelines/runtime-official.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,9 @@ extends:
8585
parameters:
8686
isOfficialBuild: true
8787
certNames:
88-
- 'dotnetesrp-diagnostics-aad-ssl-cert'
89-
- 'dotnet-diagnostics-esrp-pki-onecert'
90-
vaultName: 'clrdiag-esrp-id'
91-
azureSubscription: 'diagnostics-esrp-kvcertuser'
88+
- 'dac-dnceng-ssl-cert'
89+
vaultName: 'clrdiag-esrp-pme'
90+
azureSubscription: 'diagnostics-esrp-kvcertuser-pme'
9291

9392
buildArgs: -c $(_BuildConfig) -restore -build -publish /p:DotNetBuildAllRuntimePacks=true $(_SignDiagnosticFilesArgs) $(_EnableDefaultArtifactsArg)
9493
nameSuffix: AllRuntimes
@@ -242,10 +241,9 @@ extends:
242241
parameters:
243242
isOfficialBuild: true
244243
certNames:
245-
- 'dotnetesrp-diagnostics-aad-ssl-cert'
246-
- 'dotnet-diagnostics-esrp-pki-onecert'
247-
vaultName: 'clrdiag-esrp-id'
248-
azureSubscription: 'diagnostics-esrp-kvcertuser'
244+
- 'dac-dnceng-ssl-cert'
245+
vaultName: 'clrdiag-esrp-pme'
246+
azureSubscription: 'diagnostics-esrp-kvcertuser-pme'
249247
postBuildSteps:
250248
- template: /eng/pipelines/coreclr/templates/remove-diagnostic-certs.yml
251249
parameters:

0 commit comments

Comments
 (0)