-Updated version to 6.0.5

This commit is contained in:
James Newton-King
2014-09-06 15:14:34 +12:00
parent a4ba1cf195
commit eb1c683de3
11 changed files with 34 additions and 8 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata> <metadata>
<id>Newtonsoft.Json</id> <id>Newtonsoft.Json</id>
<version>6.0.4</version> <version>6.0.5</version>
<title>Json.NET</title> <title>Json.NET</title>
<description>Json.NET is a popular high-performance JSON framework for .NET</description> <description>Json.NET is a popular high-performance JSON framework for .NET</description>
<authors>James Newton-King</authors> <authors>James Newton-King</authors>
+2 -2
View File
@@ -1,7 +1,7 @@
properties { properties {
$zipFileName = "Json60r4.zip" $zipFileName = "Json60r5.zip"
$majorVersion = "6.0" $majorVersion = "6.0"
$majorWithReleaseVersion = "6.0.4" $majorWithReleaseVersion = "6.0.5"
$version = GetVersion $majorWithReleaseVersion $version = GetVersion $majorWithReleaseVersion
$signAssemblies = $false $signAssemblies = $false
$signKeyPath = "C:\Development\Releases\newtonsoft.snk" $signKeyPath = "C:\Development\Releases\newtonsoft.snk"
@@ -1,8 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Serialization;
#if !NETFX_CORE #if !NETFX_CORE
@@ -81,6 +81,10 @@
<Compile Include="Converters\CustomCreationConverterTests.cs" /> <Compile Include="Converters\CustomCreationConverterTests.cs" />
<Compile Include="Converters\DataSetConverterTests.cs" /> <Compile Include="Converters\DataSetConverterTests.cs" />
<Compile Include="Converters\DataTableConverterTests.cs" /> <Compile Include="Converters\DataTableConverterTests.cs" />
<Compile Include="Converters\DiscriminatedUnionConverterTests.cs" />
<Compile Include="Converters\ExpandoObjectConverterTests.cs" />
<Compile Include="Converters\JsonValueConverterTests.cs" />
<Compile Include="Converters\KeyValuePairConverterTests.cs" />
<Compile Include="Converters\ObjectIdConverterTests.cs" /> <Compile Include="Converters\ObjectIdConverterTests.cs" />
<Compile Include="Converters\RegexConverterTests.cs" /> <Compile Include="Converters\RegexConverterTests.cs" />
<Compile Include="Converters\StringEnumConverterTests.cs" /> <Compile Include="Converters\StringEnumConverterTests.cs" />
@@ -122,6 +126,7 @@
<Compile Include="TestObjects\Content.cs" /> <Compile Include="TestObjects\Content.cs" />
<Compile Include="TestObjects\ContentBaseClass.cs" /> <Compile Include="TestObjects\ContentBaseClass.cs" />
<Compile Include="TestObjects\ContentSubClass.cs" /> <Compile Include="TestObjects\ContentSubClass.cs" />
<Compile Include="TestObjects\Currency.cs" />
<Compile Include="TestObjects\CustomerDataSet.cs"> <Compile Include="TestObjects\CustomerDataSet.cs">
<SubType>Component</SubType> <SubType>Component</SubType>
</Compile> </Compile>
@@ -189,6 +194,7 @@
<Compile Include="TestObjects\SearchResult.cs" /> <Compile Include="TestObjects\SearchResult.cs" />
<Compile Include="TestObjects\SelectListItem.cs" /> <Compile Include="TestObjects\SelectListItem.cs" />
<Compile Include="TestObjects\SetOnlyPropertyClass2.cs" /> <Compile Include="TestObjects\SetOnlyPropertyClass2.cs" />
<Compile Include="TestObjects\Shape.cs" />
<Compile Include="TestObjects\StructTest.cs" /> <Compile Include="TestObjects\StructTest.cs" />
<Compile Include="TestObjects\SubKlass.cs" /> <Compile Include="TestObjects\SubKlass.cs" />
<Compile Include="TestObjects\SuperKlass.cs" /> <Compile Include="TestObjects\SuperKlass.cs" />
@@ -107,7 +107,10 @@
<Compile Include="Bson\BsonWriterTests.cs" /> <Compile Include="Bson\BsonWriterTests.cs" />
<Compile Include="Bson\BsonReaderTests.cs" /> <Compile Include="Bson\BsonReaderTests.cs" />
<Compile Include="Converters\BinaryConverterTests.cs" /> <Compile Include="Converters\BinaryConverterTests.cs" />
<Compile Include="Converters\DiscriminatedUnionConverterTests.cs" />
<Compile Include="Converters\ExpandoObjectConverterTests.cs" /> <Compile Include="Converters\ExpandoObjectConverterTests.cs" />
<Compile Include="Converters\JsonValueConverterTests.cs" />
<Compile Include="Converters\KeyValuePairConverterTests.cs" />
<Compile Include="Converters\RegexConverterTests.cs" /> <Compile Include="Converters\RegexConverterTests.cs" />
<Compile Include="Converters\DataTableConverterTests.cs" /> <Compile Include="Converters\DataTableConverterTests.cs" />
<Compile Include="Converters\DataSetConverterTests.cs" /> <Compile Include="Converters\DataSetConverterTests.cs" />
@@ -164,6 +167,7 @@
<Compile Include="TestObjects\Container.cs" /> <Compile Include="TestObjects\Container.cs" />
<Compile Include="TestObjects\ContentBaseClass.cs" /> <Compile Include="TestObjects\ContentBaseClass.cs" />
<Compile Include="TestObjects\ContentSubClass.cs" /> <Compile Include="TestObjects\ContentSubClass.cs" />
<Compile Include="TestObjects\Currency.cs" />
<Compile Include="TestObjects\CustomerDataSet.cs"> <Compile Include="TestObjects\CustomerDataSet.cs">
<SubType>Component</SubType> <SubType>Component</SubType>
</Compile> </Compile>
@@ -231,6 +235,7 @@
<Compile Include="TestObjects\RequiredObject.cs" /> <Compile Include="TestObjects\RequiredObject.cs" />
<Compile Include="TestObjects\SearchResult.cs" /> <Compile Include="TestObjects\SearchResult.cs" />
<Compile Include="TestObjects\SelectListItem.cs" /> <Compile Include="TestObjects\SelectListItem.cs" />
<Compile Include="TestObjects\Shape.cs" />
<Compile Include="TestObjects\StructTest.cs" /> <Compile Include="TestObjects\StructTest.cs" />
<Compile Include="TestObjects\TestComponent.cs" /> <Compile Include="TestObjects\TestComponent.cs" />
<Compile Include="TestObjects\TestComponentSimple.cs" /> <Compile Include="TestObjects\TestComponentSimple.cs" />
@@ -114,7 +114,10 @@
<Compile Include="Bson\BsonWriterTests.cs" /> <Compile Include="Bson\BsonWriterTests.cs" />
<Compile Include="Bson\BsonReaderTests.cs" /> <Compile Include="Bson\BsonReaderTests.cs" />
<Compile Include="Converters\BinaryConverterTests.cs" /> <Compile Include="Converters\BinaryConverterTests.cs" />
<Compile Include="Converters\DiscriminatedUnionConverterTests.cs" />
<Compile Include="Converters\ExpandoObjectConverterTests.cs" /> <Compile Include="Converters\ExpandoObjectConverterTests.cs" />
<Compile Include="Converters\JsonValueConverterTests.cs" />
<Compile Include="Converters\KeyValuePairConverterTests.cs" />
<Compile Include="Converters\RegexConverterTests.cs" /> <Compile Include="Converters\RegexConverterTests.cs" />
<Compile Include="Converters\DataTableConverterTests.cs" /> <Compile Include="Converters\DataTableConverterTests.cs" />
<Compile Include="Converters\DataSetConverterTests.cs" /> <Compile Include="Converters\DataSetConverterTests.cs" />
@@ -286,6 +289,7 @@
<Compile Include="TestObjects\Container.cs" /> <Compile Include="TestObjects\Container.cs" />
<Compile Include="TestObjects\ContentBaseClass.cs" /> <Compile Include="TestObjects\ContentBaseClass.cs" />
<Compile Include="TestObjects\ContentSubClass.cs" /> <Compile Include="TestObjects\ContentSubClass.cs" />
<Compile Include="TestObjects\Currency.cs" />
<Compile Include="TestObjects\CustomerDataSet.cs"> <Compile Include="TestObjects\CustomerDataSet.cs">
<SubType>Component</SubType> <SubType>Component</SubType>
</Compile> </Compile>
@@ -353,6 +357,7 @@
<Compile Include="TestObjects\RequiredObject.cs" /> <Compile Include="TestObjects\RequiredObject.cs" />
<Compile Include="TestObjects\SearchResult.cs" /> <Compile Include="TestObjects\SearchResult.cs" />
<Compile Include="TestObjects\SelectListItem.cs" /> <Compile Include="TestObjects\SelectListItem.cs" />
<Compile Include="TestObjects\Shape.cs" />
<Compile Include="TestObjects\StructTest.cs" /> <Compile Include="TestObjects\StructTest.cs" />
<Compile Include="TestObjects\TestComponent.cs" /> <Compile Include="TestObjects\TestComponent.cs" />
<Compile Include="TestObjects\TestComponentSimple.cs" /> <Compile Include="TestObjects\TestComponentSimple.cs" />
@@ -118,7 +118,10 @@
<Compile Include="Bson\BsonWriterTests.cs" /> <Compile Include="Bson\BsonWriterTests.cs" />
<Compile Include="Bson\BsonReaderTests.cs" /> <Compile Include="Bson\BsonReaderTests.cs" />
<Compile Include="Converters\BinaryConverterTests.cs" /> <Compile Include="Converters\BinaryConverterTests.cs" />
<Compile Include="Converters\DiscriminatedUnionConverterTests.cs" />
<Compile Include="Converters\ExpandoObjectConverterTests.cs" /> <Compile Include="Converters\ExpandoObjectConverterTests.cs" />
<Compile Include="Converters\JsonValueConverterTests.cs" />
<Compile Include="Converters\KeyValuePairConverterTests.cs" />
<Compile Include="Converters\RegexConverterTests.cs" /> <Compile Include="Converters\RegexConverterTests.cs" />
<Compile Include="Converters\DataTableConverterTests.cs" /> <Compile Include="Converters\DataTableConverterTests.cs" />
<Compile Include="Converters\DataSetConverterTests.cs" /> <Compile Include="Converters\DataSetConverterTests.cs" />
@@ -169,6 +172,7 @@
<Compile Include="TestObjects\Container.cs" /> <Compile Include="TestObjects\Container.cs" />
<Compile Include="TestObjects\ContentBaseClass.cs" /> <Compile Include="TestObjects\ContentBaseClass.cs" />
<Compile Include="TestObjects\ContentSubClass.cs" /> <Compile Include="TestObjects\ContentSubClass.cs" />
<Compile Include="TestObjects\Currency.cs" />
<Compile Include="TestObjects\CustomerDataSet.cs" /> <Compile Include="TestObjects\CustomerDataSet.cs" />
<Compile Include="TestObjects\DataContractSerializationAttributesClass.cs" /> <Compile Include="TestObjects\DataContractSerializationAttributesClass.cs" />
<Compile Include="TestObjects\DateTimeWrapper.cs" /> <Compile Include="TestObjects\DateTimeWrapper.cs" />
@@ -234,6 +238,7 @@
<Compile Include="TestObjects\RequiredObject.cs" /> <Compile Include="TestObjects\RequiredObject.cs" />
<Compile Include="TestObjects\SearchResult.cs" /> <Compile Include="TestObjects\SearchResult.cs" />
<Compile Include="TestObjects\SelectListItem.cs" /> <Compile Include="TestObjects\SelectListItem.cs" />
<Compile Include="TestObjects\Shape.cs" />
<Compile Include="TestObjects\StructTest.cs" /> <Compile Include="TestObjects\StructTest.cs" />
<Compile Include="TestObjects\TestComponent.cs" /> <Compile Include="TestObjects\TestComponent.cs" />
<Compile Include="TestObjects\TestComponentSimple.cs" /> <Compile Include="TestObjects\TestComponentSimple.cs" />
@@ -115,7 +115,10 @@
<Compile Include="Bson\BsonWriterTests.cs" /> <Compile Include="Bson\BsonWriterTests.cs" />
<Compile Include="Bson\BsonReaderTests.cs" /> <Compile Include="Bson\BsonReaderTests.cs" />
<Compile Include="Converters\BinaryConverterTests.cs" /> <Compile Include="Converters\BinaryConverterTests.cs" />
<Compile Include="Converters\DiscriminatedUnionConverterTests.cs" />
<Compile Include="Converters\ExpandoObjectConverterTests.cs" /> <Compile Include="Converters\ExpandoObjectConverterTests.cs" />
<Compile Include="Converters\JsonValueConverterTests.cs" />
<Compile Include="Converters\KeyValuePairConverterTests.cs" />
<Compile Include="Converters\RegexConverterTests.cs" /> <Compile Include="Converters\RegexConverterTests.cs" />
<Compile Include="Converters\DataTableConverterTests.cs" /> <Compile Include="Converters\DataTableConverterTests.cs" />
<Compile Include="Converters\DataSetConverterTests.cs" /> <Compile Include="Converters\DataSetConverterTests.cs" />
@@ -166,6 +169,7 @@
<Compile Include="TestObjects\Container.cs" /> <Compile Include="TestObjects\Container.cs" />
<Compile Include="TestObjects\ContentBaseClass.cs" /> <Compile Include="TestObjects\ContentBaseClass.cs" />
<Compile Include="TestObjects\ContentSubClass.cs" /> <Compile Include="TestObjects\ContentSubClass.cs" />
<Compile Include="TestObjects\Currency.cs" />
<Compile Include="TestObjects\CustomerDataSet.cs" /> <Compile Include="TestObjects\CustomerDataSet.cs" />
<Compile Include="TestObjects\DataContractSerializationAttributesClass.cs" /> <Compile Include="TestObjects\DataContractSerializationAttributesClass.cs" />
<Compile Include="TestObjects\DateTimeWrapper.cs" /> <Compile Include="TestObjects\DateTimeWrapper.cs" />
@@ -231,6 +235,7 @@
<Compile Include="TestObjects\RequiredObject.cs" /> <Compile Include="TestObjects\RequiredObject.cs" />
<Compile Include="TestObjects\SearchResult.cs" /> <Compile Include="TestObjects\SearchResult.cs" />
<Compile Include="TestObjects\SelectListItem.cs" /> <Compile Include="TestObjects\SelectListItem.cs" />
<Compile Include="TestObjects\Shape.cs" />
<Compile Include="TestObjects\StructTest.cs" /> <Compile Include="TestObjects\StructTest.cs" />
<Compile Include="TestObjects\TestComponent.cs" /> <Compile Include="TestObjects\TestComponent.cs" />
<Compile Include="TestObjects\TestComponentSimple.cs" /> <Compile Include="TestObjects\TestComponentSimple.cs" />
@@ -75,4 +75,4 @@ using System.Security;
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("6.0.0.0")] [assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.4.17705")] [assembly: AssemblyFileVersion("6.0.5.17706")]
+3 -1
View File
@@ -26,6 +26,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Runtime.CompilerServices;
using System.Text; using System.Text;
using System.IO; using System.IO;
using System.Xml; using System.Xml;
@@ -1347,12 +1348,13 @@ namespace Newtonsoft.Json
// the runtime can execute the ParseNumber even if // the runtime can execute the ParseNumber even if
// the System.Numerics.BigInteger.Parse method is // the System.Numerics.BigInteger.Parse method is
// missing, which happens in some versions of Mono // missing, which happens in some versions of Mono
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] [MethodImpl(MethodImplOptions.NoInlining)]
private static object BigIntegerParse(string number, CultureInfo culture) private static object BigIntegerParse(string number, CultureInfo culture)
{ {
return System.Numerics.BigInteger.Parse(number, culture); return System.Numerics.BigInteger.Parse(number, culture);
} }
#endif #endif
private void ParseComment() private void ParseComment()
{ {
// should have already parsed / character before reaching this method // should have already parsed / character before reaching this method
@@ -91,5 +91,5 @@ using System.Security;
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("6.0.0.0")] [assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.4.17705")] [assembly: AssemblyFileVersion("6.0.5.17706")]
[assembly: CLSCompliant(true)] [assembly: CLSCompliant(true)]