-Merge

Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs

@@ -26,6 +26,9 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+#if !(NET20 || NET35 || SILVERLIGHT || PORTABLE40 || PORTABLE)
+using System.Numerics;
+#endif
 using System.Text;
 #if !NETFX_CORE
 using NUnit.Framework;
@@ -38,9 +41,6 @@ using Newtonsoft.Json;
 using System.IO;
 using System.Xml;
 using Newtonsoft.Json.Utilities;
-#if !(NET20 || NET35 || SILVERLIGHT || PORTABLE40 || PORTABLE)
-using System.Numerics;
-#endif
 
 namespace Newtonsoft.Json.Tests
 {

Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs

@@ -1361,7 +1361,7 @@ _____'propertyName': NaN
       if (QuoteName)
         _writer.Write(QuoteChar);
 
-      _writer.Write(new string(name.Reverse().ToArray()));
+      _writer.Write(new string(name.ToCharArray().Reverse().ToArray()));
 
       if (QuoteName)
         _writer.Write(QuoteChar);

Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.WinRT.csproj

@@ -279,8 +279,10 @@
     <Compile Include="TestObjects\VersionKeyedCollection.cs" />
     <Compile Include="TestObjects\WagePerson.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Utilities\DateTimeUtilsTests.cs" />
     <Compile Include="Utilities\DynamicReflectionDelegateFactoryTests.cs" />
     <Compile Include="Utilities\ReflectionUtilsTests.cs" />
+    <Compile Include="Utilities\StringUtilsTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">

Src/Newtonsoft.Json.Tests/Utilities/DateTimeUtilsTests.cs

@@ -27,7 +27,13 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
-using NUnit.Framework;
+#if !NETFX_CORE
+using global::NUnit.Framework;
+#else
+using global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using TestFixture = global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
+using Test = global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
+#endif
 using Newtonsoft.Json.Utilities;
 
 namespace Newtonsoft.Json.Tests.Utilities

Src/Newtonsoft.Json.Tests/Utilities/StringUtilsTests.cs

@@ -23,7 +23,13 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 #endregion
 
-using NUnit.Framework;
+#if !NETFX_CORE
+using global::NUnit.Framework;
+#else
+using global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using TestFixture = global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
+using Test = global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
+#endif
 using Newtonsoft.Json.Utilities;
 
 namespace Newtonsoft.Json.Tests.Utilities

Src/Newtonsoft.Json/Converters/JsonValueConverter.cs

@@ -146,11 +146,11 @@ namespace Newtonsoft.Json.Converters
           break;
         case JsonToken.Integer:
         case JsonToken.Float:
-          return JsonValue.CreateNumberValue(Convert.ToDouble(reader.Value));
+          return JsonValue.CreateNumberValue(Convert.ToDouble(reader.Value, CultureInfo.InvariantCulture));
         case JsonToken.String:
           return JsonValue.CreateStringValue(reader.Value.ToString());
         case JsonToken.Boolean:
-          return JsonValue.CreateBooleanValue(Convert.ToBoolean(reader.Value));
+          return JsonValue.CreateBooleanValue(Convert.ToBoolean(reader.Value, CultureInfo.InvariantCulture));
         case JsonToken.Null:
           // surely there is a better way to create a null value than this?
           return JsonValue.Parse("null");

Src/Newtonsoft.Json/Newtonsoft.Json.WinRT.csproj

@@ -258,6 +258,7 @@
     <Compile Include="Utilities\CollectionUtils.cs" />
     <Compile Include="Utilities\CollectionWrapper.cs" />
     <Compile Include="Utilities\ConvertUtils.cs" />
+    <Compile Include="Utilities\DateTimeParser.cs" />
     <Compile Include="Utilities\DateTimeUtils.cs" />
     <Compile Include="Utilities\DictionaryWrapper.cs" />
     <Compile Include="Utilities\DynamicProxy.cs" />