ZipArchive now disposes given stream only once (#87982)

* Fix #79695

Even though the IDisposable contract says that you should be able to call
Dispose multiple times, be forgiving for implementations that throw when
Dispose is called multiple times.

* Remove line

* Augmented test to explicitly test behavior according to leaveOpen parameter

---------

Co-authored-by: etemi <etemi>

src/libraries/System.IO.Compression/src/System/IO/Compression/ZipArchive.cs

@@ -164,7 +164,7 @@ public ZipArchive(Stream stream, ZipArchiveMode mode, bool leaveOpen, Encoding?
                 if (mode == ZipArchiveMode.Create)
                     _archiveReader = null;
                 else
-                    _archiveReader = new BinaryReader(_archiveStream);
+                    _archiveReader = new BinaryReader(_archiveStream, Encoding.UTF8, leaveOpen: true);
                 _entries = new List<ZipArchiveEntry>();
                 _entriesCollection = new ReadOnlyCollection<ZipArchiveEntry>(_entries);
                 _entriesDictionary = new Dictionary<string, ZipArchiveEntry>();

src/libraries/System.IO.Compression/tests/ZipArchive/zip_ReadTests.cs

@@ -249,5 +249,39 @@ public static async Task IdentifyEncryptedEntries(string zipFile)
 
             Assert.Equal(expectedEntries, entriesEncrypted);
         }
+
+        [Theory]
+        [InlineData(true, 0)]
+        [InlineData(false, 1)]
+        public static async Task EnsureDisposeIsCalledAsExpectedOnTheUnderlyingStream(bool leaveOpen, int expectedDisposeCalls)
+        {
+            var disposeCallCountingStream = new DisposeCallCountingStream();
+            using (var tempStream = await StreamHelpers.CreateTempCopyStream(zfile("small.zip")))
+            {
+                tempStream.CopyTo(disposeCallCountingStream);
+            }
+
+            using (ZipArchive archive = new ZipArchive(disposeCallCountingStream, ZipArchiveMode.Read, leaveOpen))
+            {
+                // Iterate through entries to ensure read of zip file
+                foreach (ZipArchiveEntry entry in archive.Entries)
+                {
+                    Assert.False(entry.IsEncrypted);
+                }
+            }
+
+            Assert.Equal(expectedDisposeCalls, disposeCallCountingStream.NumberOfDisposeCalls);
+        }
+
+        private class DisposeCallCountingStream : MemoryStream
+        {
+            public int NumberOfDisposeCalls { get; private set; }
+
+            protected override void Dispose(bool disposing)
+            {
+                NumberOfDisposeCalls++;
+                base.Dispose(disposing);
+            }
+        }
     }
 }