This commit is contained in:
oneonezhang 2024-06-11 19:22:15 +08:00
commit 841cb7bdaf
2 changed files with 13 additions and 3 deletions

View file

@ -8,7 +8,7 @@ trigger: none
pr: none pr: none
variables: variables:
versionMajor: 11 versionMajor: 0
versionMinor: 2406 versionMinor: 2406
versionBuild: $[counter(format('{0}.{1}.*', variables['versionMajor'], variables['versionMinor']), 0)] versionBuild: $[counter(format('{0}.{1}.*', variables['versionMajor'], variables['versionMinor']), 0)]
versionPatch: 0 versionPatch: 0

View file

@ -83,7 +83,7 @@ jobs:
itemPattern: '**/*.msix' itemPattern: '**/*.msix'
targetPath: $(Build.ArtifactStagingDirectory)\drop\ARM64 targetPath: $(Build.ArtifactStagingDirectory)\drop\ARM64
- ${{ if eq(parameters.createStoreBrokerPackages, true) }}: - ${{ if or(eq(parameters.createStoreBrokerPackages, true), eq(parameters.signBundle, true)) }}:
- task: UniversalPackages@0 - task: UniversalPackages@0
displayName: Download internals package displayName: Download internals package
inputs: inputs:
@ -91,7 +91,7 @@ jobs:
downloadDirectory: $(Build.SourcesDirectory) downloadDirectory: $(Build.SourcesDirectory)
vstsFeed: WindowsInboxApps vstsFeed: WindowsInboxApps
vstsFeedPackage: calculator-internals vstsFeedPackage: calculator-internals
vstsPackageVersion: 0.0.106 vstsPackageVersion: 0.0.108
- task: PowerShell@2 - task: PowerShell@2
displayName: Generate MsixBundle mapping displayName: Generate MsixBundle mapping
@ -117,6 +117,16 @@ jobs:
targetFolder: $(Build.ArtifactStagingDirectory)\msixBundle targetFolder: $(Build.ArtifactStagingDirectory)\msixBundle
- ${{ if eq(parameters.signBundle, true) }}: - ${{ 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 - task: EsrpCodeSigning@5
displayName: Send msixbundle to code signing service displayName: Send msixbundle to code signing service
inputs: inputs: