From 952865b05c03a11c5dc64101ca32faa6a8cb09b8 Mon Sep 17 00:00:00 2001
From: Vance Morrison <vancemorrison@comcast.net>
Date: Fri, 2 Feb 2018 08:21:40 -0800
Subject: [PATCH] It is useful to know the branch where a particular build was
 made.  Add that to the extended version information

---
 .../PackageFiles/versioning.targets                        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/versioning.targets b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/versioning.targets
index 1d586d5f79..5d09a3a764 100644
--- a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/versioning.targets
+++ b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/versioning.targets
@@ -262,8 +262,13 @@
   <Target Name="CreateOrUpdateCurrentVersionFile"
       BeforeTargets="ResolveProjectReferences"
       Condition="'$(SkipVersionGeneration)' != 'true' AND '$(VersionPropsImported)' != 'true'">
+
     <!-- ############################### -->
+    <Exec Command="git rev-parse --abbrev-ref HEAD 2>&amp;1" StandardOutputImportance="Low" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true" ConsoleToMSBuild="true" Condition="'$(GitBranchName)' == ''">
+      <Output TaskParameter="ConsoleOutput" PropertyName="GitBranchName" />
+    </Exec>
 
+    <!-- ############################### -->
     <PropertyGroup Condition="'$(LatestCommit)' != ''">
       <LatestCommitExitCode>0</LatestCommitExitCode>
     </PropertyGroup>
@@ -365,6 +370,8 @@
     <PropertyGroup Condition="'$(BuiltByString)' == ''">
       <!-- Set the @BuiltBy key-value pair -->
       <BuiltByString Condition="'$(VersionUserName)' != '' AND '$(VersionHostName)' != ''">$(BuiltByString) %40BuiltBy: $(VersionUserName)-$(VersionHostName)</BuiltByString>
+      <!-- Set the @Branch key-value pair -->
+      <BuiltByString Condition="'$(GitBranchName)' != ''">$(BuiltByString) %40Branch: $(GitBranchName)</BuiltByString>
       <!-- Set the @SrcCode key-value pair -->
       <BuiltByString Condition="'$(GitHubRepositoryUrl)' != '' AND '$(LatestCommit)' != 'N/A'">$(BuiltByString) %40SrcCode: $(GitHubRepositoryUrl)/tree/$(LatestCommit)</BuiltByString>
       <!-- If that does not work, try setting the @Commit key-value pair -->