diff options
Diffstat (limited to 'src/Directory.Build.props')
| -rw-r--r-- | src/Directory.Build.props | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 9eacf3f5..35ef739b 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> | 10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> |
| 11 | 11 | ||
| 12 | <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> | 12 | <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> |
| 13 | <BaseOutputPath>$(MSBuildThisFileDirectory)..\build\</BaseOutputPath> | 13 | <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath> |
| 14 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath> | 14 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath> |
| 15 | <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath> | 15 | <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath> |
| 16 | 16 | ||
| @@ -20,10 +20,6 @@ | |||
| 20 | <Product>WiX Toolset</Product> | 20 | <Product>WiX Toolset</Product> |
| 21 | </PropertyGroup> | 21 | </PropertyGroup> |
| 22 | 22 | ||
| 23 | <PropertyGroup> | ||
| 24 | <WixToolsetRootFolder>$(MSBuildThisFileDirectory)..\..\</WixToolsetRootFolder> | ||
| 25 | </PropertyGroup> | ||
| 26 | |||
| 27 | <Import Project="Cpp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.vcxproj' " /> | 23 | <Import Project="Cpp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.vcxproj' " /> |
| 28 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | 24 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> |
| 29 | </Project> | 25 | </Project> |
