From 2bb37beda887d120a0ddabf874ad25357101faa1 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 1 Nov 2017 10:59:45 -0700
Subject: Update to WiX Intermediate Representation

---
 src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs           | 12 +++++++-----
 src/WixToolset.Core.Burn/Bind/ProvidesDependency.cs          |  2 ++
 src/WixToolset.Core.Burn/Bind/WixComponentSearchInfo.cs      |  3 ++-
 src/WixToolset.Core.Burn/Bind/WixFileSearchInfo.cs           |  2 ++
 src/WixToolset.Core.Burn/Bind/WixProductSearchInfo.cs        |  2 ++
 src/WixToolset.Core.Burn/Bind/WixRegistrySearchInfo.cs       |  3 ++-
 src/WixToolset.Core.Burn/Bind/WixSearchInfo.cs               |  2 ++
 src/WixToolset.Core.Burn/BundleBackend.cs                    |  2 +-
 .../Bundles/AutomaticallySlipstreamPatchesCommand.cs         |  2 ++
 .../Bundles/CreateBootstrapperApplicationManifestCommand.cs  |  2 ++
 .../Bundles/CreateBurnManifestCommand.cs                     |  2 ++
 src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs   |  2 ++
 src/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs |  2 ++
 .../Bundles/OrderPackagesAndRollbackBoundariesCommand.cs     |  2 ++
 src/WixToolset.Core.Burn/Bundles/PackageFacade.cs            |  2 ++
 src/WixToolset.Core.Burn/Bundles/ProcessExePackageCommand.cs |  2 ++
 src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs |  2 ++
 src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs |  2 ++
 src/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs |  4 +++-
 src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs   |  2 ++
 .../Bundles/VerifyPayloadsWithCatalogCommand.cs              |  2 ++
 21 files changed, 47 insertions(+), 9 deletions(-)

(limited to 'src/WixToolset.Core.Burn')

diff --git a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
index c9bd85b6..5e04e722 100644
--- a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
+++ b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
@@ -69,7 +69,7 @@ namespace WixToolset.Core.Burn
     {
         public BindBundleCommand(IBindContext context)
         {
-            this.TableDefinitions = WindowsInstallerStandard.GetTableDefinitions();
+            //this.TableDefinitions = WindowsInstallerStandard.GetTableDefinitions();
 
             this.DelayedFields = context.DelayedFields;
             this.ExpectedEmbeddedFiles = context.ExpectedEmbeddedFiles;
@@ -87,13 +87,13 @@ namespace WixToolset.Core.Burn
 
         public IEnumerable<IBinderExtension> Extensions { private get; set; }
 
-        public Output Output { private get; set; }
+        public Intermediate Output { private get; set; }
 
         public string OutputPath { private get; set; }
 
         public string PdbFile { private get; set; }
 
-        public TableDefinitionCollection TableDefinitions { private get; set; }
+        //public TableDefinitionCollection TableDefinitions { private get; set; }
 
         public string IntermediateFolder { private get; set; }
 
@@ -105,6 +105,8 @@ namespace WixToolset.Core.Burn
 
         public void Execute()
         {
+            throw new NotImplementedException();
+#if TODO
             this.FileTransfers = Enumerable.Empty<FileTransfer>();
             this.ContentFilePaths = Enumerable.Empty<string>();
 
@@ -822,7 +824,7 @@ namespace WixToolset.Core.Burn
             resources.Save(bundleTempPath);
         }
 
-        #region DependencyExtension
+//#region DependencyExtension
         /// <summary>
         /// Imports authored dependency providers for each package in the manifest,
         /// and generates dependency providers for certain package types that do not
@@ -936,7 +938,7 @@ namespace WixToolset.Core.Burn
             }
 
             // Defaults to the bundle ID as the provider key.
+#endif
         }
-        #endregion
     }
 }
