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

---
 .../Bind/BindDatabaseCommand.cs                               | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs')

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index 21fbb022..5a61b63c 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -39,7 +39,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             this.DelayedFields = context.DelayedFields;
             this.ExpectedEmbeddedFiles = context.ExpectedEmbeddedFiles;
             this.Extensions = context.Extensions;
-            this.Output = context.IntermediateRepresentation;
+            this.Intermediate = context.IntermediateRepresentation;
             this.OutputPath = context.OutputPath;
             this.PdbFile = context.OutputPdbPath;
             this.IntermediateFolder = context.IntermediateFolder;
@@ -69,10 +69,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         private IEnumerable<IBinderExtension> Extensions { get; }
 
-        private IEnumerable<InspectorExtension> InspectorExtensions { get; }
-
         private string PdbFile { get; }
 
+        private Intermediate Intermediate { get; }
+
         private Output Output { get; }
 
         private string OutputPath { get; }
@@ -95,6 +95,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         public void Execute()
         {
+            this.Intermediate.Save(this.OutputPath);
+#if FINISH
             List<FileTransfer> fileTransfers = new List<FileTransfer>();
 
             HashSet<string> suppressedTableNames = new HashSet<string>();
@@ -108,6 +110,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             this.LocalizeUI(this.Output.Tables);
 
+            this.Output = CreateOutputFromIR(this.Intermediate);
+
             // Process the summary information table before the other tables.
             bool compressed;
             bool longNames;
@@ -1278,6 +1282,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             command.TempFilesLocation = this.IntermediateFolder;
             command.Codepage = this.Codepage;
             command.Execute();
+#endif
         }
     }
 }
-- 
cgit v1.2.3-55-g6feb