diff options
author | Rob Mensching <rob@firegiant.com> | 2019-05-07 23:04:08 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2019-05-07 23:05:11 -0700 |
commit | 6452eb0554b667318e9c2d11d3c957b57cd9d65b (patch) | |
tree | 1814c568bceee9cb31a68ecb92043dcefa729b32 /src | |
parent | 8f288810a4bdeb7a397073ac9682f0478583be44 (diff) | |
download | wix-6452eb0554b667318e9c2d11d3c957b57cd9d65b.tar.gz wix-6452eb0554b667318e9c2d11d3c957b57cd9d65b.tar.bz2 wix-6452eb0554b667318e9c2d11d3c957b57cd9d65b.zip |
Update to latest repo-template
Diffstat (limited to 'src')
-rw-r--r-- | src/Directory.Build.props | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Directory.Build.props b/src/Directory.Build.props index e853e22d..a22f4470 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props | |||
@@ -8,6 +8,7 @@ | |||
8 | <PropertyGroup> | 8 | <PropertyGroup> |
9 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 9 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> | 10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> |
11 | <MSBuildWarningsAsMessages>MSB3246</MSBuildWarningsAsMessages> | ||
11 | 12 | ||
12 | <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> | 13 | <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> |
13 | <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath> | 14 | <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath> |
@@ -21,6 +22,7 @@ | |||
21 | <Product>WiX Toolset</Product> | 22 | <Product>WiX Toolset</Product> |
22 | </PropertyGroup> | 23 | </PropertyGroup> |
23 | 24 | ||
24 | <Import Project="Cpp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.vcxproj' " /> | 25 | <Import Project="Cpp.Build.props" Condition=" Exists('Cpp.Build.props') And '$(MSBuildProjectExtension)'=='.vcxproj' " /> |
26 | <Import Project="Wix.Build.props" Condition=" Exists('Wix.Build.props') And '$(MSBuildProjectExtension)'=='.wixproj' " /> | ||
25 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | 27 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> |
26 | </Project> | 28 | </Project> |