Imported Upstream version 6.4.0.137

Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-07-26 19:53:28 +00:00
parent e9207cf623
commit ef583813eb
2712 changed files with 74169 additions and 40587 deletions

View File

@@ -1148,7 +1148,7 @@ namespace System.Runtime.InteropServices{
}
}
[AttributeUsage(AttributeTargets.Method, Inherited = false, AllowMultiple = false)]
[AttributeUsage(AttributeTargets.Method, Inherited=false)]
[System.Runtime.InteropServices.ComVisible(false)]
public sealed class ManagedToNativeComInteropStubAttribute : Attribute
{

View File

@@ -34,7 +34,7 @@ namespace System.Runtime.Serialization.Formatters.Binary {
[System.Runtime.InteropServices.ComVisible(true)]
sealed public class BinaryFormatter :
#if !FEATURE_REMOTING && !MONO
#if DISABLE_REMOTING || (!FEATURE_REMOTING && !MONO)
IFormatter
#else
IRemotingFormatter
@@ -149,7 +149,7 @@ namespace System.Runtime.Serialization.Formatters.Binary {
return Deserialize(serializationStream, handler, true);
}
#if FEATURE_REMOTING || MOBILE_LEGACY
#if FEATURE_REMOTING || (MOBILE_LEGACY && !DISABLE_REMOTING)
[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 || MOBILE_LEGACY
#if FEATURE_REMOTING || (MOBILE_LEGACY && !DISABLE_REMOTING)
[System.Security.SecurityCritical] // auto-generated_required
[System.Runtime.InteropServices.ComVisible(false)]
public Object UnsafeDeserializeMethodResponse(Stream serializationStream, HeaderHandler handler, IMethodCallMessage methodCallMessage) {

View File

@@ -66,7 +66,7 @@ namespace System.Runtime.Serialization.Formatters.Binary {
//MethodCall and MethodReturn are handled special for perf reasons
private bool bFullDeserialization;
#if FEATURE_REMOTING
#if FEATURE_REMOTING
private bool bMethodCall;
private bool bMethodReturn;
private BinaryMethodCall binaryMethodCall;
@@ -95,7 +95,7 @@ namespace System.Runtime.Serialization.Formatters.Binary {
m_objectManager.TopObject = value;
}
}
#if FEATURE_REMOTING
#if FEATURE_REMOTING
internal void SetMethodCall(BinaryMethodCall binaryMethodCall)
{
bMethodCall = true;
@@ -141,7 +141,7 @@ namespace System.Runtime.Serialization.Formatters.Binary {
}
#if FEATURE_REMOTING || MOBILE_LEGACY
#if FEATURE_REMOTING || (MOBILE_LEGACY && !DISABLE_REMOTING)
[System.Security.SecurityCritical] // auto-generated
internal Object Deserialize(HeaderHandler handler, __BinaryParser serParser, bool fCheck, bool isCrossAppDomain, IMethodCallMessage methodCallMessage) {
if (serParser == null)

View File

@@ -18,9 +18,9 @@ namespace System.Runtime.Serialization {
using System;
[Serializable]
[System.Runtime.InteropServices.ComVisible(true)]
public struct StreamingContext {
internal Object m_additionalContext;
internal StreamingContextStates m_state;
public readonly struct StreamingContext {
internal readonly Object m_additionalContext;
internal readonly StreamingContextStates m_state;
public StreamingContext(StreamingContextStates state)
: this (state, null) {