-Merge
This commit is contained in:
@@ -26,6 +26,9 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
|
#if !(NET20 || NET35 || SILVERLIGHT || PORTABLE40 || PORTABLE)
|
||||||
|
using System.Numerics;
|
||||||
|
#endif
|
||||||
using System.Text;
|
using System.Text;
|
||||||
#if !NETFX_CORE
|
#if !NETFX_CORE
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
@@ -38,9 +41,6 @@ using Newtonsoft.Json;
|
|||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Xml;
|
using System.Xml;
|
||||||
using Newtonsoft.Json.Utilities;
|
using Newtonsoft.Json.Utilities;
|
||||||
#if !(NET20 || NET35 || SILVERLIGHT || PORTABLE40 || PORTABLE)
|
|
||||||
using System.Numerics;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace Newtonsoft.Json.Tests
|
namespace Newtonsoft.Json.Tests
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1361,7 +1361,7 @@ _____'propertyName': NaN
|
|||||||
if (QuoteName)
|
if (QuoteName)
|
||||||
_writer.Write(QuoteChar);
|
_writer.Write(QuoteChar);
|
||||||
|
|
||||||
_writer.Write(new string(name.Reverse().ToArray()));
|
_writer.Write(new string(name.ToCharArray().Reverse().ToArray()));
|
||||||
|
|
||||||
if (QuoteName)
|
if (QuoteName)
|
||||||
_writer.Write(QuoteChar);
|
_writer.Write(QuoteChar);
|
||||||
|
|||||||
@@ -279,8 +279,10 @@
|
|||||||
<Compile Include="TestObjects\VersionKeyedCollection.cs" />
|
<Compile Include="TestObjects\VersionKeyedCollection.cs" />
|
||||||
<Compile Include="TestObjects\WagePerson.cs" />
|
<Compile Include="TestObjects\WagePerson.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
|
<Compile Include="Utilities\DateTimeUtilsTests.cs" />
|
||||||
<Compile Include="Utilities\DynamicReflectionDelegateFactoryTests.cs" />
|
<Compile Include="Utilities\DynamicReflectionDelegateFactoryTests.cs" />
|
||||||
<Compile Include="Utilities\ReflectionUtilsTests.cs" />
|
<Compile Include="Utilities\ReflectionUtilsTests.cs" />
|
||||||
|
<Compile Include="Utilities\StringUtilsTests.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<AppxManifest Include="Package.appxmanifest">
|
<AppxManifest Include="Package.appxmanifest">
|
||||||
|
|||||||
@@ -27,7 +27,13 @@ using System;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Text;
|
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;
|
using Newtonsoft.Json.Utilities;
|
||||||
|
|
||||||
namespace Newtonsoft.Json.Tests.Utilities
|
namespace Newtonsoft.Json.Tests.Utilities
|
||||||
|
|||||||
@@ -23,7 +23,13 @@
|
|||||||
// OTHER DEALINGS IN THE SOFTWARE.
|
// OTHER DEALINGS IN THE SOFTWARE.
|
||||||
#endregion
|
#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;
|
using Newtonsoft.Json.Utilities;
|
||||||
|
|
||||||
namespace Newtonsoft.Json.Tests.Utilities
|
namespace Newtonsoft.Json.Tests.Utilities
|
||||||
|
|||||||
@@ -146,11 +146,11 @@ namespace Newtonsoft.Json.Converters
|
|||||||
break;
|
break;
|
||||||
case JsonToken.Integer:
|
case JsonToken.Integer:
|
||||||
case JsonToken.Float:
|
case JsonToken.Float:
|
||||||
return JsonValue.CreateNumberValue(Convert.ToDouble(reader.Value));
|
return JsonValue.CreateNumberValue(Convert.ToDouble(reader.Value, CultureInfo.InvariantCulture));
|
||||||
case JsonToken.String:
|
case JsonToken.String:
|
||||||
return JsonValue.CreateStringValue(reader.Value.ToString());
|
return JsonValue.CreateStringValue(reader.Value.ToString());
|
||||||
case JsonToken.Boolean:
|
case JsonToken.Boolean:
|
||||||
return JsonValue.CreateBooleanValue(Convert.ToBoolean(reader.Value));
|
return JsonValue.CreateBooleanValue(Convert.ToBoolean(reader.Value, CultureInfo.InvariantCulture));
|
||||||
case JsonToken.Null:
|
case JsonToken.Null:
|
||||||
// surely there is a better way to create a null value than this?
|
// surely there is a better way to create a null value than this?
|
||||||
return JsonValue.Parse("null");
|
return JsonValue.Parse("null");
|
||||||
|
|||||||
@@ -258,6 +258,7 @@
|
|||||||
<Compile Include="Utilities\CollectionUtils.cs" />
|
<Compile Include="Utilities\CollectionUtils.cs" />
|
||||||
<Compile Include="Utilities\CollectionWrapper.cs" />
|
<Compile Include="Utilities\CollectionWrapper.cs" />
|
||||||
<Compile Include="Utilities\ConvertUtils.cs" />
|
<Compile Include="Utilities\ConvertUtils.cs" />
|
||||||
|
<Compile Include="Utilities\DateTimeParser.cs" />
|
||||||
<Compile Include="Utilities\DateTimeUtils.cs" />
|
<Compile Include="Utilities\DateTimeUtils.cs" />
|
||||||
<Compile Include="Utilities\DictionaryWrapper.cs" />
|
<Compile Include="Utilities\DictionaryWrapper.cs" />
|
||||||
<Compile Include="Utilities\DynamicProxy.cs" />
|
<Compile Include="Utilities\DynamicProxy.cs" />
|
||||||
|
|||||||
Reference in New Issue
Block a user