diff --git a/build/GitCommitInfo.targets b/build/GitCommitInfo.targets
index 578feeb0d..4a384c016 100644
--- a/build/GitCommitInfo.targets
+++ b/build/GitCommitInfo.targets
@@ -10,9 +10,18 @@
       <Output TaskParameter="ConsoleOutput" PropertyName="GitInfoCommitHash" />
     </Exec>
 
+    <ItemGroup>
+      <GitInfoCommitCountLines Include="$(GitInfoCommitCount)" />
+      <GitInfoCommitHashLines Include="$(GitInfoCommitHash)" />
+    </ItemGroup>
+
     <PropertyGroup>
+      <!-- Batching in GitInfoCommitCount and GitInfoCommitHash here ensures that the property contains only the last line of the output -->
+      <GitInfoCommitCount>%(GitInfoCommitCountLines.Identity)</GitInfoCommitCount>
       <GitInfoCommitCount>$(GitInfoCommitCount.PadLeft(6,'0'))</GitInfoCommitCount>
       
+      <GitInfoCommitHash>%(GitInfoCommitHashLines.Identity)</GitInfoCommitHash>
+
       <ShouldOverWriteThePropsFile 
         Condition=" 'ForceStringComparison$(CommitCount)' != 'ForceStringComparison$(GitInfoCommitCount)' Or 
                     '$(CommitHash)' != '$(GitInfoCommitHash)' ">true</ShouldOverWriteThePropsFile>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
new file mode 100644
index 000000000..8d5c8cc42
--- /dev/null
+++ b/test/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\dir.props" />
+
+  <PropertyGroup>
+    <DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
+  </PropertyGroup>
+</Project>