From 68075faa4a60e8016ea7653cfc1396cd00e3f646 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 27 Dec 2017 14:23:39 -0800 Subject: Integrate latest Data and Extensibility changes and build light.exe --- src/WixToolset.Core.WindowsInstaller/Bind/CreateIdtFileCommand.cs | 4 ++-- .../Bind/CreateOutputFromIRCommand.cs | 2 +- src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs | 4 ++-- src/WixToolset.Core.WindowsInstaller/Bind/ModularaizeCommand.cs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/Bind') diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateIdtFileCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateIdtFileCommand.cs index 9afb3260..6b1dead5 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateIdtFileCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateIdtFileCommand.cs @@ -69,9 +69,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind return; } - if (TableDefinition.MaxColumnsInRealTable < table.Definition.Columns.Count) + if (TableDefinition.MaxColumnsInRealTable < table.Definition.Columns.Length) { - throw new WixException(ErrorMessages.TooManyColumnsInRealTable(table.Definition.Name, table.Definition.Columns.Count, TableDefinition.MaxColumnsInRealTable)); + throw new WixException(ErrorMessages.TooManyColumnsInRealTable(table.Definition.Name, table.Definition.Columns.Length, TableDefinition.MaxColumnsInRealTable)); } // Tack on the table header, and flush before we start writing bytes directly to the stream. diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs index 0642d217..ac770823 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs @@ -254,7 +254,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind var row = table.CreateRow(tuple.SourceLineNumbers); for (var i = 0; i < tuple.Fields.Length; ++i) { - if (i < tableDefinition.Columns.Count) + if (i < tableDefinition.Columns.Length) { var column = tableDefinition.Columns[i]; diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs index cc920ac2..3357db3e 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs @@ -219,7 +219,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind // Import each row containing a stream foreach (Row row in table.Rows) { - using (Record record = new Record(table.Definition.Columns.Count)) + using (Record record = new Record(table.Definition.Columns.Length)) { StringBuilder streamName = new StringBuilder(); bool needStream = false; @@ -230,7 +230,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind streamName.Append(table.Name); } - for (int i = 0; i < table.Definition.Columns.Count; i++) + for (int i = 0; i < table.Definition.Columns.Length; i++) { ColumnDefinition columnDefinition = table.Definition.Columns[i]; diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ModularaizeCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ModularaizeCommand.cs index 03538fc3..8c6e3831 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/ModularaizeCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/ModularaizeCommand.cs @@ -48,7 +48,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind var modularizedColumns = new List(); // find the modularized columns - for (var i = 0; i < table.Definition.Columns.Count; ++i) + for (var i = 0; i < table.Definition.Columns.Length; ++i) { if (ColumnModularizeType.None != table.Definition.Columns[i].ModularizeType) { -- cgit v1.2.3-55-g6feb