Make TableDefinitions ColumnDefinitions an array and other minor cleanup

6 files changed, 23 insertions, 37 deletions

diff --git a/src/WixToolset.Data/Data/messages.xml b/src/WixToolset.Data/Data/messages.xml
index 3acb21ba..5f03fef5 100644
--- a/src/WixToolset.Data/Data/messages.xml
+++ b/src/WixToolset.Data/Data/messages.xml
@@ -1,6 +1,11 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!-- 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. -->
 
+<!--
+
+This file has been kept for easy reference until we are certain we don't want to localize error strings.
+
+-->
 
 <Messages Namespace="WixToolset" Resources="Data.Messages" xmlns="http://schemas.microsoft.com/genmsgs/2004/07/messages">
   <Class Name="WixErrors" ContainerName="WixErrorEventArgs" BaseContainerName="MessageEventArgs" Level="Error">
diff --git a/src/WixToolset.Data/WindowsInstaller/Field.cs b/src/WixToolset.Data/WindowsInstaller/Field.cs
index 11cd2c33..aa359c64 100644
--- a/src/WixToolset.Data/WindowsInstaller/Field.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Field.cs
@@ -35,16 +35,8 @@ namespace WixToolset.Data.WindowsInstaller
         /// <value>Data in the field.</value>
         public object Data
         {
-            get
-            {
-                return this.data;
-            }
-
-            set
-            {
-                // Validate the value before setting it.
-                this.data = this.ValidateValue(this.Column, value);
-            }
+            get => this.data;
+            set => this.data = this.ValidateValue(this.Column, value);
         }
 
         /// <summary>
diff --git a/src/WixToolset.Data/WindowsInstaller/Pdb.cs b/src/WixToolset.Data/WindowsInstaller/Pdb.cs
index d3fea0fe..574d5593 100644
--- a/src/WixToolset.Data/WindowsInstaller/Pdb.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Pdb.cs
@@ -15,14 +15,6 @@ namespace WixToolset.Data.WindowsInstaller
         private static readonly Version CurrentVersion = new Version("4.0.0.0");
 
         /// <summary>
-        /// Creates a new empty pdb object.
-        /// </summary>
-        /// <param name="sourceLineNumbers">The source line information for the pdb.</param>
-        public Pdb()
-        {
-        }
-
-        /// <summary>
         /// Gets or sets the output that is a part of this pdb.
         /// </summary>
         /// <value>Type of the output.</value>
