-Added netstandard2.0

This commit is contained in:
James Newton-King
2017-10-01 23:11:30 +13:00
parent 5cdad2e275
commit ab3315f1d5
104 changed files with 347 additions and 410 deletions
@@ -29,15 +29,17 @@ using System.ComponentModel;
using System.Collections.Concurrent;
#endif
using System.Collections.Generic;
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0
using System.Numerics;
#endif
#if !(NET20 || DNXCORE50)
#if !(NET20 || DNXCORE50) || NETSTANDARD2_0
using System.ComponentModel.DataAnnotations;
using System.Configuration;
using System.Runtime.CompilerServices;
using System.Runtime.Serialization.Formatters;
using System.Threading;
#endif
#if !(NET20 || DNXCORE50)
using System.Web.Script.Serialization;
#endif
using System.Text;
@@ -218,7 +220,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual("def", enumerableObject[1].Value);
}
#if !(PORTABLE || PORTABLE40 || NET20 || NET35)
#if !(PORTABLE || PORTABLE40 || NET20 || NET35) || NETSTANDARD1_3 || NETSTANDARD2_0
[Test]
public void LargeIntegerAsString()
{
@@ -274,7 +276,7 @@ namespace Newtonsoft.Json.Tests.Serialization
@"Error converting value {null} to type 'System.Boolean'. Path '[0]', line 1, position 3.");
}
#if !(PORTABLE || PORTABLE40 || NET35 || NET20)
#if !(PORTABLE || PORTABLE40 || NET35 || NET20) || NETSTANDARD1_3 || NETSTANDARD2_0
[Test]
public void DeserializeBooleans()
{
@@ -739,7 +741,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.IsNull(otc.Value5);
}
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE)
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0
[Test]
public void ReadIntegerWithError()
{
@@ -991,7 +993,7 @@ namespace Newtonsoft.Json.Tests.Serialization
serializer.ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor;
Assert.AreEqual(ConstructorHandling.AllowNonPublicDefaultConstructor, serializer.ConstructorHandling);
#if !(DNXCORE50)
#if !(DNXCORE50) || NETSTANDARD2_0
serializer.Context = new StreamingContext(StreamingContextStates.Other);
Assert.AreEqual(new StreamingContext(StreamingContextStates.Other), serializer.Context);
#endif
@@ -1062,7 +1064,7 @@ namespace Newtonsoft.Json.Tests.Serialization
serializer.TraceWriter = traceWriter;
Assert.AreEqual(traceWriter, serializer.TraceWriter);
#if !(PORTABLE || PORTABLE40 || NET20 || DNXCORE50)
#if !(PORTABLE || PORTABLE40 || NET20 || DNXCORE50) || NETSTANDARD2_0
#pragma warning disable 618
serializer.TypeNameAssemblyFormat = FormatterAssemblyStyle.Full;
Assert.AreEqual(FormatterAssemblyStyle.Full, serializer.TypeNameAssemblyFormat);
@@ -1100,7 +1102,7 @@ namespace Newtonsoft.Json.Tests.Serialization
settings.ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor;
Assert.AreEqual(ConstructorHandling.AllowNonPublicDefaultConstructor, settings.ConstructorHandling);
#if !(DNXCORE50)
#if !(DNXCORE50) || NETSTANDARD2_0
settings.Context = new StreamingContext(StreamingContextStates.Other);
Assert.AreEqual(new StreamingContext(StreamingContextStates.Other), settings.Context);
#endif
@@ -1177,7 +1179,7 @@ namespace Newtonsoft.Json.Tests.Serialization
settings.TraceWriter = traceWriter;
Assert.AreEqual(traceWriter, settings.TraceWriter);
#if !(PORTABLE || PORTABLE40 || NET20 || DNXCORE50)
#if !(PORTABLE || PORTABLE40 || NET20 || DNXCORE50) || NETSTANDARD2_0
#pragma warning disable 618
settings.TypeNameAssemblyFormat = FormatterAssemblyStyle.Full;
Assert.AreEqual(FormatterAssemblyStyle.Full, settings.TypeNameAssemblyFormat);
@@ -1226,7 +1228,7 @@ namespace Newtonsoft.Json.Tests.Serialization
serializerProxy.ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor;
Assert.AreEqual(ConstructorHandling.AllowNonPublicDefaultConstructor, serializerProxy.ConstructorHandling);
#if !(DNXCORE50)
#if !(DNXCORE50) || NETSTANDARD2_0
serializerProxy.Context = new StreamingContext(StreamingContextStates.Other);
Assert.AreEqual(new StreamingContext(StreamingContextStates.Other), serializerProxy.Context);
#endif
@@ -1297,7 +1299,7 @@ namespace Newtonsoft.Json.Tests.Serialization
serializerProxy.TraceWriter = traceWriter;
Assert.AreEqual(traceWriter, serializerProxy.TraceWriter);
#if !(PORTABLE || PORTABLE40 || NET20 || DNXCORE50)
#if !(PORTABLE || PORTABLE40 || NET20 || DNXCORE50) || NETSTANDARD2_0
#pragma warning disable 618
serializerProxy.TypeNameAssemblyFormat = FormatterAssemblyStyle.Full;
Assert.AreEqual(FormatterAssemblyStyle.Full, serializerProxy.TypeNameAssemblyFormat);
@@ -1318,7 +1320,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual(TypeNameHandling.All, serializerProxy.TypeNameHandling);
}
#if !(PORTABLE || PORTABLE40 || DNXCORE50)
#if !(PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0
[Test]
public void DeserializeISerializableIConvertible()
{
@@ -1800,7 +1802,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual(executorObject2.clientGetResultFunction, "ClientBanSubsCB");
}
#if !(DNXCORE50)
#if !(DNXCORE50) || NETSTANDARD2_0
[Test]
public void HashtableDeserialization()
{
@@ -2241,7 +2243,7 @@ keyword such as type of business.""
string json = JsonConvert.SerializeObject(new ConverableMembers(), Formatting.Indented);
string expected = null;
#if !(PORTABLE || DNXCORE50)
#if !(PORTABLE || DNXCORE50) || NETSTANDARD2_0
expected = @"{
""String"": ""string"",
""Int32"": 2147483647,
@@ -3423,7 +3425,7 @@ To fix this error either change the JSON to a JSON object (e.g. {""name"":""valu
Path '', line 1, position 1.");
}
#if !(PORTABLE || DNXCORE50)
#if !(PORTABLE || DNXCORE50) || NETSTANDARD2_0
[Test]
public void CannotDeserializeArrayIntoSerializable()
{
@@ -3541,7 +3543,7 @@ Path '', line 1, position 1.");
{
ContractResolver = new DefaultContractResolver
{
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
IgnoreSerializableAttribute = true
#endif
}
@@ -3558,7 +3560,7 @@ Path '', line 1, position 1.");
{
ContractResolver = new DefaultContractResolver
{
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
IgnoreSerializableAttribute = true
#endif
}
@@ -3575,7 +3577,7 @@ Path '', line 1, position 1.");
{
ContractResolver = new DefaultContractResolver
{
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
IgnoreSerializableAttribute = true
#endif
}
@@ -3592,7 +3594,7 @@ Path '', line 1, position 1.");
{
ContractResolver = new DefaultContractResolver
{
#if !(PORTABLE || DNXCORE50 || PORTABLE40)
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
IgnoreSerializableAttribute = true
#endif
}
@@ -4054,7 +4056,7 @@ Path '', line 1, position 1.");
Assert.AreEqual("value", newModelStateDictionary["key"]);
}
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
#if DEBUG
[Test]
public void SerializeISerializableInPartialTrustWithIgnoreInterface()
@@ -4201,7 +4203,7 @@ Path '', line 1, position 1.");
#if !NET20
dateTimeOffsetText = @"\/Date(977345999000+0200)\/";
#else
dateTimeOffsetText = @"12/20/2000 22:59:59 +02:00";
dateTimeOffsetText = @"12/20/2000 22:59:59 +02:00";
#endif
ISerializableTestObject o = new ISerializableTestObject("String!", int.MinValue, dateTimeOffset, person);
@@ -4291,7 +4293,7 @@ Path '', line 1, position 1.");
}", json);
}
#if !(PORTABLE)
#if !(PORTABLE) || NETSTANDARD2_0
[Test]
public void DeserializeClassWithInheritedProtectedMember()
{
@@ -4391,7 +4393,7 @@ Path '', line 1, position 1.");
}
#endif
#if !(PORTABLE || DNXCORE50 || PORTABLE40)
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
[Test]
public void SerializeDeserializeXmlNodeProperties()
{
@@ -4607,7 +4609,7 @@ Path '', line 1, position 1.");
Assert.AreEqual(0, z[1].Prop1.Length);
}
#if !(NET20 || DNXCORE50)
#if !(NET20 || DNXCORE50) || NETSTANDARD2_0
[Test]
public void StringDictionaryTest()
{
@@ -4852,7 +4854,7 @@ Path '', line 1, position 1.");
Assert.AreEqual(meh.IDontWork, "meh");
}
#if !(NET20 || DNXCORE50)
#if !(NET20 || DNXCORE50) || NETSTANDARD2_0
[Test]
public void DeserializeNullableStruct()
{
@@ -5265,7 +5267,7 @@ Path '', line 1, position 1.");
}
#endif
#if !(PORTABLE || DNXCORE50 || PORTABLE40)
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0
[Test]
public void SerializeException1()
{
@@ -5484,7 +5486,7 @@ Path '', line 1, position 1.");
Assert.AreEqual(-3, StaticTestClass.z);
}
#if !(NET20 || DNXCORE50)
#if !(NET20 || DNXCORE50) || NETSTANDARD2_0
[Test]
public void DeserializeDecimalsWithCulture()
{
@@ -5584,7 +5586,7 @@ Path '', line 1, position 1.");
}, "Error converting value {null} to type 'System.Int32'. Path '[3]', line 5, position 6.");
}
#if !(PORTABLE)
#if !(PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0
[Test]
public void SerializeIConvertible()
{
@@ -6312,7 +6314,7 @@ Path '', line 1, position 1.");
Assert.AreEqual("", s);
}
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
[Test]
public void SerializeAndDeserializeWithAttributes()
{
@@ -6682,7 +6684,7 @@ This is just junk, though.";
}
#if !(NET20 || NET35 || NET40 || PORTABLE40)
#if !PORTABLE || NETSTANDARD1_3
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
[Test]
public void DeserializeReadOnlyListWithBigInteger()
{
@@ -6740,7 +6742,7 @@ This is just junk, though.";
Action doStuff = () => { obj = JsonConvert.DeserializeObject<MyTuple<int>>(json); };
#if !(PORTABLE || DNXCORE50 || PORTABLE40)
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0
doStuff();
Assert.AreEqual(500, obj.Item1);
#else
@@ -6771,7 +6773,7 @@ This is just junk, though.";
}
#endif
#if !(PORTABLE || NET35 || NET20 || PORTABLE40 || DNXCORE50)
#if !(PORTABLE || NET35 || NET20 || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0
[Test]
public void SerializeTupleWithSerializableAttribute()
{
@@ -6967,7 +6969,7 @@ This is just junk, though.";
}
#endif
#if !(PORTABLE || NET35 || NET20 || PORTABLE40) || NETSTANDARD1_3
#if !(PORTABLE || NET35 || NET20 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
[Test]
public void ReadTooLargeInteger()
{
@@ -6990,7 +6992,7 @@ This is just junk, though.";
Assert.AreEqual(@"{""First"":""One"",""Second"":2}", json);
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
DefaultContractResolver r = new DefaultContractResolver();
r.IgnoreSerializableAttribute = false;
@@ -7097,7 +7099,7 @@ This is just junk, though.";
Assert.AreEqual(1234567890.123456m, d);
}
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
[Test]
public void DontSerializeStaticFields()
{
@@ -7121,7 +7123,7 @@ This is just junk, though.";
}
#endif
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
[Test]
public void SerializeBigInteger()
{
@@ -7262,7 +7264,7 @@ This is just junk, though.";
}
#endif
#if !(PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD1_0 || NETSTANDARD1_3
#if !(PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD1_0 || NETSTANDARD1_3 || NETSTANDARD2_0
[Test]
public void SerializeDictionaryWithStructKey_Custom()
{
@@ -7353,7 +7355,7 @@ This is just junk, though.";
Assert.AreEqual(jane, john.Spouse);
}
#if !(NET35 || NET20 || PORTABLE || PORTABLE40)
#if !(NET35 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
[Test]
public void TypeConverterOnInterface()
{
@@ -7419,7 +7421,7 @@ This is just junk, though.";
ParticipantEntity deserializedProduct = JsonConvert.DeserializeObject<ParticipantEntity>(json);
}
#if !(PORTABLE)
#if !(PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0
[Test]
public void ConvertibleIdTest()
{
@@ -7745,7 +7747,7 @@ This is just junk, though.";
Assert.AreEqual("derived", d.DerivedProperty);
}
#if !(NET20 || NET35 || PORTABLE || PORTABLE40)
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
[Test]
public void DeserializeNullableUnsignedLong()
{
@@ -7760,7 +7762,7 @@ This is just junk, though.";
}
#endif
#if !(DNXCORE50)
#if !(DNXCORE50) || NETSTANDARD2_0
[Test]
public void MailMessageConverterTest()
{