-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
@@ -34,7 +34,7 @@ using System.Linq;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3
#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0
[Serializable]
public class AnswerFilterModel
{
@@ -28,7 +28,7 @@ using System.IO;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(DNXCORE50)
#if !(DNXCORE50) || NETSTANDARD2_0
public class AttachmentReadConverter : JsonConverter
{
public override bool CanConvert(Type objectType)
@@ -27,7 +27,7 @@ using System.ComponentModel;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(NET35 || NET20 || PORTABLE || PORTABLE40)
#if !(NET35 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
[TypeConverter(typeof(MyInterfaceConverter))]
internal class ConsoleWriter : IMyInterface
{
@@ -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 !(PORTABLE || DNXCORE50)
#if !(PORTABLE || DNXCORE50) || NETSTANDARD2_0
public DBNull DBNull = DBNull.Value;
#endif
public bool Bool = true;
@@ -27,7 +27,7 @@ using System;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(PORTABLE)
#if !(PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0
public class ConvertableIntTestClass
{
public ConvertibleInt Integer { get; set; }
@@ -27,7 +27,7 @@ using System;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(PORTABLE)
#if !(PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0
public struct ConvertibleInt : IConvertible
{
private readonly int _value;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(PORTABLE40 || PORTABLE || DNXCORE50)
#if !(PORTABLE40 || PORTABLE || DNXCORE50) || NETSTANDARD2_0
using System;
using System.Collections.Generic;
using System.Text;
@@ -28,7 +28,7 @@ using System.Text;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(DNXCORE50)
#if !(DNXCORE50) || NETSTANDARD2_0
public class EncodingReadConverter : JsonConverter
{
public override bool CanConvert(Type objectType)
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET40 || NET35 || NET20 || DNXCORE50)
#if !(NET40 || NET35 || NET20 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0
using System;
using System.Diagnostics;
using System.Runtime.CompilerServices;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET35 || NET20 || DNXCORE50)
#if !(NET35 || NET20 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0
namespace Newtonsoft.Json.Tests.TestObjects.GeometricForms
{
public static class Tags
@@ -27,7 +27,7 @@ using System.ComponentModel;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(NET35 || NET20 || PORTABLE || PORTABLE40)
#if !(NET35 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
[TypeConverter(typeof(MyInterfaceConverter))]
internal interface IMyInterface
{
@@ -66,7 +66,7 @@ namespace Newtonsoft.Json.Tests.TestObjects
public override bool CanConvert(Type objectType)
{
#if DNXCORE50
#if DNXCORE50 && !NETSTANDARD2_0
return Newtonsoft.Json.Utilities.TypeExtensions.IsAssignableFrom(typeof(IList<T>), objectType);
#else
return typeof(IList<T>).IsAssignableFrom(objectType);
@@ -28,7 +28,7 @@ using Newtonsoft.Json.Linq;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(DNXCORE50)
#if !(DNXCORE50) || NETSTANDARD2_0
public class MailAddressReadConverter : JsonConverter
{
public override bool CanConvert(Type objectType)
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET40 || NET35 || NET20 || DNXCORE50)
#if !(NET40 || NET35 || NET20 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0
using System;
using System.Diagnostics;
using System.Runtime.CompilerServices;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET35 || NET20 || DNXCORE50)
#if !(NET35 || NET20 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0
namespace Newtonsoft.Json.Tests.TestObjects.Money
{
@@ -35,7 +35,7 @@ using System.Linq;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(NET35 || NET20 || PORTABLE || PORTABLE40)
#if !(NET35 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
internal class MyInterfaceConverter : TypeConverter
{
private readonly List<IMyInterface> _writers = new List<IMyInterface>
@@ -27,7 +27,7 @@ using System.Runtime.Serialization;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(NET20 || DNXCORE50)
#if !(NET20 || DNXCORE50) || NETSTANDARD2_0
[DataContract]
public class NullableStructPropertyClass
{
@@ -27,7 +27,7 @@ using System;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3
#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0
[Serializable]
public class PersonSerializable
{
@@ -27,7 +27,7 @@ using System.Runtime.Serialization;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(PORTABLE || PORTABLE40 || DNXCORE50)
#if !(PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0
public class PreserveReferencesCallbackTestObject : ISerializable
{
internal string _stringValue;
@@ -29,7 +29,7 @@ using System.Runtime.Serialization;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(DNXCORE50)
#if !(DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0
public struct Ratio : IConvertible, IFormattable, ISerializable
{
private readonly int _numerator;
@@ -27,7 +27,7 @@ using Newtonsoft.Json.Serialization;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(PORTABLE || NET35 || NET20 || PORTABLE40 || DNXCORE50)
#if !(PORTABLE || NET35 || NET20 || PORTABLE40 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0
public class SerializableContractResolver : DefaultContractResolver
{
public SerializableContractResolver()
@@ -27,7 +27,7 @@ using System.Collections.Specialized;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(NET20 || DNXCORE50)
#if !(NET20 || DNXCORE50) || NETSTANDARD2_0
public class StringDictionaryTestClass
{
public StringDictionary StringDictionaryProperty { get; set; }
@@ -27,7 +27,7 @@ using System.Runtime.Serialization;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(NET20 || DNXCORE50)
#if !(NET20 || DNXCORE50) || NETSTANDARD2_0
[DataContract]
public struct StructISerializable : ISerializable
{
@@ -25,7 +25,7 @@
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(NET35 || NET20 || PORTABLE || PORTABLE40)
#if !(NET35 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
internal class TraceWriter : IMyInterface
{
public string Name
@@ -34,7 +34,7 @@ using Newtonsoft.Json.Utilities;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(NET35 || NET20 || PORTABLE || PORTABLE40)
#if !(NET35 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
internal class TypeConverterJsonConverter : JsonConverter
{
private TypeConverter GetConverter(Type type)
@@ -27,7 +27,7 @@ using System.Collections;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(DNXCORE50)
#if !(DNXCORE50) || NETSTANDARD2_0
public class TypedSubHashtable
{
public string Name;