From 00d39fa4d5f562f3ee03df7f0d0355501eb1af4a Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 2 Nov 2021 17:01:34 -0700 Subject: [PATCH] Increment RC MSI build number by 100 (#16354) --- tools/packaging/packaging.psm1 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index 2908357b14..5d24276308 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -3096,7 +3096,7 @@ function Get-WindowsNames { Write-Verbose -Message "Getting Windows Names for ProductName: $ProductName; ProductNameSuffix: $ProductNameSuffix; ProductVersion: $ProductVersion" -Verbose $ProductSemanticVersion = Get-PackageSemanticVersion -Version $ProductVersion - $ProductVersion = Get-PackageVersionAsMajorMinorBuildRevision -Version $ProductVersion + $ProductVersion = Get-PackageVersionAsMajorMinorBuildRevision -Version $ProductVersion -IncrementBuildNumber $productVersionWithName = $ProductName + '_' + $ProductVersion $productSemanticVersionWithName = $ProductName + '-' + $ProductSemanticVersion @@ -3748,8 +3748,9 @@ function Get-PackageVersionAsMajorMinorBuildRevision # Version of the Package [Parameter(Mandatory = $true)] [ValidateNotNullOrEmpty()] - [string] $Version - ) + [string] $Version, + [switch] $IncrementBuildNumber + ) Write-Verbose "Extract the version in the form of major.minor[.build[.revision]] for $Version" $packageVersionTokens = $Version.Split('-') @@ -3770,6 +3771,10 @@ function Get-PackageVersionAsMajorMinorBuildRevision $packageBuildTokens = $packageBuildTokens.Substring(0,4) } + if ($packageVersionTokens[1] -match 'rc' -and $IncrementBuildNumber) { + $packageBuildTokens = [int]$packageBuildTokens + 100 + } + $packageVersion = $packageVersion + '.' + $packageBuildTokens } else