Skip to content

Commit 01cfb1a

Browse files
committed
Enable Nuget signing and restore side-loaded appx transform
1 parent 4cef4d8 commit 01cfb1a

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

windows-release/azure-pipelines.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,8 @@ stages:
165165
jobs:
166166
- template: stage-pack-nuget.yml
167167
parameters:
168-
# Nuget signing is disabled because Azure Trusted Signing does not support it
169-
#${{ if and(parameters.SigningCertificate, ne(parameters.SigningCertificate, 'Unsigned')) }}:
170-
# SigningCertificate: ${{ parameters.SigningCertificate }}
168+
${{ if and(parameters.SigningCertificate, ne(parameters.SigningCertificate, 'Unsigned')) }}:
169+
SigningCertificate: ${{ parameters.SigningCertificate }}
171170
DoFreethreaded: ${{ parameters.DoFreethreaded }}
172171

173172
- stage: Test

windows-release/stage-layout-msix.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,14 @@ jobs:
6969
env:
7070
TCL_LIBRARY: $(TclLibrary)
7171
72-
# HACK: Disabled to test because new signing tool shouldn't need this
73-
#- powershell: |
74-
# $info = (gc "$(Pipeline.Workspace)\cert\certinfo.json" | ConvertFrom-JSON)
75-
# Write-Host "Side-loadable APPX must be signed with '$($info.Subject)'"
76-
# Write-Host "##vso[task.setvariable variable=APPX_DATA_PUBLISHER]$($info.Subject)"
77-
# Write-Host "##vso[task.setvariable variable=APPX_DATA_SHA256]$($info.SHA256)"
78-
# displayName: 'Override signing parameters'
79-
# condition: and(succeeded(), variables['SigningCertificate'])
72+
# The dotnet sign tool shouldn't need this, but we do because of the sccd file
73+
- powershell: |
74+
$info = (gc "$(Pipeline.Workspace)\cert\certinfo.json" | ConvertFrom-JSON)
75+
Write-Host "Side-loadable APPX must be signed with '$($info.Subject)'"
76+
Write-Host "##vso[task.setvariable variable=APPX_DATA_PUBLISHER]$($info.Subject)"
77+
Write-Host "##vso[task.setvariable variable=APPX_DATA_SHA256]$($info.SHA256)"
78+
displayName: 'Override signing parameters'
79+
condition: and(succeeded(), variables['SigningCertificate'])
8080
8181
- powershell: |
8282
Remove-Item "$(Build.ArtifactStagingDirectory)\appx" -Recurse -Force -EA 0

0 commit comments

Comments
 (0)