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
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(DNXCORE50 || PORTABLE40) || NETSTANDARD2_0
#if !(DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System;
using System.Collections.Generic;
using System.Linq;
@@ -47,7 +47,7 @@ namespace Newtonsoft.Json.Tests.Issues
[TestFixture]
public class Issue1327 : TestFixtureBase
{
#if !PORTABLE || NETSTANDARD2_0
#if !PORTABLE || NETSTANDARD2_0 || NET6_0_OR_GREATER
public class PersonWithXmlNode
{
public XmlNode TestXml { get; set; }
@@ -71,7 +71,7 @@ namespace Newtonsoft.Json.Tests.Issues
}
#endif
#if !PORTABLE || NETSTANDARD2_0
#if !PORTABLE || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test]
public void Test_XmlNode()
{
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if NETSTANDARD2_0
#if NETSTANDARD2_0 || NET6_0_OR_GREATER
using System;
using System.Data;
using System.IO;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(PORTABLE) || NETSTANDARD2_0
#if !(PORTABLE) || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System;
using System.Data;
using System.Linq;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#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.IO;
using System.Text;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#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.Collections;
using System.Collections.Generic;
@@ -36,7 +36,7 @@ using System.Runtime.Serialization;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Serialization;
using Newtonsoft.Json.Utilities;
#if PORTABLE && !NETSTANDARD2_0
#if PORTABLE && !(NETSTANDARD2_0 || NET6_0_OR_GREATER)
using BindingFlags = Newtonsoft.Json.Utilities.BindingFlags;
#else
using BindingFlags = System.Reflection.BindingFlags;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#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.JsonPath;
using System;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if (NETSTANDARD2_0)
#if (NETSTANDARD2_0 || NET6_0_OR_GREATER)
using System;
using System.Collections;
using System.Collections.Generic;
@@ -90,7 +90,7 @@ namespace Newtonsoft.Json.Tests.Issues
var objectContract = (JsonObjectContract) resolver.ResolveContract(typeof(NonSerializableException));
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));
Assert.IsFalse(objectContract.Properties.Contains("TargetSite"));
#else