Enable use of NCrunch

5 files changed, 50 insertions, 9 deletions

diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props
index 453aa442..296b36ca 100644
--- a/src/Cpp.Build.props
+++ b/src/Cpp.Build.props
@@ -3,9 +3,8 @@
 
 <Project>
   <PropertyGroup>
-    <Platform Condition=" '$(Platform)' == 'AnyCPU' ">Win32</Platform>
-    <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 63ad5d6e..9eacf3f5 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,16 +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>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <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/WixToolset.Core.Native/WixToolset.Core.Native.csproj b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
index b02c00ad..e2431fef 100644
--- a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
+++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
@@ -13,7 +13,12 @@
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
   </ItemGroup>
 
-  <Target Name="BuildWixNative" BeforeTargets="GetCopyToOutputDirectoryItems">
+  <PropertyGroup>
+    <NativeFileListPath Condition=" '$(NCrunch)'=='' ">$(MSBuildProjectDir)..\..\build\obj\$(ProjectName)\$(Configuration)\NativeFileList.txt</NativeFileListPath>
+    <NativeFileListPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalProjectDir)..\..\build\obj\$(ProjectName)\$(Configuration)\NativeFileList.txt</NativeFileListPath>
+  </PropertyGroup>
+
+  <Target Name="BuildWixNative" BeforeTargets="GetCopyToOutputDirectoryItems" Condition=" '$(NCrunch)'=='' ">
     <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=Win32" Targets="Build;BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup">
       <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" />
     </MSBuild>
@@ -21,7 +26,11 @@
       <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" />
     </MSBuild>
 
+    <WriteLinesToFile File="$(NativeFileListPath)" Lines="@(_NativeProjectOutput)" Overwrite="true" />
+
     <ItemGroup>
+      <FileWrites Include="$(NativeFileListPath)" />
+
       <AllItemsFullPathWithTargetPath Include="@(_NativeProjectOutput->'%(FullPath)')">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         <TargetPath>%(Filename)%(Extension)</TargetPath>
@@ -29,6 +38,22 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="NCrunchCopyNative" AfterTargets="AfterBuild" Condition=" '$(NCrunch)'=='1' ">
+    <ReadLinesFromFile File="$(NativeFileListPath)">
+      <Output TaskParameter="Lines" ItemName="_NCrunchNativeProjectOutput" />
+    </ReadLinesFromFile>
+
+    <Error Text="You must build $(MSBuildProjectName) to create the referenced native projects. Once built, 'Reload and rebuild' the project in the NCrunch Tests. The $(NativeFileListPath) file must not be empty." Condition=" '@(_NCrunchNativeProjectOutput)'=='' " />
+
+    <Copy SourceFiles="@(_NCrunchNativeProjectOutput)" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true">
+      <Output TaskParameter="CopiedFiles" ItemName="_NCrunchNativeCopied" />
+    </Copy>
+
+    <ItemGroup>
+      <FileWrites Include="@(_NCrunchNativeCopied)" />
+    </ItemGroup>
+  </Target>
+
   <Target Name="SetNuspecProperties" AfterTargets="CoreBuild">
     <PropertyGroup>
       <NuspecBasePath>$(OutputPath)</NuspecBasePath>
diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.v3.ncrunchproject b/src/WixToolset.Core.Native/WixToolset.Core.Native.v3.ncrunchproject
new file mode 100644
index 00000000..0da1f42d
--- /dev/null
+++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.v3.ncrunchproject
@@ -0,0 +1,10 @@
+<ProjectConfiguration>
+  <Settings>
+    <AdditionalFilesToIncludeForProject>
+      <Value>..\..\build\Debug\Win32\wixnative.x86.exe</Value>
+      <Value>..\..\build\Debug\Win32\wixnative.x86.pdb</Value>
+      <Value>..\..\build\Debug\x64\wixnative.amd64.exe</Value>
+      <Value>..\..\build\Debug\x64\wixnative.amd64.pdb</Value>
+    </AdditionalFilesToIncludeForProject>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/src/wixnative/wixnative.vcxproj b/src/wixnative/wixnative.vcxproj
index d4b31fd8..420615ed 100644
--- a/src/wixnative/wixnative.vcxproj
+++ b/src/wixnative/wixnative.vcxproj
@@ -75,7 +75,7 @@
   </ItemGroup>
 
   <Target Name="Pack" DependsOnTargets="GetBuildVersion">
-    <Exec Command="nuget pack runtime.win.WixToolset.Core.Native.nuspec -BasePath &quot;$(BaseOutputPath)\&quot; -OutputDirectory &quot;$(BaseOutputPath)\&quot; -NoPackageAnalysis -Properties Configuration=$(Configuration);Id=runtime.win.WixToolset.Core.Native;Version=&quot;$(BuildVersionSimple)&quot;;Platform=$(PlatformTarget);Authors=&quot;$(Authors)&quot;;Copyright=&quot;$(Copyright)&quot;;Description=&quot;$(Description)&quot;;Title=&quot;$(Title)&quot;" />
+    <Exec Command='nuget pack runtime.win.WixToolset.Core.Native.nuspec -BasePath "$(BaseOutputPath)$(Configuration)" -OutputDirectory "$(BaseOutputPath)$(Configuration)" -NoPackageAnalysis -Properties Configuration=$(Configuration);Id=runtime.win.WixToolset.Core.Native;Version="$(BuildVersionSimple)";Platform=$(PlatformTarget);Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' />
   </Target>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />