From 752301ba571020717862d2232e3fad585de6a39a Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 23 Oct 2019 12:53:27 -0700 Subject: Fix custom tables, small fixes in linker and update latest Data --- .../Bind/BindDatabaseCommand.cs | 34 +- .../Bind/CreateOutputFromIRCommand.cs | 119 +++++- .../Bind/LoadTableDefinitionsCommand.cs | 213 ++++++++++ .../Unbind/UnbindDatabaseCommand.cs | 2 +- src/WixToolset.Core/Common.cs | 2 - src/WixToolset.Core/Compiler.cs | 6 +- src/WixToolset.Core/Librarian.cs | 37 +- .../Link/FindEntrySectionAndLoadSymbolsCommand.cs | 16 +- .../Link/ResolveReferencesCommand.cs | 11 +- src/WixToolset.Core/Linker.cs | 459 ++------------------- src/test/Example.Extension/Data/example.wir | Bin 398 -> 588 bytes .../MsiQueryFixture.cs | 2 +- .../WixiplFixture.cs | 2 +- 13 files changed, 427 insertions(+), 476 deletions(-) create mode 100644 src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs index 53451752..411f64bf 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs @@ -32,8 +32,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind this.PathResolver = this.ServiceProvider.GetService(); - this.TableDefinitions = WindowsInstallerStandardInternal.GetTableDefinitions(); - this.CabbingThreadCount = context.CabbingThreadCount; this.CabCachePath = context.CabCachePath; this.Codepage = context.Codepage; @@ -86,8 +84,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind private bool SuppressLayout { get; } - private TableDefinitionCollection TableDefinitions { get; } - private string IntermediateFolder { get; } private Validator Validator { get; } @@ -111,6 +107,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind // If there are any fields to resolve later, create the cache to populate during bind. var variableCache = this.DelayedFields.Any() ? new Dictionary(StringComparer.InvariantCultureIgnoreCase) : null; + TableDefinitionCollection tableDefinitions; + { + var command = new LoadTableDefinitionsCommand(section); + command.Execute(); + + tableDefinitions = command.TableDefinitions; + } + // Process the summary information table before the other tables. bool compressed; bool longNames; @@ -231,7 +235,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind command.FileFacades = fileFacades; command.UpdateFileFacades = fileFacades.Where(f => !f.FromModule); command.OverwriteHash = true; - command.TableDefinitions = this.TableDefinitions; + command.TableDefinitions = tableDefinitions; command.VariableCache = variableCache; command.Execute(); } @@ -308,7 +312,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind // 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); + var command = new CreateOutputFromIRCommand(this.Messaging, section, tableDefinitions, this.BackendExtensions); command.Execute(); output = command.Output; @@ -402,7 +406,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind command.Compressed = compressed; command.FileRowsByCabinet = filesByCabinetMedia; command.ResolveMedia = this.ResolveMedia; - command.TableDefinitions = this.TableDefinitions; + command.TableDefinitions = tableDefinitions; command.TempFilesLocation = this.IntermediateFolder; command.Execute(); @@ -429,11 +433,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind // Generate database file. this.Messaging.Write(VerboseMessages.GeneratingDatabase()); - var trackMsi = this.BackendHelper.TrackFile(this.OutputPath, TrackedFileType.Final); - trackedFiles.Add(trackMsi); + { + var trackMsi = this.BackendHelper.TrackFile(this.OutputPath, TrackedFileType.Final); + trackedFiles.Add(trackMsi); - var temporaryFiles = this.GenerateDatabase(output, trackMsi.Path, false, false); - trackedFiles.AddRange(temporaryFiles); + var temporaryFiles = this.GenerateDatabase(output, tableDefinitions, trackMsi.Path, false, false); + trackedFiles.AddRange(temporaryFiles); + } // Stop processing if an error previously occurred. if (this.Messaging.EncounteredError) @@ -456,7 +462,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (null == sequenceTable) { - sequenceTable = output.EnsureTable(this.TableDefinitions[sequenceTableName]); + sequenceTable = output.EnsureTable(tableDefinitions[sequenceTableName]); } if (0 == sequenceTable.Rows.Count) @@ -911,7 +917,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// The database file to create. /// Whether to keep columns added in a transform. /// Whether to use a subdirectory based on the file name for intermediate files. - private IEnumerable GenerateDatabase(Output output, string databaseFile, bool keepAddedColumns, bool useSubdirectory) + private IEnumerable GenerateDatabase(Output output, TableDefinitionCollection tableDefinitions, string databaseFile, bool keepAddedColumns, bool useSubdirectory) { var command = new GenerateDatabaseCommand(); command.BackendHelper = this.BackendHelper; @@ -921,7 +927,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind command.KeepAddedColumns = keepAddedColumns; command.UseSubDirectory = useSubdirectory; command.SuppressAddingValidationRows = this.SuppressAddingValidationRows; - command.TableDefinitions = this.TableDefinitions; + command.TableDefinitions = tableDefinitions; command.IntermediateFolder = this.IntermediateFolder; command.Codepage = this.Codepage; command.Execute(); diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs index ebb494c0..17cac83a 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs @@ -11,14 +11,18 @@ namespace WixToolset.Core.WindowsInstaller.Bind using WixToolset.Data.WindowsInstaller; using WixToolset.Data.WindowsInstaller.Rows; using WixToolset.Extensibility; + using WixToolset.Extensibility.Services; internal class CreateOutputFromIRCommand { private const int DefaultMaximumUncompressedMediaSize = 200; // Default value is 200 MB private const int MaxValueOfMaxCabSizeForLargeFileSplitting = 2 * 1024; // 2048 MB (i.e. 2 GB) - public CreateOutputFromIRCommand(IntermediateSection section, TableDefinitionCollection tableDefinitions, IEnumerable backendExtensions) + private static readonly char[] ColonCharacter = new[] { ':' }; + + public CreateOutputFromIRCommand(IMessaging messaging, IntermediateSection section, TableDefinitionCollection tableDefinitions, IEnumerable backendExtensions) { + this.Messaging = messaging; this.Section = section; this.TableDefinitions = tableDefinitions; this.BackendExtensions = backendExtensions; @@ -26,6 +30,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind private IEnumerable BackendExtensions { get; } + private IMessaging Messaging { get; } + private TableDefinitionCollection TableDefinitions { get; } private IntermediateSection Section { get; } @@ -49,6 +55,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind { switch (tuple.Definition.Type) { + case TupleDefinitionType.AppSearch: + this.AddTupleDefaultly(tuple, output); + output.EnsureTable(this.TableDefinitions["Signature"]); + break; + case TupleDefinitionType.Binary: this.AddTupleDefaultly(tuple, output, idIsPrimaryKey: true); break; @@ -133,6 +144,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind this.AddMoveFileTuple((MoveFileTuple)tuple, output); break; + case TupleDefinitionType.ProgId: + this.AddTupleDefaultly(tuple, output); + output.EnsureTable(this.TableDefinitions["Extension"]); + break; + case TupleDefinitionType.Property: this.AddPropertyTuple((PropertyTuple)tuple, output); break; @@ -197,6 +213,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind this.AddTupleFromExtension(tuple, output); break; + case TupleDefinitionType.WixCustomRow: + this.AddWixCustomRowTuple((WixCustomRowTuple)tuple, output); + break; + + case TupleDefinitionType.WixEnsureTable: + this.AddWixEnsureTableTuple((WixEnsureTableTuple)tuple, output); + break; + // ignored. case TupleDefinitionType.WixFile: case TupleDefinitionType.WixComponentGroup: @@ -204,6 +228,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind case TupleDefinitionType.WixFeatureGroup: break; + // Already processed. + case TupleDefinitionType.WixCustomTable: + break; + default: this.AddTupleDefaultly(tuple, output); break; @@ -382,6 +410,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[7] = tuple.FirstControlRef; row[8] = tuple.DefaultControlRef; row[9] = tuple.CancelControlRef; + + output.EnsureTable(this.TableDefinitions["ListBox"]); } private void AddDirectoryTuple(DirectoryTuple tuple, Output output) @@ -929,6 +959,93 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[2] = tuple.Sequence; } } + + private void AddWixCustomRowTuple(WixCustomRowTuple tuple, Output output) + { + var customTableDefinition = this.TableDefinitions[tuple.Table]; + + if (customTableDefinition.Unreal) + { + + return; + } + + var customTable = output.EnsureTable(customTableDefinition); + var customRow = customTable.CreateRow(tuple.SourceLineNumbers); + +#if TODO // SectionId seems like a good thing to preserve. + customRow.SectionId = tuple.SectionId; +#endif + + var data = tuple.FieldDataSeparated; + + for (var i = 0; i < data.Length; ++i) + { + var foundColumn = false; + var item = data[i].Split(ColonCharacter, 2); + + for (var j = 0; j < customRow.Fields.Length; ++j) + { + if (customRow.Fields[j].Column.Name == item[0]) + { + if (0 < item[1].Length) + { + if (ColumnType.Number == customRow.Fields[j].Column.Type) + { + try + { + customRow.Fields[j].Data = Convert.ToInt32(item[1], CultureInfo.InvariantCulture); + } + catch (FormatException) + { + this.Messaging.Write(ErrorMessages.IllegalIntegerValue(tuple.SourceLineNumbers, customTableDefinition.Columns[i].Name, customTableDefinition.Name, item[1])); + } + catch (OverflowException) + { + this.Messaging.Write(ErrorMessages.IllegalIntegerValue(tuple.SourceLineNumbers, customTableDefinition.Columns[i].Name, customTableDefinition.Name, item[1])); + } + } + else if (ColumnCategory.Identifier == customRow.Fields[j].Column.Category) + { + if (Common.IsIdentifier(item[1]) || Common.IsValidBinderVariable(item[1]) || ColumnCategory.Formatted == customRow.Fields[j].Column.Category) + { + customRow.Fields[j].Data = item[1]; + } + else + { + this.Messaging.Write(ErrorMessages.IllegalIdentifier(tuple.SourceLineNumbers, "Data", item[1])); + } + } + else + { + customRow.Fields[j].Data = item[1]; + } + } + foundColumn = true; + break; + } + } + + if (!foundColumn) + { + this.Messaging.Write(ErrorMessages.UnexpectedCustomTableColumn(tuple.SourceLineNumbers, item[0])); + } + } + + for (var i = 0; i < customTableDefinition.Columns.Length; ++i) + { + if (!customTableDefinition.Columns[i].Nullable && (null == customRow.Fields[i].Data || 0 == customRow.Fields[i].Data.ToString().Length)) + { + this.Messaging.Write(ErrorMessages.NoDataForColumn(tuple.SourceLineNumbers, customTableDefinition.Columns[i].Name, customTableDefinition.Name)); + } + } + } + + private void AddWixEnsureTableTuple(WixEnsureTableTuple tuple, Output output) + { + var tableDefinition = this.TableDefinitions[tuple.Table]; + output.EnsureTable(tableDefinition); + } private void AddWixMediaTemplateTuple(WixMediaTemplateTuple tuple, Output output) { diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs new file mode 100644 index 00000000..05f865fa --- /dev/null +++ b/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs @@ -0,0 +1,213 @@ +// 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.Globalization; + using System.Linq; + using WixToolset.Data; + using WixToolset.Data.Tuples; + using WixToolset.Data.WindowsInstaller; + + internal class LoadTableDefinitionsCommand + { + public LoadTableDefinitionsCommand(IntermediateSection section) => this.Section = section; + + public TableDefinitionCollection TableDefinitions { get; private set; } + + private IntermediateSection Section { get; } + + public TableDefinitionCollection Execute() + { + var tableDefinitions = new TableDefinitionCollection(WindowsInstallerStandardInternal.GetTableDefinitions()); + + foreach (var tuple in this.Section.Tuples.OfType()) + { + var customTableDefinition = this.CreateCustomTable(tuple); + tableDefinitions.Add(customTableDefinition); + } + + this.TableDefinitions = tableDefinitions; + return this.TableDefinitions; + } + + private TableDefinition CreateCustomTable(WixCustomTableTuple row) + { + var columnNames = row.ColumnNames.Split('\t'); + var columnTypes = row.ColumnTypes.Split('\t'); + var primaryKeys = row.PrimaryKeys.Split('\t'); + var minValues = row.MinValues?.Split('\t'); + var maxValues = row.MaxValues?.Split('\t'); + var keyTables = row.KeyTables?.Split('\t'); + var keyColumns = row.KeyColumns?.Split('\t'); + var categories = row.Categories?.Split('\t'); + var sets = row.Sets?.Split('\t'); + var descriptions = row.Descriptions?.Split('\t'); + var modularizations = row.Modularizations?.Split('\t'); + + var currentPrimaryKey = 0; + + var columns = new List(columnNames.Length); + for (var i = 0; i < columnNames.Length; ++i) + { + var name = columnNames[i]; + var type = ColumnType.Unknown; + + if (columnTypes[i].StartsWith("s", StringComparison.OrdinalIgnoreCase)) + { + type = ColumnType.String; + } + else if (columnTypes[i].StartsWith("l", StringComparison.OrdinalIgnoreCase)) + { + type = ColumnType.Localized; + } + else if (columnTypes[i].StartsWith("i", StringComparison.OrdinalIgnoreCase)) + { + type = ColumnType.Number; + } + else if (columnTypes[i].StartsWith("v", StringComparison.OrdinalIgnoreCase)) + { + type = ColumnType.Object; + } + + var nullable = columnTypes[i].Substring(0, 1) == columnTypes[i].Substring(0, 1).ToUpperInvariant(); + var length = Convert.ToInt32(columnTypes[i].Substring(1), CultureInfo.InvariantCulture); + + var primaryKey = false; + if (currentPrimaryKey < primaryKeys.Length && primaryKeys[currentPrimaryKey] == columnNames[i]) + { + primaryKey = true; + currentPrimaryKey++; + } + + var minValue = String.IsNullOrEmpty(minValues?[i]) ? (int?)null : Convert.ToInt32(minValues[i], CultureInfo.InvariantCulture); + var maxValue = String.IsNullOrEmpty(maxValues?[i]) ? (int?)null : Convert.ToInt32(maxValues[i], CultureInfo.InvariantCulture); + var keyColumn = String.IsNullOrEmpty(keyColumns?[i]) ? (int?)null : Convert.ToInt32(keyColumns[i], CultureInfo.InvariantCulture); + + var category = ColumnCategory.Unknown; + if (null != categories && null != categories[i] && 0 < categories[i].Length) + { + switch (categories[i]) + { + case "Text": + category = ColumnCategory.Text; + break; + case "UpperCase": + category = ColumnCategory.UpperCase; + break; + case "LowerCase": + category = ColumnCategory.LowerCase; + break; + case "Integer": + category = ColumnCategory.Integer; + break; + case "DoubleInteger": + category = ColumnCategory.DoubleInteger; + break; + case "TimeDate": + category = ColumnCategory.TimeDate; + break; + case "Identifier": + category = ColumnCategory.Identifier; + break; + case "Property": + category = ColumnCategory.Property; + break; + case "Filename": + category = ColumnCategory.Filename; + break; + case "WildCardFilename": + category = ColumnCategory.WildCardFilename; + break; + case "Path": + category = ColumnCategory.Path; + break; + case "Paths": + category = ColumnCategory.Paths; + break; + case "AnyPath": + category = ColumnCategory.AnyPath; + break; + case "DefaultDir": + category = ColumnCategory.DefaultDir; + break; + case "RegPath": + category = ColumnCategory.RegPath; + break; + case "Formatted": + category = ColumnCategory.Formatted; + break; + case "FormattedSddl": + category = ColumnCategory.FormattedSDDLText; + break; + case "Template": + category = ColumnCategory.Template; + break; + case "Condition": + category = ColumnCategory.Condition; + break; + case "Guid": + category = ColumnCategory.Guid; + break; + case "Version": + category = ColumnCategory.Version; + break; + case "Language": + category = ColumnCategory.Language; + break; + case "Binary": + category = ColumnCategory.Binary; + break; + case "CustomSource": + category = ColumnCategory.CustomSource; + break; + case "Cabinet": + category = ColumnCategory.Cabinet; + break; + case "Shortcut": + category = ColumnCategory.Shortcut; + break; + default: + break; + } + } + + var keyTable = keyTables?[i]; + var setValue = sets?[i]; + var description = descriptions?[i]; + var modString = modularizations?[i]; + var modularization = ColumnModularizeType.None; + + switch (modString) + { + case null: + case "None": + modularization = ColumnModularizeType.None; + break; + case "Column": + modularization = ColumnModularizeType.Column; + break; + case "Property": + modularization = ColumnModularizeType.Property; + break; + case "Condition": + modularization = ColumnModularizeType.Condition; + break; + case "CompanionFile": + modularization = ColumnModularizeType.CompanionFile; + break; + case "SemicolonDelimited": + modularization = ColumnModularizeType.SemicolonDelimited; + break; + } + + var columnDefinition = new ColumnDefinition(name, type, length, primaryKey, nullable, category, minValue, maxValue, keyTable, keyColumn, setValue, description, modularization, ColumnType.Localized == type, true); + columns.Add(columnDefinition); + } + + var customTable = new TableDefinition(row.Id.Id, columns/*, unreal: bootstrapperApplicationData, bootstrapperApplicationData*/); + return customTable; + } + } +} diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs index e671f6a1..0699199b 100644 --- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs @@ -271,7 +271,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind } } - var tableDefinition = new TableDefinition(tableName, columns, false, false); + var tableDefinition = new TableDefinition(tableName, columns, false); // use our table definitions if core properties are the same; this allows us to take advantage // of wix concepts like localizable columns which current code assumes diff --git a/src/WixToolset.Core/Common.cs b/src/WixToolset.Core/Common.cs index 610bfcaa..e6f30e0c 100644 --- a/src/WixToolset.Core/Common.cs +++ b/src/WixToolset.Core/Common.cs @@ -104,8 +104,6 @@ namespace WixToolset.Core public static readonly Regex WixVariableRegex = new Regex(@"(\!|\$)\((?loc|wix|bind|bindpath)\.(?(?[_A-Za-z][0-9A-Za-z_]+)(\.(?[_A-Za-z][0-9A-Za-z_\.]*))?)(\=(?.+?))?\)", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.ExplicitCapture); - internal const char CustomRowFieldSeparator = '\x85'; - private static readonly Regex PropertySearch = new Regex(@"\[[#$!]?[a-zA-Z_][a-zA-Z0-9_\.]*]", RegexOptions.Singleline); private static readonly Regex AddPrefix = new Regex(@"^[^a-zA-Z_]", RegexOptions.Compiled); private static readonly Regex LegalIdentifierCharacters = new Regex(@"^[_A-Za-z][0-9A-Za-z_\.]*$", RegexOptions.Compiled); diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index 480e8758..974f3188 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs @@ -3750,7 +3750,7 @@ namespace WixToolset.Core case "Id": tableId = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); break; - case "BootstrapperApplicationData": + case "Unreal": bootstrapperApplicationData = YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); break; default: @@ -3951,7 +3951,7 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.ExpectedAttribute(dataSourceLineNumbers, data.Name.LocalName, "Column")); } - dataValue = String.Concat(dataValue, null == dataValue ? String.Empty : Common.CustomRowFieldSeparator.ToString(), columnName, ":", Common.GetInnerText(data)); + dataValue = String.Concat(dataValue, null == dataValue ? String.Empty : WixCustomRowTuple.FieldSeparator.ToString(), columnName, ":", Common.GetInnerText(data)); break; } } @@ -4001,7 +4001,7 @@ namespace WixToolset.Core Sets = sets, Descriptions = descriptions, Modularizations = modularizations, - BootstrapperApplicationData = bootstrapperApplicationData + Unreal = bootstrapperApplicationData }; this.Core.AddTuple(tuple); diff --git a/src/WixToolset.Core/Librarian.cs b/src/WixToolset.Core/Librarian.cs index a3bdc170..81d3a0ed 100644 --- a/src/WixToolset.Core/Librarian.cs +++ b/src/WixToolset.Core/Librarian.cs @@ -30,7 +30,6 @@ namespace WixToolset.Core /// /// Create a library by combining several intermediates (objects). /// - /// The sections to combine into a library. /// Returns the new library. public Intermediate Combine(ILibraryContext context) { @@ -79,26 +78,6 @@ namespace WixToolset.Core return this.Messaging.EncounteredError ? null : library; } - /// - /// Validate that a library contains one entry section and no duplicate symbols. - /// - /// Library to validate. - private void Validate(Intermediate library) - { - var find = new FindEntrySectionAndLoadSymbolsCommand(this.Messaging, library.Sections); - find.Execute(); - - // TODO: Consider bringing this sort of verification back. - // foreach (Section section in library.Sections) - // { - // ResolveReferencesCommand resolve = new ResolveReferencesCommand(find.EntrySection, find.Symbols); - // resolve.Execute(); - // - // ReportDuplicateResolvedSymbolErrorsCommand reportDupes = new ReportDuplicateResolvedSymbolErrorsCommand(find.SymbolsWithDuplicates, resolve.ResolvedSections); - // reportDupes.Execute(); - // } - } - private List ResolveFilePathsToEmbed(ILibraryContext context, IEnumerable sections) { var embedFilePaths = new List(); @@ -140,5 +119,21 @@ namespace WixToolset.Core return embedFilePaths; } + + private void Validate(Intermediate library) + { + var find = new FindEntrySectionAndLoadSymbolsCommand(this.Messaging, library.Sections, OutputType.Library); + find.Execute(); + + // TODO: Consider bringing this sort of verification back. + // foreach (Section section in library.Sections) + // { + // ResolveReferencesCommand resolve = new ResolveReferencesCommand(find.EntrySection, find.Symbols); + // resolve.Execute(); + // + // ReportDuplicateResolvedSymbolErrorsCommand reportDupes = new ReportDuplicateResolvedSymbolErrorsCommand(find.SymbolsWithDuplicates, resolve.ResolvedSections); + // reportDupes.Execute(); + // } + } } } diff --git a/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs b/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs index daf3e878..b9890a3b 100644 --- a/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs +++ b/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs @@ -10,20 +10,18 @@ namespace WixToolset.Core.Link internal class FindEntrySectionAndLoadSymbolsCommand { - public FindEntrySectionAndLoadSymbolsCommand(IMessaging messaging, IEnumerable sections) + public FindEntrySectionAndLoadSymbolsCommand(IMessaging messaging, IEnumerable sections, OutputType expectedOutpuType) { this.Messaging = messaging; this.Sections = sections; + this.ExpectedOutputType = expectedOutpuType; } private IMessaging Messaging { get; } private IEnumerable Sections { get; } - /// - /// Sets the expected entry output type, based on output file extension provided to the linker. - /// - public OutputType ExpectedOutputType { private get; set; } + private OutputType ExpectedOutputType { get; } /// /// Gets the located entry section after the command is executed. @@ -42,8 +40,8 @@ namespace WixToolset.Core.Link public void Execute() { - Dictionary symbols = new Dictionary(); - HashSet possibleConflicts = new HashSet(); + var symbols = new Dictionary(); + var possibleConflicts = new HashSet(); if (!Enum.TryParse(this.ExpectedOutputType.ToString(), out SectionType expectedEntrySectionType)) { @@ -74,9 +72,9 @@ namespace WixToolset.Core.Link } // Load all the symbols from the section's tables that create symbols. - foreach (var row in section.Tuples.Where(t => t.Id != null)) + foreach (var tuple in section.Tuples.Where(t => t.Id != null)) { - var symbol = new Symbol(section, row); + var symbol = new Symbol(section, tuple); if (!symbols.TryGetValue(symbol.Name, out var existingSymbol)) { diff --git a/src/WixToolset.Core/Link/ResolveReferencesCommand.cs b/src/WixToolset.Core/Link/ResolveReferencesCommand.cs index ed11095f..6dcd36d3 100644 --- a/src/WixToolset.Core/Link/ResolveReferencesCommand.cs +++ b/src/WixToolset.Core/Link/ResolveReferencesCommand.cs @@ -14,8 +14,8 @@ namespace WixToolset.Core.Link /// internal class ResolveReferencesCommand { - private IntermediateSection entrySection; - private IDictionary symbols; + private readonly IntermediateSection entrySection; + private readonly IDictionary symbols; private HashSet referencedSymbols; private HashSet resolvedSections; @@ -24,13 +24,14 @@ namespace WixToolset.Core.Link this.Messaging = messaging; this.entrySection = entrySection; this.symbols = symbols; + this.BuildingMergeModule = (SectionType.Module == entrySection.Type); } - public bool BuildingMergeModule { private get; set; } + public IEnumerable ReferencedSymbols => this.referencedSymbols; - public IEnumerable ReferencedSymbols { get { return this.referencedSymbols; } } + public IEnumerable ResolvedSections => this.resolvedSections; - public IEnumerable ResolvedSections { get { return this.resolvedSections; } } + private bool BuildingMergeModule { get; } private IMessaging Messaging { get; } diff --git a/src/WixToolset.Core/Linker.cs b/src/WixToolset.Core/Linker.cs index 9526ac95..81696840 100644 --- a/src/WixToolset.Core/Linker.cs +++ b/src/WixToolset.Core/Linker.cs @@ -20,7 +20,6 @@ namespace WixToolset.Core /// internal class Linker : ILinker { - private static readonly char[] ColonCharacter = new[] { ':' }; private static readonly string EmptyGuid = Guid.Empty.ToString("B"); private readonly bool sectionIdOnRows; @@ -56,9 +55,7 @@ namespace WixToolset.Core /// /// Links a collection of sections into an output. /// - /// The collection of sections to link together. - /// Expected output type, based on output file extension provided to the linker. - /// Output object from the linking. + /// Output intermediate from the linking. public Intermediate Link(ILinkContext context) { this.Context = context; @@ -97,9 +94,6 @@ namespace WixToolset.Core //this.activeOutput = null; - //TableDefinitionCollection customTableDefinitions = new TableDefinitionCollection(); - //IntermediateTuple customRows = new List(); - #if MOVE_TO_BACKEND StringCollection generatedShortFileNameIdentifiers = new StringCollection(); Hashtable generatedShortFileNames = new Hashtable(); @@ -123,11 +117,11 @@ namespace WixToolset.Core if (0 >= columnDefinition.KeyColumn || keyTableDefinition.Columns.Count < columnDefinition.KeyColumn) { - this.OnMessage(WixErrors.InvalidKeyColumn(tableDefinition.Name, columnDefinition.Name, columnDefinition.KeyTable, columnDefinition.KeyColumn)); + this.Messaging.Write(WixErrors.InvalidKeyColumn(tableDefinition.Name, columnDefinition.Name, columnDefinition.KeyTable, columnDefinition.KeyColumn)); } else if (keyTableDefinition.Columns[columnDefinition.KeyColumn - 1].ModularizeType != columnDefinition.ModularizeType && ColumnModularizeType.CompanionFile != columnDefinition.ModularizeType) { - this.OnMessage(WixErrors.CollidingModularizationTypes(tableDefinition.Name, columnDefinition.Name, columnDefinition.KeyTable, columnDefinition.KeyColumn, columnDefinition.ModularizeType.ToString(), keyTableDefinition.Columns[columnDefinition.KeyColumn - 1].ModularizeType.ToString())); + this.Messaging.Write(WixErrors.CollidingModularizationTypes(tableDefinition.Name, columnDefinition.Name, columnDefinition.KeyTable, columnDefinition.KeyColumn, columnDefinition.ModularizeType.ToString(), keyTableDefinition.Columns[columnDefinition.KeyColumn - 1].ModularizeType.ToString())); } } catch (WixMissingTableDefinitionException) @@ -141,8 +135,7 @@ namespace WixToolset.Core // First find the entry section and while processing all sections load all the symbols from all of the sections. // sections.FindEntrySectionAndLoadSymbols(false, this, expectedOutputType, out entrySection, out allSymbols); - var find = new FindEntrySectionAndLoadSymbolsCommand(this.Messaging, sections); - find.ExpectedOutputType = this.Context.ExpectedOutputType; + var find = new FindEntrySectionAndLoadSymbolsCommand(this.Messaging, sections, this.Context.ExpectedOutputType); find.Execute(); // Must have found the entry section by now. @@ -157,7 +150,6 @@ namespace WixToolset.Core // Resolve the symbol references to find the set of sections we care about for linking. // Of course, we start with the entry section (that's how it got its name after all). var resolve = new ResolveReferencesCommand(this.Messaging, find.EntrySection, find.Symbols); - resolve.BuildingMergeModule = (SectionType.Module == find.EntrySection.Type); resolve.Execute(); @@ -197,7 +189,7 @@ namespace WixToolset.Core { if (!referencedComponents.Contains(symbol.Name)) { - this.OnMessage(ErrorMessages.OrphanedComponent(symbol.Row.SourceLineNumbers, symbol.Row.Id.Id)); + this.Messaging.Write(ErrorMessages.OrphanedComponent(symbol.Row.SourceLineNumbers, symbol.Row.Id.Id)); } } @@ -238,12 +230,6 @@ namespace WixToolset.Core // handle special tables switch (tuple.Definition.Type) { -#if MOVE_TO_BACKEND - case "AppSearch": - this.activeOutput.EnsureTable(this.tableDefinitions["Signature"]); - break; -#endif - case TupleDefinitionType.Class: if (SectionType.Product == resolvedSection.Type) { @@ -263,10 +249,6 @@ namespace WixToolset.Core } break; - case "Dialog": - this.activeOutput.EnsureTable(this.tableDefinitions["ListBox"]); - break; - case "Directory": foreach (Row row in table.Rows) { @@ -295,7 +277,7 @@ namespace WixToolset.Core { if (directory.StartsWith(standardDirectory, StringComparison.Ordinal)) { - this.OnMessage(WixWarnings.StandardDirectoryConflictInMergeModule(row.SourceLineNumbers, directory, standardDirectory)); + this.Messaging.Write(WixWarnings.StandardDirectoryConflictInMergeModule(row.SourceLineNumbers, directory, standardDirectory)); } } } @@ -327,26 +309,6 @@ namespace WixToolset.Core } break; -#if MOVE_TO_BACKEND - case "ProgId": - // the Extension table is required with a ProgId table - this.activeOutput.EnsureTable(this.tableDefinitions["Extension"]); - break; - - case "Property": - // Remove property rows with no value. These are properties associated with - // AppSearch but without a default value. - for (int i = 0; i < table.Rows.Count; i++) - { - if (null == table.Rows[i][1]) - { - table.Rows.RemoveAt(i); - i--; - } - } - break; -#endif - case TupleDefinitionType.PublishComponent: if (SectionType.Product == resolvedSection.Type) { @@ -368,27 +330,10 @@ namespace WixToolset.Core } break; -#if SOLVE_CUSTOM_TABLE - case "WixCustomTable": - this.LinkCustomTable(table, customTableDefinitions); - copyTuple = false; // we've created table definitions from these rows, no need to process them any longer - break; - - case "WixCustomRow": - foreach (Row row in table.Rows) - { - row.SectionId = (this.sectionIdOnRows ? sectionId : null); - customRows.Add(row); - } - copyTuple = false; - break; -#endif - case TupleDefinitionType.WixEnsureTable: ensureTableRows.Add(tuple); break; - #if MOVE_TO_BACKEND case "WixFile": foreach (Row row in table.Rows) @@ -427,23 +372,23 @@ namespace WixToolset.Core case TupleDefinitionType.WixVariable: // check for colliding values and collect the wix variable rows { - var row = (WixVariableTuple)tuple; - var id = row.Id.Id; + var wixVariableTuple = (WixVariableTuple)tuple; + var id = wixVariableTuple.Id.Id; - if (wixVariables.TryGetValue(id, out var collidingRow)) + if (wixVariables.TryGetValue(id, out var collidingTuple)) { - if (collidingRow.Overridable && !row.Overridable) + if (collidingTuple.Overridable && !wixVariableTuple.Overridable) { - wixVariables[id] = row; + wixVariables[id] = wixVariableTuple; } - else if (!row.Overridable || (collidingRow.Overridable && row.Overridable)) + else if (!wixVariableTuple.Overridable || (collidingTuple.Overridable && wixVariableTuple.Overridable)) { - this.OnMessage(ErrorMessages.WixVariableCollision(row.SourceLineNumbers, id)); + this.Messaging.Write(ErrorMessages.WixVariableCollision(wixVariableTuple.SourceLineNumbers, id)); } } else { - wixVariables.Add(id, row); + wixVariables.Add(id, wixVariableTuple); } } @@ -463,36 +408,15 @@ namespace WixToolset.Core { foreach (var feature in connectToFeature.ConnectFeatures) { - var row = new WixFeatureModulesTuple(); - row.FeatureRef = feature; - row.WixMergeRef = connectToFeature.ChildId; - - resolvedSection.Tuples.Add(row); - } - } - -#if MOVE_TO_BACKEND - // ensure the creation of tables that need to exist - if (0 < ensureTableRows.Count) - { - foreach (Row row in ensureTableRows) - { - string tableId = (string)row[0]; - TableDefinition tableDef = null; - - try + var row = new WixFeatureModulesTuple { - tableDef = this.tableDefinitions[tableId]; - } - catch (WixMissingTableDefinitionException) - { - tableDef = customTableDefinitions[tableId]; - } + FeatureRef = feature, + WixMergeRef = connectToFeature.ChildId + }; - this.activeOutput.EnsureTable(tableDef); + resolvedSection.Tuples.Add(row); } } -#endif #if MOVE_TO_BACKEND // check for missing table and add them or display an error as appropriate @@ -513,17 +437,17 @@ namespace WixToolset.Core if (null == imageFamiliesTable || 1 > imageFamiliesTable.Rows.Count) { - this.OnMessage(WixErrors.ExpectedRowInPatchCreationPackage("ImageFamilies")); + this.Messaging.Write(WixErrors.ExpectedRowInPatchCreationPackage("ImageFamilies")); } if (null == targetImagesTable || 1 > targetImagesTable.Rows.Count) { - this.OnMessage(WixErrors.ExpectedRowInPatchCreationPackage("TargetImages")); + this.Messaging.Write(WixErrors.ExpectedRowInPatchCreationPackage("TargetImages")); } if (null == upgradedImagesTable || 1 > upgradedImagesTable.Rows.Count) { - this.OnMessage(WixErrors.ExpectedRowInPatchCreationPackage("UpgradedImages")); + this.Messaging.Write(WixErrors.ExpectedRowInPatchCreationPackage("UpgradedImages")); } this.activeOutput.EnsureTable(this.tableDefinitions["Properties"]); @@ -537,81 +461,6 @@ namespace WixToolset.Core this.CheckForIllegalTables(this.activeOutput); #endif -#if SOLVE_CUSTOM_TABLE - // add the custom row data - foreach (Row row in customRows) - { - TableDefinition customTableDefinition = (TableDefinition)customTableDefinitions[row[0].ToString()]; - Table customTable = this.activeOutput.EnsureTable(customTableDefinition); - Row customRow = customTable.CreateRow(row.SourceLineNumbers); - - customRow.SectionId = row.SectionId; - - string[] data = row[1].ToString().Split(Common.CustomRowFieldSeparator); - - for (int i = 0; i < data.Length; ++i) - { - bool foundColumn = false; - string[] item = data[i].Split(colonCharacter, 2); - - for (int j = 0; j < customRow.Fields.Length; ++j) - { - if (customRow.Fields[j].Column.Name == item[0]) - { - if (0 < item[1].Length) - { - if (ColumnType.Number == customRow.Fields[j].Column.Type) - { - try - { - customRow.Fields[j].Data = Convert.ToInt32(item[1], CultureInfo.InvariantCulture); - } - catch (FormatException) - { - this.OnMessage(WixErrors.IllegalIntegerValue(row.SourceLineNumbers, customTableDefinition.Columns[i].Name, customTableDefinition.Name, item[1])); - } - catch (OverflowException) - { - this.OnMessage(WixErrors.IllegalIntegerValue(row.SourceLineNumbers, customTableDefinition.Columns[i].Name, customTableDefinition.Name, item[1])); - } - } - else if (ColumnCategory.Identifier == customRow.Fields[j].Column.Category) - { - if (Common.IsIdentifier(item[1]) || Common.IsValidBinderVariable(item[1]) || ColumnCategory.Formatted == customRow.Fields[j].Column.Category) - { - customRow.Fields[j].Data = item[1]; - } - else - { - this.OnMessage(WixErrors.IllegalIdentifier(row.SourceLineNumbers, "Data", item[1])); - } - } - else - { - customRow.Fields[j].Data = item[1]; - } - } - foundColumn = true; - break; - } - } - - if (!foundColumn) - { - this.OnMessage(WixErrors.UnexpectedCustomTableColumn(row.SourceLineNumbers, item[0])); - } - } - - for (int i = 0; i < customTableDefinition.Columns.Count; ++i) - { - if (!customTableDefinition.Columns[i].Nullable && (null == customRow.Fields[i].Data || 0 == customRow.Fields[i].Data.ToString().Length)) - { - this.OnMessage(WixErrors.NoDataForColumn(row.SourceLineNumbers, customTableDefinition.Columns[i].Name, customTableDefinition.Name)); - } - } - } -#endif - //correct the section Id in FeatureComponents table if (this.sectionIdOnRows) { @@ -683,7 +532,7 @@ namespace WixToolset.Core // sort the rows by DiskId fileRows.Sort(); - this.OnMessage(WixWarnings.GeneratedShortFileNameConflict(((FileRow)fileRows[0]).SourceLineNumbers, shortFileName)); + this.Messaging.Write(WixWarnings.GeneratedShortFileNameConflict(((FileRow)fileRows[0]).SourceLineNumbers, shortFileName)); for (int i = 1; i < fileRows.Count; i++) { @@ -691,7 +540,7 @@ namespace WixToolset.Core if (null != fileRow.SourceLineNumbers) { - this.OnMessage(WixWarnings.GeneratedShortFileNameConflict2(fileRow.SourceLineNumbers)); + this.Messaging.Write(WixWarnings.GeneratedShortFileNameConflict2(fileRow.SourceLineNumbers)); } } } @@ -732,223 +581,6 @@ namespace WixToolset.Core return this.Messaging.EncounteredError ? null : intermediate; } -#if SOLVE_CUSTOM_TABLE - /// - /// Links the definition of a custom table. - /// - /// The table to link. - /// Receives the linked definition of the custom table. - private void LinkCustomTable(Table table, TableDefinitionCollection customTableDefinitions) - { - foreach (Row row in table.Rows) - { - bool bootstrapperApplicationData = (null != row[13] && 1 == (int)row[13]); - - if (null == row[4]) - { - this.OnMessage(WixErrors.ExpectedAttribute(row.SourceLineNumbers, "CustomTable/Column", "PrimaryKey")); - } - - string[] columnNames = row[2].ToString().Split('\t'); - string[] columnTypes = row[3].ToString().Split('\t'); - string[] primaryKeys = row[4].ToString().Split('\t'); - string[] minValues = row[5] == null ? null : row[5].ToString().Split('\t'); - string[] maxValues = row[6] == null ? null : row[6].ToString().Split('\t'); - string[] keyTables = row[7] == null ? null : row[7].ToString().Split('\t'); - string[] keyColumns = row[8] == null ? null : row[8].ToString().Split('\t'); - string[] categories = row[9] == null ? null : row[9].ToString().Split('\t'); - string[] sets = row[10] == null ? null : row[10].ToString().Split('\t'); - string[] descriptions = row[11] == null ? null : row[11].ToString().Split('\t'); - string[] modularizations = row[12] == null ? null : row[12].ToString().Split('\t'); - - int currentPrimaryKey = 0; - - List columns = new List(columnNames.Length); - for (int i = 0; i < columnNames.Length; ++i) - { - string name = columnNames[i]; - ColumnType type = ColumnType.Unknown; - - if (columnTypes[i].StartsWith("s", StringComparison.OrdinalIgnoreCase)) - { - type = ColumnType.String; - } - else if (columnTypes[i].StartsWith("l", StringComparison.OrdinalIgnoreCase)) - { - type = ColumnType.Localized; - } - else if (columnTypes[i].StartsWith("i", StringComparison.OrdinalIgnoreCase)) - { - type = ColumnType.Number; - } - else if (columnTypes[i].StartsWith("v", StringComparison.OrdinalIgnoreCase)) - { - type = ColumnType.Object; - } - else - { - throw new WixException(WixErrors.UnknownCustomTableColumnType(row.SourceLineNumbers, columnTypes[i])); - } - - bool nullable = columnTypes[i].Substring(0, 1) == columnTypes[i].Substring(0, 1).ToUpper(CultureInfo.InvariantCulture); - int length = Convert.ToInt32(columnTypes[i].Substring(1), CultureInfo.InvariantCulture); - - bool primaryKey = false; - if (currentPrimaryKey < primaryKeys.Length && primaryKeys[currentPrimaryKey] == columnNames[i]) - { - primaryKey = true; - currentPrimaryKey++; - } - - bool minValSet = null != minValues && null != minValues[i] && 0 < minValues[i].Length; - int minValue = 0; - if (minValSet) - { - minValue = Convert.ToInt32(minValues[i], CultureInfo.InvariantCulture); - } - - bool maxValSet = null != maxValues && null != maxValues[i] && 0 < maxValues[i].Length; - int maxValue = 0; - if (maxValSet) - { - maxValue = Convert.ToInt32(maxValues[i], CultureInfo.InvariantCulture); - } - - bool keyColumnSet = null != keyColumns && null != keyColumns[i] && 0 < keyColumns[i].Length; - int keyColumn = 0; - if (keyColumnSet) - { - keyColumn = Convert.ToInt32(keyColumns[i], CultureInfo.InvariantCulture); - } - - ColumnCategory category = ColumnCategory.Unknown; - if (null != categories && null != categories[i] && 0 < categories[i].Length) - { - switch (categories[i]) - { - case "Text": - category = ColumnCategory.Text; - break; - case "UpperCase": - category = ColumnCategory.UpperCase; - break; - case "LowerCase": - category = ColumnCategory.LowerCase; - break; - case "Integer": - category = ColumnCategory.Integer; - break; - case "DoubleInteger": - category = ColumnCategory.DoubleInteger; - break; - case "TimeDate": - category = ColumnCategory.TimeDate; - break; - case "Identifier": - category = ColumnCategory.Identifier; - break; - case "Property": - category = ColumnCategory.Property; - break; - case "Filename": - category = ColumnCategory.Filename; - break; - case "WildCardFilename": - category = ColumnCategory.WildCardFilename; - break; - case "Path": - category = ColumnCategory.Path; - break; - case "Paths": - category = ColumnCategory.Paths; - break; - case "AnyPath": - category = ColumnCategory.AnyPath; - break; - case "DefaultDir": - category = ColumnCategory.DefaultDir; - break; - case "RegPath": - category = ColumnCategory.RegPath; - break; - case "Formatted": - category = ColumnCategory.Formatted; - break; - case "FormattedSddl": - category = ColumnCategory.FormattedSDDLText; - break; - case "Template": - category = ColumnCategory.Template; - break; - case "Condition": - category = ColumnCategory.Condition; - break; - case "Guid": - category = ColumnCategory.Guid; - break; - case "Version": - category = ColumnCategory.Version; - break; - case "Language": - category = ColumnCategory.Language; - break; - case "Binary": - category = ColumnCategory.Binary; - break; - case "CustomSource": - category = ColumnCategory.CustomSource; - break; - case "Cabinet": - category = ColumnCategory.Cabinet; - break; - case "Shortcut": - category = ColumnCategory.Shortcut; - break; - default: - break; - } - } - - string keyTable = keyTables != null ? keyTables[i] : null; - string setValue = sets != null ? sets[i] : null; - string description = descriptions != null ? descriptions[i] : null; - string modString = modularizations != null ? modularizations[i] : null; - ColumnModularizeType modularization = ColumnModularizeType.None; - if (modString != null) - { - switch (modString) - { - case "None": - modularization = ColumnModularizeType.None; - break; - case "Column": - modularization = ColumnModularizeType.Column; - break; - case "Property": - modularization = ColumnModularizeType.Property; - break; - case "Condition": - modularization = ColumnModularizeType.Condition; - break; - case "CompanionFile": - modularization = ColumnModularizeType.CompanionFile; - break; - case "SemicolonDelimited": - modularization = ColumnModularizeType.SemicolonDelimited; - break; - } - } - - ColumnDefinition columnDefinition = new ColumnDefinition(name, type, length, primaryKey, nullable, modularization, ColumnType.Localized == type, minValSet, minValue, maxValSet, maxValue, keyTable, keyColumnSet, keyColumn, category, setValue, description, true, true); - columns.Add(columnDefinition); - } - - TableDefinition customTable = new TableDefinition((string)row[0], columns, false, bootstrapperApplicationData, bootstrapperApplicationData); - customTableDefinitions.Add(customTable); - } - } -#endif - #if MOVE_TO_BACKEND /// /// Checks for any tables in the output which are not allowed in the output type. @@ -973,14 +605,14 @@ namespace WixToolset.Core { foreach (Row row in table.Rows) { - this.OnMessage(WixErrors.UnexpectedTableInMergeModule(row.SourceLineNumbers, table.Name)); + this.Messaging.Write(WixErrors.UnexpectedTableInMergeModule(row.SourceLineNumbers, table.Name)); } } else if ("Error" == table.Name) { foreach (Row row in table.Rows) { - this.OnMessage(WixWarnings.DangerousTableInMergeModule(row.SourceLineNumbers, table.Name)); + this.Messaging.Write(WixWarnings.DangerousTableInMergeModule(row.SourceLineNumbers, table.Name)); } } break; @@ -1001,7 +633,7 @@ namespace WixToolset.Core { foreach (Row row in table.Rows) { - this.OnMessage(WixErrors.UnexpectedTableInPatchCreationPackage(row.SourceLineNumbers, table.Name)); + this.Messaging.Write(WixErrors.UnexpectedTableInPatchCreationPackage(row.SourceLineNumbers, table.Name)); } } break; @@ -1014,7 +646,7 @@ namespace WixToolset.Core { foreach (Row row in table.Rows) { - this.OnMessage(WixErrors.UnexpectedTableInPatch(row.SourceLineNumbers, table.Name)); + this.Messaging.Write(WixErrors.UnexpectedTableInPatch(row.SourceLineNumbers, table.Name)); } } break; @@ -1035,7 +667,7 @@ namespace WixToolset.Core { foreach (Row row in table.Rows) { - this.OnMessage(WixWarnings.UnexpectedTableInProduct(row.SourceLineNumbers, table.Name)); + this.Messaging.Write(WixWarnings.UnexpectedTableInProduct(row.SourceLineNumbers, table.Name)); } } break; @@ -1080,7 +712,7 @@ namespace WixToolset.Core { foreach (Row row in isolatedComponentTable.Rows) { - this.OnMessage(WixWarnings.TableIncompatibleWithInstallerVersion(row.SourceLineNumbers, "IsolatedComponent", outputInstallerVersion)); + this.Messaging.Write(WixWarnings.TableIncompatibleWithInstallerVersion(row.SourceLineNumbers, "IsolatedComponent", outputInstallerVersion)); } } } @@ -1095,7 +727,7 @@ namespace WixToolset.Core { if (null != row[12] || null != row[13] || null != row[14] || null != row[15]) { - this.OnMessage(WixWarnings.ColumnsIncompatibleWithInstallerVersion(row.SourceLineNumbers, "Shortcut", outputInstallerVersion)); + this.Messaging.Write(WixWarnings.ColumnsIncompatibleWithInstallerVersion(row.SourceLineNumbers, "Shortcut", outputInstallerVersion)); } } } @@ -1103,15 +735,6 @@ namespace WixToolset.Core } #endif - /// - /// Sends a message to the message delegate if there is one. - /// - /// Message event arguments. - public void OnMessage(Message message) - { - this.Messaging.Write(message); - } - /// /// Load the standard action symbols. /// @@ -1165,7 +788,7 @@ namespace WixToolset.Core { if (connection.IsExplicitPrimaryFeature) { - this.OnMessage(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Product"), connection.PrimaryFeature ?? resolvedSection.Id)); + this.Messaging.Write(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Product"), connection.PrimaryFeature ?? resolvedSection.Id)); continue; } else @@ -1197,7 +820,7 @@ namespace WixToolset.Core connection = featuresToFeatures[wixComplexReferenceRow.Child]; if (null != connection) { - this.OnMessage(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Product"), (null != connection.PrimaryFeature ? connection.PrimaryFeature : resolvedSection.Id))); + this.Messaging.Write(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Product"), (null != connection.PrimaryFeature ? connection.PrimaryFeature : resolvedSection.Id))); continue; } @@ -1214,7 +837,7 @@ namespace WixToolset.Core { if (connection.IsExplicitPrimaryFeature) { - this.OnMessage(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Product"), (null != connection.PrimaryFeature ? connection.PrimaryFeature : resolvedSection.Id))); + this.Messaging.Write(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Product"), (null != connection.PrimaryFeature ? connection.PrimaryFeature : resolvedSection.Id))); continue; } else @@ -1241,7 +864,7 @@ namespace WixToolset.Core case ComplexReferenceChildType.Component: if (componentsToModules.ContainsKey(wixComplexReferenceRow.Child)) { - this.OnMessage(ErrorMessages.ComponentReferencedTwice(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.Child)); + this.Messaging.Write(ErrorMessages.ComponentReferencedTwice(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.Child)); continue; } else @@ -1285,7 +908,7 @@ namespace WixToolset.Core connection = featuresToFeatures[wixComplexReferenceRow.Child]; if (null != connection) { - this.OnMessage(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Product"), (null != connection.PrimaryFeature ? connection.PrimaryFeature : resolvedSection.Id))); + this.Messaging.Write(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Product"), (null != connection.PrimaryFeature ? connection.PrimaryFeature : resolvedSection.Id))); continue; } @@ -1470,7 +1093,7 @@ namespace WixToolset.Core // way up to present the loop as a directed graph. var loop = String.Join(" -> ", loopDetector); - this.OnMessage(ErrorMessages.ReferenceLoopDetected(wixComplexReferenceRow?.SourceLineNumbers, loop)); + this.Messaging.Write(ErrorMessages.ReferenceLoopDetected(wixComplexReferenceRow?.SourceLineNumbers, loop)); // Cleanup the parentGroupsNeedingProcessing and the loopDetector just like the // exit of this method does at the end because we are exiting early. @@ -1712,11 +1335,11 @@ namespace WixToolset.Core // display an error for the component or merge module as approrpriate if (null != multipleFeatureComponents) { - this.OnMessage(ErrorMessages.ComponentExpectedFeature(row.SourceLineNumbers, connectionId, row.Definition.Name, row.Id.Id)); + this.Messaging.Write(ErrorMessages.ComponentExpectedFeature(row.SourceLineNumbers, connectionId, row.Definition.Name, row.Id.Id)); } else { - this.OnMessage(ErrorMessages.MergeModuleExpectedFeature(row.SourceLineNumbers, connectionId)); + this.Messaging.Write(ErrorMessages.MergeModuleExpectedFeature(row.SourceLineNumbers, connectionId)); } } else @@ -1731,7 +1354,7 @@ namespace WixToolset.Core { if (!multipleFeatureComponents.Contains(connectionId)) { - this.OnMessage(WarningMessages.ImplicitComponentPrimaryFeature(connectionId)); + this.Messaging.Write(WarningMessages.ImplicitComponentPrimaryFeature(connectionId)); // remember this component so only one warning is generated for it multipleFeatureComponents[connectionId] = null; @@ -1739,7 +1362,7 @@ namespace WixToolset.Core } else { - this.OnMessage(WarningMessages.ImplicitMergeModulePrimaryFeature(connectionId)); + this.Messaging.Write(WarningMessages.ImplicitMergeModulePrimaryFeature(connectionId)); } } diff --git a/src/test/Example.Extension/Data/example.wir b/src/test/Example.Extension/Data/example.wir index ba8ccbbe..8e32f901 100644 Binary files a/src/test/Example.Extension/Data/example.wir and b/src/test/Example.Extension/Data/example.wir differ diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs index 8535f69c..6ebdb993 100644 --- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs @@ -252,7 +252,7 @@ namespace WixToolsetTest.CoreIntegration } } - [Fact(Skip = "Test demonstrates failure")] + [Fact] public void PopulatesCustomTable1() { var folder = TestData.Get(@"TestData"); diff --git a/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs index dd730501..668c273a 100644 --- a/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs @@ -91,7 +91,7 @@ namespace WixToolsetTest.CoreIntegration } } - [Fact(Skip = "Test demonstrates failure")] + [Fact] public void CanBuildMsiUsingExtensionLibrary() { var folder = TestData.Get(@"TestData\Wixipl"); -- cgit v1.2.3-55-g6feb