From e28fcc906046ed12a867b621fc0eabf75fd9db09 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 21 May 2020 23:08:52 -0700
Subject: Add support using mergmod.dll and its interfaces

---
 src/WixToolset.Core.Native/WixToolset.Core.Native.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/WixToolset.Core.Native/WixToolset.Core.Native.csproj')

diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
index ee5cbc8e..ca8797a9 100644
--- a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
+++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
@@ -23,13 +23,13 @@
   </PropertyGroup>
 
   <Target Name="BuildWixNative" BeforeTargets="GetCopyToOutputDirectoryItems" Condition=" '$(NCrunch)'=='' ">
-    <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=Win32" Targets="Build;BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup">
+    <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=Win32" Targets="Build;BuiltProjectOutputGroup;ContentFilesProjectOutputGroup;DebugSymbolsProjectOutputGroup">
       <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" />
     </MSBuild>
-    <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=x64" Targets="Build;BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup">
+    <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=x64" Targets="Build;BuiltProjectOutputGroup;ContentFilesProjectOutputGroup;DebugSymbolsProjectOutputGroup">
       <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" />
     </MSBuild>
-
+      
     <WriteLinesToFile File="$(NativeFileListPath)" Lines="@(_NativeProjectOutput)" Overwrite="true" />
 
     <ItemGroup>
-- 
cgit v1.2.3-55-g6feb