From 5bb7ca81122f5e5627e226563f08bbc934453322 Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Fri, 24 Feb 2017 10:34:16 -0800
Subject: [PATCH] Add back BranchInfo.props

---
 Microsoft.DotNet.Cli.sln          | 1 +
 build/BranchInfo.props            | 6 ++++++
 build/publish/FinishBuild.targets | 5 -----
 dir.props                         | 2 ++
 4 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 build/BranchInfo.props

diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index 07d04c5b2..9f45a0657 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -26,6 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
 	ProjectSection(SolutionItems) = preProject
 		build\AzureInfo.props = build\AzureInfo.props
 		build\Branding.props = build\Branding.props
+		build\BranchInfo.props = build\BranchInfo.props
 		build\BuildDefaults.props = build\BuildDefaults.props
 		build\BundledRuntimes.props = build\BundledRuntimes.props
 		build\BundledSdks.proj = build\BundledSdks.proj
diff --git a/build/BranchInfo.props b/build/BranchInfo.props
new file mode 100644
index 000000000..9d145a59c
--- /dev/null
+++ b/build/BranchInfo.props
@@ -0,0 +1,6 @@
+<Project>
+  <PropertyGroup>
+    <Channel>master</Channel>
+    <BranchName>master</BranchName>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/build/publish/FinishBuild.targets b/build/publish/FinishBuild.targets
index b198eb297..206e131f2 100644
--- a/build/publish/FinishBuild.targets
+++ b/build/publish/FinishBuild.targets
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Channel>master</Channel>
-    <BranchName>master</BranchName>
-  </PropertyGroup>
-  
   <Target Name="FinishBuild"
           DependsOnTargets="CheckIfAllBuildsHavePublished;
                             FinalizeBuild" />
diff --git a/dir.props b/dir.props
index 922efad8b..44c03f7e7 100644
--- a/dir.props
+++ b/dir.props
@@ -17,6 +17,8 @@
   <Import Condition=" Exists('$(GitCommitInfoProps)') Or '$(GeneratingPropsFile)' != 'true' " Project="$(GitCommitInfoProps)" />
   <Import Condition=" Exists('$(HostInfoProps)') Or '$(GeneratingPropsFile)' != 'true' " Project="$(HostInfoProps)" />
 
+  <Import Project="build/BranchInfo.props" />
+
   <Import Project="build/BundledTools.props" />
   <Import Project="build/DependencyVersions.props" />
   <Import Project="build/Version.props" />