fixing build numbering for releases (Azure#8008)

sa-es-ir · Dec 15, 2021 · f23a5d2 · f23a5d2
1 parent b99c08f
commit f23a5d2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/build/common.props b/build/common.props
@@ -5,7 +5,7 @@
     <LangVersion>latest</LangVersion>
     <MajorVersion>4</MajorVersion>
     <MinorVersion>1</MinorVersion>
-    <PatchVersion>0</PatchVersion>
+    <PatchVersion>1</PatchVersion>
     <BuildNumber Condition="'$(BuildNumber)' == '' ">0</BuildNumber>
     <PreviewVersion></PreviewVersion>        
 

diff --git a/build/initialize-pipeline.ps1 b/build/initialize-pipeline.ps1
@@ -1,4 +1,8 @@
 $buildReason = $env:BUILD_REASON
+$sourceBranch = $env:BUILD_SOURCEBRANCH
+
+Write-Host "BUILD_REASON: '$buildReason'"
+Write-Host "BUILD_SOURCEBRANCH: '$sourceBranch'"
 
 if ($buildReason -eq "PullRequest") {
   # parse PR title to see if we should pack this
@@ -11,8 +15,13 @@ if ($buildReason -eq "PullRequest") {
   }
 }
 
-$buildNumber = $env:buildNumber
-Write-Host "BuildNumber: '$buildNumber'"
+$buildNumber = ""
+
+if(($buildReason -eq "PullRequest") -or !($sourceBranch.ToLower().Contains("release/4.")))
+{
+  $buildNumber = $env:buildNumber
+  Write-Host "BuildNumber: '$buildNumber'"
+}
 
 Import-Module $PSScriptRoot\Get-AzureFunctionsVersion -Force
 $version = Get-AzureFunctionsVersion $buildNumber $buildNumber