Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -4,8 +4,8 @@ include ../../build/rules.make
LIBRARY = System.Runtime.Remoting.dll
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Web.dll \
/r:System.Xml.dll /r:System.Runtime.Serialization.Formatters.Soap.dll
LIB_REFS = System System.Web System.Xml System.Runtime.Serialization.Formatters.Soap
LIB_MCS_FLAGS = /r:$(corlib)
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:618 /r:System.Runtime.Remoting.dll

View File

@@ -40,7 +40,7 @@ namespace System.Runtime.Remoting.Channels
public class BinaryClientFormatterSink : IClientFormatterSink,
IMessageSink, IClientChannelSink, IChannelSinkBase
{
BinaryCore _binaryCore = BinaryCore.DefaultInstance;
BinaryCore _binaryCore = BinaryCore.DefaultClientInstance;
IClientChannelSink _nextInChain;
public BinaryClientFormatterSink (IClientChannelSink nextSink)

View File

@@ -42,7 +42,7 @@ namespace System.Runtime.Remoting.Channels
public BinaryClientFormatterSinkProvider ()
{
_binaryCore = BinaryCore.DefaultInstance;
_binaryCore = BinaryCore.DefaultClientInstance;
}
public BinaryClientFormatterSinkProvider (IDictionary properties,

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 ();
}