5 files changed, 25 insertions, 8 deletions

diff --git a/appveyor.cmd b/appveyor.cmd
index 63302e89..74f0ec2c 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -1,6 +1,8 @@
 @setlocal
 @pushd %~dp0
 
+nuget restore
+
 msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v140_xp
 msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v140_xp
 
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/wcautil/wcautil.vcxproj b/src/wcautil/wcautil.vcxproj
index 61bd9437..d9356a8e 100644
--- a/src/wcautil/wcautil.vcxproj
+++ b/src/wcautil/wcautil.vcxproj
@@ -29,12 +29,14 @@
     <CharacterSet>MultiByte</CharacterSet>
     <Description>WiX Toolset Custom Action native utility library</Description>
   </PropertyGroup>
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="Shared">
     <Import Project="..\..\packages\Nerdbank.GitVersioning.2.0.37-beta\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.0.37-beta\build\Nerdbank.GitVersioning.targets')" />
   </ImportGroup>
   <Import Project="..\NativeMultiTargeting.Build.props" />
+
   <ItemGroup>
     <ClCompile Include="exbinary.cpp" />
     <ClCompile Include="wcalog.cpp" />
@@ -47,6 +49,7 @@
     <ClCompile Include="wcawrap.cpp" />
     <ClCompile Include="qtexec.cpp" />
   </ItemGroup>
+
   <ItemGroup Condition="'$(Platform)' == 'Win32'">
     <ClInclude Include="custommsierrors.h">
       <GenerateWixInclude>caerr.wxi</GenerateWixInclude>
@@ -62,12 +65,16 @@
     <ClInclude Include="inc\wcawow64.h" />
     <ClInclude Include="inc\wcawrapquery.h" />
   </ItemGroup>
+
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <Target Name="PackNativeNuget" DependsOnTargets="GetBuildVersion">
-    <Exec Command="nuget pack wcautil.nuspec -OutputDirectory $(BaseOutputPath) -Properties Configuration=$(Configuration);Id=WixToolset.WcaUtil;Version=&quot;$(BuildVersionSimple)&quot;;Authors=&quot;$(Authors)&quot;;Copyright=&quot;$(Copyright)&quot;;Description=&quot;$(Description)&quot;;Title=&quot;$(Title)&quot;" />
+
+  <Target Name="PackNativeNuget"
+          DependsOnTargets="GetBuildVersion">
+    <Exec Command='nuget pack wcautil.nuspec -OutputDirectory "$(BaseOutputPath)$(Configuration)" -Properties Configuration=$(Configuration);Id=WixToolset.WcaUtil;Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' />
   </Target>
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>