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

---
 src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index 32da410f..22858d1f 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -505,7 +505,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 // necessary.
                 foreach (SequenceTable sequence in Enum.GetValues(typeof(SequenceTable)))
                 {
-                    var sequenceTableName = sequence.ToString();
+                    var sequenceTableName = (sequence == SequenceTable.AdvertiseExecuteSequence) ? "AdvtExecuteSequence" : sequence.ToString();
                     var sequenceTable = output.Tables[sequenceTableName];
 
                     if (null == sequenceTable)
@@ -519,8 +519,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     }
                 }
 
-                var command = new MergeModulesCommand();
+                var command = new MergeModulesCommand(this.Messaging);
                 command.FileFacades = fileFacades;
+                command.IntermediateFolder = this.IntermediateFolder;
                 command.Output = output;
                 command.OutputPath = this.OutputPath;
                 command.SuppressedTableNames = suppressedTableNames;
-- 
cgit v1.2.3-55-g6feb