-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
@@ -39,7 +39,7 @@ using NUnit.Framework;
#endif
#if !(DNXCORE50 || NET20)
#if !(DNXCORE50 || NET20) || NETSTANDARD1_3 || NETSTANDARD2_0
namespace Newtonsoft.Json.Tests.Documentation.Samples.Json
{
@@ -375,7 +375,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Json
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.Integer, reader.TokenType);
Assert.AreEqual(123, reader.Value);
Assert.AreEqual(123L, reader.Value);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
@@ -442,7 +442,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Json
Assert.AreEqual(1, reader.ReadAsInt32());
Assert.AreEqual(JsonToken.Integer, reader.TokenType);
Assert.AreEqual(1, reader.Value);
Assert.AreEqual(1L, reader.Value);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.Bytes, reader.TokenType);
@@ -490,15 +490,15 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Json
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.Integer, reader.TokenType);
Assert.AreEqual(2000, reader.Value);
Assert.AreEqual(2000L, reader.Value);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.Integer, reader.TokenType);
Assert.AreEqual(12, reader.Value);
Assert.AreEqual(12L, reader.Value);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.Integer, reader.TokenType);
Assert.AreEqual(30, reader.Value);
Assert.AreEqual(30L, reader.Value);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.EndConstructor, reader.TokenType);
@@ -39,7 +39,7 @@ using NUnit.Framework;
#endif
#if !(DNXCORE50 || NET20)
#if !(DNXCORE50 || NET20) || NETSTANDARD2_0
namespace Newtonsoft.Json.Tests.Documentation.Samples.Json
{
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !DNXCORE50
#if !DNXCORE50 || NETSTANDARD2_0
using System;
using System.Collections.Generic;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !DNXCORE50
#if !DNXCORE50 || NETSTANDARD2_0
using System;
using System.Collections.Generic;
@@ -37,7 +37,7 @@ using NUnit.Framework;
#endif
#if !(DNXCORE50 || NET20 || NET35)
#if !(DNXCORE50 || NET20 || NET35) || NETSTANDARD2_0
namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
{
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(DNXCORE50 || PORTABLE || PORTABLE40)
#if !(DNXCORE50 || PORTABLE || PORTABLE40) || NETSTANDARD2_0
using System;
using System.Collections.Generic;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !DNXCORE50
#if !DNXCORE50 || NETSTANDARD2_0
using System;
using System.Collections.Generic;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || NET35 || NET40 || DNXCORE50 || PORTABLE40 || PORTABLE)
#if !(NET20 || NET35 || NET40 || DNXCORE50 || PORTABLE40 || PORTABLE) || NETSTANDARD1_0 || NETSTANDARD1_3 || NETSTANDARD2_0
using System;
using System.Collections.Generic;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(DNXCORE50 || PORTABLE || PORTABLE40)
#if !(DNXCORE50 || PORTABLE || PORTABLE40) || NETSTANDARD2_0
using System;
using System.Collections.Generic;
@@ -36,7 +36,7 @@ using NUnit.Framework;
#endif
#if !(DNXCORE50 || NET20 || PORTABLE || PORTABLE40)
#if !(DNXCORE50 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD2_0
namespace Newtonsoft.Json.Tests.Documentation.Samples.Xml
{
@@ -36,7 +36,7 @@ using NUnit.Framework;
#endif
#if !(NET20 || DNXCORE50 || PORTABLE || PORTABLE40)
#if !(NET20 || DNXCORE50 || PORTABLE || PORTABLE40) || NETSTANDARD2_0
namespace Newtonsoft.Json.Tests.Documentation.Samples.Xml
{