From 68075faa4a60e8016ea7653cfc1396cd00e3f646 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 27 Dec 2017 14:23:39 -0800
Subject: Integrate latest Data and Extensibility changes and build light.exe

---
 .../Unbind/UnbindDatabaseCommand.cs                                 | 6 +++---
 .../Unbind/UnbindTranformCommand.cs                                 | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/WixToolset.Core.WindowsInstaller/Unbind')

diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
index 5d24d08a..f4e05489 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
@@ -127,7 +127,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
 
                             using (View tableView = this.Database.OpenExecuteView(String.Format(CultureInfo.InvariantCulture, "SELECT * FROM `{0}`", tableName)))
                             {
-                                List<ColumnDefinition> columns;
+                                ColumnDefinition[] columns;
                                 using (Record columnNameRecord = tableView.GetColumnInfo(MsiInterop.MSICOLINFONAMES),
                                               columnTypeRecord = tableView.GetColumnInfo(MsiInterop.MSICOLINFOTYPES))
                                 {
@@ -144,7 +144,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
                                     }
 
                                     int columnCount = columnNameRecord.GetFieldCount();
-                                    columns = new List<ColumnDefinition>(columnCount);
+                                    columns = new ColumnDefinition[columnCount];
                                     for (int i = 1; i <= columnCount; i++)
                                     {
                                         string columnName = columnNameRecord.GetString(i);
@@ -260,7 +260,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
                                             columnModularizeType = ColumnModularizeType.Column;
                                         }
 
-                                        columns.Add(new ColumnDefinition(columnName, columnType, length, primary, nullable, columnCategory, minValue, maxValue, keyTable, keyColumn, set, description, columnModularizeType, (ColumnType.Localized == columnType), true));
+                                        columns[i - 1] = new ColumnDefinition(columnName, columnType, length, primary, nullable, columnCategory, minValue, maxValue, keyTable, keyColumn, set, description, columnModularizeType, (ColumnType.Localized == columnType), true);
                                     }
                                 }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
index 00e5a755..80401822 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
@@ -212,7 +212,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
 
                             // mark the field as modified
                             int indexOfModifiedValue = -1;
-                            for (int i = 0; i < modifiedRow.TableDefinition.Columns.Count; ++i)
+                            for (int i = 0; i < modifiedRow.TableDefinition.Columns.Length; ++i)
                             {
                                 if (columnName.Equals(modifiedRow.TableDefinition.Columns[i].Name, StringComparison.Ordinal))
                                 {
@@ -270,7 +270,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
             string[] primaryKeyParts = primaryKeys.Split('\t');
             int primaryKeyPartIndex = 0;
 
-            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];
 
-- 
cgit v1.2.3-55-g6feb