From 3b2ecc4fc8ac6f6a9c4259124d35533e75198b9f Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Thu, 6 Jun 2013 11:14:36 +1200 Subject: [PATCH] -Fixed build --- Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs | 2 +- .../Serialization/TypeNameHandlingTests.cs | 3 +-- Src/Newtonsoft.Json/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs index e741406c..c3198aab 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.16201")] +[assembly: AssemblyFileVersion("5.0.6.16206")] diff --git a/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs index e800614f..a129f595 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs @@ -1682,10 +1682,9 @@ namespace Newtonsoft.Json.Tests.Serialization } } - [DataContract] public class MyChild : ISomeBase { - [DataMember(Name = "p")] + [JsonProperty("p")] public String MyProperty { get; internal set; } } diff --git a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs index 3b6044fc..55571da4 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.16201")] +[assembly: AssemblyFileVersion("5.0.6.16206")] [assembly: CLSCompliant(true)]