Add support for long fields and fix up Bundle and many other tuples

4 files changed, 8 insertions, 31 deletions

diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixApprovedExeForElevationRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixApprovedExeForElevationRow.cs
index b3d85c8a..28a14ddd 100644
--- a/src/WixToolset.Data/WindowsInstaller/Rows/WixApprovedExeForElevationRow.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixApprovedExeForElevationRow.cs
@@ -2,6 +2,8 @@
 
 namespace WixToolset.Data.WindowsInstaller.Rows
 {
+    using WixToolset.Data.Tuples;
+
     /// <summary>
     /// Specialization of a row for the WixApprovedExeForElevation table.
     /// </summary>
@@ -61,9 +63,9 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         /// Gets or sets the attibutes.
         /// </summary>
         /// <value>The BundleApprovedExeForElevationAttributes.</value>
-        public BundleApprovedExeForElevationAttributes Attributes
+        public WixApprovedExeForElevationAttributes Attributes
         {
-            get { return (BundleApprovedExeForElevationAttributes)this.Fields[3].Data; }
+            get { return (WixApprovedExeForElevationAttributes)this.Fields[3].Data; }
             set { this.Fields[3].Data = (int)value; }
         }
 
@@ -72,7 +74,7 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         /// </summary>
         public bool Win64
         {
-            get { return BundleApprovedExeForElevationAttributes.Win64 == (this.Attributes & BundleApprovedExeForElevationAttributes.Win64); }
+            get { return WixApprovedExeForElevationAttributes.Win64 == (this.Attributes & WixApprovedExeForElevationAttributes.Win64); }
         }
     }
 }
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleExePackageRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleExePackageRow.cs
index 95fc0f54..241c1f7f 100644
--- a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleExePackageRow.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleExePackageRow.cs
@@ -2,6 +2,7 @@
 
 namespace WixToolset.Data.WindowsInstaller.Rows
 {
+    using System;
     using WixToolset.Data.Tuples;
 
     /// <summary>
@@ -97,7 +98,7 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         /// </summary>
         public bool Repairable
         {
-            get { return 0 != (this.Attributes & WixBundleExePackageAttributes.Repairable); }
+            get { return !String.IsNullOrEmpty(this.RepairCommand); }
         }
     }
 }
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleMsiPackageRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleMsiPackageRow.cs
index fdd2b6cf..5f07072d 100644
--- a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleMsiPackageRow.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleMsiPackageRow.cs
@@ -126,13 +126,5 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         {
             get { return 0 != (this.Attributes & WixBundleMsiPackageAttributes.ForcePerMachine); }
         }
-
-        /// <summary>
-        /// Gets the suppress loose file payload generation of a package.
-        /// </summary>
-        public bool SuppressLooseFilePayloadGeneration
-        {
-            get { return 0 != (this.Attributes & WixBundleMsiPackageAttributes.SuppressLooseFilePayloadGeneration); }
-        }
     }
 }
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundlePatchTargetCodeRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundlePatchTargetCodeRow.cs
index 6e05e4b7..84d13c43 100644
--- a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundlePatchTargetCodeRow.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundlePatchTargetCodeRow.cs
@@ -3,25 +3,7 @@
 namespace WixToolset.Data.WindowsInstaller.Rows
 {
     using System;
-
-    /// <summary>
-    /// Attributes for the PatchTargetCode table.
-    /// </summary>
-    [Flags]
-    public enum WixBundlePatchTargetCodeAttributes : int
-    {
-        None = 0,
-
-        /// <summary>
-        /// The transform targets a specific ProductCode.
-        /// </summary>
-        TargetsProductCode = 1,
-
-        /// <summary>
-        /// The transform targets a specific UpgradeCode.
-        /// </summary>
-        TargetsUpgradeCode = 2,
-    }
+    using WixToolset.Data.Tuples;
 
     /// <summary>
     /// Specialization of a row for the PatchTargetCode table.