From 6b30680fd7a712b45538c3f0a89d652f0457a893 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 22 May 2020 14:53:27 -0700
Subject: Support merging merge modules

---
 .../Bind/MergeModulesCommand.cs                                | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs')

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs
index b90aecd1..cd6170d0 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs
@@ -9,9 +9,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using System.Runtime.InteropServices;
     using System.Text;
     using WixToolset.Core.Bind;
+    using WixToolset.Core.Native;
     using WixToolset.Core.WindowsInstaller.Msi;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
     using WixToolset.Data.WindowsInstaller;
     using WixToolset.Data.WindowsInstaller.Rows;
     using WixToolset.Extensibility.Services;
@@ -21,6 +21,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     /// </summary>
     internal class MergeModulesCommand
     {
+        public MergeModulesCommand(IMessaging messaging)
+        {
+            this.Messaging = messaging;
+        }
+
         public IEnumerable<FileFacade> FileFacades { private get; set; }
 
         public IMessaging Messaging { private get; set; }
@@ -51,7 +56,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             string logPath = null;
             try
             {
-                merge = MsmInterop.GetMsmMerge();
+                var interop = new MsmInterop();
+                merge = interop.GetMsmMerge();
 
                 logPath = Path.Combine(this.IntermediateFolder, "merge.log");
                 merge.OpenLog(logPath);
-- 
cgit v1.2.3-55-g6feb