diff --git a/src/WixToolset.Core.Burn/Bind/ProvidesDependency.cs b/src/WixToolset.Core.Burn/Bind/ProvidesDependency.cs
index e64773b4..c7eba01c 100644
--- a/src/WixToolset.Core.Burn/Bind/ProvidesDependency.cs
+++ b/src/WixToolset.Core.Burn/Bind/ProvidesDependency.cs
@@ -11,6 +11,7 @@ namespace WixToolset.Core.Burn
     /// </summary>
     internal sealed class ProvidesDependency
     {
+#if TODO
         /// <summary>
         /// Creates a new instance of the <see cref="ProviderDependency"/> class from a <see cref="Row"/>.
         /// </summary>
@@ -19,6 +20,7 @@ namespace WixToolset.Core.Burn
             : this((string)row[2], (string)row[3], (string)row[4], (int?)row[5])
         {
         }
+#endif
 
         /// <summary>
         /// Creates a new instance of the <see cref="ProviderDependency"/> class.
diff --git a/src/WixToolset.Core.Burn/Bind/WixComponentSearchInfo.cs b/src/WixToolset.Core.Burn/Bind/WixComponentSearchInfo.cs
index f605d7c7..b9c29df0 100644
--- a/src/WixToolset.Core.Burn/Bind/WixComponentSearchInfo.cs
+++ b/src/WixToolset.Core.Burn/Bind/WixComponentSearchInfo.cs
@@ -11,10 +11,12 @@ namespace WixToolset.Core.Burn
     /// </summary>
     internal class WixComponentSearchInfo : WixSearchInfo
     {
+#if TODO
         public WixComponentSearchInfo(Row row)
             : this((string)row[0], (string)row[1], (string)row[2], (int)row[3])
         {
         }
+#endif
 
         public WixComponentSearchInfo(string id, string guid, string productCode, int attributes)
             : base(id)
@@ -60,5 +62,4 @@ namespace WixToolset.Core.Burn
             writer.WriteEndElement();
         }
     }
-
 }
diff --git a/src/WixToolset.Core.Burn/Bind/WixFileSearchInfo.cs b/src/WixToolset.Core.Burn/Bind/WixFileSearchInfo.cs
index ea955db4..41393f6b 100644
--- a/src/WixToolset.Core.Burn/Bind/WixFileSearchInfo.cs
+++ b/src/WixToolset.Core.Burn/Bind/WixFileSearchInfo.cs
@@ -11,10 +11,12 @@ namespace WixToolset.Core.Burn
     /// </summary>
     internal class WixFileSearchInfo : WixSearchInfo
     {
+#if TODO
         public WixFileSearchInfo(Row row)
             : this((string)row[0], (string)row[1], (int)row[9])
         {
         }
+#endif
 
         public WixFileSearchInfo(string id, string path, int attributes)
             : base(id)
diff --git a/src/WixToolset.Core.Burn/Bind/WixProductSearchInfo.cs b/src/WixToolset.Core.Burn/Bind/WixProductSearchInfo.cs
index b3bf5fee..cd4a70b3 100644
--- a/src/WixToolset.Core.Burn/Bind/WixProductSearchInfo.cs
+++ b/src/WixToolset.Core.Burn/Bind/WixProductSearchInfo.cs
@@ -11,10 +11,12 @@ namespace WixToolset.Core.Burn
     /// </summary>
     internal class WixProductSearchInfo : WixSearchInfo
     {
+#if TODO
         public WixProductSearchInfo(Row row)
             : this((string)row[0], (string)row[1], (int)row[2])
         {
         }
+#endif
 
         public WixProductSearchInfo(string id, string guid, int attributes)
             : base(id)
diff --git a/src/WixToolset.Core.Burn/Bind/WixRegistrySearchInfo.cs b/src/WixToolset.Core.Burn/Bind/WixRegistrySearchInfo.cs
index e25f25f4..e5227be5 100644
--- a/src/WixToolset.Core.Burn/Bind/WixRegistrySearchInfo.cs
+++ b/src/WixToolset.Core.Burn/Bind/WixRegistrySearchInfo.cs
@@ -11,10 +11,12 @@ namespace WixToolset.Core.Burn
     /// </summary>
     internal class WixRegistrySearchInfo : WixSearchInfo
     {
+#if TODO
         public WixRegistrySearchInfo(Row row)
             : this((string)row[0], (int)row[1], (string)row[2], (string)row[3], (int)row[4])
         {
         }
+#endif
 
         public WixRegistrySearchInfo(string id, int root, string key, string value, int attributes)
             : base(id)
@@ -88,5 +90,4 @@ namespace WixToolset.Core.Burn
             writer.WriteEndElement();
         }
     }
-
 }
diff --git a/src/WixToolset.Core.Burn/Bind/WixSearchInfo.cs b/src/WixToolset.Core.Burn/Bind/WixSearchInfo.cs
index 9ebca4ae..04347583 100644
--- a/src/WixToolset.Core.Burn/Bind/WixSearchInfo.cs
+++ b/src/WixToolset.Core.Burn/Bind/WixSearchInfo.cs
@@ -17,12 +17,14 @@ namespace WixToolset.Core.Burn
             this.Id = id;
         }
 
+#if TODO
         public void AddWixSearchRowInfo(Row row)
         {
             Debug.Assert((string)row[0] == Id);
             Variable = (string)row[1];
             Condition = (string)row[2];
         }
+#endif
 
         public string Id { get; private set; }
         public string Variable { get; private set; }
