diff --git a/build/AzurePipelinesTemplates/MUX-BuildDevProject-Steps.yml b/build/AzurePipelinesTemplates/MUX-BuildDevProject-Steps.yml index ce85967e6b..f243f5079b 100644 --- a/build/AzurePipelinesTemplates/MUX-BuildDevProject-Steps.yml +++ b/build/AzurePipelinesTemplates/MUX-BuildDevProject-Steps.yml @@ -64,10 +64,15 @@ steps: artifactName: nativecodeanalysis - ${{ if eq( parameters.signOutput, true) }}: - - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 + - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5 displayName: 'CodeSign' inputs: - ConnectedServiceName: WinUISigning + ConnectedServiceName: $(WinUI2SigningConnectedServiceName) + AppRegistrationClientId: $(WinUI2SigningAppRegistrationClientId) + AppRegistrationTenantId: $(WinUI2SigningAppRegistrationTenantId) + AuthAKVName: $(ProjectReunionCerts) + AuthCertName: $(WinUI2SigningAuthCertName) + AuthSignCertName: $(WinUI2SigningAuthSignCertName) FolderPath: '$(buildOutputDir)/$(buildConfiguration)/$(buildPlatform)/Microsoft.UI.Xaml' # Recursively finds files matching these patterns: Pattern: | diff --git a/build/AzurePipelinesTemplates/MUX-CreateNugetPackage-Job.yml b/build/AzurePipelinesTemplates/MUX-CreateNugetPackage-Job.yml index 38de2202e3..3e32a0737c 100644 --- a/build/AzurePipelinesTemplates/MUX-CreateNugetPackage-Job.yml +++ b/build/AzurePipelinesTemplates/MUX-CreateNugetPackage-Job.yml @@ -55,10 +55,15 @@ jobs: displayName: 'build-nupkg.ps1' - ${{ if eq( parameters.signOutput, true) }}: - - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 + - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5 displayName: 'CodeSign (nupkg)' inputs: - ConnectedServiceName: WinUISigning + ConnectedServiceName: $(WinUI2SigningConnectedServiceName) + AppRegistrationClientId: $(WinUI2SigningAppRegistrationClientId) + AppRegistrationTenantId: $(WinUI2SigningAppRegistrationTenantId) + AuthAKVName: $(ProjectReunionCerts) + AuthCertName: $(WinUI2SigningAuthCertName) + AuthSignCertName: $(WinUI2SigningAuthSignCertName) FolderPath: '${{ parameters.nupkgdir }}' Pattern: | **/Microsoft.UI.Xaml*.nupkg diff --git a/build/AzurePipelinesTemplates/MUX-MakeFrameworkPackages-Steps.yml b/build/AzurePipelinesTemplates/MUX-MakeFrameworkPackages-Steps.yml index ffaca1823a..30105478c0 100644 --- a/build/AzurePipelinesTemplates/MUX-MakeFrameworkPackages-Steps.yml +++ b/build/AzurePipelinesTemplates/MUX-MakeFrameworkPackages-Steps.yml @@ -28,10 +28,15 @@ steps: displayName: 'Make FrameworkPackages' - ${{ if eq( parameters.signOutput, true) }}: - - task: EsrpCodeSigning@1 + - task: EsrpCodeSigning@5 displayName: First Party StoreSign Framework Package inputs: - ConnectedServiceName: WinUISigning + ConnectedServiceName: $(WinUI2SigningConnectedServiceName) + AppRegistrationClientId: $(WinUI2SigningAppRegistrationClientId) + AppRegistrationTenantId: $(WinUI2SigningAppRegistrationTenantId) + AuthAKVName: $(ProjectReunionCerts) + AuthCertName: $(WinUI2SigningAuthCertName) + AuthSignCertName: $(WinUI2SigningAuthSignCertName) FolderPath: '${{ parameters.buildOutputDir }}\$(buildConfiguration)\$(buildPlatform)\FrameworkPackage' Pattern: | *.appx diff --git a/build/WinUI-OB-Official.yml b/build/WinUI-OB-Official.yml index d17b938869..112ee0d7f5 100644 --- a/build/WinUI-OB-Official.yml +++ b/build/WinUI-OB-Official.yml @@ -243,10 +243,15 @@ extends: -BuildFlavor Release displayName: 'build-nupkg.ps1' - - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 + - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5 displayName: 'CodeSign (nupkg)' inputs: - ConnectedServiceName: WinUISigning + ConnectedServiceName: $(WinUI2SigningConnectedServiceName) + AppRegistrationClientId: $(WinUI2SigningAppRegistrationClientId) + AppRegistrationTenantId: $(WinUI2SigningAppRegistrationTenantId) + AuthAKVName: $(ProjectReunionCerts) + AuthCertName: $(WinUI2SigningAuthCertName) + AuthSignCertName: $(WinUI2SigningAuthSignCertName) FolderPath: $(nupkgdir) Pattern: | **/Microsoft.UI.Xaml*.nupkg