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/wixnative/Win32/mergemod.dll                       | Bin 0 -> 169304 bytes
 .../runtime.win.WixToolset.Core.Native.nuspec          |   2 ++
 src/wixnative/wixnative.vcxproj                        |   8 ++++++++
 src/wixnative/x64/mergemod.dll                         | Bin 0 -> 183848 bytes
 4 files changed, 10 insertions(+)
 create mode 100644 src/wixnative/Win32/mergemod.dll
 create mode 100644 src/wixnative/x64/mergemod.dll

(limited to 'src/wixnative')

diff --git a/src/wixnative/Win32/mergemod.dll b/src/wixnative/Win32/mergemod.dll
new file mode 100644
index 00000000..2bf647b2
Binary files /dev/null and b/src/wixnative/Win32/mergemod.dll differ
diff --git a/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec b/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec
index 59eff4e6..a775b570 100644
--- a/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec
+++ b/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec
@@ -14,8 +14,10 @@
   </metadata>
 
   <files>
+    <file src="Win32\mergemod.dll" target="runtimes\win-x86\native" />
     <file src="Win32\wixnative.exe" target="runtimes\win-x86\native" />
     <file src="Win32\wixnative.pdb" target="runtimes\win-x86\native" />
+    <file src="x64\mergemod.dll" target="runtimes\win-x64\native" />
     <file src="x64\wixnative.exe" target="runtimes\win-x64\native" />
     <file src="x64\wixnative.pdb" target="runtimes\win-x64\native" />
   </files>
diff --git a/src/wixnative/wixnative.vcxproj b/src/wixnative/wixnative.vcxproj
index 57afcc0b..80e0aae5 100644
--- a/src/wixnative/wixnative.vcxproj
+++ b/src/wixnative/wixnative.vcxproj
@@ -69,6 +69,14 @@
     <None Include="packages.config" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="$(Platform)\mergemod.dll">
+      <DeploymentContent>true</DeploymentContent>
+      <Link>%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
   <Target Name="Pack" DependsOnTargets="GetBuildVersion">
     <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>
diff --git a/src/wixnative/x64/mergemod.dll b/src/wixnative/x64/mergemod.dll
new file mode 100644
index 00000000..2f4cdc7c
Binary files /dev/null and b/src/wixnative/x64/mergemod.dll differ
-- 
cgit v1.2.3-55-g6feb