diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-12-22 09:02:00 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2018-12-22 09:02:00 -0800 |
| commit | f026bf4147cadcf50006145c51d5191d037e191b (patch) | |
| tree | c7147bb3a59b39f50827c835ac21bab18dd7f6a6 /src/Directory.Build.props | |
| parent | aaffa96b1ca5175364dd23aa8f03a3b2fd10d3b0 (diff) | |
| download | wix-f026bf4147cadcf50006145c51d5191d037e191b.tar.gz wix-f026bf4147cadcf50006145c51d5191d037e191b.tar.bz2 wix-f026bf4147cadcf50006145c51d5191d037e191b.zip | |
Update to latest Home\repo-template
Diffstat (limited to 'src/Directory.Build.props')
| -rw-r--r-- | src/Directory.Build.props | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 9eacf3f5..f09c622b 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | <!-- | 3 | <!-- |
| 4 | Do NOT modify this file. Update the canonical version in Home\src\Directory.Build.props | 4 | Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.props |
| 5 | then update all of the repos. | 5 | then update all of the repos. |
| 6 | --> | 6 | --> |
| 7 | <Project> | 7 | <Project> |
| @@ -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> |
