From 6014309c4cb85bf2ee2efb034eafa956ca06a42a Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Thu, 13 Feb 2020 21:32:33 -0500
Subject: Support reopening WixOutputs, to be able to read immediately after
 writing.

---
 src/WixToolset.Data/WixOutput.cs | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/WixToolset.Data/WixOutput.cs b/src/WixToolset.Data/WixOutput.cs
index f27f7c77..43a43a6a 100644
--- a/src/WixToolset.Data/WixOutput.cs
+++ b/src/WixToolset.Data/WixOutput.cs
@@ -13,13 +13,15 @@ namespace WixToolset.Data
     /// </summary>
     public class WixOutput : IDisposable
     {
-        private readonly ZipArchive archive;
+        private ZipArchive archive;
+        private Stream stream;
         private bool disposed;
 
-        private WixOutput(Uri uri, ZipArchive archive)
+        private WixOutput(Uri uri, ZipArchive archive, Stream stream)
         {
             this.Uri = uri;
             this.archive = archive;
+            this.stream = stream;
         }
 
         public Uri Uri { get; }
@@ -59,9 +61,9 @@ namespace WixToolset.Data
         /// <returns>Newly created <c>WixOutput</c>.</returns>
         public static WixOutput Create(Uri uri, Stream stream)
         {
-            var archive = new ZipArchive(stream, ZipArchiveMode.Update);
+            var archive = new ZipArchive(stream, ZipArchiveMode.Update, leaveOpen: true);
 
-            return new WixOutput(uri, archive);
+            return new WixOutput(uri, archive, stream);
         }
 
         /// <summary>
@@ -124,13 +126,13 @@ namespace WixToolset.Data
         /// </summary>
         /// <param name="stream">Stream to read from.</param>
         /// <returns>Loaded created <c>WixOutput</c>.</returns>
-        public static WixOutput Read(Uri uri, Stream stream, bool leaveOpen = false)
+        public static WixOutput Read(Uri uri, Stream stream)
         {
             try
             {
-                var archive = new ZipArchive(stream, ZipArchiveMode.Read, leaveOpen);
+                var archive = new ZipArchive(stream, ZipArchiveMode.Read, leaveOpen: true);
 
-                return new WixOutput(uri, archive);
+                return new WixOutput(uri, archive, stream);
             }
             catch (InvalidDataException)
             {
@@ -138,6 +140,12 @@ namespace WixToolset.Data
             }
         }
 
+        public void Reopen(ZipArchiveMode mode)
+        {
+            this.archive?.Dispose();
+            this.archive = new ZipArchive(this.stream, mode, leaveOpen: true);
+        }
+
         /// <summary>
         /// Extracts an embedded file.
         /// </summary>
@@ -224,6 +232,7 @@ namespace WixToolset.Data
                 if (disposing)
                 {
                     this.archive?.Dispose();
+                    this.stream?.Dispose();
                 }
             }
 
-- 
cgit v1.2.3-55-g6feb