-Incremented version to 4.5.2
-Fixed failing turkey test -XML documentation
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
||||
<metadata>
|
||||
<id>Newtonsoft.Json</id>
|
||||
<version>4.5.1</version>
|
||||
<version>4.5.2</version>
|
||||
<title>Json.NET</title>
|
||||
<description>Json.NET is a popular high-performance JSON framework for .NET</description>
|
||||
<authors>James Newton-King</authors>
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
properties {
|
||||
$zipFileName = "Json45r1.zip"
|
||||
$majorVersion = "4.5"
|
||||
$majorWithReleaseVersion = "4.5.1"
|
||||
$majorWithReleaseVersion = "4.5.2"
|
||||
$version = GetVersion $majorWithReleaseVersion
|
||||
$signAssemblies = $false
|
||||
$signKeyPath = "D:\Development\Releases\newtonsoft.snk"
|
||||
|
||||
@@ -72,5 +72,5 @@ using System.Security;
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("4.5.0.0")]
|
||||
#if !PocketPC
|
||||
[assembly: AssemblyFileVersion("4.5.1.14809")]
|
||||
[assembly: AssemblyFileVersion("4.5.2.14811")]
|
||||
#endif
|
||||
|
||||
@@ -5890,7 +5890,7 @@ Parameter name: value"
|
||||
{
|
||||
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
|
||||
{
|
||||
writer.WriteValue(":::" + value.ToString().ToUpper() + ":::");
|
||||
writer.WriteValue(":::" + value.ToString().ToUpper(CultureInfo.InvariantCulture) + ":::");
|
||||
}
|
||||
|
||||
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
|
||||
@@ -5908,7 +5908,7 @@ Parameter name: value"
|
||||
{
|
||||
protected internal override string ResolvePropertyName(string propertyName)
|
||||
{
|
||||
return ":::" + propertyName.ToUpper() + ":::";
|
||||
return ":::" + propertyName.ToUpper(CultureInfo.InvariantCulture) + ":::";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -150,6 +150,9 @@ namespace Newtonsoft.Json
|
||||
set { _dateTimeZoneHandling = value; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the maximum depth allowed when reading JSON. Reading past this depth will throw a <see cref="JsonReaderException"/>.
|
||||
/// </summary>
|
||||
public int? MaxDepth
|
||||
{
|
||||
get { return _maxDepth; }
|
||||
|
||||
@@ -323,6 +323,9 @@ namespace Newtonsoft.Json
|
||||
set { _culture = value; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the maximum depth allowed when reading JSON. Reading past this depth will throw a <see cref="JsonReaderException"/>.
|
||||
/// </summary>
|
||||
public virtual int? MaxDepth
|
||||
{
|
||||
get { return _maxDepth; }
|
||||
|
||||
@@ -126,6 +126,9 @@ namespace Newtonsoft.Json
|
||||
/// <value>The context.</value>
|
||||
public StreamingContext Context { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the maximum depth allowed when reading JSON. Reading past this depth will throw a <see cref="JsonReaderException"/>.
|
||||
/// </summary>
|
||||
public int? MaxDepth
|
||||
{
|
||||
get { return _maxDepth; }
|
||||
|
||||
@@ -88,7 +88,7 @@ using System.Security;
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("4.5.0.0")]
|
||||
#if !PocketPC
|
||||
[assembly: AssemblyFileVersion("4.5.1.14809")]
|
||||
[assembly: AssemblyFileVersion("4.5.2.14811")]
|
||||
#endif
|
||||
|
||||
[assembly: CLSCompliant(true)]
|
||||
|
||||
@@ -153,13 +153,19 @@ namespace Newtonsoft.Json.Serialization
|
||||
|
||||
#if !(SILVERLIGHT || NETFX_CORE)
|
||||
/// <summary>
|
||||
/// Gets or sets a value indicating whether to ignore the ISerializable interface when serializing and deserializing types.
|
||||
/// Gets or sets a value indicating whether to ignore the <see cref="ISerializable"/> interface when serializing and deserializing types.
|
||||
/// </summary>
|
||||
/// <value>
|
||||
/// <c>true</c> if the ISerializable interface will be ignored when serializing and deserializing types; otherwise, <c>false</c>.
|
||||
/// <c>true</c> if the <see cref="ISerializable"/> interface will be ignored when serializing and deserializing types; otherwise, <c>false</c>.
|
||||
/// </value>
|
||||
public bool IgnoreSerializableInterface { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets a value indicating whether to ignore the <see cref="SerializableAttribute"/> attribute when serializing and deserializing types.
|
||||
/// </summary>
|
||||
/// <value>
|
||||
/// <c>true</c> if the <see cref="SerializableAttribute"/> attribute will be ignored when serializing and deserializing types; otherwise, <c>false</c>.
|
||||
/// </value>
|
||||
public bool IgnoreSerializableAttribute { get; set; }
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user