Merge branch 'master' into Move-classes-to-files-under-TestObjects

# Conflicts:
#	Src/Newtonsoft.Json.Tests/Converters/IsoDateTimeConverterTests.cs
#	Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs
#	Src/Newtonsoft.Json.Tests/Schema/ExtensionsTests.cs
#	Src/Newtonsoft.Json.Tests/Serialization/DependencyInjectionTests.cs
#	Src/Newtonsoft.Json.Tests/Serialization/ExtensionDataTests.cs
#	Src/Newtonsoft.Json.Tests/Serialization/PopulateTests.cs
#	Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs
#	Src/Newtonsoft.Json.Tests/TestObjects/Money/Currency.cs
This commit is contained in:
Pyit Phyo Aung
2016-10-13 14:49:15 +13:00
117 changed files with 213 additions and 1434 deletions
@@ -34,7 +34,7 @@ using System.Linq;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(NETFX_CORE || PORTABLE || DNXCORE50)
#if !(PORTABLE || DNXCORE50)
[Serializable]
public class AnswerFilterModel
{
@@ -41,7 +41,7 @@ namespace Newtonsoft.Json.Tests.TestObjects
public ulong ULong = long.MaxValue;
public double Double = double.MaxValue;
public float Float = float.MaxValue;
#if !(NETFX_CORE || PORTABLE || DNXCORE50)
#if !(PORTABLE || DNXCORE50)
public DBNull DBNull = DBNull.Value;
#endif
public bool Bool = true;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NETFX_CORE || PORTABLE40 || PORTABLE || DNXCORE50)
#if !(PORTABLE40 || PORTABLE || DNXCORE50)
using System;
using System.Collections.Generic;
using System.Text;
@@ -27,7 +27,7 @@ using System.ComponentModel;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(NETFX_CORE || DNXCORE50)
#if !(DNXCORE50)
[Description("DefaultValueAttributeTestClass description!")]
#endif
public sealed class DefaultValueAttributeTestClass
@@ -32,7 +32,7 @@ namespace Newtonsoft.Json.Tests.TestObjects
{
protected override string ResolvePropertyName(string propertyName)
{
#if !(NETFX_CORE || DNXCORE50)
#if !(DNXCORE50)
return ":::" + propertyName.ToUpper(CultureInfo.InvariantCulture) + ":::";
#else
return ":::" + propertyName.ToUpper() + ":::";
@@ -32,7 +32,7 @@ namespace Newtonsoft.Json.Tests.TestObjects
{
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
#if !(NETFX_CORE || DNXCORE50)
#if !(DNXCORE50)
writer.WriteValue(":::" + value.ToString().ToUpper(CultureInfo.InvariantCulture) + ":::");
#else
writer.WriteValue(":::" + value.ToString().ToUpper() + ":::");
@@ -47,7 +47,7 @@ namespace Newtonsoft.Json.Tests.TestObjects
return null;
}
#if !(NETFX_CORE || DNXCORE50)
#if !(DNXCORE50)
return s.ToLower(CultureInfo.InvariantCulture).Trim(new[] { ':' });
#else
return s.ToLower().Trim(new[] { ':' });
@@ -27,7 +27,7 @@ using System;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(NETFX_CORE || PORTABLE || DNXCORE50)
#if !(PORTABLE || DNXCORE50)
[Serializable]
public class PersonSerializable
{
@@ -29,7 +29,7 @@ using System.Runtime.Serialization;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(NETFX_CORE || DNXCORE50)
#if !(DNXCORE50)
public struct Ratio : IConvertible, IFormattable, ISerializable
{
private readonly int _numerator;
@@ -27,7 +27,7 @@ using System.Collections;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(NETFX_CORE || DNXCORE50)
#if !(DNXCORE50)
public class TypedSubHashtable
{
public string Name;