-Incremented version to 4.5.5

JamesNK · May 8, 2012 · 05ba339 · 05ba339
1 parent d815dc7
commit 05ba339
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Build/Newtonsoft.Json.nuspec b/Build/Newtonsoft.Json.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Newtonsoft.Json</id>
-    <version>4.5.4</version>
+    <version>4.5.5</version>
     <title>Json.NET</title>
     <description>Json.NET is a popular high-performance JSON framework for .NET</description>
     <authors>James Newton-King</authors>

diff --git a/Build/build.ps1 b/Build/build.ps1
@@ -1,7 +1,7 @@
 properties { 
   $zipFileName = "Json45r4.zip"
   $majorVersion = "4.5"
-  $majorWithReleaseVersion = "4.5.4"
+  $majorWithReleaseVersion = "4.5.5"
   $version = GetVersion $majorWithReleaseVersion
   $signAssemblies = $false
   $signKeyPath = "D:\Development\Releases\newtonsoft.snk"

diff --git a/Src/Newtonsoft.Json/MemberSerialization.cs b/Src/Newtonsoft.Json/MemberSerialization.cs
@@ -25,6 +25,7 @@
 
 using System;
 using System.Runtime.Serialization;
+using Newtonsoft.Json.Serialization;
 
 namespace Newtonsoft.Json
 {
@@ -45,7 +46,8 @@ public enum MemberSerialization
     OptIn,
     /// <summary>
     /// All public and private fields are serialized. Members can be excluded using <see cref="JsonIgnoreAttribute"/> or <see cref="NonSerializedAttribute"/>.
-    /// This member serialization mode can also be set by marking the class with <see cref="SerializableAttribute"/>.
+    /// This member serialization mode can also be set by marking the class with <see cref="SerializableAttribute"/>
+    /// and setting IgnoreSerializableAttribute on <see cref="DefaultContractResolver"/> to false.
     /// </summary>
     Fields
   }