1 files changed, 11 insertions, 44 deletions

diff --git a/src/WixToolset.Core.Burn/Bundles/PackageFacade.cs b/src/WixToolset.Core.Burn/Bundles/PackageFacade.cs
index c68a8311..8b1711a1 100644
--- a/src/WixToolset.Core.Burn/Bundles/PackageFacade.cs
+++ b/src/WixToolset.Core.Burn/Bundles/PackageFacade.cs
@@ -2,57 +2,24 @@
 
 namespace WixToolset.Core.Burn.Bundles
 {
+    using System.Diagnostics;
+    using WixToolset.Data;
+    using WixToolset.Data.Tuples;
+
     internal class PackageFacade
     {
-#if TODO
-        private PackageFacade(WixBundlePackageRow package)
-        {
-            this.Package = package;
-            this.Provides = new ProvidesDependencyCollection();
-        }
-
-        public PackageFacade(WixBundlePackageRow package, WixBundleExePackageRow exePackage)
-            : this(package)
+        public PackageFacade(WixBundlePackageTuple packageTuple, IntermediateTuple specificPackageTuple)
         {
-            this.ExePackage = exePackage;
-        }
+            Debug.Assert(packageTuple.Id.Id == specificPackageTuple.Id.Id);
 
-        public PackageFacade(WixBundlePackageRow package, WixBundleMsiPackageRow msiPackage)
-            : this(package)
-        {
-            this.MsiPackage = msiPackage;
+            this.PackageTuple = packageTuple;
+            this.SpecificPackageTuple = specificPackageTuple;
         }
 
-        public PackageFacade(WixBundlePackageRow package, WixBundleMspPackageRow mspPackage)
-            : this(package)
-        {
-            this.MspPackage = mspPackage;
-        }
-
-        public PackageFacade(WixBundlePackageRow package, WixBundleMsuPackageRow msuPackage)
-            : this(package)
-        {
-            this.MsuPackage = msuPackage;
-        }
-
-        public WixBundlePackageRow Package { get; private set; }
-
-        public WixBundleExePackageRow ExePackage { get; private set; }
-
-        public WixBundleMsiPackageRow MsiPackage { get; private set; }
-
-        public WixBundleMspPackageRow MspPackage { get; private set; }
+        public string PackageId => this.PackageTuple.Id.Id;
 
-        public WixBundleMsuPackageRow MsuPackage { get; private set; }
+        public WixBundlePackageTuple PackageTuple { get; }
 
-        /// <summary>
-        /// The provides dependencies authored and imported for this package.
-        /// </summary>
-        /// <remarks>
-        /// TODO: Eventually this collection should turn into Rows so they are tracked in the PDB but
-        /// the relationship with the extension makes it much trickier to pull off.
-        /// </remarks>
-        public ProvidesDependencyCollection Provides { get; private set; }
-#endif
+        public IntermediateTuple SpecificPackageTuple { get; }
     }
 }