Bump corefx

11 files changed, 26 insertions, 15 deletions

diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.dll.sources b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.dll.sources
index 897f691ae66..c29e417d6c1 100644
--- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.dll.sources
+++ b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.dll.sources
@@ -34,7 +34,6 @@ corefx/SR.cs
 ../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ExpressionTreeCallRewriter.cs
 ../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ICSharpBinder.cs
 ../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ICSharpInvokeOrInvokeMemberBinder.cs
-../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ResetBindException.cs
 ../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinder.cs
 ../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinderException.cs
 ../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinderExtensions.cs
diff --git a/mcs/class/System.Data/corefx.common.sources b/mcs/class/System.Data/corefx.common.sources
index f5124d9641e..b249f0d81a5 100644
--- a/mcs/class/System.Data/corefx.common.sources
+++ b/mcs/class/System.Data/corefx.common.sources
@@ -13,7 +13,6 @@ System.Data.SqlClient/SqlCredential.cs
 System.Data.SqlClient/SQLDebugging.cs
 corefx/Odbc/AdapterUtil.cs
 corefx/Odbc/Res.cs
-corefx/DbConnection.cs
 corefx/DbConnectionOptions.cs
 corefx/DiagnosticListener.cs
 corefx/SqlClientFactory.cs
@@ -395,14 +394,14 @@ corefx/SqlDependencyUtils.cs
 ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlDataReader.cs
 ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlEnums.cs
 ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlError.cs
-../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/sqlmetadatafactory.cs
+../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlMetadataFactory_.cs
 ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlErrorCollection.cs
 ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlException.cs
 ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlInfoMessageEvent.cs
 ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlInfoMessageEventHandler.cs
 ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlInternalConnection.cs
 ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlInternalConnectionTds.cs
-../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/sqlinternaltransaction.cs
+../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlInternalTransaction.cs
 ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlParameter.cs
 ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlParameterCollection.cs
 ../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlParameterCollectionHelper.cs
diff --git a/mcs/class/System.Data/corefx/DbConnection.cs b/mcs/class/System.Data/corefx/DbConnection.cs
deleted file mode 100644
index 4b5f1439c5d..00000000000
--- a/mcs/class/System.Data/corefx/DbConnection.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace System.Data.Common
-{
-	partial class DbConnection
-	{
-		internal DbProviderFactory ProviderFactory => DbProviderFactory;
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.IO.Compression/AssemblyInfo.cs b/mcs/class/System.IO.Compression/AssemblyInfo.cs
index d89e9e473bd..4c1ba113675 100644
--- a/mcs/class/System.IO.Compression/AssemblyInfo.cs
+++ b/mcs/class/System.IO.Compression/AssemblyInfo.cs
@@ -36,3 +36,4 @@ using System.Reflection;
 [assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 [assembly: AssemblyDelaySign (true)]
+[assembly: CLSCompliant (true)]
diff --git a/mcs/class/System.Numerics/corefx/SR.cs b/mcs/class/System.Numerics/corefx/SR.cs
index 156d298a3dc..07a5cb163d0 100644
--- a/mcs/class/System.Numerics/corefx/SR.cs
+++ b/mcs/class/System.Numerics/corefx/SR.cs
@@ -23,4 +23,5 @@ partial class SR
 	public const string Arg_NullArgumentNullRef = "The method was called with a null array argument.";
 	public const string Arg_TypeNotSupported = "Specified type is not supported";
 	public const string ArgumentException_BufferNotFromPool = "The buffer is not associated with this pool and may not be returned to it.";
+	public const string Overflow_Negative_Unsigned = "Negative values do not have an unsigned representation.";
 }
diff --git a/mcs/class/corlib/ReferenceSources/String.cs b/mcs/class/corlib/ReferenceSources/String.cs
index de8634abd01..bb6cad74292 100644
--- a/mcs/class/corlib/ReferenceSources/String.cs
+++ b/mcs/class/corlib/ReferenceSources/String.cs
@@ -50,6 +50,16 @@ namespace System
 			}
 		}
 
+		public unsafe static implicit operator ReadOnlySpan<char> (String value)
+		{
+			if (value == null)
+				return default;
+
+			fixed (void* start = &value.m_firstChar)
+				return new ReadOnlySpan<char> (start, value.Length);
+		}
+
+
 		internal static unsafe int CompareOrdinalUnchecked (String strA, int indexA, int lenA, String strB, int indexB, int lenB)
 		{
 			if (strA == null) {
diff --git a/mcs/class/corlib/corefx/SR.cs b/mcs/class/corlib/corefx/SR.cs
index 862cedc12f1..9ac00eca4c5 100644
--- a/mcs/class/corlib/corefx/SR.cs
+++ b/mcs/class/corlib/corefx/SR.cs
@@ -907,6 +907,7 @@ partial class SR
 	public const string Argument_GWithPrecisionNotSupported = "The 'G' format combined with a precision is not supported.";
 	public const string Argument_CannotParsePrecision = "Characters following the format symbol must be a number of {0} or less.";
 	public const string Argument_PrecisionTooLarge = "Precision cannot be larger than {0}.";
+	public const string Argument_OverlapAlignmentMismatch = "Overlapping spans have mismatching alignment.";
 	public const string Argument_EmptyValue = "Value cannot be empty.";
 	public const string PlatformNotSupported_RuntimeInformation = "RuntimeInformation is not supported for Portable Class Libraries.";
 }
diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources
index b3e617eb133..559dbdb0246 100644
--- a/mcs/class/corlib/corlib.dll.sources
+++ b/mcs/class/corlib/corlib.dll.sources
@@ -1691,6 +1691,7 @@ corefx/SR.cs
 ../../../external/corefx/src/System.Memory/src/System/MemoryExtensions.cs
 ../../../external/corefx/src/System.Memory/src/System/MemoryExtensions.Portable.cs
 ../../../external/corefx/src/System.Memory/src/System/SpanHelpers.cs
+../../../external/corefx/src/System.Memory/src/System/SpanHelpers.BinarySearch.cs
 ../../../external/corefx/src/System.Memory/src/System/SpanHelpers.Clear.cs
 ../../../external/corefx/src/System.Memory/src/System/SpanHelpers.byte.cs
 ../../../external/corefx/src/System.Memory/src/System/SpanHelpers.T.cs
diff --git a/mcs/class/referencesource/mscorlib/system/int32.cs b/mcs/class/referencesource/mscorlib/system/int32.cs
index a07f6e89c6a..8e38b232941 100644
--- a/mcs/class/referencesource/mscorlib/system/int32.cs
+++ b/mcs/class/referencesource/mscorlib/system/int32.cs
@@ -388,5 +388,11 @@ namespace System {
 ///        }
 ///#endif // #if GENERICS_WORK
 
+#if MONO
+        public bool TryFormat(Span<char> destination, out int charsWritten, System.ReadOnlySpan<char> format = default, System.IFormatProvider provider = null)
+        {
+            throw new NotImplementedException ();
+        }
+#endif
     }
 }
diff --git a/mcs/class/referencesource/mscorlib/system/throwhelper.cs b/mcs/class/referencesource/mscorlib/system/throwhelper.cs
index 523f467e8ff..0ea8b4d22f3 100644
--- a/mcs/class/referencesource/mscorlib/system/throwhelper.cs
+++ b/mcs/class/referencesource/mscorlib/system/throwhelper.cs
@@ -532,6 +532,8 @@ namespace System {
         ownedMemory,
         text,
         length,
+        comparer,
+        comparable
 #endif
     }
 
diff --git a/mcs/class/referencesource/mscorlib/system/type.cs b/mcs/class/referencesource/mscorlib/system/type.cs
index ef7472f5016..e5611108ff0 100644
--- a/mcs/class/referencesource/mscorlib/system/type.cs
+++ b/mcs/class/referencesource/mscorlib/system/type.cs
@@ -1894,6 +1894,8 @@ namespace System {
 
 #if MONO
         public virtual bool IsSZArray { get { throw new NotImplementedException (); } }
+
+        public virtual bool IsCollectible => true;
 #endif
 }