github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-20 21:33:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Migrate StoreBroker tasks to SN+I authentication (#2179)

Browse source 
* update

* reset

(cherry picked from commit 7315f364b9)
This commit is contained in:
oneonezhang 2024-05-31 23:43:12 +08:00 • committed by Han Zhang
commit f223ba560c
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@ jobs:
in(dependencies.Buildx86.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'), in(dependencies.Buildx86.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'),
in(dependencies.BuildARM.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'), in(dependencies.BuildARM.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'),
in(dependencies.BuildARM64.result, 'Succeeded', 'SucceededWithIssues', 'Skipped') in(dependencies.BuildARM64.result, 'Succeeded', 'SucceededWithIssues', 'Skipped')
) )
variables: variables:
skipComponentGovernanceDetection: true skipComponentGovernanceDetection: true
StoreBrokerMediaRootPath: $(TEMP)\SBMedia StoreBrokerMediaRootPath: $(TEMP)\SBMedia
@ -41,7 +41,7 @@ jobs:
displayName: Publish MsixBundleSigned artifact displayName: Publish MsixBundleSigned artifact
targetPath: $(Build.ArtifactStagingDirectory)\msixBundle targetPath: $(Build.ArtifactStagingDirectory)\msixBundle
artifactName: msixBundleSigned artifactName: msixBundleSigned
- ${{ if eq(parameters.createStoreBrokerPackages, true) }}: - ${{ if eq(parameters.createStoreBrokerPackages, true) }}:
- output: pipelineArtifact - output: pipelineArtifact
displayName: Publish StoreBroker Payload artifact displayName: Publish StoreBroker Payload artifact
targetPath: $(StoreBrokerPackagePath) targetPath: $(StoreBrokerPackagePath)
@ -151,7 +151,7 @@ jobs:
} }
] ]
- ${{ if eq(parameters.createStoreBrokerPackages, true) }}: - ${{ if eq(parameters.createStoreBrokerPackages, true) }}:
- powershell: | - powershell: |
# Just modify this line to indicate where your en-us PDP file is. Leave the other lines alone. # Just modify this line to indicate where your en-us PDP file is. Leave the other lines alone.
$enUSPdpFilePath = "$(Build.SourcesDirectory)\PDP\en-US\PDP.xml" $enUSPdpFilePath = "$(Build.SourcesDirectory)\PDP\en-US\PDP.xml"
@ -170,11 +170,11 @@ jobs:
vstsFeed: WindowsInboxApps vstsFeed: WindowsInboxApps
vstsFeedPackage: calculator-pdp-media vstsFeedPackage: calculator-pdp-media
vstsPackageVersion: $(SBMediaReleaseVersion) vstsPackageVersion: $(SBMediaReleaseVersion)
- task: MS-RDX-MRO.windows-store-publish-dev.package-task.store-package@2 - task: MS-RDX-MRO.windows-store-publish-dev.package-task.store-package@3
displayName: Create StoreBroker Payload displayName: Create StoreBroker Payload
inputs: inputs:
serviceEndpoint: Calculator StoreBroker Connection ConnectedServiceNameARM: Calculator StoreBroker SNI
sbConfigPath: Tools/Build/StoreBroker/SBCalculatorConfig.json sbConfigPath: Tools/Build/StoreBroker/SBCalculatorConfig.json
sourceFolder: $(Build.ArtifactStagingDirectory)/msixBundle sourceFolder: $(Build.ArtifactStagingDirectory)/msixBundle
contents: Microsoft.WindowsCalculator_8wekyb3d8bbwe.msixbundle contents: Microsoft.WindowsCalculator_8wekyb3d8bbwe.msixbundle

6
build/pipelines/templates/release-store.yaml
View file

@ -17,11 +17,11 @@ jobs:
displayName: Download storeBrokerPayload artifact displayName: Download storeBrokerPayload artifact
artifact: storeBrokerPayload artifact: storeBrokerPayload
- task: MS-RDX-MRO.windows-store-publish-dev.flight-task.store-flight@2 - task: MS-RDX-MRO.windows-store-publish-dev.flight-task.store-flight@3
displayName: Flight StoreBroker Payload to team ring displayName: Flight StoreBroker Payload to team ring
name: StoreBrokerFlight name: StoreBrokerFlight
inputs: inputs:
serviceEndpoint: Calculator StoreBroker Connection ConnectedServiceNameARM: Calculator StoreBroker SNI
appId: $(AppId) appId: $(AppId)
flightId: $(FlightId) flightId: $(FlightId)
inputMethod: JsonAndZip inputMethod: JsonAndZip
@ -42,4 +42,4 @@ jobs:
submissionId: $(StoreBrokerFlight.WS_SubmissionId) submissionId: $(StoreBrokerFlight.WS_SubmissionId)
submissionDataPath: $(StoreBrokerPackagePath)\SBCalculator.json submissionDataPath: $(StoreBrokerPackagePath)\SBCalculator.json
packagePath: $(StoreBrokerPackagePath)\SBCalculator.zip packagePath: $(StoreBrokerPackagePath)\SBCalculator.zip
serviceEndpoint: AeroUpload-APS-Calculator serviceEndpoint: AeroUpload-APS-Calculator