From 25de5022e45999caf3c3f38d1e5ea39dcc540c3a Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Mon, 27 Mar 2017 21:34:00 +1300 Subject: [PATCH] -Removed binary serialization support from netstandard1.3 -Changed packages to use NETStandard.Libary 1.6.0 --- Build/Newtonsoft.Json.nuspec | 59 ++++--------------- .../Schema/JsonSchemaGeneratorTests.cs | 6 +- .../Serialization/ContractResolverTests.cs | 2 +- .../Serialization/JsonSerializerTest.cs | 16 ++--- .../Serialization/WebApiIntegrationTests.cs | 6 +- .../Newtonsoft.Json.Roslyn.csproj | 34 +++-------- 6 files changed, 32 insertions(+), 91 deletions(-) diff --git a/Build/Newtonsoft.Json.nuspec b/Build/Newtonsoft.Json.nuspec index 14cfbb1f..19ca976d 100644 --- a/Build/Newtonsoft.Json.nuspec +++ b/Build/Newtonsoft.Json.nuspec @@ -18,57 +18,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs index f13ad3f9..d2955e5e 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs @@ -312,7 +312,7 @@ namespace Newtonsoft.Json.Tests.Schema Assert.IsTrue(v.IsValid(schema)); } -#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 +#if !(PORTABLE || DNXCORE50) [Test] public void GenerateSchemaForISerializable() { @@ -479,7 +479,7 @@ namespace Newtonsoft.Json.Tests.Schema generator.UndefinedSchemaIdHandling = UndefinedSchemaIdHandling.UseTypeName; generator.ContractResolver = new CamelCasePropertyNamesContractResolver() { -#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 +#if !(PORTABLE || DNXCORE50) IgnoreSerializableAttribute = true #endif }; @@ -524,7 +524,7 @@ namespace Newtonsoft.Json.Tests.Schema }", json); } -#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 +#if !(PORTABLE || DNXCORE50) [Test] public void GenerateSchemaSerializable() { diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs index ad35cc3a..4a6ad7dd 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs @@ -115,7 +115,7 @@ namespace Newtonsoft.Json.Tests.Serialization [TestFixture] public class ContractResolverTests : TestFixtureBase { -#if !(PORTABLE) || NETSTANDARD1_3 +#if !(PORTABLE) [Test] public void ResolveSerializableContract() { diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs index ed0ecde8..cac1d087 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs @@ -4158,7 +4158,7 @@ Path '', line 1, position 1."); { ContractResolver = new DefaultContractResolver { -#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 +#if !(PORTABLE || DNXCORE50) IgnoreSerializableAttribute = true #endif } @@ -4175,7 +4175,7 @@ Path '', line 1, position 1."); { ContractResolver = new DefaultContractResolver { -#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 +#if !(PORTABLE || DNXCORE50) IgnoreSerializableAttribute = true #endif } @@ -4192,7 +4192,7 @@ Path '', line 1, position 1."); { ContractResolver = new DefaultContractResolver { -#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 +#if !(PORTABLE || DNXCORE50) IgnoreSerializableAttribute = true #endif } @@ -4984,7 +4984,7 @@ Path '', line 1, position 1."); Assert.AreEqual("value", newModelStateDictionary["key"]); } -#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 +#if !(PORTABLE || DNXCORE50) #if DEBUG [Test] public void SerializeISerializableInPartialTrustWithIgnoreInterface() @@ -8014,7 +8014,7 @@ Path '', line 1, position 1."); Assert.AreEqual("", s); } -#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 +#if !(PORTABLE || DNXCORE50) [Test] public void SerializeAndDeserializeWithAttributes() { @@ -8812,7 +8812,7 @@ This is just junk, though."; Assert.AreEqual(@"{""First"":""One"",""Second"":2}", json); -#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 +#if !(PORTABLE || DNXCORE50) DefaultContractResolver r = new DefaultContractResolver(); r.IgnoreSerializableAttribute = false; @@ -8928,7 +8928,7 @@ This is just junk, though."; Assert.AreEqual(1234567890.123456m, d); } -#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 +#if !(PORTABLE || DNXCORE50) [Test] public void DontSerializeStaticFields() { @@ -10256,7 +10256,7 @@ This is just junk, though."; public string Project { get; } } -#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 +#if !(PORTABLE || DNXCORE50) public class ISerializableTestObject : ISerializable { internal string _stringValue; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs index 2452055c..99ae7680 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs @@ -75,7 +75,7 @@ namespace Newtonsoft.Json.Tests.Serialization { ContractResolver = new DefaultContractResolver { -#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 +#if !(PORTABLE || DNXCORE50) IgnoreSerializableAttribute = false #endif } @@ -84,7 +84,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual(expected, json); } -#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 +#if !(PORTABLE || DNXCORE50) [Test] public void SerializeInheritedType() { @@ -114,7 +114,7 @@ namespace Newtonsoft.Json.Tests.Serialization } } -#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 +#if !(PORTABLE || DNXCORE50) [Serializable] #else [JsonObject(MemberSerialization.Fields)] diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.Roslyn.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.Roslyn.csproj index cd2c5963..475d7f98 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.Roslyn.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.Roslyn.csproj @@ -39,29 +39,10 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + Json.NET .NET Standard 1.0 @@ -69,14 +50,13 @@ NETSTANDARD1_0;PORTABLE;HAVE_ASYNC;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DYNAMIC;HAVE_EXPRESSIONS;HAVE_FSHARP_TYPES;HAVE_GUID_TRY_PARSE;HAVE_HASH_SET;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_IMMUTABLE_COLLECTIONS;HAVE_INOTIFY_COLLECTION_CHANGED;HAVE_ISET;HAVE_LINQ;HAVE_METHOD_IMPL_ATTRIBUTE;HAVE_READ_ONLY_COLLECTIONS;HAVE_REFLECTION_BINDER;HAVE_SERIALIZATION_BINDER_BIND_TO_NAME;HAVE_STRING_JOIN_WITH_ENUMERABLE;HAVE_TIME_SPAN_PARSE_WITH_CULTURE;HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE;HAVE_TIME_ZONE_INFO;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;HAVE_OBSOLETE_FORMATTER_ASSEMBLY_STYLE;$(AdditionalConstants) - - - + + Json.NET .NET Standard 1.3 true - NETSTANDARD1_3;PORTABLE;HAVE_ASYNC;HAVE_BIG_INTEGER;HAVE_BINARY_SERIALIZATION;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DYNAMIC;HAVE_EXPRESSIONS;HAVE_FSHARP_TYPES;HAVE_GUID_TRY_PARSE;HAVE_HASH_SET;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_IMMUTABLE_COLLECTIONS;HAVE_INOTIFY_COLLECTION_CHANGED;HAVE_ISET;HAVE_LINQ;HAVE_METHOD_IMPL_ATTRIBUTE;HAVE_NON_SERIALIZED_ATTRIBUTE;HAVE_READ_ONLY_COLLECTIONS;HAVE_REFLECTION_BINDER;HAVE_SERIALIZATION_BINDER_BIND_TO_NAME;HAVE_STRING_JOIN_WITH_ENUMERABLE;HAVE_TIME_SPAN_PARSE_WITH_CULTURE;HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE;HAVE_TIME_ZONE_INFO;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;HAVE_OBSOLETE_FORMATTER_ASSEMBLY_STYLE;HAVE_XML_DOCUMENT;$(AdditionalConstants) + NETSTANDARD1_3;PORTABLE;HAVE_ASYNC;HAVE_BIG_INTEGER;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DYNAMIC;HAVE_EXPRESSIONS;HAVE_FSHARP_TYPES;HAVE_GUID_TRY_PARSE;HAVE_HASH_SET;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_IMMUTABLE_COLLECTIONS;HAVE_INOTIFY_COLLECTION_CHANGED;HAVE_ISET;HAVE_LINQ;HAVE_METHOD_IMPL_ATTRIBUTE;HAVE_NON_SERIALIZED_ATTRIBUTE;HAVE_READ_ONLY_COLLECTIONS;HAVE_REFLECTION_BINDER;HAVE_SERIALIZATION_BINDER_BIND_TO_NAME;HAVE_STRING_JOIN_WITH_ENUMERABLE;HAVE_TIME_SPAN_PARSE_WITH_CULTURE;HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE;HAVE_TIME_ZONE_INFO;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;HAVE_OBSOLETE_FORMATTER_ASSEMBLY_STYLE;HAVE_XML_DOCUMENT;$(AdditionalConstants) PORTABLE;HAVE_ASYNC;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DYNAMIC;HAVE_EXPRESSIONS;HAVE_FSHARP_TYPES;HAVE_GUID_TRY_PARSE;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_IMMUTABLE_COLLECTIONS;HAVE_ISET;HAVE_LINQ;HAVE_METHOD_IMPL_ATTRIBUTE;HAVE_READ_ONLY_COLLECTIONS;HAVE_REFLECTION_BINDER;HAVE_SERIALIZATION_BINDER_BIND_TO_NAME;HAVE_STRING_JOIN_WITH_ENUMERABLE;HAVE_TIME_SPAN_PARSE_WITH_CULTURE;HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE;HAVE_TIME_ZONE_INFO;HAVE_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;HAVE_INOTIFY_COLLECTION_CHANGED;HAVE_OBSOLETE_FORMATTER_ASSEMBLY_STYLE;$(AdditionalConstants)