github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-07-06 05:01:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

update esrp (#2257)

Browse source
This commit is contained in:
oneonezhang 2024-11-28 15:16:41 +08:00 • committed by GitHub
parent 777b1a6e52
commit c94a88ebad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/pipelines/templates/build-single-architecture.yaml
View file

@ -55,7 +55,7 @@ jobs:
downloadDirectory: $(Build.SourcesDirectory) downloadDirectory: $(Build.SourcesDirectory)
vstsFeed: WindowsInboxApps vstsFeed: WindowsInboxApps
vstsFeedPackage: calculator-internals vstsFeedPackage: calculator-internals
vstsPackageVersion: 0.0.109 vstsPackageVersion: 0.0.111
- task: NuGetToolInstaller@1 - task: NuGetToolInstaller@1
displayName: Use NuGet 6.x displayName: Use NuGet 6.x

22
build/pipelines/templates/package-msixbundle.yaml
View file

@ -91,7 +91,7 @@ jobs:
downloadDirectory: $(Build.SourcesDirectory) downloadDirectory: $(Build.SourcesDirectory)
vstsFeed: WindowsInboxApps vstsFeed: WindowsInboxApps
vstsFeedPackage: calculator-internals vstsFeedPackage: calculator-internals
vstsPackageVersion: 0.0.109 vstsPackageVersion: 0.0.111
- task: PowerShell@2 - task: PowerShell@2
displayName: Generate MsixBundle mapping displayName: Generate MsixBundle mapping
@ -120,20 +120,24 @@ jobs:
- pwsh: | - pwsh: |
$configPath = "$(Build.SourcesDirectory)\Tools\Build\Signing\ESRP-codesign.json" $configPath = "$(Build.SourcesDirectory)\Tools\Build\Signing\ESRP-codesign.json"
$config = Get-Content -Raw $configPath | ConvertFrom-Json $config = Get-Content -Raw $configPath | ConvertFrom-Json
$esrpClientId = $config.AppRegistrationClientId $esrpAppRegClientId = $config.AppRegistrationClientId
$esrpTenantId = $config.AppRegistrationTenantId $esrpAppRegTenantId = $config.AppRegistrationClientId
echo ClientId:$esrpClientId, TenantId:$esrpTenantId $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=EsrpClientId]$esrpClientId"
echo "##vso[task.setvariable variable=EsrpTenantId]$esrpTenantId"
displayName: Get ESRP config displayName: Get ESRP config
- task: EsrpCodeSigning@5 - task: EsrpCodeSigning@5
displayName: Send msixbundle to code signing service displayName: Send msixbundle to code signing service
inputs: inputs:
ConnectedServiceName: Essential Experiences Codesign ARM ConnectedServiceName: Essential Experiences Codesign PME
AppRegistrationClientId: $(EsrpClientId) UseMSIAuthentication: true
AppRegistrationTenantId: $(EsrpTenantId) AppRegistrationClientId: $(EsrpAppRegClientId)
AuthAKVName: EE-CodeSignKeyVault AppRegistrationTenantId: $(EsrpAppRegTenantId)
EsrpClientId: $(EsrpClientId)
AuthAKVName: EE-Apps-CodeSign-KV
AuthCertName: EE-Auth-Cert AuthCertName: EE-Auth-Cert
AuthSignCertName: EE-Codesign-Cert AuthSignCertName: EE-Codesign-Cert
FolderPath: $(Build.ArtifactStagingDirectory)\msixBundle FolderPath: $(Build.ArtifactStagingDirectory)\msixBundle

2
build/pipelines/templates/release-vpack.yaml
View file

@ -35,7 +35,7 @@ jobs:
downloadDirectory: $(Build.SourcesDirectory) downloadDirectory: $(Build.SourcesDirectory)
vstsFeed: WindowsInboxApps vstsFeed: WindowsInboxApps
vstsFeedPackage: calculator-internals vstsFeedPackage: calculator-internals
vstsPackageVersion: 0.0.109 vstsPackageVersion: 0.0.111
- pwsh: | - pwsh: |
$configPath = "$(Build.SourcesDirectory)\Tools\Build\Signing\ESRP-auth.json" $configPath = "$(Build.SourcesDirectory)\Tools\Build\Signing\ESRP-auth.json"