diff --git a/Doc/doc.shfbproj b/Doc/doc.shfbproj index ea74c888..8b169b28 100644 --- a/Doc/doc.shfbproj +++ b/Doc/doc.shfbproj @@ -36,7 +36,7 @@ Json.NET Documentation VS2013 MemberName - ..\Src\Newtonsoft.Json\bin\Release + ..\Src\Newtonsoft.Json\bin\Release\Net45 diff --git a/Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs index aba0f90f..37c7105c 100644 --- a/Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs @@ -57,4 +57,4 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: [assembly: AssemblyVersion("7.0.0.0")] -[assembly: AssemblyFileVersion("7.0.1.18029")] +[assembly: AssemblyFileVersion("7.0.1.18030")] diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs index 97582489..6d90e236 100644 --- a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs @@ -76,4 +76,4 @@ using System.Security; // by using the '*' as shown below: [assembly: AssemblyVersion("7.0.0.0")] -[assembly: AssemblyFileVersion("7.0.1.18029")] +[assembly: AssemblyFileVersion("7.0.1.18030")] diff --git a/Src/Newtonsoft.Json/JsonConverterAttribute.cs b/Src/Newtonsoft.Json/JsonConverterAttribute.cs index f3897801..1b759c90 100644 --- a/Src/Newtonsoft.Json/JsonConverterAttribute.cs +++ b/Src/Newtonsoft.Json/JsonConverterAttribute.cs @@ -38,9 +38,9 @@ namespace Newtonsoft.Json private readonly Type _converterType; /// - /// Gets the type of the converter. + /// Gets the of the converter. /// - /// The type of the converter. + /// The of the converter. public Type ConverterType { get { return _converterType; } @@ -68,7 +68,7 @@ namespace Newtonsoft.Json /// Initializes a new instance of the class. /// /// Type of the converter. - /// Parameter list to use when constructing the JsonConverter. Can be null. + /// Parameter list to use when constructing the JsonConverter. Can be null. public JsonConverterAttribute(Type converterType, params object[] converterParameters) : this(converterType) { diff --git a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs index 0551b164..261a3a37 100644 --- a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs @@ -92,5 +92,5 @@ using System.Security; // by using the '*' as shown below: [assembly: AssemblyVersion("7.0.0.0")] -[assembly: AssemblyFileVersion("7.0.1.18029")] +[assembly: AssemblyFileVersion("7.0.1.18030")] [assembly: CLSCompliant(true)]