-Added Portable40 back

This commit is contained in:
James Newton-King
2017-04-02 10:24:09 +12:00
parent 760e9ff3f3
commit aa5f28c097
90 changed files with 978 additions and 191 deletions
@@ -55,7 +55,7 @@ namespace Newtonsoft.Json.Tests.Converters
public byte[] NullByteArray { get; set; }
}
#if !(NET20 || PORTABLE || DNXCORE50)
#if !(NET20 || PORTABLE || PORTABLE40 || DNXCORE50)
[Test]
public void DeserializeBinaryClass()
{
@@ -121,7 +121,7 @@ namespace Newtonsoft.Json.Tests.Converters
}", json);
}
#if !(PORTABLE || DNXCORE50)
#if !(PORTABLE || PORTABLE40 || DNXCORE50)
public class SqlBinaryClass
{
public SqlBinary SqlBinary { get; set; }
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(PORTABLE || DNXCORE50)
#if !(PORTABLE || DNXCORE50 || PORTABLE40)
using System;
using Newtonsoft.Json.Converters;
#if DNXCORE50
@@ -28,7 +28,7 @@ using System.Text;
using Newtonsoft.Json.Bson;
using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Linq;
#if !(PORTABLE || DNXCORE50)
#if !(PORTABLE || DNXCORE50 || PORTABLE40)
using System;
using System.Collections.Generic;
#if DNXCORE50
@@ -486,7 +486,7 @@ namespace Newtonsoft.Json.Tests.Converters
StringAssert.AreEqual(@"null", json);
}
#if !(NET20 || PORTABLE)
#if !(NET20 || PORTABLE || PORTABLE40)
[Test]
public void DeserializedTypedDataTableWithConverter()
{
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET35 || NET20)
#if !(NET35 || NET20 || PORTABLE40)
using System;
using System.Collections.Generic;
using System.Dynamic;
@@ -23,6 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(DNXCORE50 || PORTABLE40)
using System.Globalization;
#if NET20
using Newtonsoft.Json.Utilities.LinqBridge;
@@ -2705,7 +2706,7 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.AreEqual(@"<root><b xmlns=""http://www.example.com/ns"">Asd</b><c>AAA</c><test>adad</test></root>", xmlBack.OuterXml);
}
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3
[Test]
public void DeserializeBigInteger()
{
@@ -2990,4 +2991,5 @@ namespace Newtonsoft.Json.Tests.Converters
}
#endif
}
}
}
#endif