diff options
| -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)')" /> |