Correctly join command line arguments and other small clean up and optimizations

6 files changed, 45 insertions, 58 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index c47a1e56..205feeac 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -39,7 +39,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             this.PdbFile = context.OutputPdbPath;
             this.IntermediateFolder = context.IntermediateFolder;
             this.Validator = validator;
-            
+
             this.BackendExtensions = backendExtension;
         }
 
@@ -90,6 +90,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             var fileTransfers = new List<FileTransfer>();
 
+            var containsMergeModules = false;
             var suppressedTableNames = new HashSet<string>();
 
             // If there are any fields to resolve later, create the cache to populate during bind.
@@ -209,7 +210,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 command.Execute();
             }
 
-            // Gather information about files that did not come from merge modules (i.e. rows with a reference to the File table).
+            // Gather information about files that do not come from merge modules.
             {
                 var command = new UpdateFileFacadesCommand(this.Messaging, section);
                 command.FileFacades = fileFacades;
@@ -233,13 +234,15 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 command.Execute();
             }
 
+            // Retrieve file information from merge modules.
             if (SectionType.Product == section.Type)
             {
-                // Retrieve files and their information from merge modules.
                 var wixMergeTuples = section.Tuples.OfType<WixMergeTuple>().ToList();
 
                 if (wixMergeTuples.Any())
                 {
+                    containsMergeModules = true;
+
                     var command = new ExtractMergeModuleFilesCommand(this.Messaging, section, wixMergeTuples);
                     command.FileFacades = fileFacades;
                     command.OutputInstallerVersion = installerVersion;
@@ -266,11 +269,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 return;
             }
 
-#if TODO_FIX_INSTANCE_TRANSFORM
-            // With the Component Guids set now we can create instance transforms.
-            this.CreateInstanceTransforms(this.Output);
-#endif
-
             // Assign files to media.
             Dictionary<int, MediaTuple> assignedMediaRows;
             Dictionary<MediaTuple, IEnumerable<FileFacade>> filesByCabinetMedia;
@@ -292,7 +290,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 return;
             }
 
-            // Try to put as much above here as possible, updating the IR is better.
+            // Time to create the output object. Try to put as much above here as possible, updating the IR is better.
             Output output;
             {
                 var command = new CreateOutputFromIRCommand(section, this.TableDefinitions, this.BackendExtensions);
@@ -307,12 +305,18 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 command.Execute();
             }
 
-            // Modularize identifiers and add tables with real streams to the import tables.
+            // Modularize identifiers.
             if (OutputType.Module == output.Type)
             {
-                var command = new ModularaizeCommand(output, modularizationGuid, section.Tuples.OfType<WixSuppressModularizationTuple>());
+                var command = new ModularizeCommand(output, modularizationGuid, section.Tuples.OfType<WixSuppressModularizationTuple>());
                 command.Execute();
             }
+            else // we can create instance transforms since Component Guids are set.
+            {
+#if TODO_FIX_INSTANCE_TRANSFORM
+                this.CreateInstanceTransforms(this.Output);
+#endif
+            }
 
 #if TODO_FINISH_UPDATE
             // Extended binder extensions can be called now that fields are resolved.
@@ -367,7 +371,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
 
             // create cabinet files and process uncompressed files
