Skip to content

Commit f23a5d2

Browse files
authored
fixing build numbering for releases (#8008)
1 parent b99c08f commit f23a5d2

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

build/common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<LangVersion>latest</LangVersion>
66
<MajorVersion>4</MajorVersion>
77
<MinorVersion>1</MinorVersion>
8-
<PatchVersion>0</PatchVersion>
8+
<PatchVersion>1</PatchVersion>
99
<BuildNumber Condition="'$(BuildNumber)' == '' ">0</BuildNumber>
1010
<PreviewVersion></PreviewVersion>
1111

build/initialize-pipeline.ps1

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
$buildReason = $env:BUILD_REASON
2+
$sourceBranch = $env:BUILD_SOURCEBRANCH
3+
4+
Write-Host "BUILD_REASON: '$buildReason'"
5+
Write-Host "BUILD_SOURCEBRANCH: '$sourceBranch'"
26

37
if ($buildReason -eq "PullRequest") {
48
# parse PR title to see if we should pack this
@@ -11,8 +15,13 @@ if ($buildReason -eq "PullRequest") {
1115
}
1216
}
1317

14-
$buildNumber = $env:buildNumber
15-
Write-Host "BuildNumber: '$buildNumber'"
18+
$buildNumber = ""
19+
20+
if(($buildReason -eq "PullRequest") -or !($sourceBranch.ToLower().Contains("release/4.")))
21+
{
22+
$buildNumber = $env:buildNumber
23+
Write-Host "BuildNumber: '$buildNumber'"
24+
}
1625

1726
Import-Module $PSScriptRoot\Get-AzureFunctionsVersion -Force
1827
$version = Get-AzureFunctionsVersion $buildNumber $buildNumber

0 commit comments

Comments
 (0)