[bcl] Update to 4.6 referencesource

mono · Oct 16, 2015 · 27f07c8 · 27f07c8
1 parent f412b55
commit 27f07c8
Show file tree

Hide file tree

Showing 14 changed files with 1,231 additions and 1,722 deletions.
diff --git a/external/referencesource b/external/referencesource
diff --git a/mcs/class/System.Core/common_System.Core.dll.sources b/mcs/class/System.Core/common_System.Core.dll.sources
@@ -13,6 +13,8 @@ ReferenceSources/Strings.cs
 
 ../../../external/referencesource/System.Core/Microsoft/Scripting/Ast/DynamicExpression.cs
 ../../../external/referencesource/System.Core/Microsoft/Scripting/Ast/ExpressionVisitor.cs
+../../../external/referencesource/System.Core/Microsoft/Scripting/Ast/IArgumentProvider.cs
+../../../external/referencesource/System.Core/Microsoft/Scripting/Ast/IDynamicExpression.cs
 
 ../../../external/referencesource/System.Core/Microsoft/Scripting/Utils/Action.cs
 ../../../external/referencesource/System.Core/Microsoft/Scripting/Utils/Extension.cs

diff --git a/mcs/class/System.Core/dynamic_System.Core.dll.sources b/mcs/class/System.Core/dynamic_System.Core.dll.sources
@@ -40,7 +40,6 @@
 ../dlr/Runtime/Microsoft.Scripting.Core/Ast/ExpressionStringBuilder.cs
 ../dlr/Runtime/Microsoft.Scripting.Core/Ast/ExpressionType.cs
 ../dlr/Runtime/Microsoft.Scripting.Core/Ast/GotoExpression.cs
-../dlr/Runtime/Microsoft.Scripting.Core/Ast/IArgumentProvider.cs
 ../dlr/Runtime/Microsoft.Scripting.Core/Ast/IndexExpression.cs
 ../dlr/Runtime/Microsoft.Scripting.Core/Ast/InvocationExpression.cs
 ../dlr/Runtime/Microsoft.Scripting.Core/Ast/LabelExpression.cs

diff --git a/mcs/class/System.Core/interpreter_System.Core.dll.sources b/mcs/class/System.Core/interpreter_System.Core.dll.sources
@@ -40,7 +40,6 @@
 ../dlr/Runtime/Microsoft.Scripting.Core/Ast/ExpressionStringBuilder.cs
 ../dlr/Runtime/Microsoft.Scripting.Core/Ast/ExpressionType.cs
 ../dlr/Runtime/Microsoft.Scripting.Core/Ast/GotoExpression.cs
-../dlr/Runtime/Microsoft.Scripting.Core/Ast/IArgumentProvider.cs
 ../dlr/Runtime/Microsoft.Scripting.Core/Ast/IndexExpression.cs
 ../dlr/Runtime/Microsoft.Scripting.Core/Ast/InvocationExpression.cs
 ../dlr/Runtime/Microsoft.Scripting.Core/Ast/LabelExpression.cs

diff --git a/mcs/class/System.Data/ReferenceSources/Res.cs b/mcs/class/System.Data/ReferenceSources/Res.cs
diff --git a/mcs/class/System.Data/referencesource.sources b/mcs/class/System.Data/referencesource.sources
@@ -284,6 +284,8 @@
 ../../../external/referencesource/System.Data/System/Data/ProviderBase/DbConnectionFactory.cs
 # ../../../external/referencesource/System.Data/System/Data/ProviderBase/DbConnectionHelper.cs
 ../../../external/referencesource/System.Data/System/Data/ProviderBase/DbConnectionInternal.cs
+../../../external/referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolAuthenticationContext.cs
+../../../external/referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolAuthenticationContextKey.cs
 ../../../external/referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolCounters.cs
 ../../../external/referencesource/System.Data/System/Data/ProviderBase/DbConnectionPool.cs
 ../../../external/referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolGroup.cs
@@ -358,6 +360,7 @@
 
 ../../../external/referencesource/System.Data/System/Data/SqlClient/ApplicationIntent.cs
 ../../../external/referencesource/System.Data/System/Data/SqlClient/LocalDBAPI.cs
+../../../external/referencesource/System.Data/System/Data/SqlClient/SqlClientEncryptionType.cs
 ../../../external/referencesource/System.Data/System/Data/SqlClient/SqlClientPermission.cs
 ../../../external/referencesource/System.Data/System/Data/SqlClient/SqlConnectionString.cs
 ../../../external/referencesource/System.Data/System/Data/SqlClient/SqlConnectionStringBuilder.cs