-            string layoutDirectory = Path.GetDirectoryName(this.OutputPath);
+            var layoutDirectory = Path.GetDirectoryName(this.OutputPath);
             if (!this.SuppressLayout || OutputType.Module == output.Type)
             {
                 this.Messaging.Write(VerboseMessages.CreatingCabinetFiles());
@@ -399,36 +403,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
 #endif
 
-            // Add back suppressed tables which must be present prior to merging in modules.
-            if (OutputType.Product == output.Type)
-            {
-                Table wixMergeTable = output.Tables["WixMerge"];
-
-                if (null != wixMergeTable && 0 < wixMergeTable.Rows.Count)
-                {
-                    foreach (SequenceTable sequence in Enum.GetValues(typeof(SequenceTable)))
-                    {
-                        string sequenceTableName = sequence.ToString();
-                        Table sequenceTable = output.Tables[sequenceTableName];
-
-                        if (null == sequenceTable)
-                        {
-                            sequenceTable = output.EnsureTable(this.TableDefinitions[sequenceTableName]);
-                        }
-
-                        if (0 == sequenceTable.Rows.Count)
-                        {
-                            suppressedTableNames.Add(sequenceTableName);
-                        }
-                    }
-                }
-            }
-
-            //foreach (BinderExtension extension in this.Extensions)
-            //{
-            //    extension.PostBind(this.Context);
-            //}
-
             this.ValidateComponentGuids(output);
 
             // stop processing if an error previously occurred
@@ -455,18 +429,37 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
 
             // Output the output to a file.
-            Pdb pdb = new Pdb();
-            pdb.Output = output;
             if (!String.IsNullOrEmpty(this.PdbFile))
             {
+                Pdb pdb = new Pdb();
+                pdb.Output = output;
                 pdb.Save(this.PdbFile);
             }
 
             // Merge modules.
-            if (OutputType.Product == output.Type)
+            if (containsMergeModules)
             {
                 this.Messaging.Write(VerboseMessages.MergingModules());
 
+                // Add back possibly suppressed sequence tables since all sequence tables must be present
+                // for the merge process to work. We'll drop the suppressed sequence tables again as
+                // necessary.
+                foreach (SequenceTable sequence in Enum.GetValues(typeof(SequenceTable)))
+                {
+                    var sequenceTableName = sequence.ToString();
+                    var sequenceTable = output.Tables[sequenceTableName];
+
+                    if (null == sequenceTable)
+                    {
+                        sequenceTable = output.EnsureTable(this.TableDefinitions[sequenceTableName]);
+                    }
+
+                    if (0 == sequenceTable.Rows.Count)
+                    {
+                        suppressedTableNames.Add(sequenceTableName);
+                    }
+                }
+
                 var command = new MergeModulesCommand();
                 command.FileFacades = fileFacades;
                 command.Output = output;
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ModularaizeCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ModularizeCommand.cs
index 8c6e3831..ba6af986 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/ModularaizeCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/ModularizeCommand.cs
@@ -13,9 +13,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using WixToolset.Data.Tuples;
     using WixToolset.Data.WindowsInstaller;
 
-    internal class ModularaizeCommand
+    internal class ModularizeCommand
     {
-        public ModularaizeCommand(Output output, string modularizationGuid, IEnumerable<WixSuppressModularizationTuple> suppressTuples)
+        public ModularizeCommand(Output output, string modularizationGuid, IEnumerable<WixSuppressModularizationTuple> suppressTuples)
         {
             this.Output = output;
             this.ModularizationGuid = modularizationGuid;
@@ -38,12 +38,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
         }
 
-        /// <summary>
-        /// Modularize the table.
-        /// </summary>
-        /// <param name="modularizationGuid">String containing the GUID of the Merge Module, if appropriate.</param>
-        /// <param name="suppressModularizationIdentifiers">Optional collection of identifiers that should not be modularized.</param>
-        public void ModularizeTable(Table table)
+        private void ModularizeTable(Table table)
         {
             var modularizedColumns = new List<int>();
 
@@ -79,7 +74,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             if (!(WindowsInstallerStandard.IsStandardAction(fieldData) || WindowsInstallerStandard.IsStandardProperty(fieldData)))
             {
-                ColumnModularizeType modularizeType = field.Column.ModularizeType;
+                var modularizeType = field.Column.ModularizeType;
 
                 // special logic for the ControlEvent table's Argument column
                 // this column requires different modularization methods depending upon the value of the Event column
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
index 39771508..56c86b11 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
@@ -41,7 +41,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         public void Execute()
         {
-            List<FileTransfer> fileTransfers = new List<FileTransfer>();
+            var fileTransfers = new List<FileTransfer>();
 
             var directories = new Dictionary<string, ResolvedDirectory>();
 
diff --git a/src/WixToolset.Core/CommandLine/CommandLineParser.cs b/src/WixToolset.Core/CommandLine/CommandLineParser.cs
index 017810e0..3c7f3d1e 100644
--- a/src/WixToolset.Core/CommandLine/CommandLineParser.cs
+++ b/src/WixToolset.Core/CommandLine/CommandLineParser.cs
@@ -54,7 +54,7 @@ namespace WixToolset.Core.CommandLine
 
             if (!String.IsNullOrEmpty(context.Arguments))
             {
-                args = CommandLineParser.ParseArgumentsToArray(context.Arguments).Union(args).ToArray();
+                args = CommandLineParser.ParseArgumentsToArray(context.Arguments).Concat(args).ToArray();
             }
 
             return this.ParseStandardCommandLine(context, args);
diff --git a/src/WixToolset.Core/Librarian.cs b/src/WixToolset.Core/Librarian.cs
index 3e843070..f4191e86 100644
--- a/src/WixToolset.Core/Librarian.cs
+++ b/src/WixToolset.Core/Librarian.cs
@@ -143,7 +143,7 @@ namespace WixToolset.Core
 
                 foreach (var tuple in sections.SelectMany(s => s.Tuples))
                 {
-                    foreach (var field in tuple.Fields.Where(f => f.Type == IntermediateFieldType.Path))
+                    foreach (var field in tuple.Fields.Where(f => f?.Type == IntermediateFieldType.Path))
                     {
                         var pathField = field.AsPath();
 
diff --git a/src/test/TestData/Example.Extension/ExampleTableDefinitions.cs b/src/test/TestData/Example.Extension/ExampleTableDefinitions.cs
index 16da1316..dbd6491b 100644
--- a/src/test/TestData/Example.Extension/ExampleTableDefinitions.cs
+++ b/src/test/TestData/Example.Extension/ExampleTableDefinitions.cs
@@ -2,7 +2,6 @@
 
 namespace Example.Extension
 {
-    using System.Collections.Generic;
     using WixToolset.Data.WindowsInstaller;
 
     public static class ExampleTableDefinitions