Standardize on props with NCrunch support
Rob Mensching committed
Oct 2, 2018 at 15:24 UTC
49b1c073fd7aac252b636a813611930fc142cdc5
4 files changed
+15
-7
src/Cpp.Build.props
+2
-2
@@ -3,8 +3,8 @@
3
4
<Project>
5
<PropertyGroup>
6
- <BaseOutputPath>$(OutputPath)</BaseOutputPath>
7
- <IntDir>$(BaseIntermediateOutputPath)$(Platform)\</IntDir>
6
+ <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform>
7
+ <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir>
8
<OutDir>$(OutputPath)$(Platform)\</OutDir>
9
</PropertyGroup>
10
src/Directory.Build.props
+11
-3
@@ -1,15 +1,23 @@
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. -->
3
-
3
+<!--
4
+ Do NOT modify this file. Update the canonical version in Home\src\Directory.Build.props
5
+ then update all of the repos.
6
+-->
7
<Project>
8
<PropertyGroup>
9
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7
- <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
8
- <OutputPath>$(MSBuildThisFileDirectory)..\build\$(Configuration)\</OutputPath>
10
+ <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink>
11
+
12
+ <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
13
+ <BaseOutputPath>$(MSBuildThisFileDirectory)..\build\</BaseOutputPath>
14
+ <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath>
15
+ <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
16
17
<Authors>WiX Toolset Team</Authors>
18
<Company>WiX Toolset</Company>
19
<Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
20
+ <Product>WiX Toolset</Product>
21
</PropertyGroup>
22
23
<PropertyGroup>
src/NativeMultiTargeting.Build.props
+1
-1
@@ -4,7 +4,7 @@
4
<Project>
5
<!-- Overrides the standard Cpp.Build.props to include the PlatformToolset in the output path. -->
6
<PropertyGroup>
7
- <IntDir>$(BaseIntermediateOutputPath)$(PlatformToolset)\$(PlatformTarget)\</IntDir>
7
+ <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\</IntDir>
8
<OutDir>$(OutputPath)$(PlatformToolset)\$(PlatformTarget)\</OutDir>
9
</PropertyGroup>
10
</Project>
src/dutil/dutil.vcxproj
+1
-1
@@ -288,7 +288,7 @@
288
289
<Target Name="PackNativeNuget"
290
DependsOnTargets="GetBuildVersion">
291
- <Exec Command='nuget pack dutil.nuspec -OutputDirectory $(BaseOutputPath) -Properties Configuration=$(Configuration);Id=WixToolset.DUtil;Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' />
291
+ <Exec Command='nuget pack dutil.nuspec -OutputDirectory "$(BaseOutputPath)$(Configuration)" -Properties Configuration=$(Configuration);Id=WixToolset.DUtil;Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' />
292
</Target>
293
294
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />