Update .NET 6 tests (#2678)

This commit is contained in:
James Newton-King
2022-05-16 17:13:53 +08:00
committed by GitHub
parent bf2e2a78e8
commit 5803c7722a
108 changed files with 262 additions and 262 deletions
@@ -35,7 +35,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Attributes;
using Newtonsoft.Json.Utilities; using Newtonsoft.Json.Utilities;
#if !PORTABLE || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD2_0 || NET6_0_OR_GREATER
using MemberTypes = System.Reflection.MemberTypes; using MemberTypes = System.Reflection.MemberTypes;
using BindingFlags = System.Reflection.BindingFlags; using BindingFlags = System.Reflection.BindingFlags;
#else #else
@@ -31,7 +31,7 @@ using System.Reflection;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Serialization;
using Newtonsoft.Json.Tests.TestObjects; using Newtonsoft.Json.Tests.TestObjects;
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using System.Text; using System.Text;
@@ -1495,7 +1495,7 @@ namespace Newtonsoft.Json.Tests.Bson
Assert.AreEqual(badText, (string)o["test"]); Assert.AreEqual(badText, (string)o["test"]);
} }
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
public class BigIntegerTestClass public class BigIntegerTestClass
{ {
public BigInteger Blah { get; set; } public BigInteger Blah { get; set; }
@@ -26,7 +26,7 @@
#pragma warning disable 618 #pragma warning disable 618
#if !(NET20 || NET35 || NET40 || PORTABLE40) #if !(NET20 || NET35 || NET40 || PORTABLE40)
using System; using System;
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using System.Text; using System.Text;
@@ -499,7 +499,7 @@ namespace Newtonsoft.Json.Tests.Bson
Assert.AreEqual("10-00-00-00-09-30-00-C8-88-07-6B-DC-00-00-00-00", (BitConverter.ToString(ms.ToArray()))); Assert.AreEqual("10-00-00-00-09-30-00-C8-88-07-6B-DC-00-00-00-00", (BitConverter.ToString(ms.ToArray())));
} }
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public async Task WriteBigIntegerAsync() public async Task WriteBigIntegerAsync()
{ {
@@ -26,7 +26,7 @@
#pragma warning disable 618 #pragma warning disable 618
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using System.Text; using System.Text;
@@ -798,7 +798,7 @@ namespace Newtonsoft.Json.Tests.Bson
Assert.AreEqual(c.AGuid, c2.AGuid.ToString()); Assert.AreEqual(c.AGuid, c2.AGuid.ToString());
} }
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void WriteBigInteger() public void WriteBigInteger()
{ {
@@ -28,7 +28,7 @@ using System.Collections.Generic;
#if !(NET20 || DNXCORE50) #if !(NET20 || DNXCORE50)
using System.Data.Linq; using System.Data.Linq;
#endif #endif
#if !DNXCORE50 || NETSTANDARD2_0 #if !DNXCORE50 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Data.SqlTypes; using System.Data.SqlTypes;
#endif #endif
using System.Text; using System.Text;
@@ -121,7 +121,7 @@ namespace Newtonsoft.Json.Tests.Converters
}", json); }", json);
} }
#if !(PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0 #if !(PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
public class SqlBinaryClass public class SqlBinaryClass
{ {
public SqlBinary SqlBinary { get; set; } public SqlBinary SqlBinary { get; set; }
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
#if DNXCORE50 #if DNXCORE50
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.IO; using System.IO;
using System.Text; using System.Text;
using Newtonsoft.Json.Bson; using Newtonsoft.Json.Bson;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET40 || NET35 || NET20 || DNXCORE50) || NETSTANDARD2_0 #if !(NET40 || NET35 || NET20 || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Diagnostics; using System.Diagnostics;
using System.Reflection; using System.Reflection;
using Microsoft.FSharp.Core; using Microsoft.FSharp.Core;
@@ -123,7 +123,7 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.AreEqual(2006, d.Year); Assert.AreEqual(2006, d.Year);
} }
#if !(DNXCORE50) || NETSTANDARD2_0 #if !(DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void SerializeFormattedDateTimeNewZealandCulture() public void SerializeFormattedDateTimeNewZealandCulture()
{ {
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Globalization; using System.Globalization;
#if NET20 #if NET20
using Newtonsoft.Json.Utilities.LinqBridge; using Newtonsoft.Json.Utilities.LinqBridge;
@@ -58,7 +58,7 @@ namespace Newtonsoft.Json.Tests.Converters
[TestFixture] [TestFixture]
public class XmlNodeConverterTest : TestFixtureBase public class XmlNodeConverterTest : TestFixtureBase
{ {
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
private string SerializeXmlNode(XmlNode node) private string SerializeXmlNode(XmlNode node)
{ {
string json = JsonConvert.SerializeXmlNode(node, Formatting.Indented); string json = JsonConvert.SerializeXmlNode(node, Formatting.Indented);
@@ -151,7 +151,7 @@ namespace Newtonsoft.Json.Tests.Converters
return sw.ToString(); return sw.ToString();
} }
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void DeserializeXmlNode_DefaultDate() public void DeserializeXmlNode_DefaultDate()
{ {
@@ -569,7 +569,7 @@ namespace Newtonsoft.Json.Tests.Converters
} }
#endif #endif
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void MultipleNamespacesXmlDocument() public void MultipleNamespacesXmlDocument()
{ {
@@ -748,7 +748,7 @@ namespace Newtonsoft.Json.Tests.Converters
</root>", doc.ToString()); </root>", doc.ToString());
} }
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void SerializeEmptyDocument() public void SerializeEmptyDocument()
{ {
@@ -794,7 +794,7 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.IsTrue(equals); Assert.IsTrue(equals);
} }
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void DeserializeUndeclaredNamespacePrefix() public void DeserializeUndeclaredNamespacePrefix()
{ {
@@ -809,7 +809,7 @@ namespace Newtonsoft.Json.Tests.Converters
#endif #endif
#endif #endif
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void DeserializeMultipleRootElements() public void DeserializeMultipleRootElements()
{ {
@@ -1604,7 +1604,7 @@ namespace Newtonsoft.Json.Tests.Converters
] ]
}"; }";
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
XmlDocument newDoc = JsonConvert.DeserializeXmlNode(json, "myRoot"); XmlDocument newDoc = JsonConvert.DeserializeXmlNode(json, "myRoot");
string xml = IndentXml(newDoc.InnerXml); string xml = IndentXml(newDoc.InnerXml);
@@ -1642,7 +1642,7 @@ namespace Newtonsoft.Json.Tests.Converters
</myRoot>", IndentXml(newXDoc.ToString(SaveOptions.DisableFormatting))); </myRoot>", IndentXml(newXDoc.ToString(SaveOptions.DisableFormatting)));
#endif #endif
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
string newJson = JsonConvert.SerializeXmlNode(newDoc, Formatting.Indented); string newJson = JsonConvert.SerializeXmlNode(newDoc, Formatting.Indented);
Console.WriteLine(newJson); Console.WriteLine(newJson);
#endif #endif
@@ -1667,7 +1667,7 @@ namespace Newtonsoft.Json.Tests.Converters
] ]
}"; }";
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
XmlDocument newDoc = JsonConvert.DeserializeXmlNode(json, "myRoot", true); XmlDocument newDoc = JsonConvert.DeserializeXmlNode(json, "myRoot", true);
StringAssert.AreEqual(@"<myRoot> StringAssert.AreEqual(@"<myRoot>
@@ -1703,7 +1703,7 @@ namespace Newtonsoft.Json.Tests.Converters
</myRoot>", IndentXml(newXDoc.ToString(SaveOptions.DisableFormatting))); </myRoot>", IndentXml(newXDoc.ToString(SaveOptions.DisableFormatting)));
#endif #endif
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
string newJson = JsonConvert.SerializeXmlNode(newDoc, Formatting.Indented, true); string newJson = JsonConvert.SerializeXmlNode(newDoc, Formatting.Indented, true);
StringAssert.AreEqual(json, newJson); StringAssert.AreEqual(json, newJson);
#endif #endif
@@ -1729,7 +1729,7 @@ namespace Newtonsoft.Json.Tests.Converters
] ]
}"; }";
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
XmlDocument newDoc = JsonConvert.DeserializeXmlNode(json, "myRoot"); XmlDocument newDoc = JsonConvert.DeserializeXmlNode(json, "myRoot");
Assert.AreEqual(@"<myRoot><available_sizes><available_sizes><available_sizes>113</available_sizes><available_sizes>150</available_sizes></available_sizes><available_sizes>assets/images/resized/0001/1070/11070v1-max-150x150.jpg</available_sizes></available_sizes><available_sizes><available_sizes><available_sizes>189</available_sizes><available_sizes>250</available_sizes></available_sizes><available_sizes>assets/images/resized/0001/1070/11070v1-max-250x250.jpg</available_sizes></available_sizes><available_sizes><available_sizes><available_sizes>341</available_sizes><available_sizes>450</available_sizes></available_sizes><available_sizes>assets/images/resized/0001/1070/11070v1-max-450x450.jpg</available_sizes></available_sizes></myRoot>", newDoc.InnerXml); Assert.AreEqual(@"<myRoot><available_sizes><available_sizes><available_sizes>113</available_sizes><available_sizes>150</available_sizes></available_sizes><available_sizes>assets/images/resized/0001/1070/11070v1-max-150x150.jpg</available_sizes></available_sizes><available_sizes><available_sizes><available_sizes>189</available_sizes><available_sizes>250</available_sizes></available_sizes><available_sizes>assets/images/resized/0001/1070/11070v1-max-250x250.jpg</available_sizes></available_sizes><available_sizes><available_sizes><available_sizes>341</available_sizes><available_sizes>450</available_sizes></available_sizes><available_sizes>assets/images/resized/0001/1070/11070v1-max-450x450.jpg</available_sizes></available_sizes></myRoot>", newDoc.InnerXml);
@@ -1742,7 +1742,7 @@ namespace Newtonsoft.Json.Tests.Converters
#endif #endif
} }
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void Encoding() public void Encoding()
{ {
@@ -1757,7 +1757,7 @@ namespace Newtonsoft.Json.Tests.Converters
} }
#endif #endif
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void SerializeComment() public void SerializeComment()
{ {
@@ -2808,7 +2808,7 @@ namespace Newtonsoft.Json.Tests.Converters
} }
#endif #endif
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void DeserializeXmlNodeDefaultNamespace() public void DeserializeXmlNodeDefaultNamespace()
{ {
@@ -3136,7 +3136,7 @@ namespace Newtonsoft.Json.Tests.Converters
} }
#endif #endif
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void SerializeAndDeserializeXmlElementWithNamespaceInChildrenRootDontHaveNameSpace() public void SerializeAndDeserializeXmlElementWithNamespaceInChildrenRootDontHaveNameSpace()
{ {
@@ -3155,7 +3155,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); 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 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void DeserializeBigInteger() public void DeserializeBigInteger()
{ {
+6 -6
View File
@@ -24,11 +24,11 @@
#endregion #endregion
using System; using System;
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0 #if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Buffers; using System.Buffers;
#endif #endif
using System.Collections.Generic; using System.Collections.Generic;
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Data; using System.Data;
#endif #endif
using System.IO; using System.IO;
@@ -596,7 +596,7 @@ namespace Newtonsoft.Json.Tests
}", json); }", json);
} }
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0 #if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void ArrayPooling() public void ArrayPooling()
{ {
@@ -614,7 +614,7 @@ namespace Newtonsoft.Json.Tests
} }
#endif #endif
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void SerializeDataTable() public void SerializeDataTable()
{ {
@@ -681,7 +681,7 @@ namespace Newtonsoft.Json.Tests
Assert.AreEqual(1, newtonsoftPackages.Count); Assert.AreEqual(1, newtonsoftPackages.Count);
} }
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0 #if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public async Task AsyncDemo() public async Task AsyncDemo()
{ {
@@ -705,7 +705,7 @@ namespace Newtonsoft.Json.Tests
#endif #endif
} }
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0 #if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
public class JsonArrayPool : IArrayPool<char> public class JsonArrayPool : IArrayPool<char>
{ {
public static readonly JsonArrayPool Instance = new JsonArrayPool(); public static readonly JsonArrayPool Instance = new JsonArrayPool();
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET35 || NET20 || PORTABLE || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET35 || NET20 || PORTABLE || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET35 || NET20 || PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET35 || NET20 || PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET40 || NET35 || NET20 || PORTABLE || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET40 || NET35 || NET20 || PORTABLE || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
#pragma warning disable 618 #pragma warning disable 618
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET35 || NET20 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET35 || NET20 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET40 || NET35 || NET20 || PORTABLE || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET40 || NET35 || NET20 || PORTABLE || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET40 || NET35 || NET20 || PORTABLE || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET40 || NET35 || NET20 || PORTABLE || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@@ -39,7 +39,7 @@ using NUnit.Framework;
#endif #endif
#if !(DNXCORE50 || NET20) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(DNXCORE50 || NET20) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
namespace Newtonsoft.Json.Tests.Documentation.Samples.Json namespace Newtonsoft.Json.Tests.Documentation.Samples.Json
{ {
@@ -39,7 +39,7 @@ using NUnit.Framework;
#endif #endif
#if !(DNXCORE50 || NET20) || NETSTANDARD2_0 #if !(DNXCORE50 || NET20) || NETSTANDARD2_0 || NET6_0_OR_GREATER
namespace Newtonsoft.Json.Tests.Documentation.Samples.Json namespace Newtonsoft.Json.Tests.Documentation.Samples.Json
{ {
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !DNXCORE50 || NETSTANDARD2_0 #if !DNXCORE50 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !DNXCORE50 || NETSTANDARD2_0 #if !DNXCORE50 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -37,7 +37,7 @@ using NUnit.Framework;
#endif #endif
#if !(DNXCORE50 || NET20 || NET35) || NETSTANDARD2_0 #if !(DNXCORE50 || NET20 || NET35) || NETSTANDARD2_0 || NET6_0_OR_GREATER
namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
{ {
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(DNXCORE50 || PORTABLE || PORTABLE40) || NETSTANDARD2_0 #if !(DNXCORE50 || PORTABLE || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !DNXCORE50 || NETSTANDARD2_0 #if !DNXCORE50 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET20 || NET35 || NET40 || DNXCORE50 || PORTABLE40 || PORTABLE) || NETSTANDARD1_0 || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || NET40 || DNXCORE50 || PORTABLE40 || PORTABLE) || NETSTANDARD1_0 || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(DNXCORE50 || PORTABLE || PORTABLE40) || NETSTANDARD2_0 #if !(DNXCORE50 || PORTABLE || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -36,7 +36,7 @@ using NUnit.Framework;
#endif #endif
#if !(DNXCORE50 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD2_0 #if !(DNXCORE50 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
namespace Newtonsoft.Json.Tests.Documentation.Samples.Xml namespace Newtonsoft.Json.Tests.Documentation.Samples.Xml
{ {
@@ -36,7 +36,7 @@ using NUnit.Framework;
#endif #endif
#if !(NET20 || DNXCORE50 || PORTABLE || PORTABLE40) || NETSTANDARD2_0 #if !(NET20 || DNXCORE50 || PORTABLE || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
namespace Newtonsoft.Json.Tests.Documentation.Samples.Xml namespace Newtonsoft.Json.Tests.Documentation.Samples.Xml
{ {
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET35 || NET20 || PORTABLE || DNXCORE50) || NETSTANDARD2_0 #if !(NET35 || NET20 || PORTABLE || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET35 || NET20 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET35 || NET20 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
+2 -2
View File
@@ -25,7 +25,7 @@
using System; using System;
using System.IO; using System.IO;
#if !(PORTABLE || DNXCORE50) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Runtime.Serialization.Formatters.Binary; using System.Runtime.Serialization.Formatters.Binary;
#endif #endif
using Newtonsoft.Json.Schema; using Newtonsoft.Json.Schema;
@@ -105,7 +105,7 @@ namespace Newtonsoft.Json.Tests
} }
#pragma warning restore 618 #pragma warning restore 618
#if !(PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0 #if !(PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void BinarySerializeException() public void BinarySerializeException()
{ {
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 #if !(DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@@ -47,7 +47,7 @@ namespace Newtonsoft.Json.Tests.Issues
[TestFixture] [TestFixture]
public class Issue1327 : TestFixtureBase public class Issue1327 : TestFixtureBase
{ {
#if !PORTABLE || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD2_0 || NET6_0_OR_GREATER
public class PersonWithXmlNode public class PersonWithXmlNode
{ {
public XmlNode TestXml { get; set; } public XmlNode TestXml { get; set; }
@@ -71,7 +71,7 @@ namespace Newtonsoft.Json.Tests.Issues
} }
#endif #endif
#if !PORTABLE || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void Test_XmlNode() public void Test_XmlNode()
{ {
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if NETSTANDARD2_0 #if NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.Data; using System.Data;
using System.IO; using System.IO;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(PORTABLE) || NETSTANDARD2_0 #if !(PORTABLE) || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.Data; using System.Data;
using System.Linq; using System.Linq;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.IO; using System.IO;
using System.Text; using System.Text;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET20 || NET35 || NET40 || PORTABLE40 || PORTABLE) || NETSTANDARD1_0 || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || NET40 || PORTABLE40 || PORTABLE) || NETSTANDARD1_0 || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
@@ -36,7 +36,7 @@ using System.Runtime.Serialization;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Serialization;
using Newtonsoft.Json.Utilities; using Newtonsoft.Json.Utilities;
#if PORTABLE && !NETSTANDARD2_0 #if PORTABLE && !(NETSTANDARD2_0 || NET6_0_OR_GREATER)
using BindingFlags = Newtonsoft.Json.Utilities.BindingFlags; using BindingFlags = Newtonsoft.Json.Utilities.BindingFlags;
#else #else
using BindingFlags = System.Reflection.BindingFlags; using BindingFlags = System.Reflection.BindingFlags;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Linq.JsonPath; using Newtonsoft.Json.Linq.JsonPath;
using System; using System;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if (NETSTANDARD2_0) #if (NETSTANDARD2_0 || NET6_0_OR_GREATER)
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
@@ -90,7 +90,7 @@ namespace Newtonsoft.Json.Tests.Issues
var objectContract = (JsonObjectContract) resolver.ResolveContract(typeof(NonSerializableException)); var objectContract = (JsonObjectContract) resolver.ResolveContract(typeof(NonSerializableException));
Assert.IsFalse(objectContract.Properties.Contains("TargetSite")); Assert.IsFalse(objectContract.Properties.Contains("TargetSite"));
#if (PORTABLE40 || PORTABLE) && !(NETSTANDARD2_0 || NETSTANDARD1_3) #if (PORTABLE40 || PORTABLE) && !(NETSTANDARD2_0 || NETSTANDARD1_3 || NET6_0_OR_GREATER)
objectContract = (JsonObjectContract) resolver.ResolveContract(typeof(Exception)); objectContract = (JsonObjectContract) resolver.ResolveContract(typeof(Exception));
Assert.IsFalse(objectContract.Properties.Contains("TargetSite")); Assert.IsFalse(objectContract.Properties.Contains("TargetSite"));
#else #else
+2 -2
View File
@@ -30,7 +30,7 @@ using System.Collections.ObjectModel;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using Newtonsoft.Json.Schema; using Newtonsoft.Json.Schema;
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using System.Runtime.Serialization; using System.Runtime.Serialization;
@@ -1139,7 +1139,7 @@ namespace Newtonsoft.Json.Tests
writer.Flush(); writer.Flush();
} }
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void IntegerLengthOverflows() public void IntegerLengthOverflows()
{ {
@@ -27,7 +27,7 @@
using System; using System;
using System.Globalization; using System.Globalization;
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using System.Text; using System.Text;
@@ -593,7 +593,7 @@ namespace Newtonsoft.Json.Tests.JsonTextReaderTests
} }
} }
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public async Task ReadInt64OverflowAsync() public async Task ReadInt64OverflowAsync()
{ {
@@ -28,7 +28,7 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using System.Text; using System.Text;
@@ -617,7 +617,7 @@ namespace Newtonsoft.Json.Tests.JsonTextReaderTests
} }
} }
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void ReadInt64Overflow() public void ReadInt64Overflow()
{ {
@@ -639,7 +639,7 @@ namespace Newtonsoft.Json.Tests.JsonTextReaderTests
} }
#endif #endif
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void ReadInt64Overflow_Negative() public void ReadInt64Overflow_Negative()
{ {
@@ -28,7 +28,7 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using System.Text; using System.Text;
@@ -28,7 +28,7 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using System.Text; using System.Text;
@@ -200,7 +200,7 @@ namespace Newtonsoft.Json.Tests.JsonTextReaderTests
Assert.AreEqual(Double.MinValue, reader.Value); Assert.AreEqual(Double.MinValue, reader.Value);
reader = new JsonTextReader(new StringReader("1E+309")); reader = new JsonTextReader(new StringReader("1E+309"));
#if !(NETSTANDARD2_0 || NETSTANDARD1_3) #if !(NETSTANDARD2_0 || NETSTANDARD1_3 || NET6_0_OR_GREATER)
await ExceptionAssert.ThrowsAsync<JsonReaderException>(async () => await reader.ReadAsync(), "Input string '1E+309' is not a valid number. Path '', line 1, position 6."); await ExceptionAssert.ThrowsAsync<JsonReaderException>(async () => await reader.ReadAsync(), "Input string '1E+309' is not a valid number. Path '', line 1, position 6.");
#else #else
Assert.IsTrue(await reader.ReadAsync()); Assert.IsTrue(await reader.ReadAsync());
@@ -209,7 +209,7 @@ namespace Newtonsoft.Json.Tests.JsonTextReaderTests
#endif #endif
reader = new JsonTextReader(new StringReader("-1E+5000")); reader = new JsonTextReader(new StringReader("-1E+5000"));
#if !(NETSTANDARD2_0 || NETSTANDARD1_3) #if !(NETSTANDARD2_0 || NETSTANDARD1_3 || NET6_0_OR_GREATER)
await ExceptionAssert.ThrowsAsync<JsonReaderException>(async () => await reader.ReadAsync(), "Input string '-1E+5000' is not a valid number. Path '', line 1, position 8."); await ExceptionAssert.ThrowsAsync<JsonReaderException>(async () => await reader.ReadAsync(), "Input string '-1E+5000' is not a valid number. Path '', line 1, position 8.");
#else #else
Assert.IsTrue(await reader.ReadAsync()); Assert.IsTrue(await reader.ReadAsync());
@@ -28,7 +28,7 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using System.Text; using System.Text;
@@ -220,7 +220,7 @@ namespace Newtonsoft.Json.Tests.JsonTextReaderTests
Assert.AreEqual(Double.MinValue, reader.Value); Assert.AreEqual(Double.MinValue, reader.Value);
reader = new JsonTextReader(new StringReader("1E+309")); reader = new JsonTextReader(new StringReader("1E+309"));
#if !(NETSTANDARD2_0 || NETSTANDARD1_3) #if !(NETSTANDARD2_0 || NETSTANDARD1_3 || NET6_0_OR_GREATER)
ExceptionAssert.Throws<JsonReaderException>(() => reader.Read(), "Input string '1E+309' is not a valid number. Path '', line 1, position 6."); ExceptionAssert.Throws<JsonReaderException>(() => reader.Read(), "Input string '1E+309' is not a valid number. Path '', line 1, position 6.");
#else #else
Assert.IsTrue(reader.Read()); Assert.IsTrue(reader.Read());
@@ -229,7 +229,7 @@ namespace Newtonsoft.Json.Tests.JsonTextReaderTests
#endif #endif
reader = new JsonTextReader(new StringReader("-1E+5000")); reader = new JsonTextReader(new StringReader("-1E+5000"));
#if !(NETSTANDARD2_0 || NETSTANDARD1_3) #if !(NETSTANDARD2_0 || NETSTANDARD1_3 || NET6_0_OR_GREATER)
ExceptionAssert.Throws<JsonReaderException>(() => reader.Read(), "Input string '-1E+5000' is not a valid number. Path '', line 1, position 8."); ExceptionAssert.Throws<JsonReaderException>(() => reader.Read(), "Input string '-1E+5000' is not a valid number. Path '', line 1, position 8.");
#else #else
Assert.IsTrue(reader.Read()); Assert.IsTrue(reader.Read());
@@ -28,7 +28,7 @@
using System; using System;
using System.Globalization; using System.Globalization;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using System.Text; using System.Text;
@@ -89,7 +89,7 @@ namespace Newtonsoft.Json.Tests.JsonTextReaderTests
); );
} }
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public async Task ReadAsInt32Async_BigIntegerValue_Success() public async Task ReadAsInt32Async_BigIntegerValue_Success()
{ {
@@ -132,7 +132,7 @@ namespace Newtonsoft.Json.Tests.JsonTextReaderTests
"Unexpected character encountered while parsing value: u. Path '', line 1, position 1."); "Unexpected character encountered while parsing value: u. Path '', line 1, position 1.");
} }
#if !(PORTABLE || PORTABLE40 || NET35 || NET20) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || PORTABLE40 || NET35 || NET20) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public async Task ReadAsBooleanAsync() public async Task ReadAsBooleanAsync()
{ {
@@ -1245,7 +1245,7 @@ second line
third line", jsonTextReader.Value); third line", jsonTextReader.Value);
} }
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public async Task ReadBigIntegerAsync() public async Task ReadBigIntegerAsync()
{ {
@@ -28,7 +28,7 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using System.Text; using System.Text;
@@ -94,7 +94,7 @@ namespace Newtonsoft.Json.Tests.JsonTextReaderTests
); );
} }
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void ReadAsInt32_BigIntegerValue_Success() public void ReadAsInt32_BigIntegerValue_Success()
{ {
@@ -137,7 +137,7 @@ namespace Newtonsoft.Json.Tests.JsonTextReaderTests
"Unexpected character encountered while parsing value: u. Path '', line 1, position 1."); "Unexpected character encountered while parsing value: u. Path '', line 1, position 1.");
} }
#if !(PORTABLE || PORTABLE40 || NET35 || NET20) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || PORTABLE40 || NET35 || NET20) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void ReadAsBoolean() public void ReadAsBoolean()
{ {
@@ -1264,7 +1264,7 @@ third line", jsonTextReader.Value);
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void ReadBigInteger() public void ReadBigInteger()
{ {
@@ -102,7 +102,7 @@ namespace Newtonsoft.Json.Tests
} }
} }
#if !(NETSTANDARD1_0 || PORTABLE) || NETSTANDARD2_0 #if !(NETSTANDARD1_0 || PORTABLE) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public async Task WriteLazy() public async Task WriteLazy()
{ {
@@ -370,7 +370,7 @@ namespace Newtonsoft.Json.Tests
Assert.IsTrue(ms.CanRead); Assert.IsTrue(ms.CanRead);
} }
#if !(PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public async Task WriteIConvertableAsync() public async Task WriteIConvertableAsync()
{ {
@@ -1018,7 +1018,7 @@ namespace Newtonsoft.Json.Tests
await jsonWriter.WriteEndArrayAsync(); await jsonWriter.WriteEndArrayAsync();
} }
#if !(NETSTANDARD2_0 || NETSTANDARD1_3) #if !(NETSTANDARD2_0 || NETSTANDARD1_3 || NET6_0_OR_GREATER)
Assert.AreEqual(@"[0.0,0.0,0.1,1.0,1.000001,1E-06,4.94065645841247E-324,Infinity,-Infinity,NaN,1.7976931348623157E+308,-1.7976931348623157E+308,Infinity,-Infinity,NaN]", sb.ToString()); Assert.AreEqual(@"[0.0,0.0,0.1,1.0,1.000001,1E-06,4.94065645841247E-324,Infinity,-Infinity,NaN,1.7976931348623157E+308,-1.7976931348623157E+308,Infinity,-Infinity,NaN]", sb.ToString());
#else #else
Assert.AreEqual(@"[0.0,0.0,0.1,1.0,1.000001,1E-06,5E-324,Infinity,-Infinity,NaN,1.7976931348623157E+308,-1.7976931348623157E+308,Infinity,-Infinity,NaN]", sb.ToString()); Assert.AreEqual(@"[0.0,0.0,0.1,1.0,1.000001,1E-06,5E-324,Infinity,-Infinity,NaN,1.7976931348623157E+308,-1.7976931348623157E+308,Infinity,-Infinity,NaN]", sb.ToString());
@@ -136,7 +136,7 @@ namespace Newtonsoft.Json.Tests
Assert.AreEqual(1, arrayPool.FreeArrays.Count); Assert.AreEqual(1, arrayPool.FreeArrays.Count);
} }
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0 #if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void BufferErroringWithInvalidSize() public void BufferErroringWithInvalidSize()
{ {
@@ -225,7 +225,7 @@ namespace Newtonsoft.Json.Tests
Assert.IsTrue(ms.CanRead); Assert.IsTrue(ms.CanRead);
} }
#if !(PORTABLE) || NETSTANDARD2_0 #if !(PORTABLE) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void WriteIConvertable() public void WriteIConvertable()
{ {
@@ -880,7 +880,7 @@ namespace Newtonsoft.Json.Tests
jsonWriter.WriteEndArray(); jsonWriter.WriteEndArray();
} }
#if !(NETSTANDARD2_0 || NETSTANDARD1_3) #if !(NETSTANDARD2_0 || NETSTANDARD1_3 || NET6_0_OR_GREATER)
Assert.AreEqual(@"[0.0,0.0,0.1,1.0,1.000001,1E-06,4.94065645841247E-324,Infinity,-Infinity,NaN,1.7976931348623157E+308,-1.7976931348623157E+308,Infinity,-Infinity,NaN]", sb.ToString()); Assert.AreEqual(@"[0.0,0.0,0.1,1.0,1.000001,1E-06,4.94065645841247E-324,Infinity,-Infinity,NaN,1.7976931348623157E+308,-1.7976931348623157E+308,Infinity,-Infinity,NaN]", sb.ToString());
#else #else
Assert.AreEqual(@"[0.0,0.0,0.1,1.0,1.000001,1E-06,5E-324,Infinity,-Infinity,NaN,1.7976931348623157E+308,-1.7976931348623157E+308,Infinity,-Infinity,NaN]", sb.ToString()); Assert.AreEqual(@"[0.0,0.0,0.1,1.0,1.000001,1E-06,5E-324,Infinity,-Infinity,NaN,1.7976931348623157E+308,-1.7976931348623157E+308,Infinity,-Infinity,NaN]", sb.ToString());
@@ -30,7 +30,7 @@ using System.IO;
#if NET20 #if NET20
using Newtonsoft.Json.Utilities.LinqBridge; using Newtonsoft.Json.Utilities.LinqBridge;
#endif #endif
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using System.Text; using System.Text;
@@ -353,7 +353,7 @@ namespace Newtonsoft.Json.Tests
Assert.IsNotNull(validationEventArgs); Assert.IsNotNull(validationEventArgs);
} }
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void IntegerGreaterThanMaximumValue_BigInteger() public void IntegerGreaterThanMaximumValue_BigInteger()
{ {
@@ -606,7 +606,7 @@ namespace Newtonsoft.Json.Tests
Assert.IsNotNull(validationEventArgs); Assert.IsNotNull(validationEventArgs);
} }
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void BigIntegerDivisibleBy_Success() public void BigIntegerDivisibleBy_Success()
{ {
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0 #if !(PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
#if DNXCORE50 #if DNXCORE50
using Xunit; using Xunit;
using Test = Xunit.FactAttribute; using Test = Xunit.FactAttribute;
+13 -13
View File
@@ -29,7 +29,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Dynamic; using System.Dynamic;
using System.Linq; using System.Linq;
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using System.Text; using System.Text;
@@ -257,7 +257,7 @@ namespace Newtonsoft.Json.Tests.Linq
new JProperty("Uri", new Uri("http://json.codeplex.com/")), new JProperty("Uri", new Uri("http://json.codeplex.com/")),
new JProperty("Guid", new Guid("EA27FE1D-0D80-44F2-BF34-4654156FA7AF")), new JProperty("Guid", new Guid("EA27FE1D-0D80-44F2-BF34-4654156FA7AF")),
new JProperty("TimeSpan", TimeSpan.FromDays(1)) new JProperty("TimeSpan", TimeSpan.FromDays(1))
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
, new JProperty("BigInteger", BigInteger.Parse("1")) , new JProperty("BigInteger", BigInteger.Parse("1"))
#endif #endif
); );
@@ -290,7 +290,7 @@ namespace Newtonsoft.Json.Tests.Linq
Assert.IsTrue(d.Decimal == 1.1m); Assert.IsTrue(d.Decimal == 1.1m);
Assert.IsTrue(d.Decimal != 1.0f); Assert.IsTrue(d.Decimal != 1.0f);
Assert.IsTrue(d.Decimal != 1.0d); Assert.IsTrue(d.Decimal != 1.0d);
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
Assert.IsTrue(d.Decimal > new BigInteger(0)); Assert.IsTrue(d.Decimal > new BigInteger(0));
#endif #endif
@@ -306,11 +306,11 @@ namespace Newtonsoft.Json.Tests.Linq
Assert.IsTrue(d.Float == 1.1m); Assert.IsTrue(d.Float == 1.1m);
Assert.IsTrue(d.Float != 1.0f); Assert.IsTrue(d.Float != 1.0f);
Assert.IsTrue(d.Float != 1.0d); Assert.IsTrue(d.Float != 1.0d);
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
Assert.IsTrue(d.Float > new BigInteger(0)); Assert.IsTrue(d.Float > new BigInteger(0));
#endif #endif
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
Assert.IsTrue(d.BigInteger == d.BigInteger); Assert.IsTrue(d.BigInteger == d.BigInteger);
Assert.IsTrue(d.BigInteger > 0); Assert.IsTrue(d.BigInteger > 0);
Assert.IsTrue(d.BigInteger > 0.0m); Assert.IsTrue(d.BigInteger > 0.0m);
@@ -366,7 +366,7 @@ namespace Newtonsoft.Json.Tests.Linq
new JProperty("Uri", new Uri("http://json.codeplex.com/")), new JProperty("Uri", new Uri("http://json.codeplex.com/")),
new JProperty("Guid", new Guid("EA27FE1D-0D80-44F2-BF34-4654156FA7AF")), new JProperty("Guid", new Guid("EA27FE1D-0D80-44F2-BF34-4654156FA7AF")),
new JProperty("TimeSpan", TimeSpan.FromDays(1)) new JProperty("TimeSpan", TimeSpan.FromDays(1))
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
, new JProperty("BigInteger", new BigInteger(100)) , new JProperty("BigInteger", new BigInteger(100))
#endif #endif
); );
@@ -445,7 +445,7 @@ namespace Newtonsoft.Json.Tests.Linq
r += 2; r += 2;
Assert.AreEqual(null, r.Value); Assert.AreEqual(null, r.Value);
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
r = d.BigInteger + null; r = d.BigInteger + null;
Assert.AreEqual(null, r.Value); Assert.AreEqual(null, r.Value);
r += 2; r += 2;
@@ -524,7 +524,7 @@ namespace Newtonsoft.Json.Tests.Linq
r -= 2; r -= 2;
Assert.AreEqual(null, r.Value); Assert.AreEqual(null, r.Value);
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
r = d.BigInteger - null; r = d.BigInteger - null;
Assert.AreEqual(null, r.Value); Assert.AreEqual(null, r.Value);
r -= 2; r -= 2;
@@ -598,7 +598,7 @@ namespace Newtonsoft.Json.Tests.Linq
r *= 2; r *= 2;
Assert.AreEqual(null, r.Value); Assert.AreEqual(null, r.Value);
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
r = d.BigInteger * 1.1d; r = d.BigInteger * 1.1d;
Assert.AreEqual(100m, (decimal)r); Assert.AreEqual(100m, (decimal)r);
r *= 2; r *= 2;
@@ -672,7 +672,7 @@ namespace Newtonsoft.Json.Tests.Linq
r /= 2; r /= 2;
Assert.AreEqual(null, r.Value); Assert.AreEqual(null, r.Value);
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
r = d.BigInteger / 1.1d; r = d.BigInteger / 1.1d;
Assert.AreEqual(100m, (decimal)r); Assert.AreEqual(100m, (decimal)r);
r /= 2; r /= 2;
@@ -700,7 +700,7 @@ namespace Newtonsoft.Json.Tests.Linq
new JProperty("Uri", new Uri("http://json.codeplex.com/")), new JProperty("Uri", new Uri("http://json.codeplex.com/")),
new JProperty("Guid", new Guid("EA27FE1D-0D80-44F2-BF34-4654156FA7AF")), new JProperty("Guid", new Guid("EA27FE1D-0D80-44F2-BF34-4654156FA7AF")),
new JProperty("TimeSpan", TimeSpan.FromDays(1)) new JProperty("TimeSpan", TimeSpan.FromDays(1))
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
, new JProperty("BigInteger", new BigInteger(100)) , new JProperty("BigInteger", new BigInteger(100))
#endif #endif
); );
@@ -717,7 +717,7 @@ namespace Newtonsoft.Json.Tests.Linq
Assert.AreEqual("http://json.codeplex.com/", d.Uri.ToString()); Assert.AreEqual("http://json.codeplex.com/", d.Uri.ToString());
Assert.AreEqual("ea27fe1d-0d80-44f2-bf34-4654156fa7af", d.Guid.ToString()); Assert.AreEqual("ea27fe1d-0d80-44f2-bf34-4654156fa7af", d.Guid.ToString());
Assert.AreEqual("1.00:00:00", d.TimeSpan.ToString()); Assert.AreEqual("1.00:00:00", d.TimeSpan.ToString());
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
Assert.AreEqual("100", d.BigInteger.ToString()); Assert.AreEqual("100", d.BigInteger.ToString());
#endif #endif
} }
@@ -801,7 +801,7 @@ namespace Newtonsoft.Json.Tests.Linq
AssertValueConverted<Guid?>(null); AssertValueConverted<Guid?>(null);
AssertValueConverted<Uri>(new Uri("http://json.codeplex.com/")); AssertValueConverted<Uri>(new Uri("http://json.codeplex.com/"));
AssertValueConverted<Uri>(null); AssertValueConverted<Uri>(null);
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
AssertValueConverted<BigInteger>(new BigInteger(100)); AssertValueConverted<BigInteger>(new BigInteger(100));
AssertValueConverted<BigInteger?>(null); AssertValueConverted<BigInteger?>(null);
#endif #endif
@@ -447,7 +447,7 @@ Parameter name: index",
} }
} }
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void ITypedListGetItemProperties() public void ITypedListGetItemProperties()
{ {
@@ -58,7 +58,7 @@ namespace Newtonsoft.Json.Tests.Linq
[TestFixture] [TestFixture]
public class JObjectTests : TestFixtureBase public class JObjectTests : TestFixtureBase
{ {
#if !(NET35 || NET20 || PORTABLE40) || NETSTANDARD2_0 #if !(NET35 || NET20 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void EmbedJValueStringInNewJObject() public void EmbedJValueStringInNewJObject()
{ {
@@ -743,7 +743,7 @@ Parameter name: arrayIndex",
Assert.AreEqual(p4, l[1]); Assert.AreEqual(p4, l[1]);
} }
#if !(NET20 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void PropertyChanging() public void PropertyChanging()
{ {
@@ -1286,7 +1286,7 @@ Parameter name: arrayIndex",
}, "Can not add property Test3 to Newtonsoft.Json.Linq.JObject. Property with the same name already exists on object."); }, "Can not add property Test3 to Newtonsoft.Json.Linq.JObject. Property with the same name already exists on object.");
} }
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void IBindingListSortDirection() public void IBindingListSortDirection()
{ {
@@ -1481,7 +1481,7 @@ Parameter name: arrayIndex",
} }
#endif #endif
#if !(NET20 || NET35 || PORTABLE40) || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void CollectionChanged() public void CollectionChanged()
{ {
@@ -1658,7 +1658,7 @@ Parameter name: arrayIndex",
Assert.AreEqual("Name2", value); Assert.AreEqual("Name2", value);
} }
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void WriteObjectNullDBNullValue() public void WriteObjectNullDBNullValue()
{ {
@@ -1770,7 +1770,7 @@ Parameter name: arrayIndex",
}, "Unexpected end of content while loading JObject. Path 'short.error.code', line 6, position 14."); }, "Unexpected end of content while loading JObject. Path 'short.error.code', line 6, position 14.");
} }
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void GetProperties() public void GetProperties()
{ {
@@ -2095,7 +2095,7 @@ Parameter name: arrayIndex",
"Additional text encountered after finished reading JSON content: [. Path '', line 3, position 0."); "Additional text encountered after finished reading JSON content: [. Path '', line 3, position 0.");
} }
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void GetPropertyOwner_ReturnsJObject() public void GetPropertyOwner_ReturnsJObject()
{ {
@@ -61,7 +61,7 @@ namespace Newtonsoft.Json.Tests.Linq
Assert.AreEqual(p, p.Value.Parent); Assert.AreEqual(p, p.Value.Parent);
} }
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void ListChanged() public void ListChanged()
{ {
@@ -36,7 +36,7 @@ using Assert = Newtonsoft.Json.Tests.XUnitAssert;
using NUnit.Framework; using NUnit.Framework;
#endif #endif
using System.IO; using System.IO;
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
@@ -48,7 +48,7 @@ namespace Newtonsoft.Json.Tests.Linq
[TestFixture] [TestFixture]
public class JTokenReaderAsyncTests : TestFixtureBase public class JTokenReaderAsyncTests : TestFixtureBase
{ {
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public async Task ConvertBigIntegerToDoubleAsync() public async Task ConvertBigIntegerToDoubleAsync()
{ {
@@ -757,7 +757,7 @@ namespace Newtonsoft.Json.Tests.Linq
Assert.AreEqual(1d, await reader.ReadAsDoubleAsync()); Assert.AreEqual(1d, await reader.ReadAsDoubleAsync());
} }
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public async Task ReadAsBoolean_BigInteger_SuccessAsync() public async Task ReadAsBoolean_BigInteger_SuccessAsync()
{ {
@@ -35,7 +35,7 @@ using NUnit.Framework;
#endif #endif
using Newtonsoft.Json; using Newtonsoft.Json;
using System.IO; using System.IO;
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
@@ -47,7 +47,7 @@ namespace Newtonsoft.Json.Tests.Linq
[TestFixture] [TestFixture]
public class JTokenReaderTest : TestFixtureBase public class JTokenReaderTest : TestFixtureBase
{ {
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void ConvertBigIntegerToDouble() public void ConvertBigIntegerToDouble()
{ {
@@ -884,7 +884,7 @@ namespace Newtonsoft.Json.Tests.Linq
Assert.AreEqual(1d, reader.ReadAsDouble()); Assert.AreEqual(1d, reader.ReadAsDouble());
} }
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void ReadAsBoolean_BigInteger_Success() public void ReadAsBoolean_BigInteger_Success()
{ {
@@ -25,7 +25,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using System.Text; using System.Text;
@@ -391,7 +391,7 @@ namespace Newtonsoft.Json.Tests.Linq
Assert.AreEqual(5, (int)(new JValue(StringComparison.OrdinalIgnoreCase))); Assert.AreEqual(5, (int)(new JValue(StringComparison.OrdinalIgnoreCase)));
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
string bigIntegerText = "1234567899999999999999999999999999999999999999999999999999999999999990"; string bigIntegerText = "1234567899999999999999999999999999999999999999999999999999999999999990";
Assert.AreEqual(BigInteger.Parse(bigIntegerText), (new JValue(BigInteger.Parse(bigIntegerText))).Value); Assert.AreEqual(BigInteger.Parse(bigIntegerText), (new JValue(BigInteger.Parse(bigIntegerText))).Value);
@@ -472,7 +472,7 @@ namespace Newtonsoft.Json.Tests.Linq
#endif #endif
ExceptionAssert.Throws<ArgumentException>(() => { var i = (Uri)new JValue(true); }, "Can not convert Boolean to Uri."); ExceptionAssert.Throws<ArgumentException>(() => { var i = (Uri)new JValue(true); }, "Can not convert Boolean to Uri.");
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
ExceptionAssert.Throws<ArgumentException>(() => { var i = (new JValue(new Uri("http://www.google.com"))).ToObject<BigInteger>(); }, "Can not convert Uri to BigInteger."); ExceptionAssert.Throws<ArgumentException>(() => { var i = (new JValue(new Uri("http://www.google.com"))).ToObject<BigInteger>(); }, "Can not convert Uri to BigInteger.");
ExceptionAssert.Throws<ArgumentException>(() => { var i = (JValue.CreateNull()).ToObject<BigInteger>(); }, "Can not convert Null to BigInteger."); ExceptionAssert.Throws<ArgumentException>(() => { var i = (JValue.CreateNull()).ToObject<BigInteger>(); }, "Can not convert Null to BigInteger.");
ExceptionAssert.Throws<ArgumentException>(() => { var i = (new JValue(Guid.NewGuid())).ToObject<BigInteger>(); }, "Can not convert Guid to BigInteger."); ExceptionAssert.Throws<ArgumentException>(() => { var i = (new JValue(Guid.NewGuid())).ToObject<BigInteger>(); }, "Can not convert Guid to BigInteger.");
@@ -489,7 +489,7 @@ namespace Newtonsoft.Json.Tests.Linq
[Test] [Test]
public void ToObject() public void ToObject()
{ {
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
Assert.AreEqual((BigInteger)1, (new JValue(1).ToObject(typeof(BigInteger)))); Assert.AreEqual((BigInteger)1, (new JValue(1).ToObject(typeof(BigInteger))));
Assert.AreEqual((BigInteger)1, (new JValue(1).ToObject(typeof(BigInteger?)))); Assert.AreEqual((BigInteger)1, (new JValue(1).ToObject(typeof(BigInteger?))));
Assert.AreEqual((BigInteger?)null, (JValue.CreateNull().ToObject(typeof(BigInteger?)))); Assert.AreEqual((BigInteger?)null, (JValue.CreateNull().ToObject(typeof(BigInteger?))));
@@ -548,7 +548,7 @@ namespace Newtonsoft.Json.Tests.Linq
Assert.IsTrue(JToken.DeepEquals(new JValue((DateTimeOffset?)null), (JValue)(DateTimeOffset?)null)); Assert.IsTrue(JToken.DeepEquals(new JValue((DateTimeOffset?)null), (JValue)(DateTimeOffset?)null));
#endif #endif
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
// had to remove implicit casting to avoid user reference to System.Numerics.dll // had to remove implicit casting to avoid user reference to System.Numerics.dll
Assert.IsTrue(JToken.DeepEquals(new JValue(new BigInteger(1)), new JValue(new BigInteger(1)))); Assert.IsTrue(JToken.DeepEquals(new JValue(new BigInteger(1)), new JValue(new BigInteger(1))));
Assert.IsTrue(JToken.DeepEquals(new JValue((BigInteger?)null), new JValue((BigInteger?)null))); Assert.IsTrue(JToken.DeepEquals(new JValue((BigInteger?)null), new JValue((BigInteger?)null)));
@@ -1172,7 +1172,7 @@ namespace Newtonsoft.Json.Tests.Linq
Assert.IsTrue(a.DeepEquals(a2)); Assert.IsTrue(a.DeepEquals(a2));
} }
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void Clone() public void Clone()
{ {
@@ -26,7 +26,7 @@
#if !(NET20 || NET35 || NET40 || PORTABLE40) #if !(NET20 || NET35 || NET40 || PORTABLE40)
using System; using System;
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using System.Text; using System.Text;
@@ -115,7 +115,7 @@ namespace Newtonsoft.Json.Tests.Linq
await jsonWriter.WriteValueAsync("DVD read/writer"); await jsonWriter.WriteValueAsync("DVD read/writer");
Assert.AreEqual(WriteState.Array, jsonWriter.WriteState); Assert.AreEqual(WriteState.Array, jsonWriter.WriteState);
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
await jsonWriter.WriteValueAsync(new BigInteger(123)); await jsonWriter.WriteValueAsync(new BigInteger(123));
Assert.AreEqual(WriteState.Array, jsonWriter.WriteState); Assert.AreEqual(WriteState.Array, jsonWriter.WriteState);
#endif #endif
@@ -167,7 +167,7 @@ namespace Newtonsoft.Json.Tests.Linq
Assert.AreEqual(WriteState.Array, jsonWriter.WriteState); Assert.AreEqual(WriteState.Array, jsonWriter.WriteState);
Assert.AreEqual(a[a.Count - 1], jsonWriter.CurrentToken); Assert.AreEqual(a[a.Count - 1], jsonWriter.CurrentToken);
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
await jsonWriter.WriteValueAsync(new BigInteger(123)); await jsonWriter.WriteValueAsync(new BigInteger(123));
Assert.AreEqual(WriteState.Array, jsonWriter.WriteState); Assert.AreEqual(WriteState.Array, jsonWriter.WriteState);
Assert.AreEqual(a[a.Count - 1], jsonWriter.CurrentToken); Assert.AreEqual(a[a.Count - 1], jsonWriter.CurrentToken);
@@ -200,7 +200,7 @@ namespace Newtonsoft.Json.Tests.Linq
/*fail*/]", writer.Token.ToString()); /*fail*/]", writer.Token.ToString());
} }
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public async Task WriteBigIntegerAsync() public async Task WriteBigIntegerAsync()
{ {
@@ -25,7 +25,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using System.Text; using System.Text;
@@ -120,7 +120,7 @@ namespace Newtonsoft.Json.Tests.Linq
jsonWriter.WriteValue("DVD read/writer"); jsonWriter.WriteValue("DVD read/writer");
Assert.AreEqual(WriteState.Array, jsonWriter.WriteState); Assert.AreEqual(WriteState.Array, jsonWriter.WriteState);
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
jsonWriter.WriteValue(new BigInteger(123)); jsonWriter.WriteValue(new BigInteger(123));
Assert.AreEqual(WriteState.Array, jsonWriter.WriteState); Assert.AreEqual(WriteState.Array, jsonWriter.WriteState);
#endif #endif
@@ -172,7 +172,7 @@ namespace Newtonsoft.Json.Tests.Linq
Assert.AreEqual(WriteState.Array, jsonWriter.WriteState); Assert.AreEqual(WriteState.Array, jsonWriter.WriteState);
Assert.AreEqual(a[a.Count - 1], jsonWriter.CurrentToken); Assert.AreEqual(a[a.Count - 1], jsonWriter.CurrentToken);
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
jsonWriter.WriteValue(new BigInteger(123)); jsonWriter.WriteValue(new BigInteger(123));
Assert.AreEqual(WriteState.Array, jsonWriter.WriteState); Assert.AreEqual(WriteState.Array, jsonWriter.WriteState);
Assert.AreEqual(a[a.Count - 1], jsonWriter.CurrentToken); Assert.AreEqual(a[a.Count - 1], jsonWriter.CurrentToken);
@@ -205,7 +205,7 @@ namespace Newtonsoft.Json.Tests.Linq
/*fail*/]", writer.Token.ToString()); /*fail*/]", writer.Token.ToString());
} }
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void WriteBigInteger() public void WriteBigInteger()
{ {
+10 -10
View File
@@ -28,7 +28,7 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using Newtonsoft.Json.Tests.TestObjects; using Newtonsoft.Json.Tests.TestObjects;
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using System.Text; using System.Text;
@@ -179,7 +179,7 @@ namespace Newtonsoft.Json.Tests.Linq
Assert.AreEqual(g, v.Value); Assert.AreEqual(g, v.Value);
Assert.AreEqual(JTokenType.Guid, v.Type); Assert.AreEqual(JTokenType.Guid, v.Type);
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
BigInteger i = BigInteger.Parse("123456789999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999990"); BigInteger i = BigInteger.Parse("123456789999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999990");
v.Value = i; v.Value = i;
Assert.AreEqual(i, v.Value); Assert.AreEqual(i, v.Value);
@@ -239,13 +239,13 @@ namespace Newtonsoft.Json.Tests.Linq
v = new JValue(new Guid("B282ADE7-C520-496C-A448-4084F6803DE5")); v = new JValue(new Guid("B282ADE7-C520-496C-A448-4084F6803DE5"));
Assert.AreEqual("b282ade7-c520-496c-a448-4084f6803de5", v.ToString(null, CultureInfo.InvariantCulture)); Assert.AreEqual("b282ade7-c520-496c-a448-4084f6803de5", v.ToString(null, CultureInfo.InvariantCulture));
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
v = new JValue(BigInteger.Parse("123456789999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999990")); v = new JValue(BigInteger.Parse("123456789999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999990"));
Assert.AreEqual("123456789999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999990", v.ToString(null, CultureInfo.InvariantCulture)); Assert.AreEqual("123456789999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999990", v.ToString(null, CultureInfo.InvariantCulture));
#endif #endif
} }
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void JValueParse() public void JValueParse()
{ {
@@ -256,7 +256,7 @@ namespace Newtonsoft.Json.Tests.Linq
} }
#endif #endif
#if !(PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void JValueIConvertable() public void JValueIConvertable()
{ {
@@ -505,7 +505,7 @@ namespace Newtonsoft.Json.Tests.Linq
} }
#endif #endif
#if !(PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void ConvertsToBoolean() public void ConvertsToBoolean()
{ {
@@ -524,7 +524,7 @@ namespace Newtonsoft.Json.Tests.Linq
Assert.AreEqual(Int32.MaxValue, Convert.ToInt32(new JValue(Int32.MaxValue))); Assert.AreEqual(Int32.MaxValue, Convert.ToInt32(new JValue(Int32.MaxValue)));
} }
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void ConvertsToInt32_BigInteger() public void ConvertsToInt32_BigInteger()
{ {
@@ -686,7 +686,7 @@ namespace Newtonsoft.Json.Tests.Linq
v = new JValue(new Uri("http://www.google.com")); v = new JValue(new Uri("http://www.google.com"));
Assert.AreEqual(TypeCode.Object, v.GetTypeCode()); Assert.AreEqual(TypeCode.Object, v.GetTypeCode());
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
v = new JValue(new BigInteger(3)); v = new JValue(new BigInteger(3));
Assert.AreEqual(TypeCode.Object, v.GetTypeCode()); Assert.AreEqual(TypeCode.Object, v.GetTypeCode());
#endif #endif
@@ -705,7 +705,7 @@ namespace Newtonsoft.Json.Tests.Linq
int i = (int)v.ToType(typeof(int), CultureInfo.InvariantCulture); int i = (int)v.ToType(typeof(int), CultureInfo.InvariantCulture);
Assert.AreEqual(9, i); Assert.AreEqual(9, i);
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
BigInteger bi = (BigInteger)v.ToType(typeof(BigInteger), CultureInfo.InvariantCulture); BigInteger bi = (BigInteger)v.ToType(typeof(BigInteger), CultureInfo.InvariantCulture);
Assert.AreEqual(new BigInteger(9), bi); Assert.AreEqual(new BigInteger(9), bi);
#endif #endif
@@ -720,7 +720,7 @@ namespace Newtonsoft.Json.Tests.Linq
Assert.AreEqual("2013", v.ToString("yyyy")); Assert.AreEqual("2013", v.ToString("yyyy"));
} }
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void ToStringNewTypes() public void ToStringNewTypes()
{ {
@@ -26,7 +26,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
#if !(PORTABLE || PORTABLE40 || NET35 || NET20) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || PORTABLE40 || NET35 || NET20) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using Newtonsoft.Json.Linq.JsonPath; using Newtonsoft.Json.Linq.JsonPath;
@@ -981,7 +981,7 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
Assert.IsTrue(JToken.DeepEquals(new JObject(new JProperty("hi", 3)), t[1])); Assert.IsTrue(JToken.DeepEquals(new JObject(new JProperty("hi", 3)), t[1]));
} }
#if !(PORTABLE || DNXCORE50 || PORTABLE40 || NET35 || NET20) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40 || NET35 || NET20) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void GreaterQueryBigInteger() public void GreaterQueryBigInteger()
{ {
@@ -62,7 +62,7 @@ namespace Newtonsoft.Json.Tests.Linq
Assert.AreEqual(@"['We\'re offline!']", v.Path); Assert.AreEqual(@"['We\'re offline!']", v.Path);
} }
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
public class DemoClass public class DemoClass
{ {
public decimal maxValue; public decimal maxValue;
@@ -148,7 +148,7 @@
<PropertyGroup Condition="'$(TargetFramework)'=='net6.0'"> <PropertyGroup Condition="'$(TargetFramework)'=='net6.0'">
<AssemblyTitle>Json.NET Tests .NET 6.0</AssemblyTitle> <AssemblyTitle>Json.NET Tests .NET 6.0</AssemblyTitle>
<ReferringTargetFrameworkForProjectReferences>net6.0</ReferringTargetFrameworkForProjectReferences> <ReferringTargetFrameworkForProjectReferences>net6.0</ReferringTargetFrameworkForProjectReferences>
<DefineConstants>NETSTANDARD2_0;DNXCORE50;PORTABLE;HAVE_BENCHMARKS;HAVE_REGEX_TIMEOUTS;$(AdditionalConstants)</DefineConstants> <DefineConstants>NET6_0;DNXCORE50;PORTABLE;HAVE_BENCHMARKS;HAVE_REGEX_TIMEOUTS;$(AdditionalConstants)</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'"> <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
@@ -312,7 +312,7 @@ namespace Newtonsoft.Json.Tests.Schema
Assert.IsTrue(v.IsValid(schema)); Assert.IsTrue(v.IsValid(schema));
} }
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void GenerateSchemaForISerializable() public void GenerateSchemaForISerializable()
{ {
@@ -340,7 +340,7 @@ namespace Newtonsoft.Json.Tests.Schema
} }
#endif #endif
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
public class CustomDirectoryInfoMapper : DefaultContractResolver public class CustomDirectoryInfoMapper : DefaultContractResolver
{ {
public CustomDirectoryInfoMapper() public CustomDirectoryInfoMapper()
@@ -376,7 +376,7 @@ namespace Newtonsoft.Json.Tests.Schema
generator.UndefinedSchemaIdHandling = UndefinedSchemaIdHandling.UseTypeName; generator.UndefinedSchemaIdHandling = UndefinedSchemaIdHandling.UseTypeName;
generator.ContractResolver = new CamelCasePropertyNamesContractResolver() generator.ContractResolver = new CamelCasePropertyNamesContractResolver()
{ {
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
IgnoreSerializableAttribute = true IgnoreSerializableAttribute = true
#endif #endif
}; };
@@ -421,7 +421,7 @@ namespace Newtonsoft.Json.Tests.Schema
}", json); }", json);
} }
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void GenerateSchemaSerializable() public void GenerateSchemaSerializable()
{ {
@@ -734,7 +734,7 @@ namespace Newtonsoft.Json.Tests.Schema
{ {
} }
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Serializable] [Serializable]
public sealed class SerializableTestObject public sealed class SerializableTestObject
{ {
@@ -119,7 +119,7 @@ namespace Newtonsoft.Json.Tests.Serialization
string json = o.ToString(); string json = o.ToString();
} }
#if !(PORTABLE || PORTABLE40) || NETSTANDARD2_0 #if !(PORTABLE || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
#pragma warning disable 618 #pragma warning disable 618
[Test] [Test]
public void MemberSearchFlags() public void MemberSearchFlags()
@@ -118,7 +118,7 @@ namespace Newtonsoft.Json.Tests.Serialization
[TestFixture] [TestFixture]
public class ContractResolverTests : TestFixtureBase public class ContractResolverTests : TestFixtureBase
{ {
#if !(PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void ResolveSerializableContract() public void ResolveSerializableContract()
{ {
@@ -585,7 +585,7 @@ namespace Newtonsoft.Json.Tests.Serialization
}", startingWithB); }", startingWithB);
} }
#if !(PORTABLE || PORTABLE40) || NETSTANDARD2_0 #if !(PORTABLE || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
#pragma warning disable 618 #pragma warning disable 618
[Test] [Test]
public void SerializeCompilerGeneratedMembers() public void SerializeCompilerGeneratedMembers()
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET40 || NET35 || NET20 || DNXCORE50 || PORTABLE || PORTABLE40) || NETSTANDARD1_0 || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET40 || NET35 || NET20 || DNXCORE50 || PORTABLE || PORTABLE40) || NETSTANDARD1_0 || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using Autofac; using Autofac;
using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Serialization;
using Newtonsoft.Json.Tests.TestObjects; using Newtonsoft.Json.Tests.TestObjects;
@@ -101,7 +101,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual(dynamicObject.ChildObject.Text, d.ChildObject.Text); Assert.AreEqual(dynamicObject.ChildObject.Text, d.ChildObject.Text);
} }
#if !(PORTABLE || PORTABLE40) || NETSTANDARD2_0 #if !(PORTABLE || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void SerializeDynamicObjectWithObjectTracking() public void SerializeDynamicObjectWithObjectTracking()
{ {
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET40 || NET35 || NET20 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET40 || NET35 || NET20 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
#if DNXCORE50 #if DNXCORE50
using Xunit; using Xunit;
using Test = Xunit.FactAttribute; using Test = Xunit.FactAttribute;
@@ -61,7 +61,7 @@ namespace Newtonsoft.Json.Tests.Serialization
[TestFixture] [TestFixture]
public class JsonSerializerCollectionsTests : TestFixtureBase public class JsonSerializerCollectionsTests : TestFixtureBase
{ {
#if !(NET35 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD2_0 #if !(NET35 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void DeserializeNonGenericListTypeAndReadOnlyListViaConstructor() public void DeserializeNonGenericListTypeAndReadOnlyListViaConstructor()
{ {
@@ -187,7 +187,7 @@ namespace Newtonsoft.Json.Tests.Serialization
{ {
Dictionary<float, int> dictionary = new Dictionary<float, int> { { float.MaxValue, 1 } }; Dictionary<float, int> dictionary = new Dictionary<float, int> { { float.MaxValue, 1 } };
string output = JsonConvert.SerializeObject(dictionary); string output = JsonConvert.SerializeObject(dictionary);
#if !(NETSTANDARD2_0 || NETSTANDARD1_3) #if !(NETSTANDARD2_0 || NETSTANDARD1_3 || NET6_0_OR_GREATER)
Assert.AreEqual(@"{""3.40282347E+38"":1}", output); Assert.AreEqual(@"{""3.40282347E+38"":1}", output);
#else #else
Assert.AreEqual(@"{""3.4028235E+38"":1}", output); Assert.AreEqual(@"{""3.4028235E+38"":1}", output);
@@ -303,7 +303,7 @@ namespace Newtonsoft.Json.Tests.Serialization
"Constructor for 'Newtonsoft.Json.Tests.Serialization.JsonSerializerCollectionsTests+TestCollectionBadIEnumerableParameter' must have no parameters or a single parameter that implements 'System.Collections.Generic.IEnumerable`1[System.Int32]'."); "Constructor for 'Newtonsoft.Json.Tests.Serialization.JsonSerializerCollectionsTests+TestCollectionBadIEnumerableParameter' must have no parameters or a single parameter that implements 'System.Collections.Generic.IEnumerable`1[System.Int32]'.");
} }
#if !(DNXCORE50 || PORTABLE) || NETSTANDARD2_0 #if !(DNXCORE50 || PORTABLE) || NETSTANDARD2_0 || NET6_0_OR_GREATER
public class TestCollectionNonGeneric : ArrayList public class TestCollectionNonGeneric : ArrayList
{ {
[JsonConstructor] [JsonConstructor]
@@ -416,7 +416,7 @@ namespace Newtonsoft.Json.Tests.Serialization
"Constructor for 'Newtonsoft.Json.Tests.Serialization.JsonSerializerCollectionsTests+TestDictionaryBadIEnumerableParameter' must have no parameters or a single parameter that implements 'System.Collections.Generic.IEnumerable`1[System.Collections.Generic.KeyValuePair`2[System.String,System.Int32]]'."); "Constructor for 'Newtonsoft.Json.Tests.Serialization.JsonSerializerCollectionsTests+TestDictionaryBadIEnumerableParameter' must have no parameters or a single parameter that implements 'System.Collections.Generic.IEnumerable`1[System.Collections.Generic.KeyValuePair`2[System.String,System.Int32]]'.");
} }
#if !(DNXCORE50 || PORTABLE) || NETSTANDARD2_0 #if !(DNXCORE50 || PORTABLE) || NETSTANDARD2_0 || NET6_0_OR_GREATER
public class TestDictionaryNonGeneric : Hashtable public class TestDictionaryNonGeneric : Hashtable
{ {
[JsonConstructor] [JsonConstructor]
@@ -439,7 +439,7 @@ namespace Newtonsoft.Json.Tests.Serialization
} }
#endif #endif
#if !(DNXCORE50) || NETSTANDARD2_0 #if !(DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
public class NameValueCollectionTestClass public class NameValueCollectionTestClass
{ {
public NameValueCollection Collection { get; set; } public NameValueCollection Collection { get; set; }
@@ -454,7 +454,7 @@ namespace Newtonsoft.Json.Tests.Serialization
} }
#endif #endif
#if !(NET35 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD2_0 #if !(NET35 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
public class SomeObject public class SomeObject
{ {
public string Text1 { get; set; } public string Text1 { get; set; }
@@ -1096,7 +1096,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual(3, v2["Third"]); Assert.AreEqual(3, v2["Third"]);
} }
#if !(NET35 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD2_0 #if !(NET35 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void DeserializeConcurrentDictionary() public void DeserializeConcurrentDictionary()
{ {
@@ -1810,7 +1810,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual(1, (int)((JObject)o.Data[2])["one"]); Assert.AreEqual(1, (int)((JObject)o.Data[2])["one"]);
} }
#if !(DNXCORE50) || NETSTANDARD2_0 #if !(DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void SerializeArrayAsArrayList() public void SerializeArrayAsArrayList()
{ {
@@ -2075,7 +2075,7 @@ namespace Newtonsoft.Json.Tests.Serialization
} }
#endif #endif
#if !DNXCORE50 || NETSTANDARD2_0 #if !DNXCORE50 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void EmptyStringInHashtableIsDeserialized() public void EmptyStringInHashtableIsDeserialized()
{ {
@@ -29,10 +29,10 @@ using System.ComponentModel;
using System.Collections.Concurrent; using System.Collections.Concurrent;
#endif #endif
using System.Collections.Generic; using System.Collections.Generic;
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
#if !(NET20 || DNXCORE50) || NETSTANDARD2_0 #if !(NET20 || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Configuration; using System.Configuration;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
@@ -221,7 +221,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual("def", enumerableObject[1].Value); Assert.AreEqual("def", enumerableObject[1].Value);
} }
#if !(PORTABLE || PORTABLE40 || NET20 || NET35) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || PORTABLE40 || NET20 || NET35) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void LargeIntegerAsString() public void LargeIntegerAsString()
{ {
@@ -277,7 +277,7 @@ namespace Newtonsoft.Json.Tests.Serialization
@"Error converting value {null} to type 'System.Boolean'. Path '[0]', line 1, position 3."); @"Error converting value {null} to type 'System.Boolean'. Path '[0]', line 1, position 3.");
} }
#if !(PORTABLE || PORTABLE40 || NET35 || NET20) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || PORTABLE40 || NET35 || NET20) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void DeserializeBooleans() public void DeserializeBooleans()
{ {
@@ -742,7 +742,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.IsNull(otc.Value5); Assert.IsNull(otc.Value5);
} }
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void ReadIntegerWithError() public void ReadIntegerWithError()
{ {
@@ -999,7 +999,7 @@ namespace Newtonsoft.Json.Tests.Serialization
serializer.ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor; serializer.ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor;
Assert.AreEqual(ConstructorHandling.AllowNonPublicDefaultConstructor, serializer.ConstructorHandling); Assert.AreEqual(ConstructorHandling.AllowNonPublicDefaultConstructor, serializer.ConstructorHandling);
#if !(DNXCORE50) || NETSTANDARD2_0 #if !(DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
serializer.Context = new StreamingContext(StreamingContextStates.Other); serializer.Context = new StreamingContext(StreamingContextStates.Other);
Assert.AreEqual(new StreamingContext(StreamingContextStates.Other), serializer.Context); Assert.AreEqual(new StreamingContext(StreamingContextStates.Other), serializer.Context);
#endif #endif
@@ -1070,7 +1070,7 @@ namespace Newtonsoft.Json.Tests.Serialization
serializer.TraceWriter = traceWriter; serializer.TraceWriter = traceWriter;
Assert.AreEqual(traceWriter, serializer.TraceWriter); Assert.AreEqual(traceWriter, serializer.TraceWriter);
#if !(PORTABLE || PORTABLE40 || NET20 || DNXCORE50) || NETSTANDARD2_0 #if !(PORTABLE || PORTABLE40 || NET20 || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
#pragma warning disable 618 #pragma warning disable 618
serializer.TypeNameAssemblyFormat = FormatterAssemblyStyle.Full; serializer.TypeNameAssemblyFormat = FormatterAssemblyStyle.Full;
Assert.AreEqual(FormatterAssemblyStyle.Full, serializer.TypeNameAssemblyFormat); Assert.AreEqual(FormatterAssemblyStyle.Full, serializer.TypeNameAssemblyFormat);
@@ -1113,7 +1113,7 @@ namespace Newtonsoft.Json.Tests.Serialization
settings.ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor; settings.ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor;
Assert.AreEqual(ConstructorHandling.AllowNonPublicDefaultConstructor, settings.ConstructorHandling); Assert.AreEqual(ConstructorHandling.AllowNonPublicDefaultConstructor, settings.ConstructorHandling);
#if !(DNXCORE50) || NETSTANDARD2_0 #if !(DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
settings.Context = new StreamingContext(StreamingContextStates.Other); settings.Context = new StreamingContext(StreamingContextStates.Other);
Assert.AreEqual(new StreamingContext(StreamingContextStates.Other), settings.Context); Assert.AreEqual(new StreamingContext(StreamingContextStates.Other), settings.Context);
#endif #endif
@@ -1190,7 +1190,7 @@ namespace Newtonsoft.Json.Tests.Serialization
settings.TraceWriter = traceWriter; settings.TraceWriter = traceWriter;
Assert.AreEqual(traceWriter, settings.TraceWriter); Assert.AreEqual(traceWriter, settings.TraceWriter);
#if !(PORTABLE || PORTABLE40 || NET20 || DNXCORE50) || NETSTANDARD2_0 #if !(PORTABLE || PORTABLE40 || NET20 || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
#pragma warning disable 618 #pragma warning disable 618
settings.TypeNameAssemblyFormat = FormatterAssemblyStyle.Full; settings.TypeNameAssemblyFormat = FormatterAssemblyStyle.Full;
Assert.AreEqual(FormatterAssemblyStyle.Full, settings.TypeNameAssemblyFormat); Assert.AreEqual(FormatterAssemblyStyle.Full, settings.TypeNameAssemblyFormat);
@@ -1244,7 +1244,7 @@ namespace Newtonsoft.Json.Tests.Serialization
serializerProxy.ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor; serializerProxy.ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor;
Assert.AreEqual(ConstructorHandling.AllowNonPublicDefaultConstructor, serializerProxy.ConstructorHandling); Assert.AreEqual(ConstructorHandling.AllowNonPublicDefaultConstructor, serializerProxy.ConstructorHandling);
#if !(DNXCORE50) || NETSTANDARD2_0 #if !(DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
serializerProxy.Context = new StreamingContext(StreamingContextStates.Other); serializerProxy.Context = new StreamingContext(StreamingContextStates.Other);
Assert.AreEqual(new StreamingContext(StreamingContextStates.Other), serializerProxy.Context); Assert.AreEqual(new StreamingContext(StreamingContextStates.Other), serializerProxy.Context);
#endif #endif
@@ -1315,7 +1315,7 @@ namespace Newtonsoft.Json.Tests.Serialization
serializerProxy.TraceWriter = traceWriter; serializerProxy.TraceWriter = traceWriter;
Assert.AreEqual(traceWriter, serializerProxy.TraceWriter); Assert.AreEqual(traceWriter, serializerProxy.TraceWriter);
#if !(PORTABLE || PORTABLE40 || NET20 || DNXCORE50) || NETSTANDARD2_0 #if !(PORTABLE || PORTABLE40 || NET20 || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
#pragma warning disable 618 #pragma warning disable 618
serializerProxy.TypeNameAssemblyFormat = FormatterAssemblyStyle.Full; serializerProxy.TypeNameAssemblyFormat = FormatterAssemblyStyle.Full;
Assert.AreEqual(FormatterAssemblyStyle.Full, serializerProxy.TypeNameAssemblyFormat); Assert.AreEqual(FormatterAssemblyStyle.Full, serializerProxy.TypeNameAssemblyFormat);
@@ -1336,7 +1336,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual(TypeNameHandling.All, serializerProxy.TypeNameHandling); Assert.AreEqual(TypeNameHandling.All, serializerProxy.TypeNameHandling);
} }
#if !(PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void DeserializeISerializableIConvertible() public void DeserializeISerializableIConvertible()
{ {
@@ -1818,7 +1818,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual(executorObject2.clientGetResultFunction, "ClientBanSubsCB"); Assert.AreEqual(executorObject2.clientGetResultFunction, "ClientBanSubsCB");
} }
#if !(DNXCORE50) || NETSTANDARD2_0 #if !(DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void HashtableDeserialization() public void HashtableDeserialization()
{ {
@@ -2259,7 +2259,7 @@ keyword such as type of business.""
string json = JsonConvert.SerializeObject(new ConverableMembers(), Formatting.Indented); string json = JsonConvert.SerializeObject(new ConverableMembers(), Formatting.Indented);
string expected = null; string expected = null;
#if (NETSTANDARD2_0) #if (NETSTANDARD2_0 || NET6_0_OR_GREATER)
expected = @"{ expected = @"{
""String"": ""string"", ""String"": ""string"",
""Int32"": 2147483647, ""Int32"": 2147483647,
@@ -3475,7 +3475,7 @@ To fix this error either change the JSON to a JSON object (e.g. {""name"":""valu
Path '', line 1, position 1."); Path '', line 1, position 1.");
} }
#if !(PORTABLE || DNXCORE50) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void CannotDeserializeArrayIntoSerializable() public void CannotDeserializeArrayIntoSerializable()
{ {
@@ -3589,7 +3589,7 @@ Path '', line 1, position 1.");
{ {
ContractResolver = new DefaultContractResolver ContractResolver = new DefaultContractResolver
{ {
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
IgnoreSerializableAttribute = true IgnoreSerializableAttribute = true
#endif #endif
} }
@@ -3606,7 +3606,7 @@ Path '', line 1, position 1.");
{ {
ContractResolver = new DefaultContractResolver ContractResolver = new DefaultContractResolver
{ {
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
IgnoreSerializableAttribute = true IgnoreSerializableAttribute = true
#endif #endif
} }
@@ -3623,7 +3623,7 @@ Path '', line 1, position 1.");
{ {
ContractResolver = new DefaultContractResolver ContractResolver = new DefaultContractResolver
{ {
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
IgnoreSerializableAttribute = true IgnoreSerializableAttribute = true
#endif #endif
} }
@@ -3640,7 +3640,7 @@ Path '', line 1, position 1.");
{ {
ContractResolver = new DefaultContractResolver ContractResolver = new DefaultContractResolver
{ {
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
IgnoreSerializableAttribute = true IgnoreSerializableAttribute = true
#endif #endif
} }
@@ -4102,7 +4102,7 @@ Path '', line 1, position 1.");
Assert.AreEqual("value", newModelStateDictionary["key"]); Assert.AreEqual("value", newModelStateDictionary["key"]);
} }
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
#if DEBUG #if DEBUG
[Test] [Test]
public void SerializeISerializableInPartialTrustWithIgnoreInterface() public void SerializeISerializableInPartialTrustWithIgnoreInterface()
@@ -4339,7 +4339,7 @@ Path '', line 1, position 1.");
}", json); }", json);
} }
#if !(PORTABLE) || NETSTANDARD2_0 #if !(PORTABLE) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void DeserializeClassWithInheritedProtectedMember() public void DeserializeClassWithInheritedProtectedMember()
{ {
@@ -4439,7 +4439,7 @@ Path '', line 1, position 1.");
} }
#endif #endif
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void SerializeDeserializeXmlNodeProperties() public void SerializeDeserializeXmlNodeProperties()
{ {
@@ -4670,7 +4670,7 @@ Path '', line 1, position 1.");
Assert.AreEqual(0, z[1].Prop1.Length); Assert.AreEqual(0, z[1].Prop1.Length);
} }
#if !(NET20 || DNXCORE50) || NETSTANDARD2_0 #if !(NET20 || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void StringDictionaryTest() public void StringDictionaryTest()
{ {
@@ -4915,7 +4915,7 @@ Path '', line 1, position 1.");
Assert.AreEqual(meh.IDontWork, "meh"); Assert.AreEqual(meh.IDontWork, "meh");
} }
#if !(NET20 || DNXCORE50) || NETSTANDARD2_0 #if !(NET20 || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void DeserializeNullableStruct() public void DeserializeNullableStruct()
{ {
@@ -5346,7 +5346,7 @@ Path '', line 1, position 1.");
Assert.AreEqual(new Guid("bb2f3da7-bf79-4d14-9d54-0a1f7ff5f902"), c.clientId); Assert.AreEqual(new Guid("bb2f3da7-bf79-4d14-9d54-0a1f7ff5f902"), c.clientId);
} }
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void SerializeException1() public void SerializeException1()
{ {
@@ -5565,7 +5565,7 @@ Path '', line 1, position 1.");
Assert.AreEqual(-3, StaticTestClass.z); Assert.AreEqual(-3, StaticTestClass.z);
} }
#if !(NET20 || DNXCORE50) || NETSTANDARD2_0 #if !(NET20 || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void DeserializeDecimalsWithCulture() public void DeserializeDecimalsWithCulture()
{ {
@@ -5665,7 +5665,7 @@ Path '', line 1, position 1.");
}, "Error converting value {null} to type 'System.Int32'. Path '[3]', line 5, position 6."); }, "Error converting value {null} to type 'System.Int32'. Path '[3]', line 5, position 6.");
} }
#if !(PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void SerializeIConvertible() public void SerializeIConvertible()
{ {
@@ -6395,7 +6395,7 @@ Path '', line 1, position 1.");
Assert.AreEqual("", s); Assert.AreEqual("", s);
} }
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void SerializeAndDeserializeWithAttributes() public void SerializeAndDeserializeWithAttributes()
{ {
@@ -6765,7 +6765,7 @@ This is just junk, though.";
} }
#if !(NET20 || NET35 || NET40 || PORTABLE40) #if !(NET20 || NET35 || NET40 || PORTABLE40)
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 #if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void DeserializeReadOnlyListWithBigInteger() public void DeserializeReadOnlyListWithBigInteger()
{ {
@@ -6823,7 +6823,7 @@ This is just junk, though.";
Action doStuff = () => { obj = JsonConvert.DeserializeObject<MyTuple<int>>(json); }; Action doStuff = () => { obj = JsonConvert.DeserializeObject<MyTuple<int>>(json); };
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
doStuff(); doStuff();
Assert.AreEqual(500, obj.Item1); Assert.AreEqual(500, obj.Item1);
#else #else
@@ -6854,7 +6854,7 @@ This is just junk, though.";
} }
#endif #endif
#if !(PORTABLE || NET35 || NET20 || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0 #if !(PORTABLE || NET35 || NET20 || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void SerializeTupleWithSerializableAttribute() public void SerializeTupleWithSerializableAttribute()
{ {
@@ -7050,7 +7050,7 @@ This is just junk, though.";
} }
#endif #endif
#if !(PORTABLE || NET35 || NET20 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || NET35 || NET20 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void ReadTooLargeInteger() public void ReadTooLargeInteger()
{ {
@@ -7073,7 +7073,7 @@ This is just junk, though.";
Assert.AreEqual(@"{""First"":""One"",""Second"":2}", json); Assert.AreEqual(@"{""First"":""One"",""Second"":2}", json);
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
DefaultContractResolver r = new DefaultContractResolver(); DefaultContractResolver r = new DefaultContractResolver();
r.IgnoreSerializableAttribute = false; r.IgnoreSerializableAttribute = false;
@@ -7180,7 +7180,7 @@ This is just junk, though.";
Assert.AreEqual(1234567890.123456m, d); Assert.AreEqual(1234567890.123456m, d);
} }
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void DontSerializeStaticFields() public void DontSerializeStaticFields()
{ {
@@ -7204,7 +7204,7 @@ This is just junk, though.";
} }
#endif #endif
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void SerializeBigInteger() public void SerializeBigInteger()
{ {
@@ -7345,7 +7345,7 @@ This is just junk, though.";
} }
#endif #endif
#if !(PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD1_0 || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD1_0 || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void SerializeDictionaryWithStructKey_Custom() public void SerializeDictionaryWithStructKey_Custom()
{ {
@@ -7436,7 +7436,7 @@ This is just junk, though.";
Assert.AreEqual(jane, john.Spouse); Assert.AreEqual(jane, john.Spouse);
} }
#if !(NET35 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET35 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void TypeConverterOnInterface() public void TypeConverterOnInterface()
{ {
@@ -7502,7 +7502,7 @@ This is just junk, though.";
ParticipantEntity deserializedProduct = JsonConvert.DeserializeObject<ParticipantEntity>(json); ParticipantEntity deserializedProduct = JsonConvert.DeserializeObject<ParticipantEntity>(json);
} }
#if !(PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void ConvertibleIdTest() public void ConvertibleIdTest()
{ {
@@ -7828,7 +7828,7 @@ This is just junk, though.";
Assert.AreEqual("derived", d.DerivedProperty); Assert.AreEqual("derived", d.DerivedProperty);
} }
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void DeserializeNullableUnsignedLong() public void DeserializeNullableUnsignedLong()
{ {
@@ -7843,7 +7843,7 @@ This is just junk, though.";
} }
#endif #endif
#if !(DNXCORE50) || NETSTANDARD2_0 #if !(DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void MailMessageConverterTest() public void MailMessageConverterTest()
{ {
@@ -339,7 +339,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.IsTrue(JToken.DeepEquals(t1, t2)); Assert.IsTrue(JToken.DeepEquals(t1, t2));
} }
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void DeserializeGenericObjectListWithTypeName() public void DeserializeGenericObjectListWithTypeName()
{ {
@@ -151,7 +151,7 @@ namespace Newtonsoft.Json.Tests.Serialization
}", json); }", json);
} }
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Serializable] [Serializable]
public class MainClass : ISerializable public class MainClass : ISerializable
{ {
@@ -68,7 +68,7 @@ namespace Newtonsoft.Json.Tests.Serialization
public void GetAttributes_Property() public void GetAttributes_Property()
{ {
PropertyInfo property; PropertyInfo property;
#if DNXCORE50 && !NETSTANDARD2_0 #if DNXCORE50 && !(NETSTANDARD2_0 || NET6_0_OR_GREATER)
property = Newtonsoft.Json.Utilities.TypeExtensions.GetProperty(typeof(ReflectionTestObject), "TestProperty"); property = Newtonsoft.Json.Utilities.TypeExtensions.GetProperty(typeof(ReflectionTestObject), "TestProperty");
#else #else
property = typeof(ReflectionTestObject).GetProperty("TestProperty"); property = typeof(ReflectionTestObject).GetProperty("TestProperty");
@@ -87,7 +87,7 @@ namespace Newtonsoft.Json.Tests.Serialization
public void GetAttributes_Field() public void GetAttributes_Field()
{ {
FieldInfo field; FieldInfo field;
#if DNXCORE50 && !NETSTANDARD2_0 #if DNXCORE50 && !(NETSTANDARD2_0 || NET6_0_OR_GREATER)
field = (FieldInfo)Newtonsoft.Json.Utilities.TypeExtensions.GetField(typeof(ReflectionTestObject), "TestField"); field = (FieldInfo)Newtonsoft.Json.Utilities.TypeExtensions.GetField(typeof(ReflectionTestObject), "TestField");
#else #else
field = typeof(ReflectionTestObject).GetField("TestField"); field = typeof(ReflectionTestObject).GetField("TestField");
@@ -272,7 +272,7 @@ namespace Newtonsoft.Json.Tests.Serialization
}", json); }", json);
} }
#if !(PORTABLE || DNXCORE50) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
public class SerializationEventContextTestObject public class SerializationEventContextTestObject
{ {
public string TestMember { get; set; } public string TestMember { get; set; }
@@ -303,7 +303,7 @@ namespace Newtonsoft.Json.Tests.Serialization
} }
#endif #endif
#if !(PORTABLE || DNXCORE50) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void WhenSerializationErrorDetectedBySerializer_ThenCallbackIsCalled() public void WhenSerializationErrorDetectedBySerializer_ThenCallbackIsCalled()
{ {
@@ -4,7 +4,7 @@ using System.Diagnostics;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Numerics; using System.Numerics;
#endif #endif
using System.Runtime.Serialization; using System.Runtime.Serialization;
@@ -121,7 +121,7 @@ namespace Newtonsoft.Json.Tests.Serialization
} }
#endif #endif
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void DiagnosticsTraceWriterTest() public void DiagnosticsTraceWriterTest()
{ {
@@ -867,7 +867,7 @@ Newtonsoft.Json Error: 0 : Error!
Assert.IsTrue(traceWriter.TraceRecords[9].Message.StartsWith("Finished deserializing System.Collections.Generic.List`1[System.Object]. Path '$values'")); Assert.IsTrue(traceWriter.TraceRecords[9].Message.StartsWith("Finished deserializing System.Collections.Generic.List`1[System.Object]. Path '$values'"));
} }
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void DeserializeISerializable() public void DeserializeISerializable()
{ {
@@ -891,7 +891,7 @@ Newtonsoft.Json Error: 0 : Error!
Assert.IsTrue(traceWriter.TraceRecords[0].Message.StartsWith("Deserializing System.Exception using ISerializable constructor. Path ''")); Assert.IsTrue(traceWriter.TraceRecords[0].Message.StartsWith("Deserializing System.Exception using ISerializable constructor. Path ''"));
Assert.AreEqual(TraceLevel.Info, traceWriter.TraceRecords[0].Level); Assert.AreEqual(TraceLevel.Info, traceWriter.TraceRecords[0].Level);
#if !NETSTANDARD2_0 #if !(NETSTANDARD2_0 || NET6_0_OR_GREATER)
Assert.AreEqual("Error deserializing System.Exception. Member 'ClassName' was not found. Path '', line 1, position 2.", traceWriter.TraceRecords[1].Message); Assert.AreEqual("Error deserializing System.Exception. Member 'ClassName' was not found. Path '', line 1, position 2.", traceWriter.TraceRecords[1].Message);
#else #else
Assert.AreEqual("Error deserializing System.Exception. Member 'Message' was not found. Path '', line 1, position 2.", traceWriter.TraceRecords[1].Message); Assert.AreEqual("Error deserializing System.Exception. Member 'Message' was not found. Path '', line 1, position 2.", traceWriter.TraceRecords[1].Message);
@@ -1125,7 +1125,7 @@ Newtonsoft.Json Error: 0 : Error!
} }
#endif #endif
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void TraceJsonWriterTest() public void TraceJsonWriterTest()
{ {
@@ -28,7 +28,7 @@ using Newtonsoft.Json.Utilities.LinqBridge;
#else #else
using System.Linq; using System.Linq;
#endif #endif
#if !(PORTABLE || PORTABLE40) || NETSTANDARD2_0 #if !(PORTABLE || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
#if !(NET35 || NET20) #if !(NET35 || NET20)
using System.Dynamic; using System.Dynamic;
@@ -1454,7 +1454,7 @@ namespace Newtonsoft.Json.Tests.Serialization
CollectionAssert.AreEquivalent(data, d); CollectionAssert.AreEquivalent(data, d);
} }
#if !(DNXCORE50) || NETSTANDARD2_0 #if !(DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void ISerializableTypeNameHandlingTest() public void ISerializableTypeNameHandlingTest()
{ {
@@ -1994,7 +1994,7 @@ namespace Newtonsoft.Json.Tests.Serialization
} }
#endif #endif
#if !(DNXCORE50) || NETSTANDARD2_0 #if !(DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void SerializeDeserialize_DictionaryContextContainsGuid_DeserializesItemAsGuid() public void SerializeDeserialize_DictionaryContextContainsGuid_DeserializesItemAsGuid()
{ {
@@ -2423,7 +2423,7 @@ namespace Newtonsoft.Json.Tests.Serialization
public string SomeProperty { get; set; } public string SomeProperty { get; set; }
} }
#if !(DNXCORE50) || NETSTANDARD2_0 #if !(DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
public class ParentParent public class ParentParent
{ {
[JsonProperty(ItemTypeNameHandling = TypeNameHandling.Auto)] [JsonProperty(ItemTypeNameHandling = TypeNameHandling.Auto)]
@@ -2491,7 +2491,7 @@ namespace Newtonsoft.Json.Tests.Serialization
public int Quantity { get; set; } public int Quantity { get; set; }
} }
#if !(DNXCORE50) || NETSTANDARD2_0 #if !(DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
public class SerializableWrapper public class SerializableWrapper
{ {
public object Content { get; set; } public object Content { get; set; }
@@ -75,7 +75,7 @@ namespace Newtonsoft.Json.Tests.Serialization
{ {
ContractResolver = new DefaultContractResolver ContractResolver = new DefaultContractResolver
{ {
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
IgnoreSerializableAttribute = false IgnoreSerializableAttribute = false
#endif #endif
} }
@@ -84,7 +84,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual(expected, json); Assert.AreEqual(expected, json);
} }
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test] [Test]
public void SerializeInheritedType() public void SerializeInheritedType()
{ {
@@ -114,7 +114,7 @@ namespace Newtonsoft.Json.Tests.Serialization
} }
} }
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Serializable] [Serializable]
#else #else
[JsonObject(MemberSerialization.Fields)] [JsonObject(MemberSerialization.Fields)]
@@ -34,7 +34,7 @@ using System.Linq;
namespace Newtonsoft.Json.Tests.TestObjects namespace Newtonsoft.Json.Tests.TestObjects
{ {
#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Serializable] [Serializable]
public class AnswerFilterModel public class AnswerFilterModel
{ {
@@ -28,7 +28,7 @@ using System.IO;
namespace Newtonsoft.Json.Tests.TestObjects namespace Newtonsoft.Json.Tests.TestObjects
{ {
#if !(DNXCORE50) || NETSTANDARD2_0 #if !(DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
public class AttachmentReadConverter : JsonConverter public class AttachmentReadConverter : JsonConverter
{ {
public override bool CanConvert(Type objectType) public override bool CanConvert(Type objectType)
@@ -27,7 +27,7 @@ using System.ComponentModel;
namespace Newtonsoft.Json.Tests.TestObjects namespace Newtonsoft.Json.Tests.TestObjects
{ {
#if !(NET35 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET35 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[TypeConverter(typeof(MyInterfaceConverter))] [TypeConverter(typeof(MyInterfaceConverter))]
internal class ConsoleWriter : IMyInterface internal class ConsoleWriter : IMyInterface
{ {
@@ -41,7 +41,7 @@ namespace Newtonsoft.Json.Tests.TestObjects
public ulong ULong = long.MaxValue; public ulong ULong = long.MaxValue;
public double Double = double.MaxValue; public double Double = double.MaxValue;
public float Float = float.MaxValue; public float Float = float.MaxValue;
#if !(PORTABLE || DNXCORE50) || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
public DBNull DBNull = DBNull.Value; public DBNull DBNull = DBNull.Value;
#endif #endif
public bool Bool = true; public bool Bool = true;
@@ -27,7 +27,7 @@ using System;
namespace Newtonsoft.Json.Tests.TestObjects namespace Newtonsoft.Json.Tests.TestObjects
{ {
#if !(PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
public class ConvertableIntTestClass public class ConvertableIntTestClass
{ {
public ConvertibleInt Integer { get; set; } public ConvertibleInt Integer { get; set; }
@@ -27,7 +27,7 @@ using System;
namespace Newtonsoft.Json.Tests.TestObjects namespace Newtonsoft.Json.Tests.TestObjects
{ {
#if !(PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
public struct ConvertibleInt : IConvertible public struct ConvertibleInt : IConvertible
{ {
private readonly int _value; private readonly int _value;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(PORTABLE40 || PORTABLE || DNXCORE50) || NETSTANDARD2_0 #if !(PORTABLE40 || PORTABLE || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
@@ -28,7 +28,7 @@ using System.Text;
namespace Newtonsoft.Json.Tests.TestObjects namespace Newtonsoft.Json.Tests.TestObjects
{ {
#if !(DNXCORE50) || NETSTANDARD2_0 #if !(DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
public class EncodingReadConverter : JsonConverter public class EncodingReadConverter : JsonConverter
{ {
public override bool CanConvert(Type objectType) public override bool CanConvert(Type objectType)
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET40 || NET35 || NET20 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET40 || NET35 || NET20 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET35 || NET20 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET35 || NET20 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
namespace Newtonsoft.Json.Tests.TestObjects.GeometricForms namespace Newtonsoft.Json.Tests.TestObjects.GeometricForms
{ {
public static class Tags public static class Tags
@@ -27,7 +27,7 @@ using System.ComponentModel;
namespace Newtonsoft.Json.Tests.TestObjects namespace Newtonsoft.Json.Tests.TestObjects
{ {
#if !(NET35 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET35 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[TypeConverter(typeof(MyInterfaceConverter))] [TypeConverter(typeof(MyInterfaceConverter))]
internal interface IMyInterface internal interface IMyInterface
{ {
@@ -66,7 +66,7 @@ namespace Newtonsoft.Json.Tests.TestObjects
public override bool CanConvert(Type objectType) public override bool CanConvert(Type objectType)
{ {
#if DNXCORE50 && !NETSTANDARD2_0 #if DNXCORE50 && !(NETSTANDARD2_0 || NET6_0_OR_GREATER)
return Newtonsoft.Json.Utilities.TypeExtensions.IsAssignableFrom(typeof(IList<T>), objectType); return Newtonsoft.Json.Utilities.TypeExtensions.IsAssignableFrom(typeof(IList<T>), objectType);
#else #else
return typeof(IList<T>).IsAssignableFrom(objectType); return typeof(IList<T>).IsAssignableFrom(objectType);
@@ -28,7 +28,7 @@ using Newtonsoft.Json.Linq;
namespace Newtonsoft.Json.Tests.TestObjects namespace Newtonsoft.Json.Tests.TestObjects
{ {
#if !(DNXCORE50) || NETSTANDARD2_0 #if !(DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
public class MailAddressReadConverter : JsonConverter public class MailAddressReadConverter : JsonConverter
{ {
public override bool CanConvert(Type objectType) public override bool CanConvert(Type objectType)
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET40 || NET35 || NET20 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET40 || NET35 || NET20 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET35 || NET20 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET35 || NET20 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
namespace Newtonsoft.Json.Tests.TestObjects.Money namespace Newtonsoft.Json.Tests.TestObjects.Money
{ {
@@ -35,7 +35,7 @@ using System.Linq;
namespace Newtonsoft.Json.Tests.TestObjects namespace Newtonsoft.Json.Tests.TestObjects
{ {
#if !(NET35 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(NET35 || NET20 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
internal class MyInterfaceConverter : TypeConverter internal class MyInterfaceConverter : TypeConverter
{ {
private readonly List<IMyInterface> _writers = new List<IMyInterface> private readonly List<IMyInterface> _writers = new List<IMyInterface>
@@ -27,7 +27,7 @@ using System.Runtime.Serialization;
namespace Newtonsoft.Json.Tests.TestObjects namespace Newtonsoft.Json.Tests.TestObjects
{ {
#if !(NET20 || DNXCORE50) || NETSTANDARD2_0 #if !(NET20 || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[DataContract] [DataContract]
public class NullableStructPropertyClass public class NullableStructPropertyClass
{ {
@@ -27,7 +27,7 @@ using System;
namespace Newtonsoft.Json.Tests.TestObjects namespace Newtonsoft.Json.Tests.TestObjects
{ {
#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Serializable] [Serializable]
public class PersonSerializable public class PersonSerializable
{ {
@@ -28,7 +28,7 @@ using System.Runtime.Serialization;
namespace Newtonsoft.Json.Tests.TestObjects namespace Newtonsoft.Json.Tests.TestObjects
{ {
#if !(PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 #if !(PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Serializable] [Serializable]
public class PreserveReferencesCallbackTestObject : ISerializable public class PreserveReferencesCallbackTestObject : ISerializable
{ {

Some files were not shown because too many files have changed in this diff Show More