-Added netstandard2.0
This commit is contained in:
@@ -28,7 +28,7 @@ using System.Collections.Generic;
|
||||
#if !(NET20 || DNXCORE50)
|
||||
using System.Data.Linq;
|
||||
#endif
|
||||
#if !DNXCORE50
|
||||
#if !DNXCORE50 || NETSTANDARD2_0
|
||||
using System.Data.SqlTypes;
|
||||
#endif
|
||||
using System.Text;
|
||||
@@ -121,7 +121,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
}", json);
|
||||
}
|
||||
|
||||
#if !(PORTABLE || PORTABLE40 || DNXCORE50)
|
||||
#if !(PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0
|
||||
public class SqlBinaryClass
|
||||
{
|
||||
public SqlBinary SqlBinary { get; set; }
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
#endregion
|
||||
|
||||
#if !(PORTABLE || DNXCORE50 || PORTABLE40)
|
||||
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0
|
||||
using System;
|
||||
using Newtonsoft.Json.Converters;
|
||||
#if DNXCORE50
|
||||
|
||||
@@ -23,12 +23,12 @@
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
#endregion
|
||||
|
||||
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
using Newtonsoft.Json.Bson;
|
||||
using Newtonsoft.Json.Converters;
|
||||
using Newtonsoft.Json.Linq;
|
||||
#if !(PORTABLE || DNXCORE50 || PORTABLE40)
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
#if DNXCORE50
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
#endregion
|
||||
|
||||
#if !(NET40 || NET35 || NET20 || DNXCORE50)
|
||||
#if !(NET40 || NET35 || NET20 || DNXCORE50) || NETSTANDARD2_0
|
||||
using System.Diagnostics;
|
||||
using System.Reflection;
|
||||
using Microsoft.FSharp.Core;
|
||||
@@ -36,7 +36,13 @@ using System.Threading.Tasks;
|
||||
using Newtonsoft.Json.Tests.TestObjects;
|
||||
using Newtonsoft.Json.Tests.TestObjects.GeometricForms;
|
||||
using Newtonsoft.Json.Tests.TestObjects.Money;
|
||||
#if DNXCORE50
|
||||
using Xunit;
|
||||
using Test = Xunit.FactAttribute;
|
||||
using Assert = Newtonsoft.Json.Tests.XUnitAssert;
|
||||
#else
|
||||
using NUnit.Framework;
|
||||
#endif
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Converters
|
||||
{
|
||||
@@ -191,7 +197,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
{
|
||||
Union u = new Union();
|
||||
|
||||
u.TagReader = FSharpFunc<object, int>.ToConverter(FSharpValue.PreComputeUnionTagReader(t, null));
|
||||
u.TagReader = (s) => FSharpValue.PreComputeUnionTagReader(t, null).Invoke(s);
|
||||
u.Cases = new List<UnionCase>();
|
||||
|
||||
UnionCaseInfo[] cases = FSharpType.GetUnionCases(t, null);
|
||||
@@ -202,8 +208,8 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
unionCase.Tag = unionCaseInfo.Tag;
|
||||
unionCase.Name = unionCaseInfo.Name;
|
||||
unionCase.Fields = unionCaseInfo.GetFields();
|
||||
unionCase.FieldReader = FSharpFunc<object, object[]>.ToConverter(FSharpValue.PreComputeUnionReader(unionCaseInfo, null));
|
||||
unionCase.Constructor = FSharpFunc<object[], object>.ToConverter(FSharpValue.PreComputeUnionConstructor(unionCaseInfo, null));
|
||||
unionCase.FieldReader = (s) => FSharpValue.PreComputeUnionReader(unionCaseInfo, null).Invoke(s);
|
||||
unionCase.Constructor = (s) => FSharpValue.PreComputeUnionConstructor(unionCaseInfo, null).Invoke(s);
|
||||
|
||||
u.Cases.Add(unionCase);
|
||||
}
|
||||
@@ -224,8 +230,8 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
|
||||
object[] fields = caseInfo.FieldReader.Invoke(value);
|
||||
|
||||
Assert.AreEqual(10, fields[0]);
|
||||
Assert.AreEqual(5, fields[1]);
|
||||
Assert.AreEqual(10d, fields[0]);
|
||||
Assert.AreEqual(5d, fields[1]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
||||
@@ -123,7 +123,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
Assert.AreEqual(2006, d.Year);
|
||||
}
|
||||
|
||||
#if !(DNXCORE50)
|
||||
#if !(DNXCORE50) || NETSTANDARD2_0
|
||||
[Test]
|
||||
public void SerializeFormattedDateTimeNewZealandCulture()
|
||||
{
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
#endregion
|
||||
|
||||
#if !(DNXCORE50 || PORTABLE40)
|
||||
#if !(DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
|
||||
using System.Globalization;
|
||||
#if NET20
|
||||
using Newtonsoft.Json.Utilities.LinqBridge;
|
||||
@@ -58,7 +58,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
[TestFixture]
|
||||
public class XmlNodeConverterTest : TestFixtureBase
|
||||
{
|
||||
#if !PORTABLE || NETSTANDARD1_3
|
||||
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
|
||||
private string SerializeXmlNode(XmlNode node)
|
||||
{
|
||||
string json = JsonConvert.SerializeXmlNode(node, Formatting.Indented);
|
||||
@@ -262,7 +262,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
}
|
||||
#endif
|
||||
|
||||
#if !PORTABLE || NETSTANDARD1_3
|
||||
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
|
||||
[Test]
|
||||
public void MultipleNamespacesXmlDocument()
|
||||
{
|
||||
@@ -441,7 +441,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
</root>", doc.ToString());
|
||||
}
|
||||
|
||||
#if !PORTABLE || NETSTANDARD1_3
|
||||
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
|
||||
[Test]
|
||||
public void SerializeEmptyDocument()
|
||||
{
|
||||
@@ -487,7 +487,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
Assert.IsTrue(equals);
|
||||
}
|
||||
|
||||
#if !PORTABLE || NETSTANDARD1_3
|
||||
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
|
||||
[Test]
|
||||
public void DeserializeUndeclaredNamespacePrefix()
|
||||
{
|
||||
@@ -502,7 +502,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if !PORTABLE || NETSTANDARD1_3
|
||||
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
|
||||
[Test]
|
||||
public void DeserializeMultipleRootElements()
|
||||
{
|
||||
@@ -1297,7 +1297,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
]
|
||||
}";
|
||||
|
||||
#if !PORTABLE || NETSTANDARD1_3
|
||||
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
|
||||
XmlDocument newDoc = JsonConvert.DeserializeXmlNode(json, "myRoot");
|
||||
|
||||
string xml = IndentXml(newDoc.InnerXml);
|
||||
@@ -1335,7 +1335,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
</myRoot>", IndentXml(newXDoc.ToString(SaveOptions.DisableFormatting)));
|
||||
#endif
|
||||
|
||||
#if !PORTABLE || NETSTANDARD1_3
|
||||
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
|
||||
string newJson = JsonConvert.SerializeXmlNode(newDoc, Formatting.Indented);
|
||||
Console.WriteLine(newJson);
|
||||
#endif
|
||||
@@ -1360,7 +1360,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
]
|
||||
}";
|
||||
|
||||
#if !PORTABLE || NETSTANDARD1_3
|
||||
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
|
||||
XmlDocument newDoc = JsonConvert.DeserializeXmlNode(json, "myRoot", true);
|
||||
|
||||
StringAssert.AreEqual(@"<myRoot>
|
||||
@@ -1396,7 +1396,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
</myRoot>", IndentXml(newXDoc.ToString(SaveOptions.DisableFormatting)));
|
||||
#endif
|
||||
|
||||
#if !PORTABLE || NETSTANDARD1_3
|
||||
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
|
||||
string newJson = JsonConvert.SerializeXmlNode(newDoc, Formatting.Indented, true);
|
||||
StringAssert.AreEqual(json, newJson);
|
||||
#endif
|
||||
@@ -1422,7 +1422,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
]
|
||||
}";
|
||||
|
||||
#if !PORTABLE || NETSTANDARD1_3
|
||||
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
|
||||
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);
|
||||
@@ -1435,7 +1435,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
#endif
|
||||
}
|
||||
|
||||
#if !PORTABLE || NETSTANDARD1_3
|
||||
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
|
||||
[Test]
|
||||
public void Encoding()
|
||||
{
|
||||
@@ -1450,7 +1450,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
}
|
||||
#endif
|
||||
|
||||
#if !PORTABLE || NETSTANDARD1_3
|
||||
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
|
||||
[Test]
|
||||
public void SerializeComment()
|
||||
{
|
||||
@@ -2139,6 +2139,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
Assert.AreEqual(@"<?xml version=""1.0"" encoding=""utf-8""?><root booleanType=""true"" />", xmlString);
|
||||
}
|
||||
|
||||
#if !(NETSTANDARD1_0 || NETSTANDARD1_3)
|
||||
[Test]
|
||||
public void IgnoreCultureForTypedAttributes()
|
||||
{
|
||||
@@ -2174,6 +2175,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
System.Threading.Thread.CurrentThread.CurrentCulture = originalCulture;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
[Test]
|
||||
public void NullAttributeValue()
|
||||
@@ -2499,7 +2501,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
}
|
||||
#endif
|
||||
|
||||
#if !PORTABLE || NETSTANDARD1_3
|
||||
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
|
||||
[Test]
|
||||
public void DeserializeXmlNodeDefaultNamespace()
|
||||
{
|
||||
@@ -2827,7 +2829,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
}
|
||||
#endif
|
||||
|
||||
#if !PORTABLE || NETSTANDARD1_3
|
||||
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
|
||||
[Test]
|
||||
public void SerializeAndDeserializeXmlElementWithNamespaceInChildrenRootDontHaveNameSpace()
|
||||
{
|
||||
@@ -2846,7 +2848,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
Assert.AreEqual(@"<root><b xmlns=""http://www.example.com/ns"">Asd</b><c>AAA</c><test>adad</test></root>", xmlBack.OuterXml);
|
||||
}
|
||||
|
||||
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3
|
||||
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
|
||||
[Test]
|
||||
public void DeserializeBigInteger()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user