diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2019-12-11 11:25:32 +1100 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2019-12-11 20:10:40 +1000 |
| commit | ca118d0123624e4e1523eeb7a54eb56364d5876e (patch) | |
| tree | 646358d3c1afefa828c32edc45b7d24b46d4e178 /src | |
| parent | 9caf38b96e4b1955eed0f391cbcbf83064c23b31 (diff) | |
| download | wix-ca118d0123624e4e1523eeb7a54eb56364d5876e.tar.gz wix-ca118d0123624e4e1523eeb7a54eb56364d5876e.tar.bz2 wix-ca118d0123624e4e1523eeb7a54eb56364d5876e.zip | |
Update to latest repo-template.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Cpp.Build.props | 2 | ||||
| -rw-r--r-- | src/Directory.Build.props | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props index 0e00132b..44a042c7 100644 --- a/src/Cpp.Build.props +++ b/src/Cpp.Build.props | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | <OutDir>$(OutputPath)$(Platform)\</OutDir> | 8 | <OutDir>$(OutputPath)$(Platform)\</OutDir> |
| 9 | </PropertyGroup> | 9 | </PropertyGroup> |
| 10 | 10 | ||
| 11 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'=='15.0'"> | 11 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> |
| 12 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | 12 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> |
| 13 | </PropertyGroup> | 13 | </PropertyGroup> |
| 14 | 14 | ||
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> |