Remove BootstrapperApplicationData generally in favor of Unreal

3 files changed, 19 insertions, 31 deletions

diff --git a/src/WixToolset.Data/Tuples/WixCustomRowTuple.cs b/src/WixToolset.Data/Tuples/WixCustomRowTuple.cs
index ec73c1b8..c51089e8 100644
--- a/src/WixToolset.Data/Tuples/WixCustomRowTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixCustomRowTuple.cs
@@ -27,6 +27,8 @@ namespace WixToolset.Data.Tuples
 
     public class WixCustomRowTuple : IntermediateTuple
     {
+        public const char FieldSeparator = '\x85';
+
         public WixCustomRowTuple() : base(TupleDefinitions.WixCustomRow, null, null)
         {
         }
@@ -48,5 +50,7 @@ namespace WixToolset.Data.Tuples
             get => (string)this.Fields[(int)WixCustomRowTupleFields.FieldData];
             set => this.Set((int)WixCustomRowTupleFields.FieldData, value);
         }
+
+        public string[] FieldDataSeparated => this.FieldData.Split(FieldSeparator);
     }
-}
\ No newline at end of file
+}
diff --git a/src/WixToolset.Data/Tuples/WixCustomTableTuple.cs b/src/WixToolset.Data/Tuples/WixCustomTableTuple.cs
index cf4e60db..2ef2b88d 100644
--- a/src/WixToolset.Data/Tuples/WixCustomTableTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixCustomTableTuple.cs
@@ -22,7 +22,7 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.Sets), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.Descriptions), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.Modularizations), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.BootstrapperApplicationData), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.Unreal), IntermediateFieldType.Number),
             },
             typeof(WixCustomTableTuple));
     }
@@ -44,7 +44,7 @@ namespace WixToolset.Data.Tuples
         Sets,
         Descriptions,
         Modularizations,
-        BootstrapperApplicationData,
+        Unreal,
     }
 
     public class WixCustomTableTuple : IntermediateTuple
@@ -131,10 +131,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)WixCustomTableTupleFields.Modularizations, value);
         }
 
-        public bool BootstrapperApplicationData
+        public bool Unreal
         {
-            get => (bool)this.Fields[(int)WixCustomTableTupleFields.BootstrapperApplicationData];
-            set => this.Set((int)WixCustomTableTupleFields.BootstrapperApplicationData, value);
+            get => (bool)this.Fields[(int)WixCustomTableTupleFields.Unreal];
+            set => this.Set((int)WixCustomTableTupleFields.Unreal, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs b/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
index bc7fb537..ee8ab0c1 100644
--- a/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
+++ b/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
@@ -4,7 +4,7 @@ namespace WixToolset.Data.WindowsInstaller
 {
     using System;
     using System.Collections.Generic;
-    using System.Collections.ObjectModel;
+    using System.Linq;
     using System.Xml;
 
     /// <summary>
@@ -24,14 +24,12 @@ namespace WixToolset.Data.WindowsInstaller
         /// <param name="name">Name of table to create.</param>
         /// <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, ColumnDefinition[] columns, bool unreal = false, bool bootstrapperApplicationData = false)
+        public TableDefinition(string name, IEnumerable<ColumnDefinition> columns, bool unreal = false)
         {
             this.Name = name;
             this.Unreal = unreal;
-            this.BootstrapperApplicationData = bootstrapperApplicationData;
 
-            this.Columns = columns;
+            this.Columns = columns.ToArray();
         }
 
         /// <summary>
@@ -47,12 +45,6 @@ namespace WixToolset.Data.WindowsInstaller
         public bool Unreal { get; private set; }
 
         /// <summary>
-        /// Gets if the table is a part of the bootstrapper application data manifest.
-        /// </summary>
-        /// <value>Flag if table is a part of the bootstrapper application data manifest.</value>
-        public bool BootstrapperApplicationData { get; private set; }
-
-        /// <summary>
         /// Gets the collection of column definitions for this table.
         /// </summary>
         /// <value>Collection of column definitions for this table.</value>
@@ -82,7 +74,7 @@ namespace WixToolset.Data.WindowsInstaller
             }
 
             // compare the table names
-            int ret = String.Compare(this.Name, updated.Name, StringComparison.Ordinal);
+            var ret = String.Compare(this.Name, updated.Name, StringComparison.Ordinal);
 
             // compare the column count
             if (0 == ret)
@@ -91,10 +83,10 @@ namespace WixToolset.Data.WindowsInstaller
                 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.Length > i; i++)
+                for (var i = 0; 0 == ret && this.Columns.Length > i; i++)
                 {
-                    ColumnDefinition thisColumnDef = this.Columns[i];
-                    ColumnDefinition updatedColumnDef = updated.Columns[i];
+                    var thisColumnDef = this.Columns[i];
+                    var updatedColumnDef = updated.Columns[i];
 
                     ret = thisColumnDef.CompareTo(updatedColumnDef);
                 }
@@ -125,9 +117,6 @@ namespace WixToolset.Data.WindowsInstaller
                     case "unreal":
                         unreal = reader.Value.Equals("yes");
                         break;
-                    case "bootstrapperApplicationData":
-                        bootstrapperApplicationData = reader.Value.Equals("yes");
-                        break;
                 }
             }
 
@@ -181,7 +170,7 @@ namespace WixToolset.Data.WindowsInstaller
                 }
             }
 
-            return new TableDefinition(name, columns.ToArray(), unreal, bootstrapperApplicationData);
+            return new TableDefinition(name, columns.ToArray(), unreal);
         }
 
         /// <summary>
@@ -199,12 +188,7 @@ namespace WixToolset.Data.WindowsInstaller
                 writer.WriteAttributeString("unreal", "yes");
             }
 
-            if (this.BootstrapperApplicationData)
-            {
-                writer.WriteAttributeString("bootstrapperApplicationData", "yes");
-            }
-
-            foreach (ColumnDefinition columnDefinition in this.Columns)
+            foreach (var columnDefinition in this.Columns)
             {
                 columnDefinition.Write(writer);
             }