aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-05-22 14:53:27 -0700
committerRob Mensching <rob@firegiant.com>2020-05-22 15:25:19 -0700
commit6b30680fd7a712b45538c3f0a89d652f0457a893 (patch)
tree46ef7f7d51de4189b7ef1af07dda3add16ad302f /src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
parent236f958468923f65a8f02e406601fb47e71cd58e (diff)
downloadwix-6b30680fd7a712b45538c3f0a89d652f0457a893.tar.gz
wix-6b30680fd7a712b45538c3f0a89d652f0457a893.tar.bz2
wix-6b30680fd7a712b45538c3f0a89d652f0457a893.zip
Support merging merge modules
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs5
1 files changed, 3 insertions, 2 deletions
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
505 // necessary. 505 // necessary.
506 foreach (SequenceTable sequence in Enum.GetValues(typeof(SequenceTable))) 506 foreach (SequenceTable sequence in Enum.GetValues(typeof(SequenceTable)))
507 { 507 {
508 var sequenceTableName = sequence.ToString(); 508 var sequenceTableName = (sequence == SequenceTable.AdvertiseExecuteSequence) ? "AdvtExecuteSequence" : sequence.ToString();
509 var sequenceTable = output.Tables[sequenceTableName]; 509 var sequenceTable = output.Tables[sequenceTableName];
510 510
511 if (null == sequenceTable) 511 if (null == sequenceTable)
@@ -519,8 +519,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
519 } 519 }
520 } 520 }
521 521
522 var command = new MergeModulesCommand(); 522 var command = new MergeModulesCommand(this.Messaging);
523 command.FileFacades = fileFacades; 523 command.FileFacades = fileFacades;
524 command.IntermediateFolder = this.IntermediateFolder;
524 command.Output = output; 525 command.Output = output;
525 command.OutputPath = this.OutputPath; 526 command.OutputPath = this.OutputPath;
526 command.SuppressedTableNames = suppressedTableNames; 527 command.SuppressedTableNames = suppressedTableNames;