From 58b8be53fd966e3d475362912477a422f5b5aa11 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 27 Dec 2017 22:58:19 -0800 Subject: Correctly join command line arguments and other small clean up and optimizations --- .../Bind/BindDatabaseCommand.cs | 83 ++++--- .../Bind/ModularaizeCommand.cs | 238 --------------------- .../Bind/ModularizeCommand.cs | 233 ++++++++++++++++++++ .../Bind/ProcessUncompressedFilesCommand.cs | 2 +- .../CommandLine/CommandLineParser.cs | 2 +- src/WixToolset.Core/Librarian.cs | 2 +- .../Example.Extension/ExampleTableDefinitions.cs | 1 - 7 files changed, 274 insertions(+), 287 deletions(-) delete mode 100644 src/WixToolset.Core.WindowsInstaller/Bind/ModularaizeCommand.cs create mode 100644 src/WixToolset.Core.WindowsInstaller/Bind/ModularizeCommand.cs (limited to 'src') 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(); + var containsMergeModules = false; var suppressedTableNames = new HashSet(); // 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().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 assignedMediaRows; Dictionary> 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()); + var command = new ModularizeCommand(output, modularizationGuid, section.Tuples.OfType()); 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/ModularaizeCommand.cs deleted file mode 100644 index 8c6e3831..00000000 --- a/src/WixToolset.Core.WindowsInstaller/Bind/ModularaizeCommand.cs +++ /dev/null @@ -1,238 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. - -namespace WixToolset.Core.WindowsInstaller.Bind -{ - using System; - using System.Collections.Generic; - using System.Diagnostics; - using System.Globalization; - using System.Linq; - using System.Text; - using System.Text.RegularExpressions; - using WixToolset.Data; - using WixToolset.Data.Tuples; - using WixToolset.Data.WindowsInstaller; - - internal class ModularaizeCommand - { - public ModularaizeCommand(Output output, string modularizationGuid, IEnumerable suppressTuples) - { - this.Output = output; - this.ModularizationGuid = modularizationGuid; - - // Gather all the unique suppress modularization identifiers. - this.SuppressModularizationIdentifiers = new HashSet(suppressTuples.Select(s => s.WixSuppressModularization)); - } - - private Output Output { get; } - - private string ModularizationGuid { get; } - - private HashSet SuppressModularizationIdentifiers { get; } - - public void Execute() - { - foreach (var table in this.Output.Tables) - { - this.ModularizeTable(table); - } - } - - /// - /// Modularize the table. - /// - /// String containing the GUID of the Merge Module, if appropriate. - /// Optional collection of identifiers that should not be modularized. - public void ModularizeTable(Table table) - { - var modularizedColumns = new List(); - - // find the modularized columns - for (var i = 0; i < table.Definition.Columns.Length; ++i) - { - if (ColumnModularizeType.None != table.Definition.Columns[i].ModularizeType) - { - modularizedColumns.Add(i); - } - } - - if (0 < modularizedColumns.Count) - { - foreach (var row in table.Rows) - { - foreach (var modularizedColumn in modularizedColumns) - { - var field = row.Fields[modularizedColumn]; - - if (field.Data != null) - { - field.Data = this.ModularizedRowFieldValue(row, field); - } - } - } - } - } - - private string ModularizedRowFieldValue(Row row, Field field) - { - var fieldData = field.AsString(); - - if (!(WindowsInstallerStandard.IsStandardAction(fieldData) || WindowsInstallerStandard.IsStandardProperty(fieldData))) - { - ColumnModularizeType 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 - if (ColumnModularizeType.ControlEventArgument == field.Column.ModularizeType) - { - switch (row[2].ToString()) - { - case "CheckExistingTargetPath": // redirectable property name - case "CheckTargetPath": - case "DoAction": // custom action name - case "NewDialog": // dialog name - case "SelectionBrowse": - case "SetTargetPath": - case "SpawnDialog": - case "SpawnWaitDialog": - if (Common.IsIdentifier(fieldData)) - { - modularizeType = ColumnModularizeType.Column; - } - else - { - modularizeType = ColumnModularizeType.Property; - } - break; - default: // formatted - modularizeType = ColumnModularizeType.Property; - break; - } - } - else if (ColumnModularizeType.ControlText == field.Column.ModularizeType) - { - // icons are stored in the Binary table, so they get column-type modularization - if (("Bitmap" == row[2].ToString() || "Icon" == row[2].ToString()) && Common.IsIdentifier(fieldData)) - { - modularizeType = ColumnModularizeType.Column; - } - else - { - modularizeType = ColumnModularizeType.Property; - } - } - - switch (modularizeType) - { - case ColumnModularizeType.Column: - // ensure the value is an identifier (otherwise it shouldn't be modularized this way) - if (!Common.IsIdentifier(fieldData)) - { - throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, WixDataStrings.EXP_CannotModularizeIllegalID, fieldData)); - } - - // if we're not supposed to suppress modularization of this identifier - if (!this.SuppressModularizationIdentifiers.Contains(fieldData)) - { - fieldData = String.Concat(fieldData, ".", this.ModularizationGuid); - } - break; - - case ColumnModularizeType.Property: - case ColumnModularizeType.Condition: - Regex regex; - if (ColumnModularizeType.Property == modularizeType) - { - regex = new Regex(@"\[(?[#$!]?[a-zA-Z_][a-zA-Z0-9_\.]*)]", RegexOptions.Singleline | RegexOptions.ExplicitCapture); - } - else - { - Debug.Assert(ColumnModularizeType.Condition == modularizeType); - - // This heinous looking regular expression is actually quite an elegant way - // to shred the entire condition into the identifiers that need to be - // modularized. Let's break it down piece by piece: - // - // 1. Look for the operators: NOT, EQV, XOR, OR, AND, IMP (plus a space). Note that the - // regular expression is case insensitive so we don't have to worry about - // all the permutations of these strings. - // 2. Look for quoted strings. Quoted strings are just text and are ignored - // outright. - // 3. Look for environment variables. These look like identifiers we might - // otherwise be interested in but start with a percent sign. Like quoted - // strings these enviroment variable references are ignored outright. - // 4. Match all identifiers that are things that need to be modularized. Note - // the special characters (!, $, ?, &) that denote Component and Feature states. - regex = new Regex(@"NOT\s|EQV\s|XOR\s|OR\s|AND\s|IMP\s|"".*?""|%[a-zA-Z_][a-zA-Z0-9_\.]*|(?[!$\?&]?[a-zA-Z_][a-zA-Z0-9_\.]*)", RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture); - - // less performant version of the above with captures showing where everything lives - // regex = new Regex(@"(?NOT|EQV|XOR|OR|AND|IMP)|(?"".*?"")|(?%[a-zA-Z_][a-zA-Z0-9_\.]*)|(?[!$\?&]?[a-zA-Z_][a-zA-Z0-9_\.]*)",RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture); - } - - var matches = regex.Matches(fieldData); - - var sb = new StringBuilder(fieldData); - - // Notice how this code walks backward through the list - // because it modifies the string as we through it. - for (var i = matches.Count - 1; 0 <= i; i--) - { - var group = matches[i].Groups["identifier"]; - if (group.Success) - { - var identifier = group.Value; - if (!WindowsInstallerStandard.IsStandardProperty(identifier) && !this.SuppressModularizationIdentifiers.Contains(identifier)) - { - sb.Insert(group.Index + group.Length, '.'); - sb.Insert(group.Index + group.Length + 1, this.ModularizationGuid); - } - } - } - - fieldData = sb.ToString(); - break; - - case ColumnModularizeType.CompanionFile: - // if we're not supposed to ignore this identifier and the value does not start with - // a digit, we must have a companion file so modularize it - if (!this.SuppressModularizationIdentifiers.Contains(fieldData) && - 0 < fieldData.Length && !Char.IsDigit(fieldData, 0)) - { - fieldData = String.Concat(fieldData, ".", this.ModularizationGuid); - } - break; - - case ColumnModularizeType.Icon: - if (!this.SuppressModularizationIdentifiers.Contains(fieldData)) - { - var start = fieldData.LastIndexOf(".", StringComparison.Ordinal); - if (-1 == start) - { - fieldData = String.Concat(fieldData, ".", this.ModularizationGuid); - } - else - { - fieldData = String.Concat(fieldData.Substring(0, start), ".", this.ModularizationGuid, fieldData.Substring(start)); - } - } - break; - - case ColumnModularizeType.SemicolonDelimited: - var keys = fieldData.Split(';'); - for (var i = 0; i < keys.Length; ++i) - { - if (!String.IsNullOrEmpty(keys[i])) - { - keys[i] = String.Concat(keys[i], ".", this.ModularizationGuid); - } - } - - fieldData = String.Join(";", keys); - break; - } - } - - return fieldData; - } - } -} diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ModularizeCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ModularizeCommand.cs new file mode 100644 index 00000000..ba6af986 --- /dev/null +++ b/src/WixToolset.Core.WindowsInstaller/Bind/ModularizeCommand.cs @@ -0,0 +1,233 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. + +namespace WixToolset.Core.WindowsInstaller.Bind +{ + using System; + using System.Collections.Generic; + using System.Diagnostics; + using System.Globalization; + using System.Linq; + using System.Text; + using System.Text.RegularExpressions; + using WixToolset.Data; + using WixToolset.Data.Tuples; + using WixToolset.Data.WindowsInstaller; + + internal class ModularizeCommand + { + public ModularizeCommand(Output output, string modularizationGuid, IEnumerable suppressTuples) + { + this.Output = output; + this.ModularizationGuid = modularizationGuid; + + // Gather all the unique suppress modularization identifiers. + this.SuppressModularizationIdentifiers = new HashSet(suppressTuples.Select(s => s.WixSuppressModularization)); + } + + private Output Output { get; } + + private string ModularizationGuid { get; } + + private HashSet SuppressModularizationIdentifiers { get; } + + public void Execute() + { + foreach (var table in this.Output.Tables) + { + this.ModularizeTable(table); + } + } + + private void ModularizeTable(Table table) + { + var modularizedColumns = new List(); + + // find the modularized columns + for (var i = 0; i < table.Definition.Columns.Length; ++i) + { + if (ColumnModularizeType.None != table.Definition.Columns[i].ModularizeType) + { + modularizedColumns.Add(i); + } + } + + if (0 < modularizedColumns.Count) + { + foreach (var row in table.Rows) + { + foreach (var modularizedColumn in modularizedColumns) + { + var field = row.Fields[modularizedColumn]; + + if (field.Data != null) + { + field.Data = this.ModularizedRowFieldValue(row, field); + } + } + } + } + } + + private string ModularizedRowFieldValue(Row row, Field field) + { + var fieldData = field.AsString(); + + if (!(WindowsInstallerStandard.IsStandardAction(fieldData) || WindowsInstallerStandard.IsStandardProperty(fieldData))) + { + 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 + if (ColumnModularizeType.ControlEventArgument == field.Column.ModularizeType) + { + switch (row[2].ToString()) + { + case "CheckExistingTargetPath": // redirectable property name + case "CheckTargetPath": + case "DoAction": // custom action name + case "NewDialog": // dialog name + case "SelectionBrowse": + case "SetTargetPath": + case "SpawnDialog": + case "SpawnWaitDialog": + if (Common.IsIdentifier(fieldData)) + { + modularizeType = ColumnModularizeType.Column; + } + else + { + modularizeType = ColumnModularizeType.Property; + } + break; + default: // formatted + modularizeType = ColumnModularizeType.Property; + break; + } + } + else if (ColumnModularizeType.ControlText == field.Column.ModularizeType) + { + // icons are stored in the Binary table, so they get column-type modularization + if (("Bitmap" == row[2].ToString() || "Icon" == row[2].ToString()) && Common.IsIdentifier(fieldData)) + { + modularizeType = ColumnModularizeType.Column; + } + else + { + modularizeType = ColumnModularizeType.Property; + } + } + + switch (modularizeType) + { + case ColumnModularizeType.Column: + // ensure the value is an identifier (otherwise it shouldn't be modularized this way) + if (!Common.IsIdentifier(fieldData)) + { + throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, WixDataStrings.EXP_CannotModularizeIllegalID, fieldData)); + } + + // if we're not supposed to suppress modularization of this identifier + if (!this.SuppressModularizationIdentifiers.Contains(fieldData)) + { + fieldData = String.Concat(fieldData, ".", this.ModularizationGuid); + } + break; + + case ColumnModularizeType.Property: + case ColumnModularizeType.Condition: + Regex regex; + if (ColumnModularizeType.Property == modularizeType) + { + regex = new Regex(@"\[(?[#$!]?[a-zA-Z_][a-zA-Z0-9_\.]*)]", RegexOptions.Singleline | RegexOptions.ExplicitCapture); + } + else + { + Debug.Assert(ColumnModularizeType.Condition == modularizeType); + + // This heinous looking regular expression is actually quite an elegant way + // to shred the entire condition into the identifiers that need to be + // modularized. Let's break it down piece by piece: + // + // 1. Look for the operators: NOT, EQV, XOR, OR, AND, IMP (plus a space). Note that the + // regular expression is case insensitive so we don't have to worry about + // all the permutations of these strings. + // 2. Look for quoted strings. Quoted strings are just text and are ignored + // outright. + // 3. Look for environment variables. These look like identifiers we might + // otherwise be interested in but start with a percent sign. Like quoted + // strings these enviroment variable references are ignored outright. + // 4. Match all identifiers that are things that need to be modularized. Note + // the special characters (!, $, ?, &) that denote Component and Feature states. + regex = new Regex(@"NOT\s|EQV\s|XOR\s|OR\s|AND\s|IMP\s|"".*?""|%[a-zA-Z_][a-zA-Z0-9_\.]*|(?[!$\?&]?[a-zA-Z_][a-zA-Z0-9_\.]*)", RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture); + + // less performant version of the above with captures showing where everything lives + // regex = new Regex(@"(?NOT|EQV|XOR|OR|AND|IMP)|(?"".*?"")|(?%[a-zA-Z_][a-zA-Z0-9_\.]*)|(?[!$\?&]?[a-zA-Z_][a-zA-Z0-9_\.]*)",RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture); + } + + var matches = regex.Matches(fieldData); + + var sb = new StringBuilder(fieldData); + + // Notice how this code walks backward through the list + // because it modifies the string as we through it. + for (var i = matches.Count - 1; 0 <= i; i--) + { + var group = matches[i].Groups["identifier"]; + if (group.Success) + { + var identifier = group.Value; + if (!WindowsInstallerStandard.IsStandardProperty(identifier) && !this.SuppressModularizationIdentifiers.Contains(identifier)) + { + sb.Insert(group.Index + group.Length, '.'); + sb.Insert(group.Index + group.Length + 1, this.ModularizationGuid); + } + } + } + + fieldData = sb.ToString(); + break; + + case ColumnModularizeType.CompanionFile: + // if we're not supposed to ignore this identifier and the value does not start with + // a digit, we must have a companion file so modularize it + if (!this.SuppressModularizationIdentifiers.Contains(fieldData) && + 0 < fieldData.Length && !Char.IsDigit(fieldData, 0)) + { + fieldData = String.Concat(fieldData, ".", this.ModularizationGuid); + } + break; + + case ColumnModularizeType.Icon: + if (!this.SuppressModularizationIdentifiers.Contains(fieldData)) + { + var start = fieldData.LastIndexOf(".", StringComparison.Ordinal); + if (-1 == start) + { + fieldData = String.Concat(fieldData, ".", this.ModularizationGuid); + } + else + { + fieldData = String.Concat(fieldData.Substring(0, start), ".", this.ModularizationGuid, fieldData.Substring(start)); + } + } + break; + + case ColumnModularizeType.SemicolonDelimited: + var keys = fieldData.Split(';'); + for (var i = 0; i < keys.Length; ++i) + { + if (!String.IsNullOrEmpty(keys[i])) + { + keys[i] = String.Concat(keys[i], ".", this.ModularizationGuid); + } + } + + fieldData = String.Join(";", keys); + break; + } + } + + return fieldData; + } + } +} 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 fileTransfers = new List(); + var fileTransfers = new List(); var directories = new Dictionary(); 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 -- cgit v1.2.3-55-g6feb