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

@@ -149,7 +149,7 @@ namespace System.Runtime.Serialization.Formatters.Binary {
return Deserialize(serializationStream, handler, true);
}
#if FEATURE_REMOTING
#if FEATURE_REMOTING || MOBILE_LEGACY
[System.Security.SecuritySafeCritical] // auto-generated
public Object DeserializeMethodResponse(Stream serializationStream, HeaderHandler handler, IMethodCallMessage methodCallMessage) {
return Deserialize(serializationStream, handler, true, methodCallMessage);
@@ -161,7 +161,7 @@ namespace System.Runtime.Serialization.Formatters.Binary {
return Deserialize(serializationStream, handler, false);
}
#if FEATURE_REMOTING
#if FEATURE_REMOTING || MOBILE_LEGACY
[System.Security.SecurityCritical] // auto-generated_required
[System.Runtime.InteropServices.ComVisible(false)]
public Object UnsafeDeserializeMethodResponse(Stream serializationStream, HeaderHandler handler, IMethodCallMessage methodCallMessage) {

View File

@@ -71,9 +71,9 @@ namespace System.Runtime.Serialization.Formatters.Binary {
private BinaryMethodReturn binaryMethodReturn;
private bool bIsCrossAppDomain;
#endif
#if !DISABLE_CAS_USE
private static FileIOPermission sfileIOPermission = new FileIOPermission(PermissionState.Unrestricted);
#endif
private SerStack ValueFixupStack
{
get {
@@ -139,7 +139,7 @@ namespace System.Runtime.Serialization.Formatters.Binary {
}
#if FEATURE_REMOTING
#if FEATURE_REMOTING || MOBILE_LEGACY
[System.Security.SecurityCritical] // auto-generated
internal Object Deserialize(HeaderHandler handler, __BinaryParser serParser, bool fCheck, bool isCrossAppDomain, IMethodCallMessage methodCallMessage) {
if (serParser == null)
@@ -1362,7 +1362,9 @@ namespace System.Runtime.Serialization.Formatters.Binary {
if (bSimpleAssembly)
{
try {
#if !DISABLE_CAS_USE
sfileIOPermission.Assert();
#endif
try {
#if FEATURE_FUSION
assm = ObjectReader.ResolveSimpleAssemblyName(new AssemblyName(assemblyName));
@@ -1371,7 +1373,9 @@ namespace System.Runtime.Serialization.Formatters.Binary {
#endif // FEATURE_FUSION
}
finally {
#if !DISABLE_CAS_USE
CodeAccessPermission.RevertAssert();
#endif
}
}
catch(Exception e){
@@ -1386,12 +1390,16 @@ namespace System.Runtime.Serialization.Formatters.Binary {
else {
try
{
#if !DISABLE_CAS_USE
sfileIOPermission.Assert();
#endif
try {
assm = Assembly.Load(assemblyName);
}
finally {
#if !DISABLE_CAS_USE
CodeAccessPermission.RevertAssert();
#endif
}
}
catch (Exception e)

View File

@@ -12,7 +12,7 @@
**
**
===========================================================*/
#if FEATURE_REMOTING
#if FEATURE_REMOTING || MOBILE_LEGACY
namespace System.Runtime.Serialization.Formatters {
using System.Runtime.Remoting;

View File

@@ -14,7 +14,7 @@
** Date: June 27, 2000
**
===========================================================*/
#if FEATURE_REMOTING
#if FEATURE_REMOTING || MOBILE_LEGACY
namespace System.Runtime.Serialization.Formatters
{
using System;

View File

@@ -12,7 +12,7 @@
**
**
===========================================================*/
#if FEATURE_REMOTING
#if FEATURE_REMOTING || MOBILE_LEGACY
namespace System.Runtime.Serialization.Formatters {
using System.Runtime.Remoting;
using System.Runtime.Remoting.Messaging;