diff --git a/src/WixToolset.Core.Burn/BundleBackend.cs b/src/WixToolset.Core.Burn/BundleBackend.cs
index 0c7f2e8b..f66a3fbe 100644
--- a/src/WixToolset.Core.Burn/BundleBackend.cs
+++ b/src/WixToolset.Core.Burn/BundleBackend.cs
@@ -42,7 +42,7 @@ namespace WixToolset.Core.Burn
             }
         }
 
-        public Output Unbind(IUnbindContext context)
+        public Intermediate Unbind(IUnbindContext context)
         {
             string uxExtractPath = Path.Combine(context.ExportBasePath, "UX");
             string acExtractPath = Path.Combine(context.ExportBasePath, "AttachedContainer");
diff --git a/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs b/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs
index bac8633b..d06cf4a8 100644
--- a/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs
@@ -11,6 +11,7 @@ namespace WixToolset.Core.Burn.Bundles
 
     internal class AutomaticallySlipstreamPatchesCommand
     {
+#if TODO
         public IEnumerable<PackageFacade> PackageFacades { private get; set; }
 
         public Table WixBundlePatchTargetCodeTable { private get; set; }
@@ -108,5 +109,6 @@ namespace WixToolset.Core.Burn.Bundles
                 }
             }
         }
+#endif
     }
 }
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
index 58814efc..b1f1f0cd 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
@@ -14,6 +14,7 @@ namespace WixToolset.Core.Burn.Bundles
 
     internal class CreateBootstrapperApplicationManifestCommand
     {
+#if TODO
         public WixBundleRow BundleRow { private get; set; }
 
         public IEnumerable<PackageFacade> ChainPackages { private get; set; }
@@ -237,5 +238,6 @@ namespace WixToolset.Core.Burn.Bundles
 
             return row;
         }
+#endif
     }
 }
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
index 772265a0..788c7296 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
@@ -15,6 +15,7 @@ namespace WixToolset.Core.Burn.Bundles
 
     internal class CreateBurnManifestCommand
     {
+#if TODO
         public IEnumerable<IBurnBackendExtension> BackendExtensions { private get; set; }
 
         public Output Output { private get; set; }
@@ -682,5 +683,6 @@ namespace WixToolset.Core.Burn.Bundles
 
             return resolved;
         }
+#endif
     }
 }
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs
index 75379713..cde6d8f3 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs
@@ -16,6 +16,7 @@ namespace WixToolset.Core.Burn.Bundles
     /// </summary>
     internal class CreateContainerCommand
     {
+#if TODO
         public CompressionLevel DefaultCompressionLevel { private get; set; }
 
         public IEnumerable<WixBundlePayloadRow> Payloads { private get; set; }
@@ -64,5 +65,6 @@ namespace WixToolset.Core.Burn.Bundles
 
             this.Size = fileInfo.Length;
         }
+#endif
     }
 }
diff --git a/src/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs b/src/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs
index 7485758c..056f6eb7 100644
--- a/src/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs
@@ -8,6 +8,7 @@ namespace WixToolset.Core.Burn.Bundles
 
     internal class GetPackageFacadesCommand
     {
+#if TODO
         public Table PackageTable { private get; set; }
 
         public Table ExePackageTable { private get; set; }
@@ -58,5 +59,6 @@ namespace WixToolset.Core.Burn.Bundles
 
             this.PackageFacades = facades;
         }
+#endif
     }
 }
diff --git a/src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs b/src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs
index cb6e2748..4266ca40 100644
--- a/src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs
@@ -9,6 +9,7 @@ namespace WixToolset.Core.Burn.Bundles
 
     internal class OrderPackagesAndRollbackBoundariesCommand
     {
+#if TODO
         public Table WixGroupTable { private get; set; }
 
         public RowDictionary<WixBundleRollbackBoundaryRow> Boundaries { private get; set; }
@@ -141,5 +142,6 @@ namespace WixToolset.Core.Burn.Bundles
             this.OrderedPackageFacades = orderedFacades;
             this.UsedRollbackBoundaries = usedBoundaries;
         }
+#endif
     }
 }
diff --git a/src/WixToolset.Core.Burn/Bundles/PackageFacade.cs b/src/WixToolset.Core.Burn/Bundles/PackageFacade.cs
index 3f2e184d..ff5c2e2e 100644
--- a/src/WixToolset.Core.Burn/Bundles/PackageFacade.cs
+++ b/src/WixToolset.Core.Burn/Bundles/PackageFacade.cs
@@ -6,6 +6,7 @@ namespace WixToolset.Core.Burn.Bundles
 
     internal class PackageFacade
     {
+#if TODO
         private PackageFacade(WixBundlePackageRow package)
         {
             this.Package = package;
@@ -54,5 +55,6 @@ namespace WixToolset.Core.Burn.Bundles
         /// the relationship with the extension makes it much trickier to pull off.
         /// </remarks>
         public ProvidesDependencyCollection Provides { get; private set; }
+#endif
     }
 }
diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessExePackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessExePackageCommand.cs
index 11512c39..75bb5bb1 100644
--- a/src/WixToolset.Core.Burn/Bundles/ProcessExePackageCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/ProcessExePackageCommand.cs
@@ -11,6 +11,7 @@ namespace WixToolset.Core.Burn.Bundles
     /// </summary>
     internal class ProcessExePackageCommand
     {
+#if TODO
         public RowDictionary<WixBundlePayloadRow> AuthoredPayloads { private get; set; }
 
         public PackageFacade Facade { private get; set; }
@@ -29,5 +30,6 @@ namespace WixToolset.Core.Burn.Bundles
 
             this.Facade.Package.Version = packagePayload.Version;
         }
+#endif
     }
 }
diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
index 322187f9..2ee58514 100644
--- a/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
@@ -22,6 +22,7 @@ namespace WixToolset.Core.Burn.Bundles
     /// </summary>
     internal class ProcessMsiPackageCommand
     {
+#if TODO
         private const string PropertySqlFormat = "SELECT `Value` FROM `Property` WHERE `Property` = '{0}'";
 
         public RowDictionary<WixBundlePayloadRow> AuthoredPayloads { private get; set; }
@@ -572,5 +573,6 @@ namespace WixToolset.Core.Burn.Bundles
 
             return String.Format(CultureInfo.InvariantCulture, ProcessMsiPackageCommand.PropertySqlFormat, property);
         }
+#endif
     }
 }
diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs
index 2d849d03..37e08634 100644
--- a/src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs
@@ -18,6 +18,7 @@ namespace WixToolset.Core.Burn.Bundles
     /// </summary>
     internal class ProcessMspPackageCommand
     {
+#if TODO
         private const string PatchMetadataFormat = "SELECT `Value` FROM `MsiPatchMetadata` WHERE `Property` = '{0}'";
         private static readonly Encoding XmlOutputEncoding = new UTF8Encoding(false);
 
@@ -185,5 +186,6 @@ namespace WixToolset.Core.Burn.Bundles
 
             return false;
         }
+#endif
     }
 }
diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs
index fcfc780c..1380385d 100644
--- a/src/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs
@@ -11,7 +11,8 @@ namespace WixToolset.Core.Burn.Bundles
     /// </summary>
     internal class ProcessMsuPackageCommand
     {
-        public RowDictionary<WixBundlePayloadRow> AuthoredPayloads { private get; set; }
+#if TODO
+        public RowDictionary<WixBundlePayload> AuthoredPayloads { private get; set; }
 
         public PackageFacade Facade { private get; set; }
 
@@ -26,5 +27,6 @@ namespace WixToolset.Core.Burn.Bundles
 
             this.Facade.Package.PerMachine = YesNoDefaultType.Yes; // MSUs are always per-machine.
         }
+#endif
     }
 }
diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs
index 5dbd6aaa..7900fcd1 100644
--- a/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs
@@ -16,6 +16,7 @@ namespace WixToolset.Core.Burn.Bundles
 
     internal class ProcessPayloadsCommand
     {
+#if TODO
         private static readonly Version EmptyVersion = new Version(0, 0, 0, 0);
 
         public IEnumerable<WixBundlePayloadRow> Payloads { private get; set; }
@@ -157,5 +158,6 @@ namespace WixToolset.Core.Burn.Bundles
                 payload.DisplayName = versionInfo.ProductName;
             }
         }
+#endif
     }
 }
diff --git a/src/WixToolset.Core.Burn/Bundles/VerifyPayloadsWithCatalogCommand.cs b/src/WixToolset.Core.Burn/Bundles/VerifyPayloadsWithCatalogCommand.cs
index 9919f777..f22a8f2b 100644
--- a/src/WixToolset.Core.Burn/Bundles/VerifyPayloadsWithCatalogCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/VerifyPayloadsWithCatalogCommand.cs
@@ -13,6 +13,7 @@ namespace WixToolset.Core.Burn.Bundles
 
     internal class VerifyPayloadsWithCatalogCommand
     {
+#if TODO
         public IEnumerable<WixBundleCatalogRow> Catalogs { private get; set; }
 
         public IEnumerable<WixBundlePayloadRow> Payloads { private get; set; }
@@ -144,5 +145,6 @@ namespace WixToolset.Core.Burn.Bundles
 
             public string FullPath { get; set; }
         }
+#endif
     }
 }
-- 
cgit v1.2.3-55-g6feb