Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850

mcs/class/System.IO.Compression/Test/System.IO.Compression/ZipTest.cs

@@ -182,6 +182,24 @@ namespace MonoTests.System.IO.Compression
 			File.Delete ("delete.zip");
 		}
 
+		[Test]
+		public void ZipDeleteEntryCheckEntries()
+		{
+			File.Copy("archive.zip", "delete.zip", overwrite: true);
+			using (var archive = new ZipArchive(File.Open("delete.zip", FileMode.Open),
+				ZipArchiveMode.Update))
+			{
+				var entry = archive.GetEntry("foo.txt");
+				Assert.IsNotNull(entry);
+
+				entry.Delete();
+
+				Assert.IsNull(archive.Entries.FirstOrDefault(e => e == entry));
+			}
+
+			File.Delete ("delete.zip");
+		}		
+
 		[Test]
 		public void ZipGetEntryDeleteUpdateMode()
 		{

mcs/class/System.IO.Compression/ZipArchive.cs

@@ -237,6 +237,12 @@ namespace System.IO.Compression
 			}
 		}
 
+		internal void RemoveEntryInternal(ZipArchiveEntry entry)
+		{
+			zipFile.RemoveEntry(entry.entry);
+			entries.Remove(entry);
+		}
+
 		protected virtual void Dispose (bool disposing)
 		{
 			if (disposed)

mcs/class/System.IO.Compression/ZipArchiveEntry.cs

@@ -210,7 +210,7 @@ namespace System.IO.Compression
 				throw new IOException("The entry is already open for reading or writing.");
 
 			wasDeleted = true;
-			Archive.zipFile.RemoveEntry(entry);
+			Archive.RemoveEntryInternal(this);
 		}
 
 		public Stream Open()