diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-06-25 14:43:50 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-06-25 14:50:31 -0700 |
| commit | 38afa9e7bc7eacc021f8805f607368a05751e3c3 (patch) | |
| tree | 803b0a8d9a06a7d6f7c4df408437017ae21a883e /src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs | |
| parent | 8968578d50858721317d410549a9f9b5c62bf1f7 (diff) | |
| download | wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.tar.gz wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.tar.bz2 wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.zip | |
The Great Tuple to Symbol Rename (tm)
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs | 16 |
1 files changed, 8 insertions, 8 deletions
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 | |||
| 7 | using System.Globalization; | 7 | using System.Globalization; |
| 8 | using System.Linq; | 8 | using System.Linq; |
| 9 | using WixToolset.Data; | 9 | using WixToolset.Data; |
| 10 | using WixToolset.Data.Tuples; | 10 | using WixToolset.Data.Symbols; |
| 11 | using WixToolset.Data.WindowsInstaller; | 11 | using WixToolset.Data.WindowsInstaller; |
| 12 | using WixToolset.Extensibility; | 12 | using WixToolset.Extensibility; |
| 13 | using WixToolset.Extensibility.Services; | 13 | using WixToolset.Extensibility.Services; |
| @@ -32,13 +32,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 32 | public TableDefinitionCollection Execute() | 32 | public TableDefinitionCollection Execute() |
| 33 | { | 33 | { |
| 34 | var tableDefinitions = new TableDefinitionCollection(WindowsInstallerTableDefinitions.All); | 34 | var tableDefinitions = new TableDefinitionCollection(WindowsInstallerTableDefinitions.All); |
| 35 | var customColumnsById = this.Section.Tuples.OfType<WixCustomTableColumnTuple>().ToDictionary(t => t.Id.Id); | 35 | var customColumnsById = this.Section.Symbols.OfType<WixCustomTableColumnSymbol>().ToDictionary(t => t.Id.Id); |
| 36 | 36 | ||
| 37 | if (customColumnsById.Any()) | 37 | if (customColumnsById.Any()) |
| 38 | { | 38 | { |
| 39 | foreach (var tuple in this.Section.Tuples.OfType<WixCustomTableTuple>()) | 39 | foreach (var symbol in this.Section.Symbols.OfType<WixCustomTableSymbol>()) |
| 40 | { | 40 | { |
| 41 | var customTableDefinition = this.CreateCustomTable(tuple, customColumnsById); | 41 | var customTableDefinition = this.CreateCustomTable(symbol, customColumnsById); |
| 42 | tableDefinitions.Add(customTableDefinition); | 42 | tableDefinitions.Add(customTableDefinition); |
| 43 | } | 43 | } |
| 44 | } | 44 | } |
| @@ -60,14 +60,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 60 | return this.TableDefinitions; | 60 | return this.TableDefinitions; |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | private TableDefinition CreateCustomTable(WixCustomTableTuple tuple, Dictionary<string, WixCustomTableColumnTuple> customColumnsById) | 63 | private TableDefinition CreateCustomTable(WixCustomTableSymbol symbol, Dictionary<string, WixCustomTableColumnSymbol> customColumnsById) |
| 64 | { | 64 | { |
| 65 | var columnNames = tuple.ColumnNamesSeparated; | 65 | var columnNames = symbol.ColumnNamesSeparated; |
| 66 | var columns = new List<ColumnDefinition>(columnNames.Length); | 66 | var columns = new List<ColumnDefinition>(columnNames.Length); |
| 67 | 67 | ||
| 68 | foreach (var name in columnNames) | 68 | foreach (var name in columnNames) |
| 69 | { | 69 | { |
| 70 | var column = customColumnsById[tuple.Id.Id + "/" + name]; | 70 | var column = customColumnsById[symbol.Id.Id + "/" + name]; |
| 71 | 71 | ||
| 72 | var type = ColumnType.Unknown; | 72 | var type = ColumnType.Unknown; |
| 73 | 73 | ||
| @@ -208,7 +208,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 208 | columns.Add(columnDefinition); | 208 | columns.Add(columnDefinition); |
| 209 | } | 209 | } |
| 210 | 210 | ||
| 211 | var customTable = new TableDefinition(tuple.Id.Id, null, columns, tuple.Unreal); | 211 | var customTable = new TableDefinition(symbol.Id.Id, null, columns, symbol.Unreal); |
| 212 | return customTable; | 212 | return customTable; |
| 213 | } | 213 | } |
| 214 | } | 214 | } |
