Update minVersion in appxmanifest only when public release

This commit is contained in:
Kenny Guo 2021-07-27 10:45:37 +08:00
commit 3896ea1de9
5 changed files with 28 additions and 27 deletions

View file

@ -20,16 +20,24 @@ jobs:
- template: ./templates/build-app-internal.yaml - template: ./templates/build-app-internal.yaml
parameters: parameters:
platform: x86 platform: x86
condition: not(eq(variables['Build.Reason'], 'PullRequest'))
- template: ./templates/build-app-internal.yaml - template: ./templates/build-app-internal.yaml
parameters: parameters:
platform: ARM platform: ARM
condition: not(eq(variables['Build.Reason'], 'PullRequest'))
- template: ./templates/run-ui-tests.yaml - template: ./templates/run-ui-tests.yaml
parameters: parameters:
platform: x64 platform: x64
runsettingsFileName: CalculatorUITests.release.runsettings runsettingsFileName: CalculatorUITests.release.runsettings
- template: ./templates/run-ui-tests.yaml
parameters:
platform: x86
runsettingsFileName: CalculatorUITests.release.runsettings
condition: not(eq(variables['Build.Reason'], 'PullRequest'))
- template: ./templates/run-unit-tests.yaml - template: ./templates/run-unit-tests.yaml
parameters: parameters:
platform: x64 platform: x64

View file

@ -1,10 +1,13 @@
# #
# Continuous Integration (CI) - Internal # Release
# This pipeline builds and validate the app for all supported architectures, in a production # This pipeline builds a version of the app in a production configuration to be released to the
# configuration. This pipeline relies on Microsoft-internal resources to run. # Store and the Windows image. This pipeline relies on Microsoft-internal resources to run.
# #
trigger: none trigger:
- master
- release/*
- feature/*
pr: none pr: none
name: 0.$(Date:yyMM).$(DayOfMonth)$(Rev:rr).0 name: 0.$(Date:yyMM).$(DayOfMonth)$(Rev:rr).0
@ -19,15 +22,20 @@ jobs:
parameters: parameters:
platform: x86 platform: x86
isPublicRelease: true isPublicRelease: true
condition: not(eq(variables['Build.Reason'], 'PullRequest'))
- template: ./templates/build-app-internal.yaml - template: ./templates/build-app-internal.yaml
parameters: parameters:
platform: ARM platform: ARM
isPublicRelease: true isPublicRelease: true
condition: not(eq(variables['Build.Reason'], 'PullRequest'))
- template: ./templates/run-ui-tests.yaml - template: ./templates/run-unit-tests.yaml
parameters: parameters:
platform: x64 platform: x64
runsettingsFileName: CalculatorUITests.release.runsettings
- template: ./templates/run-unit-tests.yaml
parameters:
platform: x86
- template: ./templates/package-appxbundle.yaml - template: ./templates/package-appxbundle.yaml

View file

@ -4,13 +4,6 @@
# Store and the Windows image. This pipeline relies on Microsoft-internal resources to run. # Store and the Windows image. This pipeline relies on Microsoft-internal resources to run.
# #
schedules:
- cron: "0 7 * * *"
displayName: Daily midnight build
branches:
include:
- master
trigger: none trigger: none
pr: none pr: none
@ -26,27 +19,20 @@ jobs:
- template: ./templates/build-app-internal.yaml - template: ./templates/build-app-internal.yaml
parameters: parameters:
platform: x64 platform: x64
isPublicRelease: true
- template: ./templates/build-app-internal.yaml - template: ./templates/build-app-internal.yaml
parameters: parameters:
platform: x86 platform: x86
isPublicRelease: true
condition: not(eq(variables['Build.Reason'], 'PullRequest')) condition: not(eq(variables['Build.Reason'], 'PullRequest'))
- template: ./templates/build-app-internal.yaml - template: ./templates/build-app-internal.yaml
parameters: parameters:
platform: ARM platform: ARM
isPublicRelease: true
condition: not(eq(variables['Build.Reason'], 'PullRequest')) condition: not(eq(variables['Build.Reason'], 'PullRequest'))
- template: ./templates/run-ui-tests.yaml
parameters:
platform: x64
runsettingsFileName: CalculatorUITests.release.runsettings
- template: ./templates/run-ui-tests.yaml
parameters:
platform: x86
runsettingsFileName: CalculatorUITests.release.runsettings
- template: ./templates/run-unit-tests.yaml - template: ./templates/run-unit-tests.yaml
parameters: parameters:
platform: x64 platform: x64

View file

@ -23,11 +23,10 @@ steps:
displayName: Set version number in AppxManifest displayName: Set version number in AppxManifest
inputs: inputs:
filePath: $(Build.SourcesDirectory)\build\scripts\UpdateAppxManifestVersion.ps1 filePath: $(Build.SourcesDirectory)\build\scripts\UpdateAppxManifestVersion.ps1
arguments: versionArgs
${{ if eq(parameters.isPublicRelease, true) }}: ${{ if eq(parameters.isPublicRelease, true) }}:
versionArgs: '-AppxManifest $(Build.SourcesDirectory)\src\Calculator\Package.appxmanifest -Version $(Build.BuildNumber) -MinVersion 10.0.22000.0' arguments: '-AppxManifest $(Build.SourcesDirectory)\src\Calculator\Package.appxmanifest -Version $(Build.BuildNumber) -MinVersion 10.0.22000.0'
${{ if eq(parameters.isPublicRelease, false) }}: ${{ if eq(parameters.isPublicRelease, false) }}:
versionArgs: '-AppxManifest $(Build.SourcesDirectory)\src\Calculator\Package.appxmanifest -Version $(Build.BuildNumber)' arguments: '-AppxManifest $(Build.SourcesDirectory)\src\Calculator\Package.appxmanifest -Version $(Build.BuildNumber)'
- task: VSBuild@1 - task: VSBuild@1
displayName: 'Build solution src/Calculator.sln' displayName: 'Build solution src/Calculator.sln'

View file

@ -26,7 +26,7 @@ param(
[ValidateScript({[version]$_})] [ValidateScript({[version]$_})]
[Parameter(Mandatory)] [Parameter(Mandatory)]
[string] [string]
$Version $Version,
[ValidateScript({[version]$_})] [ValidateScript({[version]$_})]
[Parameter(Mandatory=$false)] [Parameter(Mandatory=$false)]