Imported Upstream version 5.16.0.144

Former-commit-id: 2b9e8926e7df56dfea2d6991a64c8f5129cfffcb
2018-09-05 08:26:42 +00:00
parent 6dab091a3e
commit 47a1b3e592
53 changed files with 201 additions and 108 deletions
--- a/mcs/class/corlib/ReferenceSources/String.cs
+++ b/mcs/class/corlib/ReferenceSources/String.cs
@@ -86,6 +86,13 @@ namespace System
 			return -1;
 		}

+		[CLSCompliant(false)] 
+		public static String Concat(Object arg0, Object arg1, Object arg2, Object arg3, __arglist) 
+		{
+			// Added to maintain backward compatibility, see https://github.com/mono/mono/issues/9996
+			throw new PlatformNotSupportedException();
+		}
+
 		internal unsafe int IndexOfUncheckedIgnoreCase (string value, int startIndex, int count)
 		{
 			int valueLen = value.Length;