Use branch naming for versioning releases

Author: kzu

GitInfo.txt

@@ -1 +1 @@
-0.1.0
+0.2.0-dev

build.proj

@@ -19,6 +19,7 @@
     <CommonBuildProperties>WarningLevel=0;NoWarn=1591;Out=$(Out);Configuration=$(Configuration);RunCodeAnalysis=$(RunCodeAnalysis);PackageOutputPath=$(Out)</CommonBuildProperties>
     <DefaultImportance Condition=" '$(DefaultImportance)' == '' ">high</DefaultImportance>
     <PS>%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe</PS>
+		<GitInfoReportImportance>high</GitInfoReportImportance>
   </PropertyGroup>
 
   <ItemGroup>
@@ -140,8 +141,8 @@
       <GitSemVerPatch>0</GitSemVerPatch>
     </PropertyGroup>
   </Target>
-  <Import Project="$(GitInfoTargets)" Condition="Exists('$(GitInfoTargets)')"/>
   <Import Project="src\PackageVersion.targets" />
+  <Import Project="$(GitInfoTargets)" Condition="Exists('$(GitInfoTargets)')"/>
 
   <Target Name="Configure" DependsOnTargets="DownloadNuGet;GetPackageVersion">
     <Message Importance="high" Text="*********************************************************************************************************************" />
@@ -152,11 +153,10 @@
 			  StandardOutputImportance="low"
 			  Condition=" '$(PendingRestore)' == 'true' " />
 
-    <!-- Invoke GitVersion just like the project-level targets do -->
-    <MSBuild Projects="$(GitInfoTargets)" Targets="GitVersion;GitInfoReport" Properties="GitInfoReportImportance=high">
-      <Output TaskParameter="TargetOutputs" ItemName="GitInfo" />
-    </MSBuild>
+		<Error Text="Build script NuGet packages were missing and were just restored. Please run the build again." Condition=" '$(PendingRestore)' == 'true' "/>
 
+    <!-- Invoke GitVersion just like the project-level targets do -->
+		<CallTarget Targets="GitInfoReport" />
     <!-- For now this is an informative version #, used to update CI -->
     <Message Text="Building version $(PackageVersion)" Importance="high" />
 

src/PackageVersion.targets

@@ -2,7 +2,9 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
 	<PropertyGroup>
-	    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>	
+	    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+		<!-- We use branch and file version sources only -->
+		<GitIgnoreTagVersion>true</GitIgnoreTagVersion>
 		<BuildDependsOn>
 			GetPackageVersion;
 			$(BuildDependsOn)
@@ -11,13 +13,19 @@
 
 	<Target Name="GetPackageVersion" BeforeTargets="ThisProjectInfo" DependsOnTargets="GitVersion" Returns="$(PackageVersion)">
 		<PropertyGroup>
-			<GitSemVerDashLabel Condition="'$(GitBranch)' == 'undefined'">-pr</GitSemVerDashLabel>
+			<!-- PR builds are *always* prerelease -->
+			<!-- TFS case: BUILD_REASON=PullRequest and BUILD_SOURCEBRANCH=refs/pull/[#]/merge -->
+			<GitSemVerDashLabel Condition="'$(TF_BUILD)' == 'true' and '$(BUILD_REASON)' == 'PullRequest'">-pr$(BUILD_SOURCEBRANCH.Substring(10).TrimEnd('/merge'))</GitSemVerDashLabel>
 			<GitSemVerDashLabel Condition="'$(APPVEYOR_PULL_REQUEST_NUMBER)' != ''">-pr$(APPVEYOR_PULL_REQUEST_NUMBER)</GitSemVerDashLabel>
-			<PackageVersion>$(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)$(GitSemVerDashLabel)</PackageVersion>
+
+			<!-- Non-prerelease versions will use the package version determined by SemVer -->
+			<PackageVersion Condition="'$(GitSemVerDashLabel)' == ''">$(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)</PackageVersion>
+			<!-- Prerelease versions are fixed to the base version (this allows the stable versions to always be greater) and have the build number instead -->
+			<PackageVersion Condition="'$(GitSemVerDashLabel)' != ''">$(GitSemVerMajor).$(GitSemVerMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel)-build$(GitCommits.PadLeft(4, '0'))</PackageVersion>
 		</PropertyGroup>
 	</Target>
 
 	<PropertyGroup>
 		<PackageVersionImported>true</PackageVersionImported>
 	</PropertyGroup>
-</Project>
+</Project>