Merge pull request #10707 from dotnet/revert-10036-streamingcontext

Revert "Add StreamingContext public APIs back to contract"
dotnet · Aug 12, 2016 · 6d8e449 · 6d8e449
2 parents 920e881 + 19c1a45
commit 6d8e449
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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/...ystem.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj b/...ystem.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.0.0</AssemblyVersion>
+    <AssemblyVersion>4.1.2.0</AssemblyVersion>
     <OutputType>Library</OutputType>
     <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
     <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>

diff --git a/...ystem.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj b/...ystem.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>System.Runtime.Serialization.Primitives</AssemblyName>
-    <AssemblyVersion>4.2.0.0</AssemblyVersion>
+    <AssemblyVersion>4.1.2.0</AssemblyVersion>
     <RootNamespace>System.Runtime.Serialization.Primitives</RootNamespace>
     <NoWarn>$(NoWarn);1634;1691;649</NoWarn>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/...tem.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/StreamingContext.cs b/...tem.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
@@ -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
@@ -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",