From 67c20905eee7fa86f6f42e0de197795f75ced088 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sun, 21 Jun 2015 09:16:51 +0000 Subject: [PATCH] -Build --- .../Converters/DiscriminatedUnionConverterTests.cs | 4 ++-- .../Documentation/Samples/Json/CustomJsonReader.cs | 9 +++++---- .../Newtonsoft.Json.Tests.Portable.csproj | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Src/Newtonsoft.Json.Tests/Converters/DiscriminatedUnionConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/DiscriminatedUnionConverterTests.cs index d018fd05..1d12cbfa 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/DiscriminatedUnionConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/DiscriminatedUnionConverterTests.cs @@ -101,7 +101,7 @@ namespace Newtonsoft.Json.Tests.Converters Stopwatch ts = new Stopwatch(); ts.Start(); - for (int i = 0; i < 10000; i++) + for (int i = 0; i < 100; i++) { JsonConvert.SerializeObject(values); } @@ -127,7 +127,7 @@ namespace Newtonsoft.Json.Tests.Converters Stopwatch ts = new Stopwatch(); ts.Start(); - for (int i = 0; i < 10000; i++) + for (int i = 0; i < 100; i++) { JsonConvert.DeserializeObject>(json); } diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/CustomJsonReader.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/CustomJsonReader.cs index 09988a44..07cd6700 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/CustomJsonReader.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/CustomJsonReader.cs @@ -25,6 +25,7 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.IO; using System.Linq; using System.Text; @@ -128,10 +129,10 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Json switch (_valueType) { case JTokenType.Integer: - SetToken(JsonToken.Integer, Convert.ToInt64(_reader.Value)); + SetToken(JsonToken.Integer, Convert.ToInt64(_reader.Value, CultureInfo.InvariantCulture)); break; case JTokenType.Float: - SetToken(JsonToken.Float, Convert.ToDouble(_reader.Value)); + SetToken(JsonToken.Float, Convert.ToDouble(_reader.Value, CultureInfo.InvariantCulture)); break; case JTokenType.String: case JTokenType.Uri: @@ -140,10 +141,10 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Json SetToken(JsonToken.String, _reader.Value); break; case JTokenType.Boolean: - SetToken(JsonToken.Boolean, Convert.ToBoolean(_reader.Value)); + SetToken(JsonToken.Boolean, Convert.ToBoolean(_reader.Value, CultureInfo.InvariantCulture)); break; case JTokenType.Date: - SetToken(JsonToken.Date, Convert.ToDateTime(_reader.Value)); + SetToken(JsonToken.Date, Convert.ToDateTime(_reader.Value, CultureInfo.InvariantCulture)); break; case JTokenType.Bytes: SetToken(JsonToken.Bytes, Convert.FromBase64String(_reader.Value)); diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj index 68cb85a7..55aa3ec7 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj @@ -78,9 +78,9 @@ ..\packages\NUnit.2.6.2\lib\nunit.framework.dll - + False - ..\packages\System.Collections.Immutable.1.1.34-rc\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll + ..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll 3.5