diff --git a/src/System.Data.SqlClient/tests/ManualTests/project.json b/src/System.Data.SqlClient/tests/ManualTests/project.json index afab6a0e0904..28dd51111806 100644 --- a/src/System.Data.SqlClient/tests/ManualTests/project.json +++ b/src/System.Data.SqlClient/tests/ManualTests/project.json @@ -35,7 +35,7 @@ "System.Runtime.Extensions": "4.1.1-beta-24411-04", "System.Runtime.Handles": "4.0.2-beta-24411-04", "System.Runtime.InteropServices": "4.2.0-beta-24411-04", - "System.Runtime.Serialization.Primitives": "4.2.0-beta-24411-04", + "System.Runtime.Serialization.Primitives": "4.1.1", "System.Security.Principal": "4.0.2-beta-24411-04", "System.Security.Principal.Windows": "4.0.1-beta-24411-04", "System.Text.Encoding": "4.0.12-beta-24411-04", diff --git a/src/System.Runtime.Serialization.Formatters/tests/project.json b/src/System.Runtime.Serialization.Formatters/tests/project.json index 8899ca48696d..ade86c8965d1 100644 --- a/src/System.Runtime.Serialization.Formatters/tests/project.json +++ b/src/System.Runtime.Serialization.Formatters/tests/project.json @@ -7,7 +7,7 @@ "System.Reflection.TypeExtensions": "4.1.1-beta-24411-04", "System.Runtime": "4.1.1-beta-24411-04", "System.Runtime.Extensions": "4.1.1-beta-24411-04", - "System.Runtime.Serialization.Primitives": "4.2.0-beta-24411-04", + "System.Runtime.Serialization.Primitives": "4.1.1", "System.Text.RegularExpressions": "4.2.0-beta-24411-04", "test-runtime": { "target": "project", diff --git a/src/System.Runtime.Serialization.Json/tests/Performance/ContractReferences/project.json b/src/System.Runtime.Serialization.Json/tests/Performance/ContractReferences/project.json index 4830f0fa8767..ebe776c040af 100644 --- a/src/System.Runtime.Serialization.Json/tests/Performance/ContractReferences/project.json +++ b/src/System.Runtime.Serialization.Json/tests/Performance/ContractReferences/project.json @@ -14,7 +14,7 @@ "System.ObjectModel": "4.0.13-beta-24411-04", "System.Runtime": "4.1.1-beta-24411-04", "System.Runtime.Extensions": "4.1.1-beta-24411-04", - "System.Runtime.Serialization.Primitives": "4.2.0-beta-24411-04", + "System.Runtime.Serialization.Primitives": "4.1.1", "System.Runtime.Serialization.Json": "4.0.3-beta-24411-04", "System.Runtime.Serialization.Xml": "4.1.2-beta-24411-04", "System.Threading.Tasks": "4.0.12-beta-24411-04", diff --git a/src/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.cs b/src/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.cs index 40d345f99995..acc10a3dafd5 100644 --- a/src/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.cs +++ b/src/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.cs @@ -114,24 +114,7 @@ public SerializationException(string message, System.Exception innerException) { [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/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj b/src/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj index 4428867d45ad..e003239f1a47 100644 --- a/src/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj +++ b/src/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj @@ -2,7 +2,7 @@ - 4.2.0.0 + 4.1.2.0 Library netstandard1.3 .NETStandard,Version=v1.3 diff --git a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj index 67e59d383438..fc56a34c7ab6 100644 --- a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj +++ b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj @@ -3,7 +3,7 @@ System.Runtime.Serialization.Primitives - 4.2.0.0 + 4.1.2.0 System.Runtime.Serialization.Primitives $(NoWarn);1634;1691;649 true diff --git a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/StreamingContext.cs b/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/StreamingContext.cs index a10a2aace3dc..ee194c70dcec 100644 --- a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/StreamingContext.cs +++ b/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/StreamingContext.cs @@ -21,18 +21,18 @@ public struct StreamingContext internal Object m_additionalContext; internal StreamingContextStates m_state; - public StreamingContext(StreamingContextStates state) + internal StreamingContext(StreamingContextStates state) : this(state, null) { } - public StreamingContext(StreamingContextStates state, Object additional) + internal StreamingContext(StreamingContextStates state, Object additional) { m_state = state; m_additionalContext = additional; } - public Object Context + internal Object Context { get { return m_additionalContext; } } @@ -52,7 +52,7 @@ public override int GetHashCode() return (int)m_state; } - public StreamingContextStates State + internal StreamingContextStates State { get { return m_state; } } @@ -62,7 +62,7 @@ public StreamingContextStates State // Keep these in sync with the version in vm\runtimehandles.h // ********************************************************** [Flags] - public enum StreamingContextStates + internal enum StreamingContextStates { CrossProcess = 0x01, CrossMachine = 0x02, diff --git a/src/System.Runtime.Serialization.Xml/tests/Performance/ContractReferences/project.json b/src/System.Runtime.Serialization.Xml/tests/Performance/ContractReferences/project.json index 86b4680f78cb..7d5776b2811c 100644 --- a/src/System.Runtime.Serialization.Xml/tests/Performance/ContractReferences/project.json +++ b/src/System.Runtime.Serialization.Xml/tests/Performance/ContractReferences/project.json @@ -13,7 +13,7 @@ "System.ObjectModel": "4.0.13-beta-24411-04", "System.Runtime": "4.1.1-beta-24411-04", "System.Runtime.Extensions": "4.1.1-beta-24411-04", - "System.Runtime.Serialization.Primitives": "4.2.0-beta-24411-04", + "System.Runtime.Serialization.Primitives": "4.1.1", "System.Runtime.Serialization.Json": "4.0.3-beta-24411-04", "System.Runtime.Serialization.Xml": "4.1.2-beta-24411-04", "System.Text.Encoding": "4.0.12-beta-24411-04", diff --git a/src/System.Xml.XmlSerializer/tests/Performance/ContractReferences/project.json b/src/System.Xml.XmlSerializer/tests/Performance/ContractReferences/project.json index 4c871dde05ad..39ca118fc3ac 100644 --- a/src/System.Xml.XmlSerializer/tests/Performance/ContractReferences/project.json +++ b/src/System.Xml.XmlSerializer/tests/Performance/ContractReferences/project.json @@ -12,7 +12,7 @@ "System.Reflection": "4.1.1-beta-24411-04", "System.Runtime": "4.1.1-beta-24411-04", "System.Runtime.Extensions": "4.1.1-beta-24411-04", - "System.Runtime.Serialization.Primitives": "4.2.0-beta-24411-04", + "System.Runtime.Serialization.Primitives": "4.1.1", "System.Runtime.Serialization.Json": "4.0.3-beta-24411-04", "System.Runtime.Serialization.Xml": "4.1.2-beta-24411-04", "System.Text.Encoding": "4.0.12-beta-24411-04",