Merge branch 'upstream'

Former-commit-id: f9b9e0bd3be3a48dee945db4ec071c87d8aafbcb
2018-09-08 08:37:42 +00:00 · 2018-09-08 08:37:42 +00:00 · 5a5c0186e2
commit 5a5c0186e2
parent bc54ed6121 0ccc9f0ce1
41 changed files with 40 additions and 35 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-0ce11501124227087f971ccc176d0f620c2b3afc
+51364561320852469bd836103f71db882397229a
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-e5a5ec7e6126a46c206b043b53c87299e9751280
+35ad5674b39fdc30feaef8742befc5a9769b06f8
--- a/mcs/build/common/Consts.cs
+++ b/mcs/build/common/Consts.cs
@ -34,7 +34,7 @@ static class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//

-	public const string MonoVersion = "5.16.0.149";
+	public const string MonoVersion = "5.16.0.152";
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";
--- a/mcs/class/System/System.IO.Compression/DeflateStream.cs
+++ b/mcs/class/System/System.IO.Compression/DeflateStream.cs
@ -380,7 +380,12 @@ namespace System.IO.Compression
 				GC.SuppressFinalize (this);
 			
 				io_buffer = null;
-			
+			} else {
+				// When we are in the finalizer we don't want to access the underlying stream anymore
+				base_stream = Stream.Null;
+			}
+
+			if (z_stream != null) {
 				z_stream.Dispose();
 			}

--- a/mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-977f587aa6001f1c2f62d7fa0e222b013c9a14be
+f214e3a3a558c2cde963ef2ec939f271d60f3ade
--- a/mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-7b9c5fd1c0b674f8fa1a62d4a0af485f5b7a8686
+e9ca90c4a6cdb23f8f9351a8cc705833b1347a84
--- a/mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-3c18ef9382bd55d045696e1ce0352e62182bbad1
+05a78b86faa962bd6fd539cb6e1c036423015b67
--- a/mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-1deb3b48f9f17958091e66443b9ee8edf4128532
+0807f883fb30d5ab9bfd9bdc546942a00446dbc0
--- a/mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-42f5c77c39919687b66b96f6acde71daeca87492
+425e639f233a9bfc939a22f8aa68e74ee2b4de0c
--- a/mcs/class/lib/monolite-darwin/1051600011/System.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.dll.REMOVED.git-id
@ -1 +1 @@
-ac09e6dbb5c2c2789307be8796fbb1b44fcde632
+c0d161daa8406d2773662d0311f40ac188da847f
--- a/mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-0bef82188692ed7b1d07b578b9e16d7dd4427d74
+8ecce7fc3aed63d947cf9813488879f45fd9413f
--- a/mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-507dc2d482157fa3e043ee642930c367154e2a20
+99a5a75b372ced7a2fabf5e5fda03667f2826ab7
--- a/mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-977f587aa6001f1c2f62d7fa0e222b013c9a14be
+f214e3a3a558c2cde963ef2ec939f271d60f3ade
--- a/mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-7b9c5fd1c0b674f8fa1a62d4a0af485f5b7a8686
+e9ca90c4a6cdb23f8f9351a8cc705833b1347a84
--- a/mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-3c18ef9382bd55d045696e1ce0352e62182bbad1
+05a78b86faa962bd6fd539cb6e1c036423015b67
--- a/mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-1deb3b48f9f17958091e66443b9ee8edf4128532
+0807f883fb30d5ab9bfd9bdc546942a00446dbc0
--- a/mcs/class/lib/monolite-linux/1051600011/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-42f5c77c39919687b66b96f6acde71daeca87492
+425e639f233a9bfc939a22f8aa68e74ee2b4de0c
--- a/mcs/class/lib/monolite-linux/1051600011/System.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/System.dll.REMOVED.git-id
@ -1 +1 @@
-ac09e6dbb5c2c2789307be8796fbb1b44fcde632
+c0d161daa8406d2773662d0311f40ac188da847f
--- a/Show More
+++ b/Show More