diff --git a/mcs/class/System.Web/System.Web.dll.sources b/mcs/class/System.Web/System.Web.dll.sources
@@ -1325,7 +1325,7 @@ System.Web.Security/MembershipPasswordAttribute.cs
 System.Web/DynamicModuleManager.cs
 
 ../../../external/referencesource/System.Web/ISubscriptionToken.cs
-
+../../../external/referencesource/System.Web/ITlsTokenBindingInfo.cs
 
 ../../../external/referencesource/System.Web/ModelBinding/IModelNameProvider.cs
 ../../../external/referencesource/System.Web/ModelBinding/BindingBehaviorAttribute.cs

diff --git a/mcs/class/System.XML/ReferenceSources/LocalAppContextSwitches.cs b/mcs/class/System.XML/ReferenceSources/LocalAppContextSwitches.cs
@@ -0,0 +1,7 @@
+namespace System
+{
+    static class LocalAppContextSwitches {
+    	public const bool IgnoreEmptyKeySequences = false;
+    	public const bool DontThrowOnInvalidSurrogatePairs = false;
+    }
+}
diff --git a/mcs/class/System.XML/System.Xml.dll.sources b/mcs/class/System.XML/System.Xml.dll.sources
@@ -2,6 +2,7 @@ Assembly/AssemblyInfo.cs
 ../../build/common/Consts.cs
 ../../build/common/SR.cs
 ReferenceSources/Res.cs
+ReferenceSources/LocalAppContextSwitches.cs
 ReferenceSources/ThisAssembly.cs
 ../../../external/referencesource/System.Data.SqlXml/System/Xml/Xsl/IlGen/GenerateHelper.cs
 ../../../external/referencesource/System.Data.SqlXml/System/Xml/Xsl/IlGen/IteratorDescriptor.cs

diff --git a/mcs/class/System/ReferenceSources/SR.cs b/mcs/class/System/ReferenceSources/SR.cs
@@ -61,6 +61,7 @@ public static object GetObject (string name)
 	public const string UnterminatedBracket="Unterminated [] set.";
 	public const string UnterminatedComment="Unterminated (?#...) comment.";
 
+	public const string ArgumentNull_Array = "ArgumentNull_Array";
 	public const string ArgumentNull_ArrayWithNullElements = "ArgumentNull_ArrayWithNullElements";
 	public const string Arg_ArrayPlusOffTooSmall = "Arg_ArrayPlusOffTooSmall";
 	public const string Arg_InsufficientSpace = "Arg_InsufficientSpace";

diff --git a/mcs/class/corlib/ReferenceSources/RuntimeType.cs b/mcs/class/corlib/ReferenceSources/RuntimeType.cs
@@ -43,6 +43,8 @@ namespace System
 {
 	partial class RuntimeType
 	{
+		internal Object GenericCache;
+
 		internal virtual MonoCMethod GetDefaultConstructor ()
 		{
 			// TODO: Requires MonoType

diff --git a/mcs/class/corlib/System/Array.cs b/mcs/class/corlib/System/Array.cs
@@ -3102,6 +3102,12 @@ public static int LastIndexOf<T> (T [] array, T value, int startIndex, int count
 			return d;
 		}
 
+		[ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
+		public static T[] Empty<T>()
+		{
+			return EmptyArray<T>.Value;
+		}
+
 		public static bool Exists<T> (T [] array, Predicate <T> match)
 		{
 			if (array == null)

diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/CspParametersTest.cs b/mcs/class/corlib/Test/System.Security.Cryptography/CspParametersTest.cs
@@ -39,7 +39,7 @@ public class CspParametersTest {
 		public void Ctor () 
 		{
 			var cp = new CspParameters ();
-			Assert.AreEqual (1, cp.ProviderType);
+			Assert.AreEqual (24, cp.ProviderType);
 		}
 	}
 }
diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources
@@ -882,6 +882,7 @@ System.Threading.Tasks/DecoupledTask.cs
 ../Mono.Parallel/Mono.Threading/AtomicBoolean.cs
 
 ReferenceSources/__ConsoleStream.cs
+ReferenceSources/AppContextSwitches.cs
 ReferenceSources/Array.cs
 ReferenceSources/BCLDebug.cs
 ReferenceSources/CalendarData.cs
@@ -1019,6 +1020,7 @@ ReferenceSources/SecurityContext.cs
 ../../../external/referencesource/mscorlib/system/outofmemoryexception.cs
 ../../../external/referencesource/mscorlib/system/overflowexception.cs
 ../../../external/referencesource/mscorlib/system/paramarrayattribute.cs
+../../../external/referencesource/mscorlib/system/paramsarray.cs
 ../../../external/referencesource/mscorlib/system/platformnotsupportedexception.cs
 ../../../external/referencesource/mscorlib/system/progress.cs
 ../../../external/referencesource/mscorlib/system/random.cs
@@ -1131,6 +1133,7 @@ ReferenceSources/SecurityContext.cs
 ../../../external/referencesource/mscorlib/system/globalization/bidicategory.cs
 ../../../external/referencesource/mscorlib/system/globalization/calendar.cs
 ../../../external/referencesource/mscorlib/system/globalization/calendaralgorithmtype.cs
+../../../external/referencesource/mscorlib/system/globalization/CalendricalCalculationsHelper.cs
 ../../../external/referencesource/mscorlib/system/globalization/calendardata.cs
 ../../../external/referencesource/mscorlib/system/globalization/calendarweekrule.cs
 ../../../external/referencesource/mscorlib/system/globalization/charunicodeinfo.cs
@@ -1387,6 +1390,7 @@ ReferenceSources/SecurityContext.cs
 ../../../external/referencesource/mscorlib/system/security/cryptography/dsasignaturedeformatter.cs
 ../../../external/referencesource/mscorlib/system/security/cryptography/dsasignatureformatter.cs
 ../../../external/referencesource/mscorlib/system/security/cryptography/hashalgorithm.cs
+../../../external/referencesource/mscorlib/system/security/cryptography/HashAlgorithmName.cs
 ../../../external/referencesource/mscorlib/system/security/cryptography/hmac.cs
 ../../../external/referencesource/mscorlib/system/security/cryptography/hmacmd5.cs
 ../../../external/referencesource/mscorlib/system/security/cryptography/hmacripemd160.cs
@@ -1415,6 +1419,10 @@ ReferenceSources/SecurityContext.cs
 ../../../external/referencesource/mscorlib/system/security/cryptography/rsaoaepkeyexchangeformatter.cs
 ../../../external/referencesource/mscorlib/system/security/cryptography/rsapkcs1keyexchangedeformatter.cs
 ../../../external/referencesource/mscorlib/system/security/cryptography/rsapkcs1keyexchangeformatter.cs
+../../../external/referencesource/mscorlib/system/security/cryptography/RSAEncryptionPadding.cs
+../../../external/referencesource/mscorlib/system/security/cryptography/RSAEncryptionPaddingMode.cs
+../../../external/referencesource/mscorlib/system/security/cryptography/RSASignaturePadding.cs
+../../../external/referencesource/mscorlib/system/security/cryptography/RSASignaturePaddingMode.cs
 ../../../external/referencesource/mscorlib/system/security/cryptography/sha1.cs
 ../../../external/referencesource/mscorlib/system/security/cryptography/sha1managed.cs
 ../../../external/referencesource/mscorlib/system/security/cryptography/sha256.cs
@@ -1514,6 +1522,7 @@ ReferenceSources/SecurityContext.cs
 ../../../external/referencesource/mscorlib/system/runtime/versioning/binarycompatibility.cs
 ../../../external/referencesource/mscorlib/system/runtime/versioning/componentguaranteesattribute.cs
 ../../../external/referencesource/mscorlib/system/runtime/versioning/multitargetinghelpers.cs
+../../../external/referencesource/mscorlib/system/runtime/versioning/NonVersionableAttribute.cs
 ../../../external/referencesource/mscorlib/system/runtime/versioning/resourceattributes.cs
 ../../../external/referencesource/mscorlib/system/runtime/versioning/targetframeworkattribute.cs
 ../../../external/referencesource/mscorlib/system/runtime/versioning/targetframeworkid.cs
@@ -1552,6 +1561,7 @@ ReferenceSources/SecurityContext.cs
 ../../../external/referencesource/mscorlib/system/threading/waithandlecannotbeopenedexception.cs
 ../../../external/referencesource/mscorlib/system/threading/threadpool.cs
 
+../../../external/referencesource/mscorlib/system/threading/Tasks/AsyncCausalityTracer.cs
 ../../../external/referencesource/mscorlib/system/threading/Tasks/BeginEndAwaitableAdapter.cs
 ../../../external/referencesource/mscorlib/system/threading/Tasks/TaskFactory.cs
 ../../../external/referencesource/mscorlib/system/threading/Tasks/FutureFactory.cs