diff options
author | Davis Goodin <dagood@microsoft.com> | 2017-08-28 21:07:57 -0500 |
---|---|---|
committer | Davis Goodin <dagood@microsoft.com> | 2017-08-28 21:07:57 -0500 |
commit | 18df98fdb8ed23b05e3e4a5566860b7d6203de84 (patch) | |
tree | 82c89d8cd0c3e033dca3f256e5447c4411217edf /dir.props | |
parent | af1615dcf7002477353f738a569fe9a904a3bd93 (diff) | |
download | coreclr-18df98fdb8ed23b05e3e4a5566860b7d6203de84.tar.gz coreclr-18df98fdb8ed23b05e3e4a5566860b7d6203de84.tar.bz2 coreclr-18df98fdb8ed23b05e3e4a5566860b7d6203de84.zip |
Fix dir.props BuildVersionFile override
The override needs to be before the Build.Common.props import, because BuildVersion.targets is in Build.Common.props and it's what's responsible for importing BuildVersionFile if it exists.
Diffstat (limited to 'dir.props')
-rw-r--r-- | dir.props | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -104,6 +104,11 @@ <OutputPath Condition="'$(OutputPath)' == ''">$(BinDir)</OutputPath> </PropertyGroup> + <!-- Explicitly set BuildVersionFile before importing common. This is used by BuildVersion.targets. --> + <PropertyGroup Condition="'$(OfficialBuildId)' != ''"> + <BuildVersionFile>$(BaseIntermediateOutputPath)BuildVersion-$(OfficialBuildId).props</BuildVersionFile> + </PropertyGroup> + <!-- Import Build tools common props file where repo-independent properties are found --> <Import Condition="Exists('$(ToolsDir)Build.Common.props')" Project="$(ToolsDir)Build.Common.props" /> @@ -181,10 +186,6 @@ <PackageIndex Include="$(PackageIndexFile)" /> </ItemGroup> - <PropertyGroup Condition="'$(OfficialBuildId)' != ''"> - <BuildVersionFile>$(BaseIntermediateOutputPath)BuildVersion-$(OfficialBuildId).props</BuildVersionFile> - </PropertyGroup> - <!-- Use Roslyn Compilers to build --> <Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'!='true' and Exists('$(RoslynPropsFile)') and '$(UseRoslynCompilers)'!='false'" /> <Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'=='true' and Exists('$(RoslynPropsFile)')" /> |