From ead9b7fe182817b0ab1fa5f2d08cb344a61f0bc0 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Wed, 17 Jul 2013 00:09:51 +1200 Subject: [PATCH] -Remove unused file --- Build/build.ps1 | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Newtonsoft.Json.Net20.csproj | 1 - .../Newtonsoft.Json.Net35.csproj | 1 - .../Newtonsoft.Json.Portable.csproj | 1 - .../Newtonsoft.Json.Portable40.csproj | 1 - .../Newtonsoft.Json.Silverlight.csproj | 1 - .../Newtonsoft.Json.WinRT.csproj | 1 - Src/Newtonsoft.Json/Newtonsoft.Json.csproj | 1 - .../Properties/AssemblyInfo.cs | 2 +- Src/Newtonsoft.Json/StreamingContext.cs | 64 ------------------- 11 files changed, 3 insertions(+), 74 deletions(-) delete mode 100644 Src/Newtonsoft.Json/StreamingContext.cs diff --git a/Build/build.ps1 b/Build/build.ps1 index 2a1f6c27..011bd9a9 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -20,7 +20,7 @@ @{Name = "Newtonsoft.Json"; TestsName = "Newtonsoft.Json.Tests"; Constants=""; FinalDir="Net45"; NuGetDir = "net45"; Framework="net-4.0"; Sign=$true}, @{Name = "Newtonsoft.Json.Portable"; TestsName = "Newtonsoft.Json.Tests.Portable"; Constants="PORTABLE"; FinalDir="Portable"; NuGetDir = "portable-net45+wp80+win8"; Framework="net-4.0"; Sign=$true}, @{Name = "Newtonsoft.Json.Portable40"; TestsName = "Newtonsoft.Json.Tests.Portable40"; Constants="PORTABLE40"; FinalDir="Portable40"; NuGetDir = "portable-net40+sl4+wp7+win8"; Framework="net-4.0"; Sign=$true}, - @{Name = "Newtonsoft.Json.WinRT"; TestsName = $null; Constants="NETFX_CORE"; FinalDir="WinRT"; NuGetDir = "netcore45"; Framework="net-4.5"; Sign=$true}, + #@{Name = "Newtonsoft.Json.WinRT"; TestsName = $null; Constants="NETFX_CORE"; FinalDir="WinRT"; NuGetDir = "netcore45"; Framework="net-4.5"; Sign=$true}, @{Name = "Newtonsoft.Json.Net40"; TestsName = "Newtonsoft.Json.Tests.Net40"; Constants="NET40"; FinalDir="Net40"; NuGetDir = "net40"; Framework="net-4.0"; Sign=$true}, @{Name = "Newtonsoft.Json.Net35"; TestsName = "Newtonsoft.Json.Tests.Net35"; Constants="NET35"; FinalDir="Net35"; NuGetDir = "net35"; Framework="net-2.0"; Sign=$true}, @{Name = "Newtonsoft.Json.Net20"; TestsName = "Newtonsoft.Json.Tests.Net20"; Constants="NET20"; FinalDir="Net20"; NuGetDir = "net20"; Framework="net-2.0"; Sign=$true} diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs index fbd680f5..c071019a 100644 --- a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs @@ -75,4 +75,4 @@ using System.Security; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: [assembly: AssemblyVersion("4.5.0.0")] -[assembly: AssemblyFileVersion("5.0.6.16308")] +[assembly: AssemblyFileVersion("5.0.6.16317")] diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.Net20.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.Net20.csproj index 5425fea1..b8f9878c 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.Net20.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.Net20.csproj @@ -115,7 +115,6 @@ - diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.Net35.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.Net35.csproj index 5ecceb04..5c303751 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.Net35.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.Net35.csproj @@ -126,7 +126,6 @@ - diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.Portable.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.Portable.csproj index bbe8d0cb..97cc29a6 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.Portable.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.Portable.csproj @@ -185,7 +185,6 @@ - diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.Portable40.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.Portable40.csproj index 547fe933..dcf5ea00 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.Portable40.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.Portable40.csproj @@ -185,7 +185,6 @@ - diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.Silverlight.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.Silverlight.csproj index 16e1f22b..f5660a07 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.Silverlight.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.Silverlight.csproj @@ -200,7 +200,6 @@ - diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.WinRT.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.WinRT.csproj index 2f51c402..0aa9fce5 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.WinRT.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.WinRT.csproj @@ -253,7 +253,6 @@ - diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj index 9c579193..c6b538ab 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj @@ -186,7 +186,6 @@ - diff --git a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs index a977c2ab..c7d8d269 100644 --- a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs @@ -92,6 +92,6 @@ using System.Security; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: [assembly: AssemblyVersion("4.5.0.0")] -[assembly: AssemblyFileVersion("5.0.6.16308")] +[assembly: AssemblyFileVersion("5.0.6.16317")] [assembly: CLSCompliant(true)] diff --git a/Src/Newtonsoft.Json/StreamingContext.cs b/Src/Newtonsoft.Json/StreamingContext.cs deleted file mode 100644 index a602d166..00000000 --- a/Src/Newtonsoft.Json/StreamingContext.cs +++ /dev/null @@ -1,64 +0,0 @@ -#if PocketPC -#pragma warning disable 1591 - -// This class is... borrowed from .NET and Microsoft for a short time. -// Hopefully Microsoft will add DateTimeOffset to the compact framework -// or I will rewrite a striped down version of this file myself - -namespace System.Runtime.Serialization -{ - public enum StreamingContextStates - { - All = 255, - Clone = 64, - CrossAppDomain = 128, - CrossMachine = 2, - CrossProcess = 1, - File = 4, - Other = 32, - Persistence = 8, - Remoting = 16 - } - - public struct StreamingContext - { - internal object m_additionalContext; - internal StreamingContextStates m_state; - public StreamingContext(StreamingContextStates state) - : this(state, null) - { - } - - public StreamingContext(StreamingContextStates state, object additional) - { - this.m_state = state; - this.m_additionalContext = additional; - } - - public object Context - { - get - { - return this.m_additionalContext; - } - } - public override bool Equals(object obj) - { - return ((obj is StreamingContext) && ((((StreamingContext)obj).m_additionalContext == this.m_additionalContext) && (((StreamingContext)obj).m_state == this.m_state))); - } - - public override int GetHashCode() - { - return (int)this.m_state; - } - - public StreamingContextStates State - { - get - { - return this.m_state; - } - } - } -} -#endif \ No newline at end of file