Support loading WindowsInstallerData and Intermediate from WixOutput.

2 files changed, 43 insertions, 5 deletions

diff --git a/src/WixToolset.Data/Intermediate.cs b/src/WixToolset.Data/Intermediate.cs
index 1db21d85..7fc7d6c3 100644
--- a/src/WixToolset.Data/Intermediate.cs
+++ b/src/WixToolset.Data/Intermediate.cs
@@ -108,6 +108,31 @@ namespace WixToolset.Data
         }
 
         /// <summary>
+        /// Loads an intermediate from a WixOutput object.
+        /// </summary>
+        /// <param name="wixOutput">WixOutput object.</param>
+        /// <param name="creator">ITupleDefinitionCreator to use when reconstituting the intermediate.</param>
+        /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param>
+        /// <returns>Returns the loaded intermediate.</returns>
+        public static Intermediate Load(WixOutput wixOutput, bool suppressVersionCheck = false)
+        {
+            var creator = new SimpleTupleDefinitionCreator();
+            return Intermediate.LoadIntermediate(wixOutput, creator, suppressVersionCheck);
+        }
+
+        /// <summary>
+        /// Loads an intermediate from a WixOutput object.
+        /// </summary>
+        /// <param name="wixOutput">WixOutput object.</param>
+        /// <param name="creator">ITupleDefinitionCreator to use when reconstituting the intermediate.</param>
+        /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param>
+        /// <returns>Returns the loaded intermediate.</returns>
+        public static Intermediate Load(WixOutput wixOutput, ITupleDefinitionCreator creator, bool suppressVersionCheck = false)
+        {
+            return Intermediate.LoadIntermediate(wixOutput, creator, suppressVersionCheck);
+        }
+
+        /// <summary>
         /// Loads several intermediates from paths on disk using the same definitions.
         /// </summary>
         /// <param name="intermediateFiles">Paths to intermediate files saved on disk.</param>
diff --git a/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs
index ac593152..43c19d69 100644
--- a/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs
+++ b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs
@@ -102,11 +102,24 @@ namespace WixToolset.Data.WindowsInstaller
         /// <param name="path">Path to output file saved on disk.</param>
         /// <param name="suppressVersionCheck">Suppresses wix.dll version mismatch check.</param>
         /// <returns>Output object.</returns>
-        public static WindowsInstallerData Load(string path, bool suppressVersionCheck)
+        public static WindowsInstallerData Load(string path, bool suppressVersionCheck = false)
         {
-            using (var wixout = WixOutput.Read(path))
-            using (var stream = wixout.GetDataStream(WixOutputStreamName))
-            using (var reader = XmlReader.Create(stream, null, wixout.Uri.AbsoluteUri))
+            using (var wixOutput = WixOutput.Read(path))
+            {
+                return WindowsInstallerData.Load(wixOutput, suppressVersionCheck);
+            }
+        }
+
+        /// <summary>
+        /// Loads an output from a WixOutput object.
+        /// </summary>
+        /// <param name="wixOutput">WixOutput object.</param>
+        /// <param name="suppressVersionCheck">Suppresses wix.dll version mismatch check.</param>
+        /// <returns>Output object.</returns>
+        public static WindowsInstallerData Load(WixOutput wixOutput, bool suppressVersionCheck = false)
+        {
+            using (var stream = wixOutput.GetDataStream(WixOutputStreamName))
+            using (var reader = XmlReader.Create(stream, null, wixOutput.Uri.AbsoluteUri))
             {
                 try
                 {
@@ -115,7 +128,7 @@ namespace WixToolset.Data.WindowsInstaller
                 }
                 catch (XmlException xe)
                 {
-                    throw new WixCorruptFileException(path, "wixout", xe);
+                    throw new WixCorruptFileException(wixOutput.Uri.AbsoluteUri, "wixout", xe);
                 }
             }
         }