Skip to content

Commit

Permalink
Fix GitVersioning after recent BuildTools update (#1282)
Browse files Browse the repository at this point in the history
BuildTools now writes a file named "version.txt" which is unfortunate because GitVersioning also looks for a file named that.

This change sets $(ObjDir) so the BuildTools version.txt will be out of the paths taht GitVersioning searches.
  • Loading branch information
jeffkl authored Oct 28, 2016
1 parent 769a0e7 commit 902f7b7
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions dir.props
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,9 @@
<IntermediateOutputPath>$([System.IO.Path]::Combine($(BaseIntermediateOutputPath)$(MSBuildProjectName),$(Configuration)))$([System.IO.Path]::DirectorySeparatorChar)</IntermediateOutputPath>
<IntermediateOutputPath Condition="'$(Platform)' != 'AnyCPU'">$([System.IO.Path]::Combine($(BaseIntermediateOutputPath)$(MSBuildProjectName),$(Platform),$(Configuration)))$([System.IO.Path]::DirectorySeparatorChar)</IntermediateOutputPath>

<!-- BuildTools uses this path to write some files -->
<ObjDir>$(IntermediateOutputPath)</ObjDir>

<!-- The TestPath seems to be used by Microsoft.DotNet.BuildTools targets. It does not seem to affect the MSBuild build in any way -->
<TestPath>$(TestWorkingDir)$([System.IO.Path]::Combine($(MSBuildProjectName),$(Configuration)))$([System.IO.Path]::DirectorySeparatorChar)</TestPath>
<TestPath Condition="'$(Platform)' != 'AnyCPU'">$([System.IO.Path]::Combine($(TestWorkingDir)$(MSBuildProjectName),$(Platform),$(Configuration)))$([System.IO.Path]::DirectorySeparatorChar)</TestPath>
Expand Down

0 comments on commit 902f7b7

Please sign in to comment.