Base build name off the source branch and implement a derivative of C…

…alVer

.azure-pipelines/pull-request.yml

@@ -1,5 +1,3 @@
-name: $(date:yy)$(DayOfYear)$(rev:.r)
-
 trigger:
   - master
   - releases/shipped
@@ -11,9 +9,7 @@ pr:
   - servicing/*
 
 variables:
-  majorAndMinorVersion: '0.4'
-  revision: '$(Build.BuildNumber)'
-  platform: 'x64'
+  branchCounter: $[counter(variables['Build.SourceBranch'], 0)]
 
 jobs:
   - job: Windows_Build_and_UnitTests
@@ -29,6 +25,8 @@ jobs:
     pool:
       vmImage: vs2017-win2016
     steps:
+    - powershell: $(Build.Repository.LocalPath)/Scripts/CI/Set-Version.ps1 -SourceBranchCounter $(branchCounter)
+      displayName: "Compute product version"
     - template: templates/windows-build-and-unit-test.yml
 
   - job: macOS_Build_and_UnitTests
@@ -44,6 +42,8 @@ jobs:
     pool:
       name: 'Hosted macOS'
     steps:
+    - powershell: $(Build.Repository.LocalPath)/Scripts/CI/Set-Version.ps1 -SourceBranchCounter $(branchCounter)
+      displayName: "Compute product version"
     - template: templates/macos-build-and-unit-test.yml
 
   - job: macOS_FunctionalTests

.azure-pipelines/templates/macos-build-and-unit-test.yml

@@ -12,7 +12,7 @@ steps:
       certSecureFile: 'PrjFSKextCertExpiresJun6_2020_v2.p12'
       certPwd: '$(kext.certificate.password)'
 
-  - script: Scripts/Mac/BuildScalarForMac.sh $(configuration)
+  - script: Scripts/Mac/BuildScalarForMac.sh $(configuration) $(majorAndMinorVersion).$(revision)
     displayName: Build Scalar ($(configuration))
 
   - task: PublishTestResults@2

Scripts/CI/Set-Version.ps1

@@ -0,0 +1,47 @@
+<#
+Generates the pipeline variables for the product version and set the build number.
+#>
+param (
+    [Parameter(Mandatory)]
+    [string]$SourceBranchCounter # should always be set to counter($(Build.SourceBranch), 0)
+)
+
+function Set-PipelineVariable {
+    Param ([string]$VarName, [string]$VarValue)
+    Write-Host "##vso[task.setvariable variable=$VarName;]$VarValue"
+}
+
+function Set-BuildNumber {
+    Param([string]$BuildNumber)
+    Write-Host "##vso[build.updatebuildnumber]$BuildNumber"
+}
+
+$SourceBranch = $Env:BUILD_SOURCEBRANCH
+$SourceBranchName = $Env:BUILD_SOURCEBRANCHNAME
+
+$ReleaseBranch = 'refs/heads/releases/(?<Year>\d{2})\.(?<Month>\d{2})\.(?<Milestone>\d{3})'
+$PullRequest = 'refs/pull/(?<PrNum>\d+)/merge'
+
+$Major = 0
+$Minor = 0
+$Revision = 0
+
+if ($SourceBranch -match $ReleaseBranch) {
+    $Major = $Matches["Year"]
+    $Minor = $Matches["Month"]
+    $Revision = $Matches["Milestone"]
+    Set-BuildNumber "Release-$Major.$Minor.$Revision.$SourceBranchCounter"
+} elseif ($SourceBranch -match $PullRequest) {
+    $Major = 10
+    $Minor = 20
+    $Revision = $Matches["PrNum"]
+    Set-BuildNumber "PR-$Revision.$SourceBranchCounter"
+} else {    # Typical CI scenario. Handles tags and non-release branches.
+    $Major = (Get-Date -Format yy)
+    $Minor = (Get-Date -Format MM)
+    $Revision = (Get-Date -Format dd)
+    Set-BuildNumber "CI-$SourceBranchName.$SourceBranchCounter"
+}
+
+Set-PipelineVariable "majorAndMinorVersion" "$Major.$Minor"
+Set-PipelineVariable "revision" "$Revision.$SourceBranchCounter"