From 841cb7bdaf54791982f21432b2a1c723a6da7b7f Mon Sep 17 00:00:00 2001
From: oneonezhang <oneonezhang@users.noreply.github.com>
Date: Tue, 11 Jun 2024 19:22:15 +0800
Subject: [PATCH] variable

---
 build/pipelines/azure-pipelines.release.yaml      |  2 +-
 build/pipelines/templates/package-msixbundle.yaml | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/build/pipelines/azure-pipelines.release.yaml b/build/pipelines/azure-pipelines.release.yaml
index 1a682aea..08dc5dd7 100644
--- a/build/pipelines/azure-pipelines.release.yaml
+++ b/build/pipelines/azure-pipelines.release.yaml
@@ -8,7 +8,7 @@ trigger: none
 pr: none
 
 variables:
-  versionMajor: 11
+  versionMajor: 0
   versionMinor: 2406
   versionBuild: $[counter(format('{0}.{1}.*', variables['versionMajor'], variables['versionMinor']), 0)]
   versionPatch: 0
diff --git a/build/pipelines/templates/package-msixbundle.yaml b/build/pipelines/templates/package-msixbundle.yaml
index 39d9e20c..b10b4cbb 100644
--- a/build/pipelines/templates/package-msixbundle.yaml
+++ b/build/pipelines/templates/package-msixbundle.yaml
@@ -83,7 +83,7 @@ jobs:
       itemPattern: '**/*.msix'
       targetPath: $(Build.ArtifactStagingDirectory)\drop\ARM64
 
-  - ${{ if eq(parameters.createStoreBrokerPackages, true) }}:
+  - ${{ if or(eq(parameters.createStoreBrokerPackages, true), eq(parameters.signBundle, true)) }}:
     - task: UniversalPackages@0
       displayName: Download internals package
       inputs:
@@ -91,7 +91,7 @@ jobs:
         downloadDirectory: $(Build.SourcesDirectory)
         vstsFeed: WindowsInboxApps
         vstsFeedPackage: calculator-internals
-        vstsPackageVersion: 0.0.106
+        vstsPackageVersion: 0.0.108
 
   - task: PowerShell@2
     displayName: Generate MsixBundle mapping
@@ -117,6 +117,16 @@ jobs:
       targetFolder: $(Build.ArtifactStagingDirectory)\msixBundle
 
   - ${{ if eq(parameters.signBundle, true) }}:
+    - 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
+        echo "##vso[task.setvariable variable=EsrpClientId]$esrpClientId"
+        echo "##vso[task.setvariable variable=EsrpTenantId]$esrpTenantId"
+      displayName: Get SBOM Key Code
+
     - task: EsrpCodeSigning@5
       displayName: Send msixbundle to code signing service
       inputs: