Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -43,10 +43,11 @@ namespace System.Runtime.Remoting.Channels
bool _strictBinding = false;
IDictionary _properties;
TypeFilterLevel _filterLevel = TypeFilterLevel.Low;
public static BinaryCore DefaultInstance = new BinaryCore ();
TypeFilterLevel _filterLevel;
public static BinaryCore DefaultInstance = new BinaryCore (TypeFilterLevel.Low);
public static readonly BinaryCore DefaultClientInstance = new BinaryCore (TypeFilterLevel.Full);
public BinaryCore (object owner, IDictionary properties, string[] allowedProperties)
{
_properties = properties;
@@ -87,8 +88,9 @@ namespace System.Runtime.Remoting.Channels
Init ();
}
public BinaryCore ()
public BinaryCore (TypeFilterLevel filterLevel)
{
_filterLevel = filterLevel;
_properties = new Hashtable ();
Init ();
}