Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -580,7 +580,7 @@ namespace System.Runtime.Serialization
internal bool RequiresMemberAccessForWrite(SecurityException securityException)
{
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
EnsureMethodsImported();
if (!IsTypeVisible(UnderlyingType))

View File

@@ -1105,7 +1105,7 @@ namespace System.Runtime.Serialization
}
}
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
[Fx.Tag.SecurityNote(Critical = "Holds instance of SecurityPermission that we will Demand for SerializationFormatter."
+ " Should not be modified to something else.")]
[SecurityCritical]

View File

@@ -89,7 +89,7 @@ namespace System.Runtime.Serialization
[SecuritySafeCritical]
public void DemandSerializationFormatterPermission()
{
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
if (!demandedSerializationFormatterPermission)
{
Globals.SerializationFormatterPermission.Demand();
@@ -103,7 +103,7 @@ namespace System.Runtime.Serialization
[SecuritySafeCritical]
public void DemandMemberAccessPermission()
{
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
if (!demandedMemberAccessPermission)
{
Globals.MemberAccessPermission.Demand();

View File

@@ -496,7 +496,7 @@ namespace System.Runtime.Serialization
[MethodImpl(MethodImplOptions.NoInlining)]
internal void GetObjectData(ISerializable obj, SerializationInfo serInfo, StreamingContext context)
{
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
// Demand the serialization formatter permission every time
Globals.SerializationFormatterPermission.Demand();
#endif