github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 14:13:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert some change of build scripts

Browse source
This commit is contained in:
Kenny Guo 2021-07-27 12:19:33 +08:00
commit 8a02f815f5
4 changed files with 8 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build/pipelines/templates/build-app-internal.yaml
View file

@ -28,12 +28,14 @@ jobs:
downloadDirectory: $(Build.SourcesDirectory) downloadDirectory: $(Build.SourcesDirectory)
vstsFeed: WindowsInboxApps vstsFeed: WindowsInboxApps
vstsFeedPackage: calculator-internals vstsFeedPackage: calculator-internals
vstsPackageVersion: 0.0.65 ${{ if eq(parameters.isPublicRelease, true) }}:
vstsPackageVersion: 0.0.66
${{ if eq(parameters.isPublicRelease, false) }}:
vstsPackageVersion: 0.0.65
- template: ./build-single-architecture.yaml - template: ./build-single-architecture.yaml
parameters: parameters:
extraMsBuildArgs: '/p:IsStoreBuild=true' extraMsBuildArgs: '/p:IsStoreBuild=true'
isPublicRelease: ${{ parameters.isPublicRelease }}
- task: PublishSymbols@2 - task: PublishSymbols@2
displayName: Publish symbols displayName: Publish symbols

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

@ -3,7 +3,6 @@
parameters: parameters:
extraMsBuildArgs: '' extraMsBuildArgs: ''
isPublicRelease: false
steps: steps:
- task: NuGetToolInstaller@1 - task: NuGetToolInstaller@1
@ -23,10 +22,7 @@ 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
${{ if eq(parameters.isPublicRelease, true) }}: arguments: '-AppxManifest $(Build.SourcesDirectory)\src\Calculator\Package.appxmanifest -Version $(Build.BuildNumber)'
arguments: '-AppxManifest $(Build.SourcesDirectory)\src\Calculator\Package.appxmanifest -Version $(Build.BuildNumber) -MinVersion 10.0.22000.0'
${{ if eq(parameters.isPublicRelease, false) }}:
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'
@ -43,4 +39,4 @@ steps:
inputs: inputs:
artifactName: drop artifactName: drop
pathToPublish: $(Build.BinariesDirectory) pathToPublish: $(Build.BinariesDirectory)
parallel: true parallel: true

2
build/pipelines/templates/prepare-release-internalonly.yaml
View file

@ -81,7 +81,7 @@ jobs:
downloadDirectory: $(Build.SourcesDirectory) downloadDirectory: $(Build.SourcesDirectory)
vstsFeed: WindowsInboxApps vstsFeed: WindowsInboxApps
vstsFeedPackage: calculator-internals vstsFeedPackage: calculator-internals
vstsPackageVersion: 0.0.65 vstsPackageVersion: 0.0.66
- 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.

16
build/scripts/UpdateAppxManifestVersion.ps1
View file

@ -11,9 +11,6 @@
.PARAMETER Version .PARAMETER Version
The version number to write into the file. The version number to write into the file.
.PARAMETER MinVersion
The MinVersion to write to TargetDeviceFamily element in the file.
.EXAMPLE .EXAMPLE
Update-AppxManifestVersion -AppxManifest "C:\App\Package.appxmanifest" -Version "3.2.1.0" Update-AppxManifestVersion -AppxManifest "C:\App\Package.appxmanifest" -Version "3.2.1.0"
#> #>
@ -26,20 +23,9 @@ param(
[ValidateScript({[version]$_})] [ValidateScript({[version]$_})]
[Parameter(Mandatory)] [Parameter(Mandatory)]
[string] [string]
$Version, $Version
[ValidateScript({[version]$_})]
[Parameter(Mandatory=$false)]
[string]
$MinVersion
) )
$xmlDoc = [XML](Get-Content $AppxManifest) $xmlDoc = [XML](Get-Content $AppxManifest)
$xmlDoc.Package.Identity.setAttribute("Version", $Version); $xmlDoc.Package.Identity.setAttribute("Version", $Version);
if($MinVersion)
{
$xmlDoc.Package.Dependencies.TargetDeviceFamily.setAttribute("MinVersion", $MinVersion);
}
$xmlDoc.Save($AppxManifest) $xmlDoc.Save($AppxManifest)