Merge branch 'upstream'

Former-commit-id: 873cedc0e2d3e32cf18a649f8bb9cb33bd34a64b
2018-10-31 08:35:55 +00:00 · 2018-10-31 08:35:55 +00:00 · d78639d108
commit d78639d108
parent a974508451 4b10506457
50 changed files with 78 additions and 54 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-e144fb4c81ea5f2b02763957153a7fc133a65990
+1e69e575f03df42c51281a8ac2b32d2d1dfa3628
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-83f0eeb2e9f6b3d265f7039614c5dabcc6b980a6
+48c4dc291d8b06e8db3a816fdee6367c97808e9c
--- 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.18.0.184";
+	public const string MonoVersion = "5.18.0.188";
 	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/corlib/Test/System/DelegateTest.cs
+++ b/mcs/class/corlib/Test/System/DelegateTest.cs
@ -1144,8 +1144,6 @@ namespace MonoTests.System
 		}

 		[Test]
-		// Interp uses slowpath delegate invoke virtual wrapper which throws NRE also with JIT
-		[Category ("NotWorkingRuntimeInterpreter")]
 		public void DynamicInvokeOpenInstanceDelegate ()
 		{
 			var d1 = Delegate.CreateDelegate (typeof (Func<DelegateTest, int>), typeof(DelegateTest).GetMethod ("DynamicInvokeOpenInstanceDelegate_CB"));
--- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-e577eff8eb250e5bda629e587891c8a792f0de26
+f08cf95a27f8788a5fac479832eeac05d6b3b2bf
--- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-738759bac5cbe201cc2c9642b48ebff370d7182c
+136b55561804ea30b9802bf3349f3b9d3a128382
--- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id
@ -1 +1 @@
-a80dbc9b7ce9382cd5b8f714b603e435e6961859
+95965caca30677cd03edec4bbd343a32e4b91cc8
--- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-4552c28f91d1717b190a55703959d91e6265744c
+3acdd351a8730b79c29d4a32377fda818b29c175
--- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-75946430bea7677614e2bcce94dd787d4714510a
+622c1389d250d66e471ea86dda4a46c7bbbd18cd
--- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-88e3ea3c498ebbe3a8bba85fc00fe41cdd98460f
+d60335ee10213941805c538e86bffdb4ed5b19cf
--- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-0e4f60955565b9c00f2051fe2c4a1c516f578c10
+18afc6ce3e480143e8756997d2b4f25d07c8268a
--- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-e577eff8eb250e5bda629e587891c8a792f0de26
+f08cf95a27f8788a5fac479832eeac05d6b3b2bf
--- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-738759bac5cbe201cc2c9642b48ebff370d7182c
+136b55561804ea30b9802bf3349f3b9d3a128382
--- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id
@ -1 +1 @@
-a80dbc9b7ce9382cd5b8f714b603e435e6961859
+95965caca30677cd03edec4bbd343a32e4b91cc8
--- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-4552c28f91d1717b190a55703959d91e6265744c
+3acdd351a8730b79c29d4a32377fda818b29c175
--- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-75946430bea7677614e2bcce94dd787d4714510a
+622c1389d250d66e471ea86dda4a46c7bbbd18cd
--- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-88e3ea3c498ebbe3a8bba85fc00fe41cdd98460f
+d60335ee10213941805c538e86bffdb4ed5b19cf
--- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-0e4f60955565b9c00f2051fe2c4a1c516f578c10
+18afc6ce3e480143e8756997d2b4f25d07c8268a
--- a/Show More
+++ b/Show More