Merge branch 'upstream'

Former-commit-id: 437e8b96b2812ca82a400497864922cd3f0f7e00
2019-06-20 09:15:04 +00:00 · 2019-06-20 09:15:04 +00:00 · 8d2988d7f8
commit 8d2988d7f8
parent a9ca88d38e 4ef9806e20
50 changed files with 49 additions and 48 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-31a9498daf6bb155f2123b3ecd7faa579ade4c98
+c48be7e29de6b82f66ccf3bb75aca7896ab3d884
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-e17288b2e852e32474aebf862e6347b06e6cd2a2
+4dec026a8bfffef65a1ed8299e0eb45feb636dfc
--- a/mcs/build/common/Consts.cs
+++ b/mcs/build/common/Consts.cs
@ -41,7 +41,7 @@ static partial class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//

-	public const string MonoVersion = "6.0.0.302";
+	public const string MonoVersion = "6.0.0.306";
 	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/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-707e0df8d36d7e873f6a93d82ff286a0e675825a
+404f25458c2c32cfe1450e0a7306093972cefbd2
--- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-e0cfa451b476ede754a8d5bb0ecaf177b2506b98
+e75ae226aa0e0864a53c5ee44242b8bf9256607e
--- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
@ -1 +1 @@
-a8e0dec34755f207498bca98116670d810e34bd7
+34073db9a5ef7ccdcc7b6152716b068b2e426bb3
--- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-00060537c5a7b8b3b1b854dc6199b695e1084f0a
+e717f7a8bc6f721bb081fa1abe563dee384724a8
--- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-ef46214686b5696543af92d0c70196ba0b943a6d
+23711c4a9b9ec04b46a2db7839293bcae131b6fa
--- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-1b047b44ee58aa8a884a47305868b76578a88ff3
+b0a022225d70931c15e24955a4ea32e98c1e3e82
--- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-a1d786bde0d6c4c74526dc14a87da6a44f9279ad
+4ccdacb28b157affe97addec35459eb8d29694dc
--- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-707e0df8d36d7e873f6a93d82ff286a0e675825a
+404f25458c2c32cfe1450e0a7306093972cefbd2
--- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-e0cfa451b476ede754a8d5bb0ecaf177b2506b98
+e75ae226aa0e0864a53c5ee44242b8bf9256607e
--- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
@ -1 +1 @@
-a8e0dec34755f207498bca98116670d810e34bd7
+34073db9a5ef7ccdcc7b6152716b068b2e426bb3
--- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-00060537c5a7b8b3b1b854dc6199b695e1084f0a
+e717f7a8bc6f721bb081fa1abe563dee384724a8
--- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-ef46214686b5696543af92d0c70196ba0b943a6d
+23711c4a9b9ec04b46a2db7839293bcae131b6fa
--- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-1b047b44ee58aa8a884a47305868b76578a88ff3
+b0a022225d70931c15e24955a4ea32e98c1e3e82
--- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-a1d786bde0d6c4c74526dc14a87da6a44f9279ad
+4ccdacb28b157affe97addec35459eb8d29694dc
--- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-707e0df8d36d7e873f6a93d82ff286a0e675825a
+404f25458c2c32cfe1450e0a7306093972cefbd2
--- a/Show More
+++ b/Show More