diff --git a/build/pipelines/templates/build-single-architecture.yaml b/build/pipelines/templates/build-single-architecture.yaml index a8a7d8e70..6020cc7e2 100644 --- a/build/pipelines/templates/build-single-architecture.yaml +++ b/build/pipelines/templates/build-single-architecture.yaml @@ -55,7 +55,7 @@ jobs: downloadDirectory: $(Build.SourcesDirectory) vstsFeed: WindowsInboxApps vstsFeedPackage: calculator-internals - vstsPackageVersion: 0.0.109 + vstsPackageVersion: 0.0.111 - task: NuGetToolInstaller@1 displayName: Use NuGet 6.x diff --git a/build/pipelines/templates/package-msixbundle.yaml b/build/pipelines/templates/package-msixbundle.yaml index c538d07d5..26eca580f 100644 --- a/build/pipelines/templates/package-msixbundle.yaml +++ b/build/pipelines/templates/package-msixbundle.yaml @@ -91,7 +91,7 @@ jobs: downloadDirectory: $(Build.SourcesDirectory) vstsFeed: WindowsInboxApps vstsFeedPackage: calculator-internals - vstsPackageVersion: 0.0.109 + vstsPackageVersion: 0.0.111 - task: PowerShell@2 displayName: Generate MsixBundle mapping @@ -120,20 +120,24 @@ jobs: - pwsh: | $configPath = "$(Build.SourcesDirectory)\Tools\Build\Signing\ESRP-codesign.json" $config = Get-Content -Raw $configPath | ConvertFrom-Json - $esrpClientId = $config.AppRegistrationClientId - $esrpTenantId = $config.AppRegistrationTenantId - echo ClientId:$esrpClientId, TenantId:$esrpTenantId + $esrpAppRegClientId = $config.AppRegistrationClientId + $esrpAppRegTenantId = $config.AppRegistrationClientId + $esrpClientId = $config.EsrpClientId + echo AppRegistrationClientId:$esrpAppRegClientId, AppRegTenantId:$esrpAppRegTenantId, EsrpClientId:$esrpClientId + echo "##vso[task.setvariable variable=EsrpAppRegClientId]$esrpAppRegClientId" + echo "##vso[task.setvariable variable=EsrpAppRegTenantId]$esrpAppRegTenantId" echo "##vso[task.setvariable variable=EsrpClientId]$esrpClientId" - echo "##vso[task.setvariable variable=EsrpTenantId]$esrpTenantId" displayName: Get ESRP config - task: EsrpCodeSigning@5 displayName: Send msixbundle to code signing service inputs: - ConnectedServiceName: Essential Experiences Codesign ARM - AppRegistrationClientId: $(EsrpClientId) - AppRegistrationTenantId: $(EsrpTenantId) - AuthAKVName: EE-CodeSignKeyVault + ConnectedServiceName: Essential Experiences Codesign PME + UseMSIAuthentication: true + AppRegistrationClientId: $(EsrpAppRegClientId) + AppRegistrationTenantId: $(EsrpAppRegTenantId) + EsrpClientId: $(EsrpClientId) + AuthAKVName: EE-Apps-CodeSign-KV AuthCertName: EE-Auth-Cert AuthSignCertName: EE-Codesign-Cert FolderPath: $(Build.ArtifactStagingDirectory)\msixBundle diff --git a/build/pipelines/templates/release-vpack.yaml b/build/pipelines/templates/release-vpack.yaml index 9f2f21e02..9ecb5378c 100644 --- a/build/pipelines/templates/release-vpack.yaml +++ b/build/pipelines/templates/release-vpack.yaml @@ -35,7 +35,7 @@ jobs: downloadDirectory: $(Build.SourcesDirectory) vstsFeed: WindowsInboxApps vstsFeedPackage: calculator-internals - vstsPackageVersion: 0.0.109 + vstsPackageVersion: 0.0.111 - pwsh: | $configPath = "$(Build.SourcesDirectory)\Tools\Build\Signing\ESRP-auth.json"