diff --git a/src/WixToolset.Data/WindowsInstaller/Row.cs b/src/WixToolset.Data/WindowsInstaller/Row.cs
index cb8b81d8..af1af628 100644
--- a/src/WixToolset.Data/WindowsInstaller/Row.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Row.cs
@@ -37,7 +37,7 @@ namespace WixToolset.Data.WindowsInstaller
         {
             this.Number = rowCount++;
             this.SourceLineNumbers = sourceLineNumbers;
-            this.Fields = new Field[tableDefinition.Columns.Count];
+            this.Fields = new Field[tableDefinition.Columns.Length];
             this.TableDefinition = tableDefinition;
 
             for (var i = 0; i < this.Fields.Length; ++i)
diff --git a/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs b/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
index 2fb655e5..bc7fb537 100644
--- a/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
+++ b/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
@@ -25,13 +25,13 @@ namespace WixToolset.Data.WindowsInstaller
         /// <param name="columns">Column definitions for the table.</param>
         /// <param name="unreal">Flag if table is unreal.</param>
         /// <param name="bootstrapperApplicationData">Flag if table is part of UX Manifest.</param>
-        public TableDefinition(string name, IList<ColumnDefinition> columns, bool unreal = false, bool bootstrapperApplicationData = false)
+        public TableDefinition(string name, ColumnDefinition[] columns, bool unreal = false, bool bootstrapperApplicationData = false)
         {
             this.Name = name;
             this.Unreal = unreal;
             this.BootstrapperApplicationData = bootstrapperApplicationData;
 
-            this.Columns = new ReadOnlyCollection<ColumnDefinition>(columns);
+            this.Columns = columns;
         }
 
         /// <summary>
@@ -56,17 +56,14 @@ namespace WixToolset.Data.WindowsInstaller
         /// Gets the collection of column definitions for this table.
         /// </summary>
         /// <value>Collection of column definitions for this table.</value>
-        public IList<ColumnDefinition> Columns { get; private set; }
+        public ColumnDefinition[] Columns { get; private set; }
 
         /// <summary>
         /// Gets the column definition in the table by index.
         /// </summary>
         /// <param name="columnIndex">Index of column to locate.</param>
         /// <value>Column definition in the table by index.</value>
-        public ColumnDefinition this[int columnIndex]
-        {
-            get { return this.Columns[columnIndex]; }
-        }
+        public ColumnDefinition this[int columnIndex] => this.Columns[columnIndex];
 
         /// <summary>
         /// Compares this table definition to another table definition.
@@ -91,10 +88,10 @@ namespace WixToolset.Data.WindowsInstaller
             if (0 == ret)
             {
                 // transforms can only add columns
-                ret = Math.Min(0, updated.Columns.Count - this.Columns.Count);
+                ret = Math.Min(0, updated.Columns.Length - this.Columns.Length);
 
                 // compare name, type, and length of each column
-                for (int i = 0; 0 == ret && this.Columns.Count > i; i++)
+                for (int i = 0; 0 == ret && this.Columns.Length > i; i++)
                 {
                     ColumnDefinition thisColumnDef = this.Columns[i];
                     ColumnDefinition updatedColumnDef = updated.Columns[i];
@@ -113,10 +110,10 @@ namespace WixToolset.Data.WindowsInstaller
         /// <returns>The TableDefintion represented by the Xml.</returns>
         internal static TableDefinition Read(XmlReader reader)
         {
-            bool empty = reader.IsEmptyElement;
+            var empty = reader.IsEmptyElement;
             string name = null;
-            bool unreal = false;
-            bool bootstrapperApplicationData = false;
+            var unreal = false;
+            var bootstrapperApplicationData = false;
 
             while (reader.MoveToNextAttribute())
             {
@@ -139,13 +136,13 @@ namespace WixToolset.Data.WindowsInstaller
                 throw new XmlException();
             }
 
-            List<ColumnDefinition> columns = new List<ColumnDefinition>();
-            bool hasPrimaryKeyColumn = false;
+            var columns = new List<ColumnDefinition>();
+            var hasPrimaryKeyColumn = false;
 
             // parse the child elements
             if (!empty)
             {
-                bool done = false;
+                var done = false;
 
                 while (!done && reader.Read())
                 {
@@ -155,7 +152,7 @@ namespace WixToolset.Data.WindowsInstaller
                             switch (reader.LocalName)
                             {
                                 case "columnDefinition":
-                                    ColumnDefinition columnDefinition = ColumnDefinition.Read(reader);
+                                    var columnDefinition = ColumnDefinition.Read(reader);
                                     columns.Add(columnDefinition);
 
                                     if (columnDefinition.PrimaryKey)
@@ -184,7 +181,7 @@ namespace WixToolset.Data.WindowsInstaller
                 }
             }
 
-            return new TableDefinition(name, columns, unreal, bootstrapperApplicationData);
+            return new TableDefinition(name, columns.ToArray(), unreal, bootstrapperApplicationData);
         }
 
         /// <summary>
diff --git a/src/WixToolset.Data/WindowsInstaller/TableIndexedCollection.cs b/src/WixToolset.Data/WindowsInstaller/TableIndexedCollection.cs
index 1b7de72b..57ba19d1 100644
--- a/src/WixToolset.Data/WindowsInstaller/TableIndexedCollection.cs
+++ b/src/WixToolset.Data/WindowsInstaller/TableIndexedCollection.cs
@@ -17,7 +17,7 @@ namespace WixToolset.Data.WindowsInstaller
         /// </summary>
         public TableIndexedCollection()
         {
-            this.collection = new Dictionary<string,Table>();
+            this.collection = new Dictionary<string, Table>();
         }
 
         /// <summary>