From 23afe9a9e33acbe656965a185eb1dea2f6e58b90 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sun, 13 Oct 2013 19:04:42 +1300 Subject: [PATCH] -Fixed build warnings --- Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs | 2 +- Src/Newtonsoft.Json/MemberSerialization.cs | 6 +++--- Src/Newtonsoft.Json/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs index 39f3313a..f58bca61 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.7.16612")] +[assembly: AssemblyFileVersion("5.0.7.16613")] diff --git a/Src/Newtonsoft.Json/MemberSerialization.cs b/Src/Newtonsoft.Json/MemberSerialization.cs index 909407f1..e6c932f7 100644 --- a/Src/Newtonsoft.Json/MemberSerialization.cs +++ b/Src/Newtonsoft.Json/MemberSerialization.cs @@ -35,7 +35,7 @@ namespace Newtonsoft.Json public enum MemberSerialization { /// - /// All public members are serialized by default. Members can be excluded using or . + /// All public members are serialized by default. Members can be excluded using or NonSerializedAttribute. /// This is the default member serialization mode. /// OptOut, @@ -45,8 +45,8 @@ namespace Newtonsoft.Json /// OptIn, /// - /// All public and private fields are serialized. Members can be excluded using or . - /// This member serialization mode can also be set by marking the class with + /// All public and private fields are serialized. Members can be excluded using or NonSerializedAttribute. + /// This member serialization mode can also be set by marking the class with SerializableAttribute /// and setting IgnoreSerializableAttribute on to false. /// Fields diff --git a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs index 705c9ca9..5d0108d5 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.7.16612")] +[assembly: AssemblyFileVersion("5.0.7.16613")] [assembly: CLSCompliant(true)]