From c94a88ebad5d3bf0c126985d7333e4ccccd237e2 Mon Sep 17 00:00:00 2001
From: oneonezhang <oneonezhang@users.noreply.github.com>
Date: Thu, 28 Nov 2024 15:16:41 +0800
Subject: [PATCH] update esrp (#2257)

---
 .../templates/build-single-architecture.yaml  |  2 +-
 .../templates/package-msixbundle.yaml         | 22 +++++++++++--------
 build/pipelines/templates/release-vpack.yaml  |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/build/pipelines/templates/build-single-architecture.yaml b/build/pipelines/templates/build-single-architecture.yaml
index a8a7d8e7..6020cc7e 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 c538d07d..26eca580 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 9f2f21e0..9ecb5378 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"