Standardize on props with NCrunch support

4 files changed, 15 insertions, 7 deletions

diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props
index 1e4d4cbc..296b36ca 100644
--- a/src/Cpp.Build.props
+++ b/src/Cpp.Build.props
@@ -3,8 +3,8 @@
 
 <Project>
   <PropertyGroup>
-    <BaseOutputPath>$(OutputPath)</BaseOutputPath>
-    <IntDir>$(BaseIntermediateOutputPath)$(Platform)\</IntDir>
+    <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform>
+    <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir>
     <OutDir>$(OutputPath)$(Platform)\</OutDir>
   </PropertyGroup>
 
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 48ba462d..9eacf3f5 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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. -->
-
+<!--
+  Do NOT modify this file. Update the canonical version in Home\src\Directory.Build.props
+  then update all of the repos.
+-->
 <Project>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
-    <OutputPath>$(MSBuildThisFileDirectory)..\build\$(Configuration)\</OutputPath>
+    <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink>
+
+    <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
+    <BaseOutputPath>$(MSBuildThisFileDirectory)..\build\</BaseOutputPath>
+    <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath>
+    <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
 
     <Authors>WiX Toolset Team</Authors>
     <Company>WiX Toolset</Company>
     <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
+    <Product>WiX Toolset</Product>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/NativeMultiTargeting.Build.props b/src/NativeMultiTargeting.Build.props
index 98b1933e..1ff46559 100644
--- a/src/NativeMultiTargeting.Build.props
+++ b/src/NativeMultiTargeting.Build.props
@@ -4,7 +4,7 @@
 <Project>
   <!-- Overrides the standard Cpp.Build.props to include the PlatformToolset in the output path. -->
   <PropertyGroup>
-    <IntDir>$(BaseIntermediateOutputPath)$(PlatformToolset)\$(PlatformTarget)\</IntDir>
+    <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\</IntDir>
     <OutDir>$(OutputPath)$(PlatformToolset)\$(PlatformTarget)\</OutDir>
   </PropertyGroup>
 </Project>
diff --git a/src/dutil/dutil.vcxproj b/src/dutil/dutil.vcxproj
index 46002b82..95b90665 100644
--- a/src/dutil/dutil.vcxproj
+++ b/src/dutil/dutil.vcxproj
@@ -288,7 +288,7 @@
 
   <Target Name="PackNativeNuget"
           DependsOnTargets="GetBuildVersion">
-    <Exec Command='nuget pack dutil.nuspec -OutputDirectory $(BaseOutputPath) -Properties Configuration=$(Configuration);Id=WixToolset.DUtil;Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' />
+    <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)"' />
   </Target>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />