Minor code cleanup

4 files changed, 36 insertions, 37 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index 8887d4eb..a4b9be85 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -238,6 +238,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             // This must occur after all variables and source paths have been resolved.
             List<FileFacade> fileFacades;
+            if (SectionType.Patch == section.Type)
+            {
+                var command = new GetFileFacadesFromTransforms(this.Messaging, this.FileSystemManager, this.SubStorages);
+                command.Execute();
+
+                fileFacades = command.FileFacades;
+            }
+            else
             {
                 var command = new GetFileFacadesCommand(section);
                 command.Execute();
@@ -254,24 +262,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 {
                     containsMergeModules = true;
 
-                    var command = new ExtractMergeModuleFilesCommand(this.Messaging, section, wixMergeTuples);
-                    command.FileFacades = fileFacades;
-                    command.OutputInstallerVersion = installerVersion;
-                    command.SuppressLayout = this.SuppressLayout;
-                    command.IntermediateFolder = this.IntermediateFolder;
+                    var command = new ExtractMergeModuleFilesCommand(this.Messaging, wixMergeTuples, fileFacades, installerVersion, this.IntermediateFolder, this.SuppressLayout);
                     command.Execute();
 
                     fileFacades.AddRange(command.MergeModulesFileFacades);
                 }
             }
-            else if (SectionType.Patch == section.Type)
-            {
-                var command = new GetFileFacadesFromTransforms(this.Messaging, this.FileSystemManager, this.SubStorages);
-                command.Execute();
-                var filesFromTransforms = command.FileFacades;
-
-                fileFacades.AddRange(filesFromTransforms);
-            }
 
             // stop processing if an error previously occurred
             if (this.Messaging.EncounteredError)
@@ -368,11 +364,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     output.SubStorages.Add(storage);
                 }
             }
-            else // we can create instance transforms since Component Guids are set.
-            {
-                var command = new CreateInstanceTransformsCommand(section, output, tableDefinitions, this.BackendHelper);
-                command.Execute();
-            }
 
 #if TODO_FINISH_UPDATE
             // Extended binder extensions can be called now that fields are resolved.
@@ -412,6 +403,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             this.ValidateComponentGuids(output);
 
+            // We can create instance transforms since Component Guids and Outputs are created.
+            if (output.Type == OutputType.Product)
+            {
+                var command = new CreateInstanceTransformsCommand(section, output, tableDefinitions, this.BackendHelper);
+                command.Execute();
+            }
+
             // Stop processing if an error previously occurred.
             if (this.Messaging.EncounteredError)
             {
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
index 62f7fce3..792a13a9 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
@@ -21,26 +21,27 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     /// </summary>
     internal class ExtractMergeModuleFilesCommand
     {
-        public ExtractMergeModuleFilesCommand(IMessaging messaging, IntermediateSection section, List<WixMergeTuple> wixMergeTuples)
+        public ExtractMergeModuleFilesCommand(IMessaging messaging, IEnumerable<WixMergeTuple> wixMergeTuples, IEnumerable<FileFacade> fileFacades, int installerVersion, string intermediateFolder, bool suppressLayout)
         {
             this.Messaging = messaging;
-            this.Section = section;
             this.WixMergeTuples = wixMergeTuples;
+            this.FileFacades = fileFacades;
+            this.OutputInstallerVersion = installerVersion;
+            this.IntermediateFolder = intermediateFolder;
+            this.SuppressLayout = suppressLayout;
         }
 
         private IMessaging Messaging { get; }
 
-        private IntermediateSection Section { get; }
+        private IEnumerable<WixMergeTuple> WixMergeTuples { get; }
 
-        private List<WixMergeTuple> WixMergeTuples { get; }
+        private IEnumerable<FileFacade> FileFacades { get; }
 
-        public IEnumerable<FileFacade> FileFacades { private get; set; }
+        private int OutputInstallerVersion { get; }
 
-        public int OutputInstallerVersion { private get; set; }
+        private string IntermediateFolder { get; }
 
-        public bool SuppressLayout { private get; set; }
-
-        public string IntermediateFolder { private get; set; }
+        private bool SuppressLayout { get; }
 
         public IEnumerable<FileFacade> MergeModulesFileFacades { get; private set; }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesFromTransforms.cs b/src/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesFromTransforms.cs
index 99bf7101..585bdac0 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesFromTransforms.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesFromTransforms.cs
@@ -27,7 +27,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         private IEnumerable<SubStorage> SubStorages { get; }
 
-        public IEnumerable<FileFacade> FileFacades { get; private set; }
+        public List<FileFacade> FileFacades { get; private set; }
 
         public void Execute()
         {
diff --git a/src/WixToolset.Core/Linker.cs b/src/WixToolset.Core/Linker.cs
index 7b381347..fb1b2488 100644
--- a/src/WixToolset.Core/Linker.cs
+++ b/src/WixToolset.Core/Linker.cs
@@ -168,7 +168,7 @@ namespace WixToolset.Core
                 // references that particpate in groups.
                 sections = resolve.ResolvedSections.ToList();
 
-                // TODO: consider filtering "localizations" down to only those localizations from 
+                // TODO: consider filtering "localizations" down to only those localizations from
                 //       intermediates in the sections.
 
                 this.FlattenSectionsComplexReferences(sections);
@@ -261,8 +261,8 @@ namespace WixToolset.Core
                                         if (WindowsInstallerStandard.IsStandardDirectory(directory))
                                         {
                                             // if the directory table contains references to standard windows folders
-                                            // mergemod.dll will add customactions to set the MSM directory to 
-                                            // the same directory as the standard windows folder and will add references to 
+                                            // mergemod.dll will add customactions to set the MSM directory to
+                                            // the same directory as the standard windows folder and will add references to
                                             // custom action to all the standard sequence tables. A problem will occur
                                             // if the MSI does not have these tables as mergemod.dll does not add these
                                             // tables to the MSI if absent. This code adds the tables in case mergemod.dll
@@ -982,7 +982,7 @@ namespace WixToolset.Core
                         }
 
                         // If the child of the complex reference is another group, then in Step 2
-                        // we're going to have to process this complex reference again to copy 
+                        // we're going to have to process this complex reference again to copy
                         // the child group's references into the parent group.
                         if ((ComplexReferenceChildType.ComponentGroup == wixComplexReferenceRow.ChildType) ||
                             (ComplexReferenceChildType.FeatureGroup == wixComplexReferenceRow.ChildType) ||
@@ -1081,14 +1081,14 @@ namespace WixToolset.Core
                     var childTypeAndId = this.CombineTypeAndId(wixComplexReferenceRow.ChildType, wixComplexReferenceRow.Child);
                     if (loopDetector.Contains(childTypeAndId))
                     {
-                        // Create a comma delimited list of the references that participate in the 
+                        // Create a comma delimited list of the references that participate in the
                         // loop for the error message. Start at the bottom of the stack and work the
                         // way up to present the loop as a directed graph.
                         var loop = String.Join(" -> ", loopDetector);
 
                         this.Messaging.Write(ErrorMessages.ReferenceLoopDetected(wixComplexReferenceRow?.SourceLineNumbers, loop));
 
-                        // Cleanup the parentGroupsNeedingProcessing and the loopDetector just like the 
+                        // Cleanup the parentGroupsNeedingProcessing and the loopDetector just like the
                         // exit of this method does at the end because we are exiting early.
                         loopDetector.Pop();
                         parentGroupsNeedingProcessing.Remove(parentTypeAndId);
@@ -1097,7 +1097,7 @@ namespace WixToolset.Core
                     }
 
                     // Check to see if the child group still needs to be processed. If so,
-                    // go do that so that we'll get all of that children's (and children's 
+                    // go do that so that we'll get all of that children's (and children's
                     // children) complex references correctly merged into our parent group.
                     if (parentGroupsNeedingProcessing.ContainsKey(childTypeAndId))
                     {
@@ -1107,7 +1107,7 @@ namespace WixToolset.Core
                     // If the child is a parent to anything (i.e. the parent has grandchildren)
                     // clone each of the children's complex references, repoint them to the parent
                     // complex reference (because we're moving references up the tree), and finally
-                    // add the cloned child's complex reference to the list of complex references 
+                    // add the cloned child's complex reference to the list of complex references
                     // that we'll eventually add to the parent group.
                     if (parentGroups.TryGetValue(childTypeAndId, out var referencesToChild))
                     {
@@ -1148,7 +1148,7 @@ namespace WixToolset.Core
                 }
                 else if (i > 0)
                 {
-                    // Since the list is already sorted, we can find duplicates by simply 
+                    // Since the list is already sorted, we can find duplicates by simply
                     // looking at the next sibling in the list and tossing out one if they
                     // match.
                     var crefCompare = referencesToParent[i - 1];