Restore MSIX signing and ensure expired certificates are not selected (GH-30649)

Reverts the change in d6c6e6b and applies a better fix.
This commit is contained in:
Steve Dower 2022-01-17 20:22:52 +00:00 committed by GitHub
parent 596cf51a4d
commit 9e20ec4d43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions

View File

@ -96,9 +96,7 @@ jobs:
displayName: Sign side-loadable MSIX bundles
dependsOn:
- Pack_MSIX
# Our current certificate does not support MSIX signing, so we unconditionally skip this step
#condition: and(succeeded(), variables['SigningCertificate'])
condition: false
condition: and(succeeded(), variables['SigningCertificate'])
pool:
name: 'Windows Release'
@ -123,6 +121,10 @@ jobs:
downloadPath: $(Build.BinariesDirectory)
# MSIX must be signed and timestamped simultaneously
#
# Getting "Error: SignerSign() failed." (-2147024885/0x8007000b)"?
# It may be that the certificate info collected in stage-sign.yml is wrong. Check that
# you do not have multiple matches for the certificate name you have specified.
- powershell: |
$failed = $true
foreach ($retry in 1..3) {

View File

@ -91,7 +91,7 @@ jobs:
- powershell: |
$m = 'CN=$(SigningCertificate)'
$c = ((gci Cert:\CurrentUser\My), (gci Cert:\LocalMachine\My)) | %{ $_ } | `
?{ $_.Subject -match $m } | `
?{ $_.Subject -match $m -and $_.NotBefore -lt (Get-Date) -and $_.NotAfter -gt (Get-Date) } | `
select -First 1
if (-not $c) {
Write-Host "Failed to find certificate for $(SigningCertificate)"