From ba514c4610e4f0c190e93b84edadc68bdd357a37 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sun, 5 Mar 2017 15:12:52 +1300 Subject: [PATCH] -Cleaned up preprocessor symbols --- .../Bson/BsonReaderAsyncTests.cs | 2 +- .../Bson/BsonReaderTests.cs | 4 +- .../Bson/BsonWriterAsyncTests.cs | 6 +- .../Bson/BsonWriterTests.cs | 4 +- .../Converters/BinaryConverterTests.cs | 4 +- .../Converters/DataSetConverterTests.cs | 2 +- .../Converters/DataTableConverterTests.cs | 4 +- .../Converters/ExpandoObjectConverterTests.cs | 2 +- .../Converters/XmlNodeConverterTest.cs | 4 +- Src/Newtonsoft.Json.Tests/DemoTests.cs | 6 +- Src/Newtonsoft.Json.Tests/JsonConvertTest.cs | 6 +- .../ExceptionHandlingAsyncTests.cs | 6 +- .../ExceptionHandlingTests.cs | 6 +- .../JsonTextReaderTests/FloatAsyncTests.cs | 2 +- .../JsonTextReaderTests/FloatTests.cs | 2 +- .../JsonTextReaderTests/MiscAsyncTests.cs | 2 +- .../JsonTextReaderTests/MiscTests.cs | 2 +- .../JsonTextReaderTests/ParseAsyncTests.cs | 2 +- .../JsonTextReaderTests/ParseTests.cs | 2 +- .../JsonTextReaderTests/ReadAsyncTests.cs | 8 +-- .../JsonTextReaderTests/ReadTests.cs | 6 +- .../JsonTextWriterAsyncTests.cs | 2 +- .../JsonTextWriterTest.cs | 2 +- .../JsonValidatingReaderTests.cs | 6 +- .../Linq/ComponentModel/BindingTests.cs | 2 +- .../JPropertyDescriptorTests.cs | 2 +- .../Linq/DynamicTests.cs | 28 ++++---- Src/Newtonsoft.Json.Tests/Linq/JArrayTests.cs | 2 +- .../Linq/JConstructorAsyncTests.cs | 2 +- .../Linq/JObjectAsyncTests.cs | 2 +- .../Linq/JObjectTests.cs | 12 ++-- .../Linq/JPropertyAsyncTests.cs | 2 +- .../Linq/JPropertyTests.cs | 2 +- .../Linq/JTokenAsyncTests.cs | 2 +- .../Linq/JTokenReaderAsyncTests.cs | 8 +-- .../Linq/JTokenReaderTest.cs | 6 +- Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs | 12 ++-- .../Linq/JTokenWriterAsyncTests.cs | 10 +-- .../Linq/JTokenWriterTest.cs | 8 +-- .../Linq/JValueAsyncTests.cs | 2 +- Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs | 22 +++--- .../Linq/JsonPath/JPathExecuteTests.cs | 4 +- .../Linq/LinqToJsonAsyncTests.cs | 2 +- .../Linq/LinqToJsonTest.cs | 2 +- .../LinqToSqlClassesSerializationTests.cs | 2 +- .../Newtonsoft.Json.Tests.Roslyn.csproj | 2 +- .../Properties/AssemblyInfo.cs | 6 +- .../Schema/ExtensionsTests.cs | 4 +- .../Schema/JsonSchemaGeneratorTests.cs | 14 ++-- .../CamelCaseNamingStrategyTests.cs | 2 +- ...lCasePropertyNamesContractResolverTests.cs | 4 +- .../Serialization/ContractResolverTests.cs | 4 +- .../Serialization/DependencyInjectionTests.cs | 2 +- .../Serialization/DynamicTests.cs | 4 +- .../EntitiesSerializationTests.cs | 2 +- .../ImmutableCollectionsTests.cs | 2 +- .../JsonSerializerCollectionsTests.cs | 20 +++--- .../Serialization/JsonSerializerTest.cs | 70 +++++++++---------- .../MetadataPropertyHandlingTests.cs | 2 +- .../ReferenceLoopHandlingTests.cs | 4 +- .../SerializationErrorHandlingTests.cs | 2 +- .../SnakeCaseNamingStrategyTests.cs | 2 +- .../Serialization/TraceWriterTests.cs | 8 +-- .../Serialization/TypeNameHandlingTests.cs | 8 +-- .../Serialization/WebApiIntegrationTests.cs | 10 +-- Src/Newtonsoft.Json.Tests/TestFixtureBase.cs | 4 +- .../TestObjects/AnswerFilterModel.cs | 2 +- .../TestObjects/ConsoleWriter.cs | 2 +- .../TestObjects/CustomerDataSet.cs | 2 +- .../TestObjects/IMyInterface.cs | 2 +- .../TestObjects/MyInterfaceConverter.cs | 2 +- .../TestObjects/PersonSerializable.cs | 2 +- .../TestObjects/TraceWriter.cs | 2 +- .../TestObjects/TypeConverterJsonConverter.cs | 2 +- .../DynamicReflectionDelegateFactoryTests.cs | 2 +- .../Utilities/ReflectionUtilsTests.cs | 2 +- .../Newtonsoft.Json.Roslyn.csproj | 5 +- .../Properties/AssemblyInfo.cs | 4 +- .../Serialization/DefaultContractResolver.cs | 6 +- .../DefaultSerializationBinder.cs | 2 +- .../Serialization/JsonTypeReflector.cs | 6 +- Src/Newtonsoft.Json/SerializationBinder.cs | 2 +- .../Utilities/DateTimeUtils.cs | 2 +- .../Utilities/ReflectionUtils.cs | 8 +-- .../Utilities/TypeExtensions.cs | 4 +- 85 files changed, 226 insertions(+), 235 deletions(-) diff --git a/Src/Newtonsoft.Json.Tests/Bson/BsonReaderAsyncTests.cs b/Src/Newtonsoft.Json.Tests/Bson/BsonReaderAsyncTests.cs index 289e91fa..827b1a1b 100644 --- a/Src/Newtonsoft.Json.Tests/Bson/BsonReaderAsyncTests.cs +++ b/Src/Newtonsoft.Json.Tests/Bson/BsonReaderAsyncTests.cs @@ -24,7 +24,7 @@ #endregion #pragma warning disable 618 -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) using System; using System.Collections.Generic; using System.Globalization; diff --git a/Src/Newtonsoft.Json.Tests/Bson/BsonReaderTests.cs b/Src/Newtonsoft.Json.Tests/Bson/BsonReaderTests.cs index f9954f17..9269e0d7 100644 --- a/Src/Newtonsoft.Json.Tests/Bson/BsonReaderTests.cs +++ b/Src/Newtonsoft.Json.Tests/Bson/BsonReaderTests.cs @@ -31,7 +31,7 @@ using System.Reflection; using System.Runtime.Serialization; using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Tests.TestObjects; -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 using System.Numerics; #endif using System.Text; @@ -1491,7 +1491,7 @@ namespace Newtonsoft.Json.Tests.Bson Assert.AreEqual(badText, (string)o["test"]); } -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 public class BigIntegerTestClass { public BigInteger Blah { get; set; } diff --git a/Src/Newtonsoft.Json.Tests/Bson/BsonWriterAsyncTests.cs b/Src/Newtonsoft.Json.Tests/Bson/BsonWriterAsyncTests.cs index f7046133..a0cc4cde 100644 --- a/Src/Newtonsoft.Json.Tests/Bson/BsonWriterAsyncTests.cs +++ b/Src/Newtonsoft.Json.Tests/Bson/BsonWriterAsyncTests.cs @@ -24,9 +24,9 @@ #endregion #pragma warning disable 618 -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) using System; -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 using System.Numerics; #endif 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()))); } -#if !PORTABLE || NETSTANDARD1_1 +#if !PORTABLE || NETSTANDARD1_3 [Test] public async Task WriteBigIntegerAsync() { diff --git a/Src/Newtonsoft.Json.Tests/Bson/BsonWriterTests.cs b/Src/Newtonsoft.Json.Tests/Bson/BsonWriterTests.cs index 1f0e0a1f..614b0e13 100644 --- a/Src/Newtonsoft.Json.Tests/Bson/BsonWriterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Bson/BsonWriterTests.cs @@ -26,7 +26,7 @@ #pragma warning disable 618 using System; using System.Collections.Generic; -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 using System.Numerics; #endif using System.Text; @@ -798,7 +798,7 @@ namespace Newtonsoft.Json.Tests.Bson Assert.AreEqual(c.AGuid, c2.AGuid.ToString()); } -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 [Test] public void WriteBigInteger() { diff --git a/Src/Newtonsoft.Json.Tests/Converters/BinaryConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/BinaryConverterTests.cs index 391a5900..a0d6c2dd 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/BinaryConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/BinaryConverterTests.cs @@ -55,7 +55,7 @@ namespace Newtonsoft.Json.Tests.Converters public byte[] NullByteArray { get; set; } } -#if !(NET20 || PORTABLE || PORTABLE40 || DNXCORE50) +#if !(NET20 || PORTABLE || DNXCORE50) [Test] public void DeserializeBinaryClass() { @@ -121,7 +121,7 @@ namespace Newtonsoft.Json.Tests.Converters }", json); } -#if !(PORTABLE || PORTABLE40 || DNXCORE50) +#if !(PORTABLE || DNXCORE50) public class SqlBinaryClass { public SqlBinary SqlBinary { get; set; } diff --git a/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs index 41b8528e..93df7c4f 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) using System; using Newtonsoft.Json.Converters; #if DNXCORE50 diff --git a/Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs index 1539564e..5b008df2 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs @@ -28,7 +28,7 @@ using System.Text; using Newtonsoft.Json.Bson; using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) using System; using System.Collections.Generic; #if DNXCORE50 @@ -486,7 +486,7 @@ namespace Newtonsoft.Json.Tests.Converters StringAssert.AreEqual(@"null", json); } -#if !(NET20 || PORTABLE || PORTABLE40) +#if !(NET20 || PORTABLE) [Test] public void DeserializedTypedDataTableWithConverter() { diff --git a/Src/Newtonsoft.Json.Tests/Converters/ExpandoObjectConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/ExpandoObjectConverterTests.cs index dec67f4a..d58d747e 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/ExpandoObjectConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/ExpandoObjectConverterTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET35 || NET20 || PORTABLE40) +#if !(NET35 || NET20) using System; using System.Collections.Generic; using System.Dynamic; diff --git a/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs b/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs index 61dbf5bc..d54fe281 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs @@ -30,7 +30,7 @@ using Newtonsoft.Json.Utilities.LinqBridge; using System.Linq; #endif using System.Text; -#if !(DNXCORE50 || PORTABLE40) +#if !(DNXCORE50) using System; using System.Collections.Generic; using Newtonsoft.Json.Tests.Serialization; @@ -2698,7 +2698,7 @@ namespace Newtonsoft.Json.Tests.Converters Assert.AreEqual(@"AsdAAAadad", xmlBack.OuterXml); } -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 [Test] public void DeserializeBigInteger() { diff --git a/Src/Newtonsoft.Json.Tests/DemoTests.cs b/Src/Newtonsoft.Json.Tests/DemoTests.cs index d0ff58b4..aeaadfb2 100644 --- a/Src/Newtonsoft.Json.Tests/DemoTests.cs +++ b/Src/Newtonsoft.Json.Tests/DemoTests.cs @@ -24,7 +24,7 @@ #endregion using System; -#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40 || DNXCORE50) +#if !(NET20 || NET35 || NET40 || PORTABLE || DNXCORE50) using System.Buffers; #endif using System.Collections.Generic; @@ -589,7 +589,7 @@ namespace Newtonsoft.Json.Tests }", json); } -#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40 || DNXCORE50) +#if !(NET20 || NET35 || NET40 || PORTABLE || DNXCORE50) [Test] public void ArrayPooling() { @@ -608,7 +608,7 @@ namespace Newtonsoft.Json.Tests #endif } -#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40 || DNXCORE50) +#if !(NET20 || NET35 || NET40 || PORTABLE || DNXCORE50) public class JsonArrayPool : IArrayPool { public static readonly JsonArrayPool Instance = new JsonArrayPool(); diff --git a/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs b/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs index be188bee..7efb041b 100644 --- a/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs +++ b/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs @@ -28,7 +28,7 @@ using System.Collections.Generic; using System.Globalization; using System.IO; using Newtonsoft.Json.Schema; -#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 using System.Numerics; #endif using System.Runtime.Serialization; @@ -607,7 +607,7 @@ namespace Newtonsoft.Json.Tests value = null; Assert.AreEqual("null", JsonConvert.ToString(value)); -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) value = DBNull.Value; Assert.AreEqual("null", JsonConvert.ToString(value)); #endif @@ -1109,7 +1109,7 @@ namespace Newtonsoft.Json.Tests writer.Flush(); } -#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 [Test] public void IntegerLengthOverflows() { diff --git a/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ExceptionHandlingAsyncTests.cs b/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ExceptionHandlingAsyncTests.cs index 5a6b1123..c21f7bde 100644 --- a/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ExceptionHandlingAsyncTests.cs +++ b/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ExceptionHandlingAsyncTests.cs @@ -23,11 +23,11 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) using System; using System.Globalization; -#if !PORTABLE || NETSTANDARD1_1 +#if !PORTABLE || NETSTANDARD1_3 using System.Numerics; #endif using System.Text; @@ -593,7 +593,7 @@ namespace Newtonsoft.Json.Tests.JsonTextReaderTests } } -#if !PORTABLE || NETSTANDARD1_1 +#if !PORTABLE || NETSTANDARD1_3 [Test] public async Task ReadInt64OverflowAsync() { diff --git a/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ExceptionHandlingTests.cs b/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ExceptionHandlingTests.cs index 6b30199a..cbf6b06e 100644 --- a/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ExceptionHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ExceptionHandlingTests.cs @@ -28,7 +28,7 @@ using System.Collections; using System.Collections.Generic; using System.Globalization; using Newtonsoft.Json.Linq; -#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 using System.Numerics; #endif using System.Text; @@ -616,7 +616,7 @@ namespace Newtonsoft.Json.Tests.JsonTextReaderTests } } -#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 [Test] public void ReadInt64Overflow() { @@ -638,7 +638,7 @@ namespace Newtonsoft.Json.Tests.JsonTextReaderTests } #endif -#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 [Test] public void ReadInt64Overflow_Negative() { diff --git a/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/FloatAsyncTests.cs b/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/FloatAsyncTests.cs index ee48f234..77bb2e6a 100644 --- a/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/FloatAsyncTests.cs +++ b/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/FloatAsyncTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) using System; #if DNXCORE50 diff --git a/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/FloatTests.cs b/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/FloatTests.cs index 04477c97..53ac297c 100644 --- a/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/FloatTests.cs +++ b/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/FloatTests.cs @@ -28,7 +28,7 @@ using System.Collections; using System.Collections.Generic; using System.Globalization; using Newtonsoft.Json.Linq; -#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 using System.Numerics; #endif using System.Text; diff --git a/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/MiscAsyncTests.cs b/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/MiscAsyncTests.cs index 112368ae..69c1cf2f 100644 --- a/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/MiscAsyncTests.cs +++ b/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/MiscAsyncTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) using System; using System.Globalization; diff --git a/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/MiscTests.cs b/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/MiscTests.cs index 46242dbb..c47b9aab 100644 --- a/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/MiscTests.cs +++ b/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/MiscTests.cs @@ -28,7 +28,7 @@ using System.Collections; using System.Collections.Generic; using System.Globalization; using Newtonsoft.Json.Linq; -#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 using System.Numerics; #endif using System.Text; diff --git a/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ParseAsyncTests.cs b/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ParseAsyncTests.cs index 5225eaaa..c5147187 100644 --- a/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ParseAsyncTests.cs +++ b/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ParseAsyncTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) using System; using System.Text; diff --git a/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ParseTests.cs b/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ParseTests.cs index f9e3ad81..c7ffab91 100644 --- a/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ParseTests.cs +++ b/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ParseTests.cs @@ -28,7 +28,7 @@ using System.Collections; using System.Collections.Generic; using System.Globalization; using Newtonsoft.Json.Linq; -#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 using System.Numerics; #endif using System.Text; diff --git a/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ReadAsyncTests.cs b/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ReadAsyncTests.cs index 7674c0c5..a88ba40e 100644 --- a/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ReadAsyncTests.cs +++ b/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ReadAsyncTests.cs @@ -23,12 +23,12 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) using System; using System.Globalization; using Newtonsoft.Json.Linq; -#if !PORTABLE || NETSTANDARD1_1 +#if !PORTABLE || NETSTANDARD1_3 using System.Numerics; #endif using System.Text; @@ -56,7 +56,7 @@ namespace Newtonsoft.Json.Tests.JsonTextReaderTests #endif public class ReadAsyncTests : TestFixtureBase { -#if !(PORTABLE || PORTABLE40 || NET35 || NET20) +#if !(PORTABLE || NET35 || NET20) [Test] public async Task ReadAsBooleanAsync() { @@ -1173,7 +1173,7 @@ second line third line", jsonTextReader.Value); } -#if !PORTABLE || NETSTANDARD1_1 +#if !PORTABLE || NETSTANDARD1_3 [Test] public async Task ReadBigIntegerAsync() { diff --git a/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ReadTests.cs b/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ReadTests.cs index 5517c8ab..33c1c17c 100644 --- a/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ReadTests.cs +++ b/Src/Newtonsoft.Json.Tests/JsonTextReaderTests/ReadTests.cs @@ -28,7 +28,7 @@ using System.Collections; using System.Collections.Generic; using System.Globalization; using Newtonsoft.Json.Linq; -#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 using System.Numerics; #endif using System.Text; @@ -61,7 +61,7 @@ namespace Newtonsoft.Json.Tests.JsonTextReaderTests #endif public class ReadTests : TestFixtureBase { -#if !(PORTABLE || PORTABLE40 || NET35 || NET20) +#if !(PORTABLE || NET35 || NET20) [Test] public void ReadAsBoolean() { @@ -1194,7 +1194,7 @@ third line", jsonTextReader.Value); -#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 [Test] public void ReadBigInteger() { diff --git a/Src/Newtonsoft.Json.Tests/JsonTextWriterAsyncTests.cs b/Src/Newtonsoft.Json.Tests/JsonTextWriterAsyncTests.cs index 88017a75..4e6f3010 100644 --- a/Src/Newtonsoft.Json.Tests/JsonTextWriterAsyncTests.cs +++ b/Src/Newtonsoft.Json.Tests/JsonTextWriterAsyncTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) using System; using System.Collections.Generic; diff --git a/Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs b/Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs index 99c9d386..e5ea2512 100644 --- a/Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs +++ b/Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs @@ -134,7 +134,7 @@ namespace Newtonsoft.Json.Tests Assert.AreEqual(1, arrayPool.FreeArrays.Count); } -#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40 || DNXCORE50) +#if !(NET20 || NET35 || NET40 || PORTABLE || DNXCORE50) [Test] public void BufferErroringWithInvalidSize() { diff --git a/Src/Newtonsoft.Json.Tests/JsonValidatingReaderTests.cs b/Src/Newtonsoft.Json.Tests/JsonValidatingReaderTests.cs index 89fcd431..b4bc1cd2 100644 --- a/Src/Newtonsoft.Json.Tests/JsonValidatingReaderTests.cs +++ b/Src/Newtonsoft.Json.Tests/JsonValidatingReaderTests.cs @@ -30,7 +30,7 @@ using System.IO; #if NET20 using Newtonsoft.Json.Utilities.LinqBridge; #endif -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 using System.Numerics; #endif using System.Text; @@ -353,7 +353,7 @@ namespace Newtonsoft.Json.Tests Assert.IsNotNull(validationEventArgs); } -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 [Test] public void IntegerGreaterThanMaximumValue_BigInteger() { @@ -606,7 +606,7 @@ namespace Newtonsoft.Json.Tests Assert.IsNotNull(validationEventArgs); } -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 [Test] public void BigIntegerDivisibleBy_Success() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/ComponentModel/BindingTests.cs b/Src/Newtonsoft.Json.Tests/Linq/ComponentModel/BindingTests.cs index 3461dadf..df75b3d4 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/ComponentModel/BindingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/ComponentModel/BindingTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(PORTABLE || PORTABLE40 || DNXCORE50) +#if !(PORTABLE || DNXCORE50) using NUnit.Framework; using System.Web.UI; using Newtonsoft.Json.Linq; diff --git a/Src/Newtonsoft.Json.Tests/Linq/ComponentModel/JPropertyDescriptorTests.cs b/Src/Newtonsoft.Json.Tests/Linq/ComponentModel/JPropertyDescriptorTests.cs index 96aee34e..aa11f930 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/ComponentModel/JPropertyDescriptorTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/ComponentModel/JPropertyDescriptorTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(PORTABLE || PORTABLE40 || DNXCORE50) +#if !(PORTABLE || DNXCORE50) using NUnit.Framework; using Newtonsoft.Json.Linq; diff --git a/Src/Newtonsoft.Json.Tests/Linq/DynamicTests.cs b/Src/Newtonsoft.Json.Tests/Linq/DynamicTests.cs index 4f6a114b..ae894415 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/DynamicTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/DynamicTests.cs @@ -24,12 +24,12 @@ #endregion using System.Diagnostics; -#if !(NET35 || NET20 || PORTABLE40) +#if !(NET35 || NET20) using System; using System.Collections.Generic; using System.Dynamic; using System.Linq; -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 using System.Numerics; #endif using System.Text; @@ -257,7 +257,7 @@ namespace Newtonsoft.Json.Tests.Linq new JProperty("Uri", new Uri("http://json.codeplex.com/")), new JProperty("Guid", new Guid("EA27FE1D-0D80-44F2-BF34-4654156FA7AF")), new JProperty("TimeSpan", TimeSpan.FromDays(1)) -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 , new JProperty("BigInteger", BigInteger.Parse("1")) #endif ); @@ -290,7 +290,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.IsTrue(d.Decimal == 1.1m); Assert.IsTrue(d.Decimal != 1.0f); Assert.IsTrue(d.Decimal != 1.0d); -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 Assert.IsTrue(d.Decimal > new BigInteger(0)); #endif @@ -306,11 +306,11 @@ namespace Newtonsoft.Json.Tests.Linq Assert.IsTrue(d.Float == 1.1m); Assert.IsTrue(d.Float != 1.0f); Assert.IsTrue(d.Float != 1.0d); -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 Assert.IsTrue(d.Float > new BigInteger(0)); #endif -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 Assert.IsTrue(d.BigInteger == d.BigInteger); Assert.IsTrue(d.BigInteger > 0); 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("Guid", new Guid("EA27FE1D-0D80-44F2-BF34-4654156FA7AF")), new JProperty("TimeSpan", TimeSpan.FromDays(1)) -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 , new JProperty("BigInteger", new BigInteger(100)) #endif ); @@ -445,7 +445,7 @@ namespace Newtonsoft.Json.Tests.Linq r += 2; Assert.AreEqual(null, r.Value); -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 r = d.BigInteger + null; Assert.AreEqual(null, r.Value); r += 2; @@ -524,7 +524,7 @@ namespace Newtonsoft.Json.Tests.Linq r -= 2; Assert.AreEqual(null, r.Value); -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 r = d.BigInteger - null; Assert.AreEqual(null, r.Value); r -= 2; @@ -598,7 +598,7 @@ namespace Newtonsoft.Json.Tests.Linq r *= 2; Assert.AreEqual(null, r.Value); -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 r = d.BigInteger * 1.1d; Assert.AreEqual(100m, (decimal)r); r *= 2; @@ -672,7 +672,7 @@ namespace Newtonsoft.Json.Tests.Linq r /= 2; Assert.AreEqual(null, r.Value); -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 r = d.BigInteger / 1.1d; Assert.AreEqual(100m, (decimal)r); r /= 2; @@ -700,7 +700,7 @@ namespace Newtonsoft.Json.Tests.Linq new JProperty("Uri", new Uri("http://json.codeplex.com/")), new JProperty("Guid", new Guid("EA27FE1D-0D80-44F2-BF34-4654156FA7AF")), new JProperty("TimeSpan", TimeSpan.FromDays(1)) -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 , new JProperty("BigInteger", new BigInteger(100)) #endif ); @@ -717,7 +717,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual("http://json.codeplex.com/", d.Uri.ToString()); Assert.AreEqual("ea27fe1d-0d80-44f2-bf34-4654156fa7af", d.Guid.ToString()); Assert.AreEqual("1.00:00:00", d.TimeSpan.ToString()); -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 Assert.AreEqual("100", d.BigInteger.ToString()); #endif } @@ -801,7 +801,7 @@ namespace Newtonsoft.Json.Tests.Linq AssertValueConverted(null); AssertValueConverted(new Uri("http://json.codeplex.com/")); AssertValueConverted(null); -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 AssertValueConverted(new BigInteger(100)); AssertValueConverted(null); #endif diff --git a/Src/Newtonsoft.Json.Tests/Linq/JArrayTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JArrayTests.cs index 30880d6b..7cf72aa9 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JArrayTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JArrayTests.cs @@ -431,7 +431,7 @@ Parameter name: index"); } } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) [Test] public void ITypedListGetItemProperties() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JConstructorAsyncTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JConstructorAsyncTests.cs index 3ed7a9c5..710913d0 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JConstructorAsyncTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JConstructorAsyncTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) using Newtonsoft.Json.Linq; #if DNXCORE50 diff --git a/Src/Newtonsoft.Json.Tests/Linq/JObjectAsyncTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JObjectAsyncTests.cs index 4a440088..046de582 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JObjectAsyncTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JObjectAsyncTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) using System.Collections.Generic; using Newtonsoft.Json.Tests.TestObjects; diff --git a/Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs index 3bd1acee..83425456 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs @@ -58,7 +58,7 @@ namespace Newtonsoft.Json.Tests.Linq [TestFixture] public class JObjectTests : TestFixtureBase { -#if !(NET35 || NET20 || PORTABLE40) +#if !(NET35 || NET20) [Test] public void EmbedJValueStringInNewJObject() { @@ -716,7 +716,7 @@ Parameter name: arrayIndex"); Assert.AreEqual(p4, l[1]); } -#if !(NET20 || PORTABLE || PORTABLE40) +#if !(NET20 || PORTABLE) [Test] public void PropertyChanging() { @@ -1259,7 +1259,7 @@ Parameter name: arrayIndex"); }, "Can not add property Test3 to Newtonsoft.Json.Linq.JObject. Property with the same name already exists on object."); } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) [Test] public void IBindingListSortDirection() { @@ -1454,7 +1454,7 @@ Parameter name: arrayIndex"); } #endif -#if !(NET20 || NET35 || PORTABLE40) +#if !(NET20 || NET35) [Test] public void CollectionChanged() { @@ -1583,7 +1583,7 @@ Parameter name: arrayIndex"); Assert.AreEqual("Name2", value); } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) [Test] public void WriteObjectNullDBNullValue() { @@ -1695,7 +1695,7 @@ Parameter name: arrayIndex"); }, "Unexpected end of content while loading JObject. Path 'short.error.code', line 6, position 14."); } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) [Test] public void GetProperties() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JPropertyAsyncTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JPropertyAsyncTests.cs index 15a12ab5..5a81846c 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JPropertyAsyncTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JPropertyAsyncTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) using Newtonsoft.Json.Linq; #if DNXCORE50 diff --git a/Src/Newtonsoft.Json.Tests/Linq/JPropertyTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JPropertyTests.cs index 49b74c61..c9f65ea9 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JPropertyTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JPropertyTests.cs @@ -61,7 +61,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual(p, p.Value.Parent); } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) [Test] public void ListChanged() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JTokenAsyncTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenAsyncTests.cs index b8a3b8cc..c8162b60 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JTokenAsyncTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JTokenAsyncTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) using System; using System.Threading.Tasks; diff --git a/Src/Newtonsoft.Json.Tests/Linq/JTokenReaderAsyncTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenReaderAsyncTests.cs index e43dcb13..6832cb3f 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JTokenReaderAsyncTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JTokenReaderAsyncTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) using System; using System.Text; @@ -36,7 +36,7 @@ using Assert = Newtonsoft.Json.Tests.XUnitAssert; using NUnit.Framework; #endif using System.IO; -#if !PORTABLE || NETSTANDARD1_1 +#if !PORTABLE || NETSTANDARD1_3 using System.Numerics; #endif using Newtonsoft.Json.Linq; @@ -48,7 +48,7 @@ namespace Newtonsoft.Json.Tests.Linq [TestFixture] public class JTokenReaderAsyncTests : TestFixtureBase { -#if !PORTABLE || NETSTANDARD1_1 +#if !PORTABLE || NETSTANDARD1_3 [Test] public async Task ConvertBigIntegerToDoubleAsync() { @@ -757,7 +757,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual(1d, await reader.ReadAsDoubleAsync()); } -#if !PORTABLE || NETSTANDARD1_1 +#if !PORTABLE || NETSTANDARD1_3 [Test] public async Task ReadAsBoolean_BigInteger_SuccessAsync() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JTokenReaderTest.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenReaderTest.cs index e2b6ba33..4a259979 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JTokenReaderTest.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JTokenReaderTest.cs @@ -35,7 +35,7 @@ using NUnit.Framework; #endif using Newtonsoft.Json; using System.IO; -#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 using System.Numerics; #endif using Newtonsoft.Json.Linq; @@ -47,7 +47,7 @@ namespace Newtonsoft.Json.Tests.Linq [TestFixture] public class JTokenReaderTest : TestFixtureBase { -#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 [Test] public void ConvertBigIntegerToDouble() { @@ -872,7 +872,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual(1d, reader.ReadAsDouble()); } -#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 [Test] public void ReadAsBoolean_BigInteger_Success() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs index 46981876..f0a475ff 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs @@ -25,7 +25,7 @@ using System; using System.Collections.Generic; -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 using System.Numerics; #endif using System.Text; @@ -369,7 +369,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual(5, (int)(new JValue(StringComparison.OrdinalIgnoreCase))); -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 string bigIntegerText = "1234567899999999999999999999999999999999999999999999999999999999999990"; Assert.AreEqual(BigInteger.Parse(bigIntegerText), (new JValue(BigInteger.Parse(bigIntegerText))).Value); @@ -449,7 +449,7 @@ namespace Newtonsoft.Json.Tests.Linq #endif ExceptionAssert.Throws(() => { var i = (Uri)new JValue(true); }, "Can not convert Boolean to Uri."); -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 ExceptionAssert.Throws(() => { var i = (new JValue(new Uri("http://www.google.com"))).ToObject(); }, "Can not convert Uri to BigInteger."); ExceptionAssert.Throws(() => { var i = (JValue.CreateNull()).ToObject(); }, "Can not convert Null to BigInteger."); ExceptionAssert.Throws(() => { var i = (new JValue(Guid.NewGuid())).ToObject(); }, "Can not convert Guid to BigInteger."); @@ -466,7 +466,7 @@ namespace Newtonsoft.Json.Tests.Linq [Test] public void ToObject() { -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 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?)))); @@ -524,7 +524,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.IsTrue(JToken.DeepEquals(new JValue((DateTimeOffset?)null), (JValue)(DateTimeOffset?)null)); #endif -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 // 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((BigInteger?)null), new JValue((BigInteger?)null))); @@ -1147,7 +1147,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.IsTrue(a.DeepEquals(a2)); } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) [Test] public void Clone() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterAsyncTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterAsyncTests.cs index 7a6b84be..d65dbdcb 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterAsyncTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterAsyncTests.cs @@ -23,10 +23,10 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) using System; -#if !PORTABLE || NETSTANDARD1_1 +#if !PORTABLE || NETSTANDARD1_3 using System.Numerics; #endif using System.Text; @@ -115,7 +115,7 @@ namespace Newtonsoft.Json.Tests.Linq await jsonWriter.WriteValueAsync("DVD read/writer"); Assert.AreEqual(WriteState.Array, jsonWriter.WriteState); -#if !PORTABLE || NETSTANDARD1_1 +#if !PORTABLE || NETSTANDARD1_3 await jsonWriter.WriteValueAsync(new BigInteger(123)); Assert.AreEqual(WriteState.Array, jsonWriter.WriteState); #endif @@ -167,7 +167,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual(WriteState.Array, jsonWriter.WriteState); Assert.AreEqual(a[a.Count - 1], jsonWriter.CurrentToken); -#if !PORTABLE || NETSTANDARD1_1 +#if !PORTABLE || NETSTANDARD1_3 await jsonWriter.WriteValueAsync(new BigInteger(123)); Assert.AreEqual(WriteState.Array, jsonWriter.WriteState); Assert.AreEqual(a[a.Count - 1], jsonWriter.CurrentToken); @@ -200,7 +200,7 @@ namespace Newtonsoft.Json.Tests.Linq /*fail*/]", writer.Token.ToString()); } -#if !PORTABLE || NETSTANDARD1_1 +#if !PORTABLE || NETSTANDARD1_3 [Test] public async Task WriteBigIntegerAsync() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterTest.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterTest.cs index 4ad23556..1ab23b41 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterTest.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterTest.cs @@ -25,7 +25,7 @@ using System; using System.Collections.Generic; -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 using System.Numerics; #endif using System.Text; @@ -120,7 +120,7 @@ namespace Newtonsoft.Json.Tests.Linq jsonWriter.WriteValue("DVD read/writer"); Assert.AreEqual(WriteState.Array, jsonWriter.WriteState); -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 jsonWriter.WriteValue(new BigInteger(123)); Assert.AreEqual(WriteState.Array, jsonWriter.WriteState); #endif @@ -172,7 +172,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual(WriteState.Array, jsonWriter.WriteState); Assert.AreEqual(a[a.Count - 1], jsonWriter.CurrentToken); -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 jsonWriter.WriteValue(new BigInteger(123)); Assert.AreEqual(WriteState.Array, jsonWriter.WriteState); Assert.AreEqual(a[a.Count - 1], jsonWriter.CurrentToken); @@ -205,7 +205,7 @@ namespace Newtonsoft.Json.Tests.Linq /*fail*/]", writer.Token.ToString()); } -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 [Test] public void WriteBigInteger() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JValueAsyncTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JValueAsyncTests.cs index 9a28890b..541c1ced 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JValueAsyncTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JValueAsyncTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) using System; using System.IO; diff --git a/Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs index d0db3600..0b329c29 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs @@ -28,7 +28,7 @@ using System.Collections.Generic; using System.IO; using System.Runtime.Serialization; using Newtonsoft.Json.Tests.TestObjects; -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 using System.Numerics; #endif using System.Text; @@ -150,7 +150,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual("Pie", v.Value); Assert.AreEqual(JTokenType.String, v.Type); -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) v.Value = DBNull.Value; Assert.AreEqual(DBNull.Value, v.Value); Assert.AreEqual(JTokenType.Null, v.Type); @@ -179,7 +179,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual(g, v.Value); Assert.AreEqual(JTokenType.Guid, v.Type); -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 BigInteger i = BigInteger.Parse("123456789999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999990"); v.Value = i; Assert.AreEqual(i, v.Value); @@ -239,13 +239,13 @@ namespace Newtonsoft.Json.Tests.Linq v = new JValue(new Guid("B282ADE7-C520-496C-A448-4084F6803DE5")); Assert.AreEqual("b282ade7-c520-496c-a448-4084f6803de5", v.ToString(null, CultureInfo.InvariantCulture)); -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 v = new JValue(BigInteger.Parse("123456789999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999990")); Assert.AreEqual("123456789999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999990", v.ToString(null, CultureInfo.InvariantCulture)); #endif } -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 [Test] public void JValueParse() { @@ -513,7 +513,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual(Int32.MaxValue, Convert.ToInt32(new JValue(Int32.MaxValue))); } -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 [Test] public void ConvertsToInt32_BigInteger() { @@ -641,7 +641,7 @@ namespace Newtonsoft.Json.Tests.Linq } #endif -#if !(PORTABLE40 || NET35 || NET20) +#if !(NET35 || NET20) [Test] public void ExpicitConversionTest() { @@ -675,7 +675,7 @@ namespace Newtonsoft.Json.Tests.Linq v = new JValue(new Uri("http://www.google.com")); Assert.AreEqual(TypeCode.Object, v.GetTypeCode()); -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 v = new JValue(new BigInteger(3)); Assert.AreEqual(TypeCode.Object, v.GetTypeCode()); #endif @@ -694,7 +694,7 @@ namespace Newtonsoft.Json.Tests.Linq int i = (int)v.ToType(typeof(int), CultureInfo.InvariantCulture); Assert.AreEqual(9, i); -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 BigInteger bi = (BigInteger)v.ToType(typeof(BigInteger), CultureInfo.InvariantCulture); Assert.AreEqual(new BigInteger(9), bi); #endif @@ -709,7 +709,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual("2013", v.ToString("yyyy")); } -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 [Test] public void ToStringNewTypes() { @@ -796,7 +796,7 @@ namespace Newtonsoft.Json.Tests.Linq }", json); } -#if !(NET20 || NET35 || PORTABLE40) +#if !(NET20 || NET35) [Test] public void EnumTests() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathExecuteTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathExecuteTests.cs index 303c5f6e..b14b0081 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathExecuteTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathExecuteTests.cs @@ -26,7 +26,7 @@ using System; using System.Collections.Generic; using System.Text; -#if !(PORTABLE || PORTABLE40 || NET35 || NET20) || NETSTANDARD1_1 +#if !(PORTABLE || NET35 || NET20) || NETSTANDARD1_3 using System.Numerics; #endif using Newtonsoft.Json.Linq.JsonPath; @@ -738,7 +738,7 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath Assert.IsTrue(JToken.DeepEquals(new JObject(new JProperty("hi", 3)), t[1])); } -#if !(PORTABLE || DNXCORE50 || PORTABLE40 || NET35 || NET20) || NETSTANDARD1_1 +#if !(PORTABLE || DNXCORE50 || NET35 || NET20) || NETSTANDARD1_3 [Test] public void GreaterQueryBigInteger() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonAsyncTests.cs b/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonAsyncTests.cs index fbcb8087..9399a48b 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonAsyncTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonAsyncTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) using System; using System.Collections.Generic; diff --git a/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs b/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs index 6105664d..f652abad 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs @@ -1185,7 +1185,7 @@ keyword such as type of business."" Assert.AreEqual(new DateTime(2000, 10, 15, 5, 5, 5, DateTimeKind.Utc), d); } -#if !(NET20 || NET35 || PORTABLE40) +#if !(NET20 || NET35) [Test] public void CovariantIJEnumerable() { diff --git a/Src/Newtonsoft.Json.Tests/LinqToSql/LinqToSqlClassesSerializationTests.cs b/Src/Newtonsoft.Json.Tests/LinqToSql/LinqToSqlClassesSerializationTests.cs index 09568bfa..5600d56d 100644 --- a/Src/Newtonsoft.Json.Tests/LinqToSql/LinqToSqlClassesSerializationTests.cs +++ b/Src/Newtonsoft.Json.Tests/LinqToSql/LinqToSqlClassesSerializationTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(DNXCORE50 || PORTABLE40 || PORTABLE40 || NET20) +#if !(DNXCORE50 || NET20) using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Roslyn.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Roslyn.csproj index f6881036..54d8658b 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Roslyn.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Roslyn.csproj @@ -113,6 +113,6 @@ - NETSTANDARD1_1;DNXCORE50;PORTABLE;$(AdditionalConstants) + NETSTANDARD1_3;DNXCORE50;PORTABLE;$(AdditionalConstants) \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs index 2ff59694..d99bb40e 100644 --- a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs @@ -33,10 +33,8 @@ using System.Security; #if NETSTANDARD1_0 [assembly: AssemblyTitle("Json.NET Tests .NET Standard 1.0")] -#elif NETSTANDARD1_1 -[assembly: AssemblyTitle("Json.NET Tests .NET Standard 1.1")] -#elif PORTABLE40 -[assembly: AssemblyTitle("Json.NET Tests Portable .NET 4.0")] +#elif NETSTANDARD1_3 +[assembly: AssemblyTitle("Json.NET Tests .NET Standard 1.3")] #elif PORTABLE [assembly: AssemblyTitle("Json.NET Tests Portable")] #elif NET20 diff --git a/Src/Newtonsoft.Json.Tests/Schema/ExtensionsTests.cs b/Src/Newtonsoft.Json.Tests/Schema/ExtensionsTests.cs index c2d25ab2..30adc416 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/ExtensionsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/ExtensionsTests.cs @@ -204,7 +204,7 @@ namespace Newtonsoft.Json.Tests.Schema #if !NET20 GenerateSchemaAndSerializeFromType(new NullableDateTimeTestClass()); #endif -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) GenerateSchemaAndSerializeFromType(new DataSet()); #endif GenerateSchemaAndSerializeFromType(new object()); @@ -212,7 +212,7 @@ namespace Newtonsoft.Json.Tests.Schema GenerateSchemaAndSerializeFromType("Hi"); GenerateSchemaAndSerializeFromType(new DateTime(2000, 12, 29, 23, 59, 0, DateTimeKind.Utc)); GenerateSchemaAndSerializeFromType(TimeSpan.FromTicks(1000000)); -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) GenerateSchemaAndSerializeFromType(DBNull.Value); #endif GenerateSchemaAndSerializeFromType(new JsonPropertyWithHandlingValues()); diff --git a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs index 6e24c120..f13ad3f9 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs @@ -93,7 +93,7 @@ namespace Newtonsoft.Json.Tests.Schema Assert.IsTrue(o.IsValid(schema)); } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) [Test] public void Generate_DefaultValueAttributeTestClass() { @@ -312,7 +312,7 @@ namespace Newtonsoft.Json.Tests.Schema Assert.IsTrue(v.IsValid(schema)); } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_1 +#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 [Test] public void GenerateSchemaForISerializable() { @@ -327,7 +327,7 @@ namespace Newtonsoft.Json.Tests.Schema } #endif -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) [Test] public void GenerateSchemaForDBNull() { @@ -340,7 +340,7 @@ namespace Newtonsoft.Json.Tests.Schema } #endif -#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_1 +#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 public class CustomDirectoryInfoMapper : DefaultContractResolver { public CustomDirectoryInfoMapper() @@ -479,7 +479,7 @@ namespace Newtonsoft.Json.Tests.Schema generator.UndefinedSchemaIdHandling = UndefinedSchemaIdHandling.UseTypeName; generator.ContractResolver = new CamelCasePropertyNamesContractResolver() { -#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_1 +#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 IgnoreSerializableAttribute = true #endif }; @@ -524,7 +524,7 @@ namespace Newtonsoft.Json.Tests.Schema }", json); } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_1 +#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 [Test] public void GenerateSchemaSerializable() { @@ -837,7 +837,7 @@ namespace Newtonsoft.Json.Tests.Schema { } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_1 +#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 [Serializable] public sealed class SerializableTestObject { diff --git a/Src/Newtonsoft.Json.Tests/Serialization/CamelCaseNamingStrategyTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/CamelCaseNamingStrategyTests.cs index ee13c53d..9e3c6ef1 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/CamelCaseNamingStrategyTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/CamelCaseNamingStrategyTests.cs @@ -159,7 +159,7 @@ namespace Newtonsoft.Json.Tests.Serialization }", json); } -#if !(NET35 || NET20 || PORTABLE40) +#if !(NET35 || NET20) [Test] public void DynamicCamelCasePropertyNames() { diff --git a/Src/Newtonsoft.Json.Tests/Serialization/CamelCasePropertyNamesContractResolverTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/CamelCasePropertyNamesContractResolverTests.cs index 620c0deb..9a466113 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/CamelCasePropertyNamesContractResolverTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/CamelCasePropertyNamesContractResolverTests.cs @@ -119,7 +119,7 @@ namespace Newtonsoft.Json.Tests.Serialization string json = o.ToString(); } -#if !(PORTABLE || PORTABLE40) +#if !(PORTABLE) #pragma warning disable 618 [Test] public void MemberSearchFlags() @@ -196,7 +196,7 @@ namespace Newtonsoft.Json.Tests.Serialization }", json); } -#if !(NET35 || NET20 || PORTABLE40) +#if !(NET35 || NET20) [Test] public void DynamicCamelCasePropertyNames() { diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs index 7fb7bf01..ad35cc3a 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_1 +#if !(PORTABLE) || NETSTANDARD1_3 [Test] public void ResolveSerializableContract() { @@ -573,7 +573,7 @@ namespace Newtonsoft.Json.Tests.Serialization }", startingWithB); } -#if !(PORTABLE || PORTABLE40) +#if !(PORTABLE) #pragma warning disable 618 [Test] public void SerializeCompilerGeneratedMembers() diff --git a/Src/Newtonsoft.Json.Tests/Serialization/DependencyInjectionTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/DependencyInjectionTests.cs index 06306b76..57d88129 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/DependencyInjectionTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/DependencyInjectionTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET40 || NET35 || NET20 || DNXCORE50 || PORTABLE || PORTABLE40) +#if !(NET40 || NET35 || NET20 || DNXCORE50 || PORTABLE) using Autofac; using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Tests.TestObjects; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/DynamicTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/DynamicTests.cs index 84096969..495aa4a4 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/DynamicTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/DynamicTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET35 || NET20 || PORTABLE40) +#if !(NET35 || NET20) using System; using System.Collections; using System.Collections.Generic; @@ -101,7 +101,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual(dynamicObject.ChildObject.Text, d.ChildObject.Text); } -#if !(PORTABLE || PORTABLE40) +#if !(PORTABLE) [Test] public void SerializeDynamicObjectWithObjectTracking() { diff --git a/Src/Newtonsoft.Json.Tests/Serialization/EntitiesSerializationTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/EntitiesSerializationTests.cs index f3af3b15..813693a0 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/EntitiesSerializationTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/EntitiesSerializationTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET35 || NET20 || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(NET35 || NET20 || PORTABLE || DNXCORE50) using Newtonsoft.Json.Serialization; using System; using System.Collections.Generic; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ImmutableCollectionsTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ImmutableCollectionsTests.cs index 81876c5d..4e032af1 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ImmutableCollectionsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ImmutableCollectionsTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) using System; using System.Collections.Generic; using System.Collections.Immutable; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerCollectionsTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerCollectionsTests.cs index 6c54d628..5ac3e4ec 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerCollectionsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerCollectionsTests.cs @@ -27,7 +27,7 @@ using System; using System.Collections; using System.Collections.Specialized; using System.Runtime.Serialization; -#if !(NET35 || NET20 || PORTABLE || PORTABLE40) +#if !(NET35 || NET20 || PORTABLE) using System.Collections.Concurrent; #endif using System.Collections.Generic; @@ -54,7 +54,7 @@ using Assert = Newtonsoft.Json.Tests.XUnitAssert; #else using NUnit.Framework; #endif -#if !NET20 && !PORTABLE40 +#if !NET20 using System.Xml.Linq; #endif @@ -353,7 +353,7 @@ namespace Newtonsoft.Json.Tests.Serialization } #endif -#if !(NET35 || NET20 || PORTABLE || PORTABLE40) +#if !(NET35 || NET20 || PORTABLE) public class SomeObject { public string Text1 { get; set; } @@ -640,7 +640,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual("string!", l[0]); } -#if !(NET40 || NET35 || NET20 || PORTABLE40) +#if !(NET40 || NET35 || NET20) [Test] public void DeserializeReadOnlyListInterface() { @@ -995,7 +995,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual(3, v2["Third"]); } -#if !(NET35 || NET20 || PORTABLE || PORTABLE40) +#if !(NET35 || NET20 || PORTABLE) [Test] public void DeserializeConcurrentDictionary() { @@ -1073,7 +1073,7 @@ namespace Newtonsoft.Json.Tests.Serialization ExceptionAssert.Throws(() => { JsonConvert.DeserializeObject>>>(json); }, "Cannot convert null value to KeyValuePair. Path '[0]', line 1, position 6."); } -#if !(NET40 || NET35 || NET20 || PORTABLE40) +#if !(NET40 || NET35 || NET20) public class PopulateReadOnlyTestClass { public IList NonReadOnlyList { get; set; } @@ -1916,7 +1916,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual("Product 1", p1.Name); } -#if !(NET40 || NET35 || NET20 || PORTABLE40) +#if !(NET40 || NET35 || NET20) [Test] public void ReadOnlyIntegerList() { @@ -1966,7 +1966,7 @@ namespace Newtonsoft.Json.Tests.Serialization }, "Unable to find a constructor to use for type Newtonsoft.Json.Tests.Serialization.ReadOnlyCollectionWithArrayArgument`1[System.Double]. Path '', line 1, position 1."); } -#if !NET20 && !PORTABLE40 +#if !NET20 [Test] public void NonDefaultConstructor_DuplicateKeyInDictionary_Replace() { @@ -2085,7 +2085,7 @@ namespace Newtonsoft.Json.Tests.Serialization } } -#if !NET20 && !PORTABLE40 +#if !NET20 public class CASResponce { // @@ -2389,7 +2389,7 @@ namespace Newtonsoft.Json.Tests.Serialization } } -#if !(NET40 || NET35 || NET20 || PORTABLE40) +#if !(NET40 || NET35 || NET20) public class ReadOnlyIntegerList : IReadOnlyCollection { private readonly List _list; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs index 0e6fe17c..2641e79e 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs @@ -29,7 +29,7 @@ using System.ComponentModel; using System.Collections.Concurrent; #endif using System.Collections.Generic; -#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 using System.Numerics; #endif #if !(NET20 || DNXCORE50) @@ -295,7 +295,7 @@ namespace Newtonsoft.Json.Tests.Serialization } } -#if !(PORTABLE || PORTABLE40 || NET20 || NET35) +#if !(PORTABLE || NET20 || NET35) [Test] public void LargeIntegerAsString() { @@ -356,7 +356,7 @@ namespace Newtonsoft.Json.Tests.Serialization @"Error converting value {null} to type 'System.Boolean'. Path '[0]', line 1, position 3."); } -#if !(PORTABLE || PORTABLE40 || NET35 || NET20) +#if !(PORTABLE || NET35 || NET20) [Test] public void DeserializeBooleans() { @@ -1022,7 +1022,7 @@ namespace Newtonsoft.Json.Tests.Serialization public int ChildId; } -#if !(NET20 || NET35 || PORTABLE40 || PORTABLE) +#if !(NET20 || NET35 || PORTABLE) [Test] public void ReadIntegerWithError() { @@ -1390,7 +1390,7 @@ namespace Newtonsoft.Json.Tests.Serialization serializer.TraceWriter = traceWriter; Assert.AreEqual(traceWriter, serializer.TraceWriter); -#if !(PORTABLE || PORTABLE40 || NET20 || DNXCORE50) +#if !(PORTABLE || NET20 || DNXCORE50) #pragma warning disable 618 serializer.TypeNameAssemblyFormat = FormatterAssemblyStyle.Full; Assert.AreEqual(FormatterAssemblyStyle.Full, serializer.TypeNameAssemblyFormat); @@ -1505,7 +1505,7 @@ namespace Newtonsoft.Json.Tests.Serialization settings.TraceWriter = traceWriter; Assert.AreEqual(traceWriter, settings.TraceWriter); -#if !(PORTABLE || PORTABLE40 || NET20 || DNXCORE50) +#if !(PORTABLE || NET20 || DNXCORE50) #pragma warning disable 618 settings.TypeNameAssemblyFormat = FormatterAssemblyStyle.Full; Assert.AreEqual(FormatterAssemblyStyle.Full, settings.TypeNameAssemblyFormat); @@ -1627,7 +1627,7 @@ namespace Newtonsoft.Json.Tests.Serialization serializerProxy.TraceWriter = traceWriter; Assert.AreEqual(traceWriter, serializerProxy.TraceWriter); -#if !(PORTABLE || PORTABLE40 || NET20 || DNXCORE50) +#if !(PORTABLE || NET20 || DNXCORE50) #pragma warning disable 618 serializerProxy.TypeNameAssemblyFormat = FormatterAssemblyStyle.Full; Assert.AreEqual(FormatterAssemblyStyle.Full, serializerProxy.TypeNameAssemblyFormat); @@ -1648,7 +1648,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual(TypeNameHandling.All, serializerProxy.TypeNameHandling); } -#if !(PORTABLE || PORTABLE40 || DNXCORE50) +#if !(PORTABLE || DNXCORE50) [Test] public void DeserializeISerializableIConvertible() { @@ -2811,7 +2811,7 @@ keyword such as type of business."" ConverableMembers c = JsonConvert.DeserializeObject(json); Assert.AreEqual("string", c.String); Assert.AreEqual(double.MaxValue, c.Double); -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) Assert.AreEqual(DBNull.Value, c.DBNull); #endif } @@ -4062,7 +4062,7 @@ Path '', line 1, position 1."); @"Unexpected character encountered while parsing value: [. Path '', line 1, position 1."); } -#if !(NET35 || NET20 || PORTABLE40) +#if !(NET35 || NET20) [Test] public void CannotDeserializeArrayIntoDynamic() { @@ -4158,7 +4158,7 @@ Path '', line 1, position 1."); { ContractResolver = new DefaultContractResolver { -#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_1 +#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 IgnoreSerializableAttribute = true #endif } @@ -4175,7 +4175,7 @@ Path '', line 1, position 1."); { ContractResolver = new DefaultContractResolver { -#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_1 +#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 IgnoreSerializableAttribute = true #endif } @@ -4192,7 +4192,7 @@ Path '', line 1, position 1."); { ContractResolver = new DefaultContractResolver { -#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_1 +#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 IgnoreSerializableAttribute = true #endif } @@ -4209,7 +4209,7 @@ Path '', line 1, position 1."); { ContractResolver = new DefaultContractResolver { -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) IgnoreSerializableAttribute = true #endif } @@ -4984,7 +4984,7 @@ Path '', line 1, position 1."); Assert.AreEqual("value", newModelStateDictionary["key"]); } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_1 +#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 #if DEBUG [Test] public void SerializeISerializableInPartialTrustWithIgnoreInterface() @@ -5403,7 +5403,7 @@ Path '', line 1, position 1."); } #endif -#if !(NET20 || PORTABLE40) +#if !(NET20) [Test] public void SerializeDeserializeXNodeProperties() { @@ -5434,7 +5434,7 @@ Path '', line 1, position 1."); } #endif -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) [Test] public void SerializeDeserializeXmlNodeProperties() { @@ -5918,7 +5918,7 @@ Path '', line 1, position 1."); }", json); } -#if !(NET35 || NET20 || PORTABLE40) +#if !(NET35 || NET20) [Test] public void SerializeExpandoObject() { @@ -6836,7 +6836,7 @@ Path '', line 1, position 1."); } } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) [Test] public void SerializeException1() { @@ -8014,7 +8014,7 @@ Path '', line 1, position 1."); Assert.AreEqual("", s); } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_1 +#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 [Test] public void SerializeAndDeserializeWithAttributes() { @@ -8217,7 +8217,7 @@ lines.*/ ExceptionAssert.Throws(() => { s.Deserialize>(new JsonTextReader(new StringReader(json))); }, "Additional text encountered after finished reading JSON content: {. Path '', line 7, position 0."); } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) [Test] public void DeserializeException() { @@ -8445,8 +8445,8 @@ This is just junk, though."; Assert.AreEqual("[1.1,0.0,0.0]", json); } -#if !(NET20 || NET35 || NET40 || PORTABLE40) -#if !PORTABLE || NETSTANDARD1_1 +#if !(NET20 || NET35 || NET40) +#if !PORTABLE || NETSTANDARD1_3 [Test] public void DeserializeReadOnlyListWithBigInteger() { @@ -8504,7 +8504,7 @@ This is just junk, though."; Action doStuff = () => { obj = JsonConvert.DeserializeObject>(json); }; -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) doStuff(); Assert.AreEqual(500, obj.Item1); #else @@ -8535,7 +8535,7 @@ This is just junk, though."; } #endif -#if !(PORTABLE || NET35 || NET20 || PORTABLE40 || DNXCORE50) +#if !(PORTABLE || NET35 || NET20 || DNXCORE50) [Test] public void SerializeTupleWithSerializableAttribute() { @@ -8753,7 +8753,7 @@ This is just junk, though."; ExceptionAssert.Throws(() => JsonConvert.DeserializeObject>("[1]"), "Cannot deserialize readonly or fixed size list: Newtonsoft.Json.Tests.Serialization.JsonSerializerTest+NoConstructorReadOnlyCollection`1[System.Int32]. Path '', line 1, position 1."); } -#if !(NET40 || NET35 || NET20 || PORTABLE40) +#if !(NET40 || NET35 || NET20) public class NoConstructorReadOnlyDictionary : ReadOnlyDictionary { public NoConstructorReadOnlyDictionary() @@ -8769,7 +8769,7 @@ This is just junk, though."; } #endif -#if !(PORTABLE || NET35 || NET20 || PORTABLE40) || NETSTANDARD1_1 +#if !(PORTABLE || NET35 || NET20) || NETSTANDARD1_3 [Test] public void ReadTooLargeInteger() { @@ -8812,7 +8812,7 @@ This is just junk, though."; Assert.AreEqual(@"{""First"":""One"",""Second"":2}", json); -#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_1 +#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 DefaultContractResolver r = new DefaultContractResolver(); r.IgnoreSerializableAttribute = false; @@ -8928,7 +8928,7 @@ This is just junk, though."; Assert.AreEqual(1234567890.123456m, d); } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_1 +#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 [Test] public void DontSerializeStaticFields() { @@ -8952,7 +8952,7 @@ This is just junk, though."; } #endif -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 [Test] public void SerializeBigInteger() { @@ -9092,7 +9092,7 @@ This is just junk, though."; ]", json); } -#if !(PORTABLE || PORTABLE40 || DNXCORE50) +#if !(PORTABLE || DNXCORE50) [Test] public void SerializeDictionaryWithStructKey() { @@ -9109,7 +9109,7 @@ This is just junk, though."; } #endif -#if !(PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD1_0 || NETSTANDARD1_1 +#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_0 || NETSTANDARD1_3 [Test] public void SerializeDictionaryWithStructKey_Custom() { @@ -9296,7 +9296,7 @@ This is just junk, though."; Assert.AreEqual(jane, john.Spouse); } -#if !(NET35 || NET20 || PORTABLE || PORTABLE40) +#if !(NET35 || NET20 || PORTABLE) [Test] public void TypeConverterOnInterface() { @@ -9874,7 +9874,7 @@ This is just junk, though."; Assert.AreEqual("derived", d.DerivedProperty); } -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE) [Test] public void DeserializeNullableUnsignedLong() { @@ -10256,7 +10256,7 @@ This is just junk, though."; public string Project { get; } } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_1 +#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 public class ISerializableTestObject : ISerializable { internal string _stringValue; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/MetadataPropertyHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/MetadataPropertyHandlingTests.cs index 3ecd9794..b9bdac77 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/MetadataPropertyHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/MetadataPropertyHandlingTests.cs @@ -339,7 +339,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.IsTrue(JToken.DeepEquals(t1, t2)); } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) [Test] public void DeserializeGenericObjectListWithTypeName() { diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ReferenceLoopHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ReferenceLoopHandlingTests.cs index 56163d4d..b9a5663a 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ReferenceLoopHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ReferenceLoopHandlingTests.cs @@ -151,7 +151,7 @@ namespace Newtonsoft.Json.Tests.Serialization }", json); } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) public class MainClass : ISerializable { public ChildClass Child { get; set; } @@ -210,7 +210,7 @@ namespace Newtonsoft.Json.Tests.Serialization } #endif -#if !(NET20 || NET35 || PORTABLE40) +#if !(NET20 || NET35) public class DictionaryDynamicObject : DynamicObject { public IDictionary Values { get; private set; } diff --git a/Src/Newtonsoft.Json.Tests/Serialization/SerializationErrorHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/SerializationErrorHandlingTests.cs index 71113922..f0f7e0a7 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/SerializationErrorHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/SerializationErrorHandlingTests.cs @@ -693,7 +693,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual(@"Unexpected end when deserializing object. Path 'events2.code', line 1, position 49.", errors[1]); } -#if !(NET35 || NET20 || PORTABLE40) +#if !(NET35 || NET20) [Test] public void ErrorHandlingEndOfContentDynamic() { diff --git a/Src/Newtonsoft.Json.Tests/Serialization/SnakeCaseNamingStrategyTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/SnakeCaseNamingStrategyTests.cs index d1584693..8dbeac53 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/SnakeCaseNamingStrategyTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/SnakeCaseNamingStrategyTests.cs @@ -159,7 +159,7 @@ namespace Newtonsoft.Json.Tests.Serialization }", json); } -#if !(NET35 || NET20 || PORTABLE40) +#if !(NET35 || NET20) [Test] public void DynamicSnakeCasePropertyNames() { diff --git a/Src/Newtonsoft.Json.Tests/Serialization/TraceWriterTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/TraceWriterTests.cs index d2392e17..97e35f32 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/TraceWriterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/TraceWriterTests.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using System.Globalization; using System.IO; using Newtonsoft.Json.Linq; -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 using System.Numerics; #endif using System.Runtime.Serialization; @@ -41,7 +41,7 @@ namespace Newtonsoft.Json.Tests.Serialization [TestFixture] public class TraceWriterTests : TestFixtureBase { -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) [Test] public void DiagnosticsTraceWriterTest() { @@ -730,7 +730,7 @@ Newtonsoft.Json Error: 0 : Error! Assert.IsTrue(traceWriter.TraceRecords[9].Message.StartsWith("Finished deserializing System.Collections.Generic.List`1[System.Object]. Path '$values'")); } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) [Test] public void DeserializeISerializable() { @@ -936,7 +936,7 @@ Newtonsoft.Json Error: 0 : Error! Assert.AreEqual(23, deserialized.FavoriteNumber); } -#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 +#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3 [Test] public void TraceJsonWriterTest() { diff --git a/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs index 586d339f..51513249 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs @@ -28,7 +28,7 @@ using Newtonsoft.Json.Utilities.LinqBridge; #else using System.Linq; #endif -#if !(PORTABLE || PORTABLE40) +#if !(PORTABLE) using System.Collections.ObjectModel; #if !(NET35 || NET20) using System.Dynamic; @@ -1737,7 +1737,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual(1, (int)j["MyProperty"]); } -#if !(NET35 || NET20 || PORTABLE40) +#if !(NET35 || NET20) [Test] public void PropertyItemTypeNameHandlingDynamic() { @@ -2036,7 +2036,7 @@ namespace Newtonsoft.Json.Tests.Serialization } #endif -#if !(NET20 || PORTABLE || PORTABLE40) +#if !(NET20 || PORTABLE) [Test] public void DeserializeComplexGenericDictionary_Simple() { @@ -2329,7 +2329,7 @@ namespace Newtonsoft.Json.Tests.Serialization public TypeNameHandlingTestObject Data { get; set; } } -#if !(NET35 || NET20 || PORTABLE40) +#if !(NET35 || NET20) public class PropertyItemTypeNameHandlingDynamic { [JsonProperty(ItemTypeNameHandling = TypeNameHandling.All)] diff --git a/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs index 180158c0..2452055c 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs @@ -59,7 +59,7 @@ namespace Newtonsoft.Json.Tests.Serialization nonSerializedField = "Error" }; -#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) MemoryStream ms = new MemoryStream(); DataContractJsonSerializer dataContractJsonSerializer = new DataContractJsonSerializer(typeof(SerializableType)); dataContractJsonSerializer.WriteObject(ms, serializableType); @@ -75,7 +75,7 @@ namespace Newtonsoft.Json.Tests.Serialization { ContractResolver = new DefaultContractResolver { -#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_1 +#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 IgnoreSerializableAttribute = false #endif } @@ -84,7 +84,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual(expected, json); } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_1 +#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 [Test] public void SerializeInheritedType() { @@ -114,7 +114,7 @@ namespace Newtonsoft.Json.Tests.Serialization } } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD1_1 +#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 [Serializable] #else [JsonObject(MemberSerialization.Fields)] @@ -138,7 +138,7 @@ namespace Newtonsoft.Json.Tests.Serialization set { privateField = value; } } -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) [NonSerialized] #else [JsonIgnore] diff --git a/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs b/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs index 18db21df..eea0c60b 100644 --- a/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs +++ b/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs @@ -45,7 +45,7 @@ using NUnit.Framework; #endif using Newtonsoft.Json.Utilities; using System.Collections; -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) using System.Threading.Tasks; #endif #if NET20 @@ -388,7 +388,7 @@ namespace Newtonsoft.Json.Tests } } -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) public static async Task ThrowsAsync(Func action, params string[] possibleMessages) where TException : Exception { diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/AnswerFilterModel.cs b/Src/Newtonsoft.Json.Tests/TestObjects/AnswerFilterModel.cs index 23860640..f75eb4c8 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/AnswerFilterModel.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/AnswerFilterModel.cs @@ -34,7 +34,7 @@ using System.Linq; namespace Newtonsoft.Json.Tests.TestObjects { -#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_1 +#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 [Serializable] public class AnswerFilterModel { diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/ConsoleWriter.cs b/Src/Newtonsoft.Json.Tests/TestObjects/ConsoleWriter.cs index 6807dbbb..920776f7 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/ConsoleWriter.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/ConsoleWriter.cs @@ -27,7 +27,7 @@ using System.ComponentModel; namespace Newtonsoft.Json.Tests.TestObjects { -#if !(NET35 || NET20 || PORTABLE || PORTABLE40) +#if !(NET35 || NET20 || PORTABLE) [TypeConverter(typeof(MyInterfaceConverter))] internal class ConsoleWriter : IMyInterface { diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/CustomerDataSet.cs b/Src/Newtonsoft.Json.Tests/TestObjects/CustomerDataSet.cs index 0d938b6c..3c009494 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/CustomerDataSet.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/CustomerDataSet.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(PORTABLE40 || PORTABLE || DNXCORE50) +#if !(PORTABLE || DNXCORE50) using System; using System.Collections.Generic; using System.Text; diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/IMyInterface.cs b/Src/Newtonsoft.Json.Tests/TestObjects/IMyInterface.cs index 4d72a87f..5dc56551 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/IMyInterface.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/IMyInterface.cs @@ -27,7 +27,7 @@ using System.ComponentModel; namespace Newtonsoft.Json.Tests.TestObjects { -#if !(NET35 || NET20 || PORTABLE || PORTABLE40) +#if !(NET35 || NET20 || PORTABLE) [TypeConverter(typeof(MyInterfaceConverter))] internal interface IMyInterface { diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/MyInterfaceConverter.cs b/Src/Newtonsoft.Json.Tests/TestObjects/MyInterfaceConverter.cs index 7994dd7b..d5a3446f 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/MyInterfaceConverter.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/MyInterfaceConverter.cs @@ -35,7 +35,7 @@ using System.Linq; namespace Newtonsoft.Json.Tests.TestObjects { -#if !(NET35 || NET20 || PORTABLE || PORTABLE40) +#if !(NET35 || NET20 || PORTABLE) internal class MyInterfaceConverter : TypeConverter { private readonly List _writers = new List diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/PersonSerializable.cs b/Src/Newtonsoft.Json.Tests/TestObjects/PersonSerializable.cs index 4da204ab..eccef277 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/PersonSerializable.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/PersonSerializable.cs @@ -27,7 +27,7 @@ using System; namespace Newtonsoft.Json.Tests.TestObjects { -#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_1 +#if !(PORTABLE || DNXCORE50) || NETSTANDARD1_3 [Serializable] public class PersonSerializable { diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/TraceWriter.cs b/Src/Newtonsoft.Json.Tests/TestObjects/TraceWriter.cs index 17f5014a..7e9a00c0 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/TraceWriter.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/TraceWriter.cs @@ -25,7 +25,7 @@ namespace Newtonsoft.Json.Tests.TestObjects { -#if !(NET35 || NET20 || PORTABLE || PORTABLE40) +#if !(NET35 || NET20 || PORTABLE) internal class TraceWriter : IMyInterface { public string Name diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/TypeConverterJsonConverter.cs b/Src/Newtonsoft.Json.Tests/TestObjects/TypeConverterJsonConverter.cs index 956c480c..2db02c32 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/TypeConverterJsonConverter.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/TypeConverterJsonConverter.cs @@ -34,7 +34,7 @@ using Newtonsoft.Json.Utilities; namespace Newtonsoft.Json.Tests.TestObjects { -#if !(NET35 || NET20 || PORTABLE || PORTABLE40) +#if !(NET35 || NET20 || PORTABLE) internal class TypeConverterJsonConverter : JsonConverter { private TypeConverter GetConverter(Type type) diff --git a/Src/Newtonsoft.Json.Tests/Utilities/DynamicReflectionDelegateFactoryTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/DynamicReflectionDelegateFactoryTests.cs index b3abbbce..4a8c9a63 100644 --- a/Src/Newtonsoft.Json.Tests/Utilities/DynamicReflectionDelegateFactoryTests.cs +++ b/Src/Newtonsoft.Json.Tests/Utilities/DynamicReflectionDelegateFactoryTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) using System; using System.Diagnostics; using System.Reflection; diff --git a/Src/Newtonsoft.Json.Tests/Utilities/ReflectionUtilsTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/ReflectionUtilsTests.cs index b1dc6afa..c1ea0def 100644 --- a/Src/Newtonsoft.Json.Tests/Utilities/ReflectionUtilsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Utilities/ReflectionUtilsTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50) using System; using System.Collections.Generic; using System.Runtime.Serialization.Formatters; diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.Roslyn.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.Roslyn.csproj index 4d3bfda6..843311b1 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.Roslyn.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.Roslyn.csproj @@ -36,6 +36,9 @@ NET20;HAVE_ADO_NET;HAVE_APP_DOMAIN;HAVE_BINARY_FORMATTER;HAVE_BINARY_SERIALIZATION;HAVE_BINARY_EXCEPTION_SERIALIZATION;HAVE_CAS;HAVE_CHAR_TO_LOWER_WITH_CULTURE;HAVE_CHAR_TO_STRING_WITH_CULTURE;HAVE_COM_ATTRIBUTES;HAVE_COMPONENT_MODEL;HAVE_DB_NULL_TYPE_CODE;HAVE_EMPTY_TYPES;HAVE_FULL_REFLECTION;HAVE_ICLONEABLE;HAVE_ICONVERTIBLE;HAVE_MEMORY_BARRIER;HAVE_NON_SERIALIZED_ATTRIBUTE;HAVE_REFLECTION_EMIT;HAVE_STREAM_READER_WRITER_CLOSE;HAVE_TRACE_WRITER;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_XML_DOCUMENT;$(AdditionalConstants) + + + @@ -73,7 +76,7 @@ Json.NET .NET Standard 1.3 true - NETSTANDARD1_1;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;$(AdditionalConstants) + 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;$(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) diff --git a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs index bd5fa0f8..ddea4be2 100644 --- a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs @@ -34,10 +34,8 @@ using System.Security; // associated with an assembly. #if NETSTANDARD1_0 [assembly: AssemblyTitle("Json.NET .NET Standard 1.0")] -#elif NETSTANDARD1_1 +#elif NETSTANDARD1_3 [assembly: AssemblyTitle("Json.NET .NET Standard 1.3")] -#elif PORTABLE40 -[assembly: AssemblyTitle("Json.NET Portable .NET 4.0")] #elif PORTABLE [assembly: AssemblyTitle("Json.NET Portable")] #elif DOTNET diff --git a/Src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs b/Src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs index d8122355..a95fefc0 100644 --- a/Src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs +++ b/Src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs @@ -1331,7 +1331,7 @@ namespace Newtonsoft.Json.Serialization // warning - this method use to cause errors with Intellitrace. Retest in VS Ultimate after changes IValueProvider valueProvider; -#if !(PORTABLE40 || PORTABLE || DOTNET) +#if !(PORTABLE || DOTNET) if (DynamicCodeGeneration) { valueProvider = new DynamicValueProvider(member); @@ -1340,10 +1340,8 @@ namespace Newtonsoft.Json.Serialization { valueProvider = new ReflectionValueProvider(member); } -#elif !(PORTABLE40) - valueProvider = new ExpressionValueProvider(member); #else - valueProvider = new ReflectionValueProvider(member); + valueProvider = new ExpressionValueProvider(member); #endif return valueProvider; diff --git a/Src/Newtonsoft.Json/Serialization/DefaultSerializationBinder.cs b/Src/Newtonsoft.Json/Serialization/DefaultSerializationBinder.cs index b43e4b0b..2588f97b 100644 --- a/Src/Newtonsoft.Json/Serialization/DefaultSerializationBinder.cs +++ b/Src/Newtonsoft.Json/Serialization/DefaultSerializationBinder.cs @@ -62,7 +62,7 @@ namespace Newtonsoft.Json.Serialization { Assembly assembly; -#if !(DOTNET || PORTABLE40 || PORTABLE) +#if !(DOTNET || PORTABLE) // look, I don't like using obsolete methods as much as you do but this is the only way // Assembly.Load won't check the GAC for a partial name #pragma warning disable 618,612 diff --git a/Src/Newtonsoft.Json/Serialization/JsonTypeReflector.cs b/Src/Newtonsoft.Json/Serialization/JsonTypeReflector.cs index c4ce3df4..432ab7da 100644 --- a/Src/Newtonsoft.Json/Serialization/JsonTypeReflector.cs +++ b/Src/Newtonsoft.Json/Serialization/JsonTypeReflector.cs @@ -479,9 +479,9 @@ namespace Newtonsoft.Json.Serialization { if (_fullyTrusted == null) { -#if (DOTNET || PORTABLE || PORTABLE40) +#if (DOTNET || PORTABLE) _fullyTrusted = true; -#elif !(NET20 || NET35 || PORTABLE40) +#elif !(NET20 || NET35) AppDomain appDomain = AppDomain.CurrentDomain; _fullyTrusted = appDomain.IsHomogenous && appDomain.IsFullyTrusted; @@ -506,7 +506,7 @@ namespace Newtonsoft.Json.Serialization { get { -#if !(PORTABLE40 || PORTABLE || DOTNET) +#if !(PORTABLE || DOTNET) if (DynamicCodeGeneration) { return DynamicReflectionDelegateFactory.Instance; diff --git a/Src/Newtonsoft.Json/SerializationBinder.cs b/Src/Newtonsoft.Json/SerializationBinder.cs index b3e480f0..791c6df6 100644 --- a/Src/Newtonsoft.Json/SerializationBinder.cs +++ b/Src/Newtonsoft.Json/SerializationBinder.cs @@ -1,5 +1,5 @@  -#if (DOTNET || PORTABLE40 || PORTABLE) +#if (DOTNET || PORTABLE) using System; using System.Reflection; diff --git a/Src/Newtonsoft.Json/Utilities/DateTimeUtils.cs b/Src/Newtonsoft.Json/Utilities/DateTimeUtils.cs index 807c3a1a..441d717a 100644 --- a/Src/Newtonsoft.Json/Utilities/DateTimeUtils.cs +++ b/Src/Newtonsoft.Json/Utilities/DateTimeUtils.cs @@ -58,7 +58,7 @@ namespace Newtonsoft.Json.Utilities #endif } -#if !(PORTABLE40 || PORTABLE) +#if !(PORTABLE) public static XmlDateTimeSerializationMode ToSerializationMode(DateTimeKind kind) { switch (kind) diff --git a/Src/Newtonsoft.Json/Utilities/ReflectionUtils.cs b/Src/Newtonsoft.Json/Utilities/ReflectionUtils.cs index 03a445df..a67c90d9 100644 --- a/Src/Newtonsoft.Json/Utilities/ReflectionUtils.cs +++ b/Src/Newtonsoft.Json/Utilities/ReflectionUtils.cs @@ -43,7 +43,7 @@ using Newtonsoft.Json.Serialization; namespace Newtonsoft.Json.Utilities { -#if (DOTNET || PORTABLE || PORTABLE40) +#if (DOTNET || PORTABLE) internal enum MemberTypes { Property = 0, @@ -790,13 +790,11 @@ namespace Newtonsoft.Json.Utilities return (attributeType != null) ? Attribute.GetCustomAttributes(mi, attributeType, inherit) : Attribute.GetCustomAttributes(mi, inherit); } -#if !PORTABLE40 Module m = provider as Module; if (m != null) { return (attributeType != null) ? Attribute.GetCustomAttributes(m, attributeType, inherit) : Attribute.GetCustomAttributes(m, inherit); } -#endif ParameterInfo p = provider as ParameterInfo; if (p != null) @@ -804,14 +802,10 @@ namespace Newtonsoft.Json.Utilities return (attributeType != null) ? Attribute.GetCustomAttributes(p, attributeType, inherit) : Attribute.GetCustomAttributes(p, inherit); } -#if !PORTABLE40 ICustomAttributeProvider customAttributeProvider = (ICustomAttributeProvider)attributeProvider; object[] result = (attributeType != null) ? customAttributeProvider.GetCustomAttributes(attributeType, inherit) : customAttributeProvider.GetCustomAttributes(inherit); return (Attribute[])result; -#else - throw new Exception("Cannot get attributes from '{0}'.".FormatWith(CultureInfo.InvariantCulture, provider)); -#endif } #else public static T[] GetAttributes(object attributeProvider, bool inherit) where T : Attribute diff --git a/Src/Newtonsoft.Json/Utilities/TypeExtensions.cs b/Src/Newtonsoft.Json/Utilities/TypeExtensions.cs index 0d7f0b1f..c3427ac4 100644 --- a/Src/Newtonsoft.Json/Utilities/TypeExtensions.cs +++ b/Src/Newtonsoft.Json/Utilities/TypeExtensions.cs @@ -107,7 +107,7 @@ namespace Newtonsoft.Json.Utilities public static MemberTypes MemberType(this MemberInfo memberInfo) { -#if !(DOTNET || PORTABLE || PORTABLE40) +#if !(DOTNET || PORTABLE) return memberInfo.MemberType; #else if (memberInfo is PropertyInfo) @@ -214,7 +214,7 @@ namespace Newtonsoft.Json.Utilities #endif } -#if (PORTABLE40 || DOTNET || PORTABLE) +#if (DOTNET || PORTABLE) public static PropertyInfo GetProperty(this Type type, string name, BindingFlags bindingFlags, object placeholder1, Type propertyType, IList indexParameters, object placeholder2) { IEnumerable propertyInfos = type.GetProperties(bindingFlags);