This commit is contained in:
James Newton-King
2015-06-21 09:16:51 +00:00
parent f77d0db98e
commit 67c20905ee
3 changed files with 9 additions and 8 deletions
@@ -101,7 +101,7 @@ namespace Newtonsoft.Json.Tests.Converters
Stopwatch ts = new Stopwatch(); Stopwatch ts = new Stopwatch();
ts.Start(); ts.Start();
for (int i = 0; i < 10000; i++) for (int i = 0; i < 100; i++)
{ {
JsonConvert.SerializeObject(values); JsonConvert.SerializeObject(values);
} }
@@ -127,7 +127,7 @@ namespace Newtonsoft.Json.Tests.Converters
Stopwatch ts = new Stopwatch(); Stopwatch ts = new Stopwatch();
ts.Start(); ts.Start();
for (int i = 0; i < 10000; i++) for (int i = 0; i < 100; i++)
{ {
JsonConvert.DeserializeObject<List<Shape>>(json); JsonConvert.DeserializeObject<List<Shape>>(json);
} }
@@ -25,6 +25,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
@@ -128,10 +129,10 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Json
switch (_valueType) switch (_valueType)
{ {
case JTokenType.Integer: case JTokenType.Integer:
SetToken(JsonToken.Integer, Convert.ToInt64(_reader.Value)); SetToken(JsonToken.Integer, Convert.ToInt64(_reader.Value, CultureInfo.InvariantCulture));
break; break;
case JTokenType.Float: case JTokenType.Float:
SetToken(JsonToken.Float, Convert.ToDouble(_reader.Value)); SetToken(JsonToken.Float, Convert.ToDouble(_reader.Value, CultureInfo.InvariantCulture));
break; break;
case JTokenType.String: case JTokenType.String:
case JTokenType.Uri: case JTokenType.Uri:
@@ -140,10 +141,10 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Json
SetToken(JsonToken.String, _reader.Value); SetToken(JsonToken.String, _reader.Value);
break; break;
case JTokenType.Boolean: case JTokenType.Boolean:
SetToken(JsonToken.Boolean, Convert.ToBoolean(_reader.Value)); SetToken(JsonToken.Boolean, Convert.ToBoolean(_reader.Value, CultureInfo.InvariantCulture));
break; break;
case JTokenType.Date: case JTokenType.Date:
SetToken(JsonToken.Date, Convert.ToDateTime(_reader.Value)); SetToken(JsonToken.Date, Convert.ToDateTime(_reader.Value, CultureInfo.InvariantCulture));
break; break;
case JTokenType.Bytes: case JTokenType.Bytes:
SetToken(JsonToken.Bytes, Convert.FromBase64String(_reader.Value)); SetToken(JsonToken.Bytes, Convert.FromBase64String(_reader.Value));
@@ -78,9 +78,9 @@
<HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath> <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Collections.Immutable, Version=1.1.33.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Collections.Immutable, Version=1.1.34.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\System.Collections.Immutable.1.1.34-rc\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> <HintPath>..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.ComponentModel.DataAnnotations"> <Reference Include="System.ComponentModel.DataAnnotations">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>3.5</RequiredTargetFramework>