From 38afa9e7bc7eacc021f8805f607368a05751e3c3 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 25 Jun 2020 14:43:50 -0700 Subject: The Great Tuple to Symbol Rename (tm) --- .../Bind/LoadTableDefinitionsCommand.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs') diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs index 0312ab44..2eb95bc5 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs @@ -7,7 +7,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Globalization; using System.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility; using WixToolset.Extensibility.Services; @@ -32,13 +32,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind public TableDefinitionCollection Execute() { var tableDefinitions = new TableDefinitionCollection(WindowsInstallerTableDefinitions.All); - var customColumnsById = this.Section.Tuples.OfType().ToDictionary(t => t.Id.Id); + var customColumnsById = this.Section.Symbols.OfType().ToDictionary(t => t.Id.Id); if (customColumnsById.Any()) { - foreach (var tuple in this.Section.Tuples.OfType()) + foreach (var symbol in this.Section.Symbols.OfType()) { - var customTableDefinition = this.CreateCustomTable(tuple, customColumnsById); + var customTableDefinition = this.CreateCustomTable(symbol, customColumnsById); tableDefinitions.Add(customTableDefinition); } } @@ -60,14 +60,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind return this.TableDefinitions; } - private TableDefinition CreateCustomTable(WixCustomTableTuple tuple, Dictionary customColumnsById) + private TableDefinition CreateCustomTable(WixCustomTableSymbol symbol, Dictionary customColumnsById) { - var columnNames = tuple.ColumnNamesSeparated; + var columnNames = symbol.ColumnNamesSeparated; var columns = new List(columnNames.Length); foreach (var name in columnNames) { - var column = customColumnsById[tuple.Id.Id + "/" + name]; + var column = customColumnsById[symbol.Id.Id + "/" + name]; var type = ColumnType.Unknown; @@ -208,7 +208,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind columns.Add(columnDefinition); } - var customTable = new TableDefinition(tuple.Id.Id, null, columns, tuple.Unreal); + var customTable = new TableDefinition(symbol.Id.Id, null, columns, symbol.Unreal); return customTable; } } -- cgit v1.2.3-55-g6feb