From 3b79718086e03aca165a6f200498b5307c72fb5c Mon Sep 17 00:00:00 2001 From: Stephen Toub Date: Wed, 13 Jul 2016 12:19:35 -0400 Subject: [PATCH] Add StreamingContext public APIs back to contract Necessary for formatters. Commit migrated from https://github.com/dotnet/corefx/commit/e8169527905734b295708a8cb6922057908f45e7 --- .../ref/System.Runtime.Serialization.Primitives.cs | 17 +++++++++++++++++ .../ref/System.Runtime.Serialization.Primitives.csproj | 2 +- .../src/System.Runtime.Serialization.Primitives.csproj | 2 +- .../System/Runtime/Serialization/StreamingContext.cs | 10 +++++----- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/libraries/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.cs b/src/libraries/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.cs index acc10a3..40d345f 100644 --- a/src/libraries/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.cs +++ b/src/libraries/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.cs @@ -114,7 +114,24 @@ namespace System.Runtime.Serialization [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] public partial struct StreamingContext { + public StreamingContext(System.Runtime.Serialization.StreamingContextStates state) { } + public StreamingContext(System.Runtime.Serialization.StreamingContextStates state, object additional) { } public override bool Equals(object obj) { return default(bool); } public override int GetHashCode() { return default(int); } + public System.Runtime.Serialization.StreamingContextStates State { get { return default(System.Runtime.Serialization.StreamingContextStates); } } + public object Context { get { return default(object); } } + } + [Flags] + public enum StreamingContextStates + { + CrossProcess = 0x01, + CrossMachine = 0x02, + File = 0x04, + Persistence = 0x08, + Remoting = 0x10, + Other = 0x20, + Clone = 0x40, + CrossAppDomain = 0x80, + All = 0xFF, } } diff --git a/src/libraries/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj b/src/libraries/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj index e003239..4428867 100644 --- a/src/libraries/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj +++ b/src/libraries/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj @@ -2,7 +2,7 @@ - 4.1.2.0 + 4.2.0.0 Library netstandard1.3 .NETStandard,Version=v1.3 diff --git a/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj b/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj index fc56a34..67e59d3 100644 --- a/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj +++ b/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj @@ -3,7 +3,7 @@ System.Runtime.Serialization.Primitives - 4.1.2.0 + 4.2.0.0 System.Runtime.Serialization.Primitives $(NoWarn);1634;1691;649 true diff --git a/src/libraries/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/StreamingContext.cs b/src/libraries/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/StreamingContext.cs index ee194c7..a10a2aa 100644 --- a/src/libraries/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/StreamingContext.cs +++ b/src/libraries/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/StreamingContext.cs @@ -21,18 +21,18 @@ namespace System.Runtime.Serialization internal Object m_additionalContext; internal StreamingContextStates m_state; - internal StreamingContext(StreamingContextStates state) + public StreamingContext(StreamingContextStates state) : this(state, null) { } - internal StreamingContext(StreamingContextStates state, Object additional) + public StreamingContext(StreamingContextStates state, Object additional) { m_state = state; m_additionalContext = additional; } - internal Object Context + public Object Context { get { return m_additionalContext; } } @@ -52,7 +52,7 @@ namespace System.Runtime.Serialization return (int)m_state; } - internal StreamingContextStates State + public StreamingContextStates State { get { return m_state; } } @@ -62,7 +62,7 @@ namespace System.Runtime.Serialization // Keep these in sync with the version in vm\runtimehandles.h // ********************************************************** [Flags] - internal enum StreamingContextStates + public enum StreamingContextStates { CrossProcess = 0x01, CrossMachine = 0x02, -- 2.7.4