From 0552affb8366a0b05d8c8ba2385015fb881231bd Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sat, 4 Apr 2015 16:13:37 +1300 Subject: [PATCH] -Renamed aspnetcore50 to dnxcore50 -Documentation --- Build/build.ps1 | 4 +- Doc/SerializationAttributes.aml | 34 ++----- Doc/doc.content | 2 +- .../Bson/BsonReaderTests.cs | 6 +- .../Bson/BsonWriterTests.cs | 6 +- .../Converters/BinaryConverterTests.cs | 10 +- .../CustomCreationConverterTests.cs | 2 +- .../Converters/DataSetConverterTests.cs | 4 +- .../Converters/DataTableConverterTests.cs | 4 +- .../DiscriminatedUnionConverterTests.cs | 2 +- .../Converters/ExpandoObjectConverterTests.cs | 2 +- .../Converters/IsoDateTimeConverterTests.cs | 4 +- .../JavaScriptDateTimeConverterTests.cs | 2 +- .../Converters/KeyValuePairConverterTests.cs | 2 +- .../Converters/ObjectIdConverterTests.cs | 2 +- .../Converters/RegexConverterTests.cs | 2 +- .../Converters/StringEnumConverterTests.cs | 2 +- .../Converters/VersionConverterTests.cs | 2 +- .../Converters/XmlNodeConverterTest.cs | 4 +- Src/Newtonsoft.Json.Tests/DemoTests.cs | 2 +- .../ConditionalPropertiesTests.cs | 4 +- .../ConvertingJsonAndXmlTests.cs | 4 +- .../Documentation/JsonSchemaTests.cs | 4 +- .../Documentation/LinqToJsonTests.cs | 4 +- .../Documentation/PerformanceTests.cs | 4 +- .../ReadingAndWritingJsonTests.cs | 4 +- .../Samples/Json/CustomJsonReader.cs | 2 +- .../Json/ReadMultipleContentWithJsonReader.cs | 2 +- .../Documentation/SerializationTests.cs | 4 +- .../Documentation/TraceWriterTests.cs | 4 +- Src/Newtonsoft.Json.Tests/ExceptionTests.cs | 2 +- .../JsonArrayAttributeTests.cs | 2 +- Src/Newtonsoft.Json.Tests/JsonConvertTest.cs | 8 +- .../JsonTextReaderTest.cs | 12 +-- .../JsonTextWriterTest.cs | 6 +- .../JsonValidatingReaderTests.cs | 8 +- .../Linq/ComponentModel/BindingTests.cs | 2 +- .../JPropertyDescriptorTests.cs | 2 +- .../Linq/DynamicTests.cs | 28 +++--- Src/Newtonsoft.Json.Tests/Linq/JArrayTests.cs | 4 +- .../Linq/JConstructorTests.cs | 2 +- .../Linq/JObjectTests.cs | 14 +-- .../Linq/JPropertyTests.cs | 4 +- Src/Newtonsoft.Json.Tests/Linq/JRawTests.cs | 2 +- .../Linq/JTokenEqualityComparerTests.cs | 2 +- .../Linq/JTokenReaderTest.cs | 2 +- Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs | 14 +-- .../Linq/JTokenWriterTest.cs | 8 +- Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs | 22 ++--- .../Linq/JsonPath/JPathExecuteTests.cs | 4 +- .../Linq/JsonPath/JPathParseTests.cs | 6 +- .../Linq/JsonPath/QueryExpressionTests.cs | 2 +- .../Linq/LinqToJsonTest.cs | 8 +- Src/Newtonsoft.Json.Tests/Linq/MergeTests.cs | 2 +- .../LinqToSqlClassesSerializationTests.cs | 2 +- Src/Newtonsoft.Json.Tests/PerformanceTests.cs | 2 +- .../Schema/ExtensionsTests.cs | 8 +- .../Schema/JsonSchemaBuilderTests.cs | 2 +- .../Schema/JsonSchemaGeneratorTests.cs | 16 ++-- .../Schema/JsonSchemaModelBuilderTests.cs | 2 +- .../Schema/JsonSchemaNodeTests.cs | 2 +- .../Schema/JsonSchemaSpecTests.cs | 2 +- .../Schema/JsonSchemaTests.cs | 2 +- ...lCasePropertyNamesContractResolverTests.cs | 4 +- .../Serialization/ConstructorHandlingTests.cs | 2 +- .../Serialization/ContractResolverTests.cs | 4 +- .../DefaultValueHandlingTests.cs | 2 +- .../Serialization/DependencyInjectionTests.cs | 4 +- .../Serialization/DynamicConcreteTests.cs | 4 +- .../Serialization/DynamicTests.cs | 2 +- .../EntitiesSerializationTests.cs | 4 +- .../Serialization/ExtensionDataTests.cs | 2 +- .../Serialization/FSharpTests.cs | 2 +- .../ImmutableCollectionsTests.cs | 2 +- .../JsonPropertyCollectionTests.cs | 2 +- .../JsonSerializerCollectionsTests.cs | 8 +- .../Serialization/JsonSerializerTest.cs | 94 +++++++++---------- .../MetadataPropertyHandlingTests.cs | 4 +- .../MissingMemberHandlingTests.cs | 2 +- .../Serialization/NullValueHandlingTests.cs | 2 +- .../Serialization/PopulateTests.cs | 2 +- .../PreserveReferencesHandlingTests.cs | 2 +- .../ReferenceLoopHandlingTests.cs | 4 +- .../ReflectionAttributeProviderTests.cs | 2 +- .../SerializationErrorHandlingTests.cs | 2 +- .../SerializationEventAttributeTests.cs | 6 +- .../Serialization/ShouldSerializeTests.cs | 2 +- .../Serialization/TraceWriterTests.cs | 10 +- .../Serialization/TypeNameHandlingTests.cs | 16 ++-- .../Serialization/WebApiIntegrationTests.cs | 12 +-- Src/Newtonsoft.Json.Tests/TestFixtureBase.cs | 16 ++-- .../TestObjects/AnswerFilterModel.cs | 2 +- .../TestObjects/ConverableMembers.cs | 2 +- .../TestObjects/Currency.cs | 2 +- .../TestObjects/CustomerDataSet.cs | 2 +- .../DefaultValueAttributeTestClass.cs | 2 +- .../TestObjects/IMyInterface.cs | 2 +- .../TestObjects/MetroPropertyNameResolver.cs | 2 +- .../TestObjects/MetroStringConverter.cs | 4 +- .../TestObjects/Person.cs | 2 +- .../TestObjects/PersonSerializable.cs | 2 +- .../TestObjects/Ratio.cs | 2 +- .../TestObjects/Shape.cs | 2 +- .../TestObjects/TypedSubHashtable.cs | 2 +- .../Utilities/DateTimeUtilsTests.cs | 2 +- .../DynamicReflectionDelegateFactoryTests.cs | 4 +- ...xpressionReflectionDelegateFactoryTests.cs | 2 +- ...LateboundReflectionDelegateFactoryTests.cs | 2 +- .../Utilities/ReflectionUtilsTests.cs | 4 +- .../Utilities/StringUtilsTests.cs | 2 +- Src/Newtonsoft.Json.Tests/project.json | 2 +- 111 files changed, 293 insertions(+), 309 deletions(-) diff --git a/Build/build.ps1 b/Build/build.ps1 index 393e0acc..b54435d8 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -21,9 +21,9 @@ $workingDir = "$baseDir\$workingName" $builds = @( @{Name = "Newtonsoft.Json"; TestsName = "Newtonsoft.Json.Tests"; TestsFunction = "NUnitTests"; Constants=""; FinalDir="Net45"; NuGetDir = "net45"; Framework="net-4.0"; Sign=$true}, - @{Name = "Newtonsoft.Json.Portable"; TestsName = "Newtonsoft.Json.Tests.Portable"; TestsFunction = "NUnitTests"; Constants="PORTABLE"; FinalDir="Portable"; NuGetDir = "portable-net45+wp80+win8+wpa81+aspnetcore50"; Framework="net-4.0"; Sign=$true}, + @{Name = "Newtonsoft.Json.Portable"; TestsName = "Newtonsoft.Json.Tests.Portable"; TestsFunction = "NUnitTests"; Constants="PORTABLE"; FinalDir="Portable"; NuGetDir = "portable-net45+wp80+win8+wpa81+dnxcore50"; Framework="net-4.0"; Sign=$true}, @{Name = "Newtonsoft.Json.Portable40"; TestsName = "Newtonsoft.Json.Tests.Portable40"; TestsFunction = "NUnitTests"; Constants="PORTABLE40"; FinalDir="Portable40"; NuGetDir = "portable-net40+sl5+wp80+win8+wpa81"; Framework="net-4.0"; Sign=$true}, - #@{Name = $null; TestsName = "Newtonsoft.Json.Tests.AspNetCore50"; TestsFunction = "CoreClrTests"; Constants="ASPNETCORE50"; FinalDir="ASPNETCORE50"; NuGetDir = $null; Framework=$null; Sign=$null}, + #@{Name = $null; TestsName = "Newtonsoft.Json.Tests.DnxCore50"; TestsFunction = "CoreClrTests"; Constants="DNXCORE50"; FinalDir="DNXCORE50"; NuGetDir = $null; Framework=$null; Sign=$null}, @{Name = "Newtonsoft.Json.Net40"; TestsName = "Newtonsoft.Json.Tests.Net40"; TestsFunction = "NUnitTests"; Constants="NET40"; FinalDir="Net40"; NuGetDir = "net40"; Framework="net-4.0"; Sign=$true}, @{Name = "Newtonsoft.Json.Net35"; TestsName = "Newtonsoft.Json.Tests.Net35"; TestsFunction = "NUnitTests"; Constants="NET35"; FinalDir="Net35"; NuGetDir = "net35"; Framework="net-2.0"; Sign=$true}, @{Name = "Newtonsoft.Json.Net20"; TestsName = "Newtonsoft.Json.Tests.Net20"; TestsFunction = "NUnitTests"; Constants="NET20"; FinalDir="Net20"; NuGetDir = "net20"; Framework="net-2.0"; Sign=$true} diff --git a/Doc/SerializationAttributes.aml b/Doc/SerializationAttributes.aml index b88a98b7..d21d4097 100644 --- a/Doc/SerializationAttributes.aml +++ b/Doc/SerializationAttributes.aml @@ -1,19 +1,10 @@  - + - - Attributes can be used to control how Json.NET serializes and deserializes .NET objects. - + T:Newtonsoft.Json.JsonObjectAttribute - Placed on classes to control how they should be serialized as a JSON object. T:Newtonsoft.Json.JsonArrayAttribute - Placed on collections to control how they should be serialized as a JSON array. @@ -28,8 +19,6 @@
Standard .NET Serialization Attributes - As well as using the built-in Json.NET attributes, Json.NET also looks for the T:System.SerializableAttribute (if IgnoreSerializableAttribute on DefaultContractResolver is set to false) T:System.Runtime.Serialization.DataContractAttribute, @@ -37,7 +26,6 @@ and T:System.NonSerializedAttribute and attributes when determining how JSON is to be serialized and deserialized. - Json.NET attributes take precedence over standard .NET serialization attributes (e.g. if both JsonPropertyAttribute and DataMemberAttribute are present on a property and both customize the name, @@ -55,8 +43,6 @@
JsonObjectAttribute - The MemberSerialization flag on this attribute specifies whether member serialization is opt-in (a member must have the JsonProperty or DataMember attribute to be serialized), opt-out (everything is serialized by default but can be ignored with the JsonIgnoreAttribute, Json.NET's default behavior) or @@ -72,8 +58,6 @@
JsonArrayAttribute/JsonDictionaryAttribute - The JsonArrayAttribute and JsonDictionaryAttributes are used to specify whether a class is serialized as that collection type. The collection attributes have options to customize the JsonConverter, type name handling, and reference handling that are applied to collection items. @@ -82,8 +66,6 @@
JsonPropertyAttribute - JsonPropertyAttribute has a number of uses: @@ -110,9 +92,8 @@
JsonConverterAttribute - - The JsonConverterAttribute specifies which JsonSerializer is used to convert an object. + The T:Newtonsoft.Json.JsonConverterAttribute specifies which + T:Newtonsoft.Json.JsonConverter is used to convert an object. The attribute can be placed on a class or a member. When placed on a class, the JsonConverter specified by the attribute will be the default way of serializing that class. When the attribute is on a field or property, then the specified JsonConverter will always be used to serialize that value. @@ -135,8 +116,10 @@
JsonExtensionDataAttribute - Instructs the T:Newtonsoft.Json.JsonSerializer to deserialize properties with no matching class member - into the specified collection and write values during serialization. + The T:Newtonsoft.Json.JsonExtensionDataAttribute instructs the + T:Newtonsoft.Json.JsonSerializer to deserialize properties with no matching field or property + on the type into the specified collection. During serialization the values in this collection are written back to the instance's JSON object. + This example shows the JsonExtensionDataAttribute being applied to a field, unmatched JSON properties being added to the field's collection during deserialization. @@ -150,6 +133,7 @@ T:Newtonsoft.Json.JsonDictionaryAttribute T:Newtonsoft.Json.JsonPropertyAttribute T:Newtonsoft.Json.JsonConverterAttribute + T:Newtonsoft.Json.JsonExtensionDataAttribute \ No newline at end of file diff --git a/Doc/doc.content b/Doc/doc.content index d57463b9..78f3eb47 100644 --- a/Doc/doc.content +++ b/Doc/doc.content @@ -153,7 +153,7 @@ - + diff --git a/Src/Newtonsoft.Json.Tests/Bson/BsonReaderTests.cs b/Src/Newtonsoft.Json.Tests/Bson/BsonReaderTests.cs index 0da436eb..d0085bd0 100644 --- a/Src/Newtonsoft.Json.Tests/Bson/BsonReaderTests.cs +++ b/Src/Newtonsoft.Json.Tests/Bson/BsonReaderTests.cs @@ -30,7 +30,7 @@ using System.Reflection; using System.Runtime.Serialization; using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Tests.TestObjects; -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) using System.Numerics; #endif using System.Text; @@ -39,7 +39,7 @@ using System.Text.RegularExpressions; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -1506,7 +1506,7 @@ namespace Newtonsoft.Json.Tests.Bson } #endif -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) public class BigIntegerTestClass { public BigInteger Blah { get; set; } diff --git a/Src/Newtonsoft.Json.Tests/Bson/BsonWriterTests.cs b/Src/Newtonsoft.Json.Tests/Bson/BsonWriterTests.cs index db965148..898e8e1c 100644 --- a/Src/Newtonsoft.Json.Tests/Bson/BsonWriterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Bson/BsonWriterTests.cs @@ -25,7 +25,7 @@ using System; using System.Collections.Generic; -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) using System.Numerics; #endif using System.Text; @@ -34,7 +34,7 @@ using System.Text.RegularExpressions; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -803,7 +803,7 @@ namespace Newtonsoft.Json.Tests.Bson Assert.AreEqual(c.AGuid, c2.AGuid.ToString()); } -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void WriteBigInteger() { diff --git a/Src/Newtonsoft.Json.Tests/Converters/BinaryConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/BinaryConverterTests.cs index 6ae0e7a4..5c6b156f 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/BinaryConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/BinaryConverterTests.cs @@ -25,10 +25,10 @@ using System; using System.Collections.Generic; -#if !(NET20 || NETFX_CORE || ASPNETCORE50) +#if !(NET20 || NETFX_CORE || DNXCORE50) using System.Data.Linq; #endif -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) using System.Data.SqlTypes; #endif using System.Text; @@ -37,7 +37,7 @@ using Newtonsoft.Json.Converters; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -58,7 +58,7 @@ namespace Newtonsoft.Json.Tests.Converters public byte[] NullByteArray { get; set; } } -#if !(NET20 || NETFX_CORE || PORTABLE || PORTABLE40 || ASPNETCORE50) +#if !(NET20 || NETFX_CORE || PORTABLE || PORTABLE40 || DNXCORE50) [Test] public void DeserializeBinaryClass() { @@ -124,7 +124,7 @@ namespace Newtonsoft.Json.Tests.Converters }", json); } -#if !(NETFX_CORE || PORTABLE || PORTABLE40 || ASPNETCORE50) +#if !(NETFX_CORE || PORTABLE || PORTABLE40 || DNXCORE50) public class SqlBinaryClass { public SqlBinary SqlBinary { get; set; } diff --git a/Src/Newtonsoft.Json.Tests/Converters/CustomCreationConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/CustomCreationConverterTests.cs index 4cf565b1..41ccfbac 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/CustomCreationConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/CustomCreationConverterTests.cs @@ -30,7 +30,7 @@ using Newtonsoft.Json.Converters; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs index 86afde9f..e6974081 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs @@ -23,14 +23,14 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) using System; using Newtonsoft.Json.Converters; #if NETFX_CORE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs index 36f9269a..f0566ed5 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs @@ -27,14 +27,14 @@ using System.IO; using System.Text; using Newtonsoft.Json.Bson; using Newtonsoft.Json.Linq; -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) using System; using System.Collections.Generic; #if NETFX_CORE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Converters/DiscriminatedUnionConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/DiscriminatedUnionConverterTests.cs index a59da65a..d7a11f44 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/DiscriminatedUnionConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/DiscriminatedUnionConverterTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET35 || NET20 || NETFX_CORE || ASPNETCORE50) +#if !(NET35 || NET20 || NETFX_CORE || DNXCORE50) using System.Diagnostics; using System.Reflection; using Microsoft.FSharp.Core; diff --git a/Src/Newtonsoft.Json.Tests/Converters/ExpandoObjectConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/ExpandoObjectConverterTests.cs index 915adbfa..f95413ab 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/ExpandoObjectConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/ExpandoObjectConverterTests.cs @@ -34,7 +34,7 @@ using Newtonsoft.Json.Converters; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Converters/IsoDateTimeConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/IsoDateTimeConverterTests.cs index 3bfeb610..942e2a69 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/IsoDateTimeConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/IsoDateTimeConverterTests.cs @@ -29,7 +29,7 @@ using Newtonsoft.Json.Tests.TestObjects; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -126,7 +126,7 @@ namespace Newtonsoft.Json.Tests.Converters Assert.AreEqual(2006, d.Year); } -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) [Test] public void SerializeFormattedDateTimeNewZealandCulture() { diff --git a/Src/Newtonsoft.Json.Tests/Converters/JavaScriptDateTimeConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/JavaScriptDateTimeConverterTests.cs index 4dfc8c80..b079843b 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/JavaScriptDateTimeConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/JavaScriptDateTimeConverterTests.cs @@ -29,7 +29,7 @@ using System.Collections.Generic; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Converters/KeyValuePairConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/KeyValuePairConverterTests.cs index 3bd593a5..07e6a7fe 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/KeyValuePairConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/KeyValuePairConverterTests.cs @@ -7,7 +7,7 @@ using Newtonsoft.Json.Serialization; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Converters/ObjectIdConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/ObjectIdConverterTests.cs index 4d24f929..8a14569e 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/ObjectIdConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/ObjectIdConverterTests.cs @@ -30,7 +30,7 @@ using Newtonsoft.Json.Utilities; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Converters/RegexConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/RegexConverterTests.cs index e08b7aef..46da21e0 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/RegexConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/RegexConverterTests.cs @@ -35,7 +35,7 @@ using Newtonsoft.Json.Utilities; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Converters/StringEnumConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/StringEnumConverterTests.cs index b74bc14b..9240de41 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/StringEnumConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/StringEnumConverterTests.cs @@ -35,7 +35,7 @@ using Newtonsoft.Json.Converters; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Converters/VersionConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/VersionConverterTests.cs index 238608ca..38393e3c 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/VersionConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/VersionConverterTests.cs @@ -29,7 +29,7 @@ using Newtonsoft.Json.Converters; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs b/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs index 40b61cb4..a20e392d 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs @@ -29,7 +29,7 @@ using Newtonsoft.Json.Utilities.LinqBridge; using System.Linq; #endif using System.Text; -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) using System; using System.Collections.Generic; using Newtonsoft.Json.Tests.Serialization; @@ -38,7 +38,7 @@ using Newtonsoft.Json.Tests.TestObjects; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/DemoTests.cs b/Src/Newtonsoft.Json.Tests/DemoTests.cs index 05608f16..e74e8f84 100644 --- a/Src/Newtonsoft.Json.Tests/DemoTests.cs +++ b/Src/Newtonsoft.Json.Tests/DemoTests.cs @@ -36,7 +36,7 @@ using Newtonsoft.Json.Serialization; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/ConditionalPropertiesTests.cs b/Src/Newtonsoft.Json.Tests/Documentation/ConditionalPropertiesTests.cs index cc7ff33a..87cfe484 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/ConditionalPropertiesTests.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/ConditionalPropertiesTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET35 || NET20 || PORTABLE || ASPNETCORE50) +#if !(NET35 || NET20 || PORTABLE || DNXCORE50) using System; using System.Collections.Generic; using System.ComponentModel; @@ -41,7 +41,7 @@ using Newtonsoft.Json.Linq; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/ConvertingJsonAndXmlTests.cs b/Src/Newtonsoft.Json.Tests/Documentation/ConvertingJsonAndXmlTests.cs index 0ca02d57..da8f4ce3 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/ConvertingJsonAndXmlTests.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/ConvertingJsonAndXmlTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET35 || NET20 || PORTABLE || ASPNETCORE50) +#if !(NET35 || NET20 || PORTABLE || DNXCORE50) using System; using System.Collections.Generic; using System.ComponentModel; @@ -39,7 +39,7 @@ using Newtonsoft.Json.Linq; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/JsonSchemaTests.cs b/Src/Newtonsoft.Json.Tests/Documentation/JsonSchemaTests.cs index 224f777b..7958c9cc 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/JsonSchemaTests.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/JsonSchemaTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET35 || NET20 || PORTABLE || ASPNETCORE50) +#if !(NET35 || NET20 || PORTABLE || DNXCORE50) #pragma warning disable 618 using System; using System.Collections.Generic; @@ -39,7 +39,7 @@ using Newtonsoft.Json.Linq; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/LinqToJsonTests.cs b/Src/Newtonsoft.Json.Tests/Documentation/LinqToJsonTests.cs index 7b53df16..ac84a90b 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/LinqToJsonTests.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/LinqToJsonTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET35 || NET20 || PORTABLE || ASPNETCORE50) +#if !(NET35 || NET20 || PORTABLE || DNXCORE50) using System; using System.Collections.Generic; using System.ComponentModel; @@ -38,7 +38,7 @@ using Newtonsoft.Json.Linq; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/PerformanceTests.cs b/Src/Newtonsoft.Json.Tests/Documentation/PerformanceTests.cs index 85e27694..f75d4a41 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/PerformanceTests.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/PerformanceTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET35 || NET20 || PORTABLE || ASPNETCORE50) +#if !(NET35 || NET20 || PORTABLE || DNXCORE50) using System; using System.Collections.Generic; using System.ComponentModel; @@ -40,7 +40,7 @@ using Newtonsoft.Json.Linq; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/ReadingAndWritingJsonTests.cs b/Src/Newtonsoft.Json.Tests/Documentation/ReadingAndWritingJsonTests.cs index ff5a5969..cb118c97 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/ReadingAndWritingJsonTests.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/ReadingAndWritingJsonTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET35 || NET20 || PORTABLE || ASPNETCORE50) +#if !(NET35 || NET20 || PORTABLE || DNXCORE50) using System; using System.Collections.Generic; using System.ComponentModel; @@ -38,7 +38,7 @@ using Newtonsoft.Json.Linq; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/CustomJsonReader.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/CustomJsonReader.cs index baaa31ec..8d15971e 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/CustomJsonReader.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/CustomJsonReader.cs @@ -34,7 +34,7 @@ using Newtonsoft.Json.Linq; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/ReadMultipleContentWithJsonReader.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/ReadMultipleContentWithJsonReader.cs index 0a0362d0..e20339b8 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/ReadMultipleContentWithJsonReader.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/ReadMultipleContentWithJsonReader.cs @@ -33,7 +33,7 @@ using System.Text; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/SerializationTests.cs b/Src/Newtonsoft.Json.Tests/Documentation/SerializationTests.cs index fbfd378c..eda5de72 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/SerializationTests.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/SerializationTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET35 || NET20 || PORTABLE || ASPNETCORE50) +#if !(NET35 || NET20 || PORTABLE || DNXCORE50) using System; using System.Collections.Generic; using System.ComponentModel; @@ -38,7 +38,7 @@ using Newtonsoft.Json.Linq; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/TraceWriterTests.cs b/Src/Newtonsoft.Json.Tests/Documentation/TraceWriterTests.cs index 934ee531..6eae67bb 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/TraceWriterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/TraceWriterTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET35 || NET20 || PORTABLE || ASPNETCORE50) +#if !(NET35 || NET20 || PORTABLE || DNXCORE50) using System; using System.Collections.Generic; using System.ComponentModel; @@ -42,7 +42,7 @@ using Newtonsoft.Json.Linq; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/ExceptionTests.cs b/Src/Newtonsoft.Json.Tests/ExceptionTests.cs index cf53d054..28701014 100644 --- a/Src/Newtonsoft.Json.Tests/ExceptionTests.cs +++ b/Src/Newtonsoft.Json.Tests/ExceptionTests.cs @@ -29,7 +29,7 @@ using Newtonsoft.Json.Schema; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/JsonArrayAttributeTests.cs b/Src/Newtonsoft.Json.Tests/JsonArrayAttributeTests.cs index 0d3d9b7e..03d9e61e 100644 --- a/Src/Newtonsoft.Json.Tests/JsonArrayAttributeTests.cs +++ b/Src/Newtonsoft.Json.Tests/JsonArrayAttributeTests.cs @@ -27,7 +27,7 @@ using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs b/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs index 43191ecb..505396b7 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 || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE40 || PORTABLE || DNXCORE50) using System.Numerics; #endif using System.Runtime.Serialization; @@ -47,7 +47,7 @@ using Newtonsoft.Json.Utilities; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -539,7 +539,7 @@ namespace Newtonsoft.Json.Tests value = null; Assert.AreEqual("null", JsonConvert.ToString(value)); -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) value = DBNull.Value; Assert.AreEqual("null", JsonConvert.ToString(value)); #endif @@ -1132,7 +1132,7 @@ namespace Newtonsoft.Json.Tests } -#if !(NET20 || NET35 || PORTABLE40 || PORTABLE || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE40 || PORTABLE || DNXCORE50) [Test] public void IntegerLengthOverflows() { diff --git a/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs b/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs index 7e1efd1a..7e313fa5 100644 --- a/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs +++ b/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs @@ -27,7 +27,7 @@ using System; using System.Collections.Generic; using System.Globalization; using Newtonsoft.Json.Linq; -#if !(NET20 || NET35 || PORTABLE40 || PORTABLE || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE40 || PORTABLE || DNXCORE50) using System.Numerics; #endif using System.Text; @@ -35,7 +35,7 @@ using System.Text; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -82,7 +82,7 @@ second line third line", jsonTextReader.Value); } -#if !(NET20 || NET35 || PORTABLE40 || PORTABLE || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE40 || PORTABLE || DNXCORE50) [Test] public void ReadBigInteger() { @@ -961,7 +961,7 @@ third line", jsonTextReader.Value); } } -#if !(NET20 || NET35 || PORTABLE40 || PORTABLE || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE40 || PORTABLE || DNXCORE50) [Test] public void ReadInt64Overflow() { @@ -3172,7 +3172,7 @@ null//comment { string json = @"{ ""frameworks"": { - ""aspnetcore50"": { + ""dnxcore50"": { ""dependencies"": { ""System.Xml.ReaderWriter"": { ""source"": !!! !!! @@ -3190,7 +3190,7 @@ null//comment { } }, - "Unexpected character encountered while parsing value: !. Path 'frameworks.aspnetcore50.dependencies.['System.Xml.ReaderWriter'].source', line 6, position 21."); + "Unexpected character encountered while parsing value: !. Path 'frameworks.dnxcore50.dependencies.['System.Xml.ReaderWriter'].source', line 6, position 21."); } } diff --git a/Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs b/Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs index 271e5348..b078d883 100644 --- a/Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs +++ b/Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs @@ -40,7 +40,7 @@ using System.Xml; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -121,7 +121,7 @@ namespace Newtonsoft.Json.Tests Assert.IsTrue(ms.CanRead); } -#if !(PORTABLE || ASPNETCORE50 || NETFX_CORE) +#if !(PORTABLE || DNXCORE50 || NETFX_CORE) [Test] public void WriteIConvertable() { @@ -1552,7 +1552,7 @@ null//comment } } -#if !(PORTABLE || ASPNETCORE50 || NETFX_CORE) +#if !(PORTABLE || DNXCORE50 || NETFX_CORE) public struct ConvertibleInt : IConvertible { private readonly int _value; diff --git a/Src/Newtonsoft.Json.Tests/JsonValidatingReaderTests.cs b/Src/Newtonsoft.Json.Tests/JsonValidatingReaderTests.cs index f169547f..09a3ffc2 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 || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) using System.Numerics; #endif using System.Text; @@ -38,7 +38,7 @@ using System.Text; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -357,7 +357,7 @@ namespace Newtonsoft.Json.Tests Assert.IsNotNull(validationEventArgs); } -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void IntegerGreaterThanMaximumValue_BigInteger() { @@ -610,7 +610,7 @@ namespace Newtonsoft.Json.Tests Assert.IsNotNull(validationEventArgs); } -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) [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 74fecb08..6ebb1ccb 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 !(NETFX_CORE || PORTABLE || PORTABLE40 || ASPNETCORE50) +#if !(NETFX_CORE || PORTABLE || PORTABLE40 || 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 59226b0a..589d8848 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 !(NETFX_CORE || PORTABLE || PORTABLE40 || ASPNETCORE50) +#if !(NETFX_CORE || PORTABLE || PORTABLE40 || 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 c5d3c9a4..1fea5f6c 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/DynamicTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/DynamicTests.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; using System.Dynamic; using System.Linq; -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) using System.Numerics; #endif using System.Text; @@ -38,7 +38,7 @@ using Newtonsoft.Json.Linq; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -226,7 +226,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 || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) , new JProperty("BigInteger", BigInteger.Parse("1")) #endif ); @@ -259,7 +259,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 || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) Assert.IsTrue(d.Decimal > new BigInteger(0)); #endif @@ -275,11 +275,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 || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) Assert.IsTrue(d.Float > new BigInteger(0)); #endif -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) Assert.IsTrue(d.BigInteger == d.BigInteger); Assert.IsTrue(d.BigInteger > 0); Assert.IsTrue(d.BigInteger > 0.0m); @@ -335,7 +335,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 || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) , new JProperty("BigInteger", new BigInteger(100)) #endif ); @@ -414,7 +414,7 @@ namespace Newtonsoft.Json.Tests.Linq r += 2; Assert.AreEqual(null, r.Value); -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) r = d.BigInteger + null; Assert.AreEqual(null, r.Value); r += 2; @@ -493,7 +493,7 @@ namespace Newtonsoft.Json.Tests.Linq r -= 2; Assert.AreEqual(null, r.Value); -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) r = d.BigInteger - null; Assert.AreEqual(null, r.Value); r -= 2; @@ -567,7 +567,7 @@ namespace Newtonsoft.Json.Tests.Linq r *= 2; Assert.AreEqual(null, r.Value); -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) r = d.BigInteger * 1.1d; Assert.AreEqual(100m, (decimal)r); r *= 2; @@ -641,7 +641,7 @@ namespace Newtonsoft.Json.Tests.Linq r /= 2; Assert.AreEqual(null, r.Value); -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) r = d.BigInteger / 1.1d; Assert.AreEqual(100m, (decimal)r); r /= 2; @@ -669,7 +669,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 || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) , new JProperty("BigInteger", new BigInteger(100)) #endif ); @@ -686,7 +686,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 || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) Assert.AreEqual("100", d.BigInteger.ToString()); #endif } @@ -770,7 +770,7 @@ namespace Newtonsoft.Json.Tests.Linq AssertValueConverted(null); AssertValueConverted(new Uri("http://json.codeplex.com/")); AssertValueConverted(null); -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) 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 3510cd9c..e0e9a217 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JArrayTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JArrayTests.cs @@ -30,7 +30,7 @@ using System.ComponentModel; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -436,7 +436,7 @@ Parameter name: index"); } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void ITypedListGetItemProperties() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JConstructorTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JConstructorTests.cs index a5d6c479..8725012c 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JConstructorTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JConstructorTests.cs @@ -30,7 +30,7 @@ using Newtonsoft.Json.Linq; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs index 148bea4c..eccf9bd1 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs @@ -27,7 +27,7 @@ using System; using System.Collections.Generic; using System.Collections.Specialized; using System.ComponentModel; -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) using System.Numerics; #endif using Newtonsoft.Json.Serialization; @@ -36,7 +36,7 @@ using Newtonsoft.Json.Tests.TestObjects; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -46,7 +46,7 @@ using NUnit.Framework; using Newtonsoft.Json.Linq; using System.IO; using System.Collections; -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) using System.Web.UI; #endif #if NET20 @@ -692,7 +692,7 @@ Parameter name: arrayIndex"); Assert.AreEqual(p4, l[1]); } -#if !(NET20 || NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NET20 || NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void PropertyChanging() { @@ -1235,7 +1235,7 @@ Parameter name: arrayIndex"); }, "Can not add property Test3 to Newtonsoft.Json.Linq.JObject. Property with the same name already exists on object."); } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void IBindingListSortDirection() { @@ -1559,7 +1559,7 @@ Parameter name: arrayIndex"); Assert.AreEqual("Name2", value); } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void WriteObjectNullDBNullValue() { @@ -1671,7 +1671,7 @@ Parameter name: arrayIndex"); }, "Unexpected end of content while loading JObject. Path 'short.error.code', line 6, position 15."); } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void GetProperties() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JPropertyTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JPropertyTests.cs index efc30aa4..9eea3c6a 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JPropertyTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JPropertyTests.cs @@ -37,7 +37,7 @@ using Newtonsoft.Json.Linq; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -65,7 +65,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual(p, p.Value.Parent); } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void ListChanged() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JRawTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JRawTests.cs index b2431622..f5444769 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JRawTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JRawTests.cs @@ -27,7 +27,7 @@ using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Linq/JTokenEqualityComparerTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenEqualityComparerTests.cs index ecc64929..3ccc5a98 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JTokenEqualityComparerTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JTokenEqualityComparerTests.cs @@ -28,7 +28,7 @@ using System.Collections.Generic; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Linq/JTokenReaderTest.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenReaderTest.cs index 40556f12..feeeb572 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JTokenReaderTest.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JTokenReaderTest.cs @@ -30,7 +30,7 @@ using System.Text; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs index 984602fb..d048bae2 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 || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) using System.Numerics; #endif using System.Text; @@ -34,7 +34,7 @@ using Newtonsoft.Json.Converters; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -361,7 +361,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual(5, (int)(new JValue(StringComparison.OrdinalIgnoreCase))); -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) string bigIntegerText = "1234567899999999999999999999999999999999999999999999999999999999999990"; Assert.AreEqual(BigInteger.Parse(bigIntegerText), (new JValue(BigInteger.Parse(bigIntegerText))).Value); @@ -441,7 +441,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 || ASPNETCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) 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."); @@ -458,7 +458,7 @@ namespace Newtonsoft.Json.Tests.Linq [Test] public void ToObject() { -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) 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?)))); @@ -515,7 +515,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.IsTrue(JToken.DeepEquals(new JValue((DateTimeOffset?)null), (JValue)(DateTimeOffset?)null)); #endif -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) // 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))); @@ -1138,7 +1138,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.IsTrue(a.DeepEquals(a2)); } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void Clone() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterTest.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterTest.cs index 4e1218b8..98ac87d5 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterTest.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterTest.cs @@ -33,7 +33,7 @@ using System.Text; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -124,7 +124,7 @@ namespace Newtonsoft.Json.Tests.Linq jsonWriter.WriteValue("DVD read/writer"); Assert.AreEqual(WriteState.Array, jsonWriter.WriteState); -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) jsonWriter.WriteValue(new BigInteger(123)); Assert.AreEqual(WriteState.Array, jsonWriter.WriteState); #endif @@ -176,7 +176,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual(WriteState.Array, jsonWriter.WriteState); Assert.AreEqual(a[a.Count - 1], jsonWriter.CurrentToken); -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) jsonWriter.WriteValue(new BigInteger(123)); Assert.AreEqual(WriteState.Array, jsonWriter.WriteState); Assert.AreEqual(a[a.Count - 1], jsonWriter.CurrentToken); @@ -209,7 +209,7 @@ namespace Newtonsoft.Json.Tests.Linq /*fail*/]", writer.Token.ToString()); } -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void WriteBigInteger() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs index fc7a554c..5b3a8644 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 || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) using System.Numerics; #endif using System.Text; @@ -36,7 +36,7 @@ using System.Text; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -129,7 +129,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual("Pie", v.Value); Assert.AreEqual(JTokenType.String, v.Type); -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) v.Value = DBNull.Value; Assert.AreEqual(DBNull.Value, v.Value); Assert.AreEqual(JTokenType.Null, v.Type); @@ -158,7 +158,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual(g, v.Value); Assert.AreEqual(JTokenType.Guid, v.Type); -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) BigInteger i = BigInteger.Parse("123456789999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999990"); v.Value = i; Assert.AreEqual(i, v.Value); @@ -218,13 +218,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 || ASPNETCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) v = new JValue(BigInteger.Parse("123456789999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999990")); Assert.AreEqual("123456789999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999990", v.ToString(null, CultureInfo.InvariantCulture)); #endif } -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void JValueParse() { @@ -473,7 +473,7 @@ namespace Newtonsoft.Json.Tests.Linq } #endif -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50) +#if !(NETFX_CORE || PORTABLE || DNXCORE50) [Test] public void ConvertsToBoolean() { @@ -492,7 +492,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual(Int32.MaxValue, Convert.ToInt32(new JValue(Int32.MaxValue))); } -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void ConvertsToInt32_BigInteger() { @@ -654,7 +654,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 || ASPNETCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) v = new JValue(new BigInteger(3)); Assert.AreEqual(TypeCode.Object, v.GetTypeCode()); #endif @@ -668,7 +668,7 @@ namespace Newtonsoft.Json.Tests.Linq int i = (int)v.ToType(typeof(int), CultureInfo.InvariantCulture); Assert.AreEqual(9, i); -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) BigInteger bi = (BigInteger)v.ToType(typeof(BigInteger), CultureInfo.InvariantCulture); Assert.AreEqual(new BigInteger(9), bi); #endif @@ -683,7 +683,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual("2013", v.ToString("yyyy")); } -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void ToStringNewTypes() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathExecuteTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathExecuteTests.cs index 267fca4d..cd2b1f3d 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathExecuteTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathExecuteTests.cs @@ -34,7 +34,7 @@ using Newtonsoft.Json.Tests.Bson; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -651,7 +651,7 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath Assert.IsTrue(JToken.DeepEquals(new JObject(new JProperty("hi", 3)), t[1])); } -#if !(PORTABLE || ASPNETCORE50 || PORTABLE40 || NET35 || NET20) +#if !(PORTABLE || DNXCORE50 || PORTABLE40 || NET35 || NET20) [Test] public void GreaterQueryBigInteger() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathParseTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathParseTests.cs index 5e0fa9d3..6428cebe 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathParseTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathParseTests.cs @@ -30,7 +30,7 @@ using Newtonsoft.Json.Linq.JsonPath; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -647,11 +647,11 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath [Test] public void PropertyFollowingEscapedPropertyName() { - JPath path = new JPath("frameworks.aspnetcore50.dependencies.['System.Xml.ReaderWriter'].source"); + JPath path = new JPath("frameworks.dnxcore50.dependencies.['System.Xml.ReaderWriter'].source"); Assert.AreEqual(5, path.Filters.Count); Assert.AreEqual("frameworks", ((FieldFilter)path.Filters[0]).Name); - Assert.AreEqual("aspnetcore50", ((FieldFilter)path.Filters[1]).Name); + Assert.AreEqual("dnxcore50", ((FieldFilter)path.Filters[1]).Name); Assert.AreEqual("dependencies", ((FieldFilter)path.Filters[2]).Name); Assert.AreEqual("System.Xml.ReaderWriter", ((FieldFilter)path.Filters[3]).Name); Assert.AreEqual("source", ((FieldFilter)path.Filters[4]).Name); diff --git a/Src/Newtonsoft.Json.Tests/Linq/JsonPath/QueryExpressionTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JsonPath/QueryExpressionTests.cs index 707ccb0c..415df2d5 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JsonPath/QueryExpressionTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JsonPath/QueryExpressionTests.cs @@ -32,7 +32,7 @@ using Newtonsoft.Json.Linq.JsonPath; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs b/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs index b0727656..3e2b5e67 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs @@ -31,7 +31,7 @@ using System.Globalization; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -209,7 +209,7 @@ undefined { string json = @"{ ""frameworks"": { - ""aspnetcore50"": { + ""dnxcore50"": { ""dependencies"": { ""System.Xml.ReaderWriter"": { ""source"": ""NuGet"" @@ -221,9 +221,9 @@ undefined JObject o = JObject.Parse(json); - JToken v1 = o["frameworks"]["aspnetcore50"]["dependencies"]["System.Xml.ReaderWriter"]["source"]; + JToken v1 = o["frameworks"]["dnxcore50"]["dependencies"]["System.Xml.ReaderWriter"]["source"]; - Assert.AreEqual("frameworks.aspnetcore50.dependencies.['System.Xml.ReaderWriter'].source", v1.Path); + Assert.AreEqual("frameworks.dnxcore50.dependencies.['System.Xml.ReaderWriter'].source", v1.Path); JToken v2 = o.SelectToken(v1.Path); diff --git a/Src/Newtonsoft.Json.Tests/Linq/MergeTests.cs b/Src/Newtonsoft.Json.Tests/Linq/MergeTests.cs index bba380f9..add425d3 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/MergeTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/MergeTests.cs @@ -36,7 +36,7 @@ using Newtonsoft.Json.Linq; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/LinqToSql/LinqToSqlClassesSerializationTests.cs b/Src/Newtonsoft.Json.Tests/LinqToSql/LinqToSqlClassesSerializationTests.cs index c675e444..8e8ae170 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 !(ASPNETCORE50 || NETFX_CORE || PORTABLE40 || PORTABLE40) +#if !(DNXCORE50 || NETFX_CORE || PORTABLE40 || PORTABLE40) using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/Src/Newtonsoft.Json.Tests/PerformanceTests.cs b/Src/Newtonsoft.Json.Tests/PerformanceTests.cs index 35d2a4e8..131a46bc 100644 --- a/Src/Newtonsoft.Json.Tests/PerformanceTests.cs +++ b/Src/Newtonsoft.Json.Tests/PerformanceTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET20 || NET35 || NETFX_CORE || PORTABLE || ASPNETCORE50) +#if !(NET20 || NET35 || NETFX_CORE || PORTABLE || DNXCORE50) using System.Xml; using System; using System.Collections; diff --git a/Src/Newtonsoft.Json.Tests/Schema/ExtensionsTests.cs b/Src/Newtonsoft.Json.Tests/Schema/ExtensionsTests.cs index 54f7995b..48a48953 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/ExtensionsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/ExtensionsTests.cs @@ -30,7 +30,7 @@ using System.Collections.Generic; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -41,7 +41,7 @@ using Newtonsoft.Json.Schema; using Newtonsoft.Json.Linq; using System.IO; using Newtonsoft.Json.Tests.TestObjects; -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) using System.Data; #endif @@ -204,7 +204,7 @@ namespace Newtonsoft.Json.Tests.Schema #if !NET20 GenerateSchemaAndSerializeFromType(new NullableDateTimeTestClass()); #endif -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) 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 !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) GenerateSchemaAndSerializeFromType(DBNull.Value); #endif GenerateSchemaAndSerializeFromType(new JsonPropertyWithHandlingValues()); diff --git a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaBuilderTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaBuilderTests.cs index 22c8422d..6350ab25 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaBuilderTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaBuilderTests.cs @@ -29,7 +29,7 @@ using System; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs index e28b54e5..f5322b53 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs @@ -36,7 +36,7 @@ using Newtonsoft.Json.Utilities; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -95,7 +95,7 @@ namespace Newtonsoft.Json.Tests.Schema Assert.IsTrue(o.IsValid(schema)); } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void Generate_DefaultValueAttributeTestClass() { @@ -314,7 +314,7 @@ namespace Newtonsoft.Json.Tests.Schema Assert.IsTrue(v.IsValid(schema)); } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void GenerateSchemaForISerializable() { @@ -329,7 +329,7 @@ namespace Newtonsoft.Json.Tests.Schema } #endif -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void GenerateSchemaForDBNull() { @@ -376,7 +376,7 @@ namespace Newtonsoft.Json.Tests.Schema generator.UndefinedSchemaIdHandling = UndefinedSchemaIdHandling.UseTypeName; generator.ContractResolver = new CustomDirectoryInfoMapper { -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50) +#if !(NETFX_CORE || PORTABLE || DNXCORE50) IgnoreSerializableAttribute = true #endif }; @@ -460,7 +460,7 @@ namespace Newtonsoft.Json.Tests.Schema serializer.Converters.Add(new IsoDateTimeConverter()); serializer.ContractResolver = new CustomDirectoryInfoMapper { -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50) +#if !(NETFX_CORE || PORTABLE || DNXCORE50) IgnoreSerializableInterface = true #endif }; @@ -480,7 +480,7 @@ namespace Newtonsoft.Json.Tests.Schema generator.UndefinedSchemaIdHandling = UndefinedSchemaIdHandling.UseTypeName; generator.ContractResolver = new CamelCasePropertyNamesContractResolver() { -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) IgnoreSerializableAttribute = true #endif }; @@ -525,7 +525,7 @@ namespace Newtonsoft.Json.Tests.Schema }", json); } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void GenerateSchemaSerializable() { diff --git a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaModelBuilderTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaModelBuilderTests.cs index ad98ae8b..20526a30 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaModelBuilderTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaModelBuilderTests.cs @@ -29,7 +29,7 @@ using Newtonsoft.Json.Schema; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaNodeTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaNodeTests.cs index 09b112c1..a18881bf 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaNodeTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaNodeTests.cs @@ -29,7 +29,7 @@ using Newtonsoft.Json.Schema; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaSpecTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaSpecTests.cs index bbd663b8..5138cf91 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaSpecTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaSpecTests.cs @@ -24,7 +24,7 @@ #endregion #pragma warning disable 618 -#if !(ASPNETCORE50 || NETFX_CORE) +#if !(DNXCORE50 || NETFX_CORE) using System; using System.Collections.Generic; using System.IO; diff --git a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaTests.cs index c91c0b95..6cd77392 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaTests.cs @@ -33,7 +33,7 @@ using Newtonsoft.Json.Schema; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/CamelCasePropertyNamesContractResolverTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/CamelCasePropertyNamesContractResolverTests.cs index 44438f86..6ce098f4 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/CamelCasePropertyNamesContractResolverTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/CamelCasePropertyNamesContractResolverTests.cs @@ -30,7 +30,7 @@ using Newtonsoft.Json.Serialization; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -105,7 +105,7 @@ namespace Newtonsoft.Json.Tests.Serialization string json = o.ToString(); } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) #pragma warning disable 618 [Test] public void MemberSearchFlags() diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ConstructorHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ConstructorHandlingTests.cs index 2f82b038..cef0ffdd 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ConstructorHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ConstructorHandlingTests.cs @@ -30,7 +30,7 @@ using Newtonsoft.Json.Tests.TestObjects; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs index b835e8d8..4a5e2a57 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs @@ -32,7 +32,7 @@ using System.Runtime.Serialization; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -565,7 +565,7 @@ namespace Newtonsoft.Json.Tests.Serialization }", startingWithB); } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) #pragma warning disable 618 [Test] public void SerializeCompilerGeneratedMembers() diff --git a/Src/Newtonsoft.Json.Tests/Serialization/DefaultValueHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/DefaultValueHandlingTests.cs index f8dab047..fc2cf0d8 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/DefaultValueHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/DefaultValueHandlingTests.cs @@ -36,7 +36,7 @@ using Newtonsoft.Json.Tests.TestObjects; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/DependencyInjectionTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/DependencyInjectionTests.cs index 44da8965..4c929c59 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 || ASPNETCORE50 || PORTABLE || PORTABLE40 || NETFX_CORE) +#if !(NET40 || NET35 || NET20 || DNXCORE50 || PORTABLE || PORTABLE40 || NETFX_CORE) using Autofac; using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Tests.TestObjects; @@ -37,7 +37,7 @@ using Microsoft.FSharp.Collections; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/DynamicConcreteTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/DynamicConcreteTests.cs index f9505689..264abcfa 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/DynamicConcreteTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/DynamicConcreteTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50) +#if !(NETFX_CORE || PORTABLE || DNXCORE50) using System.Reflection; using System.Reflection.Emit; using Newtonsoft.Json.Serialization; @@ -38,7 +38,7 @@ using System.Linq; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/DynamicTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/DynamicTests.cs index 7614027f..e3444085 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/DynamicTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/DynamicTests.cs @@ -41,7 +41,7 @@ using Newtonsoft.Json.Utilities; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/EntitiesSerializationTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/EntitiesSerializationTests.cs index a0ef1d1a..ad21c056 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 || NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NET35 || NET20 || NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) using Newtonsoft.Json.Serialization; using System; using System.Collections.Generic; @@ -35,7 +35,7 @@ using Newtonsoft.Json.Converters; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ExtensionDataTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ExtensionDataTests.cs index 20efb4c2..bf3fc402 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ExtensionDataTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ExtensionDataTests.cs @@ -32,7 +32,7 @@ using Newtonsoft.Json.Tests.TestObjects; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/FSharpTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/FSharpTests.cs index c703f993..e8e0ca4c 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/FSharpTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/FSharpTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET35 || NET20 || NETFX_CORE || ASPNETCORE50) +#if !(NET35 || NET20 || NETFX_CORE || DNXCORE50) using NUnit.Framework; 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 4883d505..5a6a0d3b 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ImmutableCollectionsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ImmutableCollectionsTests.cs @@ -34,7 +34,7 @@ using System.Threading.Tasks; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonPropertyCollectionTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonPropertyCollectionTests.cs index 3d483ad9..ff0923ca 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/JsonPropertyCollectionTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonPropertyCollectionTests.cs @@ -27,7 +27,7 @@ using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerCollectionsTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerCollectionsTests.cs index c5b2cc17..8aa483c3 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerCollectionsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerCollectionsTests.cs @@ -26,7 +26,7 @@ using System; using System.Collections; using System.Collections.Specialized; -#if !(NET35 || NET20 || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NET35 || NET20 || PORTABLE || DNXCORE50 || PORTABLE40) using System.Collections.Concurrent; #endif using System.Collections.Generic; @@ -45,7 +45,7 @@ using Newtonsoft.Json.Tests.TestObjects; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -607,7 +607,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual(3, v2["Third"]); } -#if !(NET35 || NET20 || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NET35 || NET20 || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void DeserializeConcurrentDictionary() { @@ -1321,7 +1321,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual(1, (int)((JObject)o.Data[2])["one"]); } -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) [Test] public void SerializeArrayAsArrayList() { diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs index 0498c3c6..a4b42f7a 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs @@ -29,10 +29,10 @@ using System.ComponentModel; using System.Collections.Concurrent; #endif using System.Collections.Generic; -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) using System.Numerics; #endif -#if !(NET20 || NETFX_CORE || ASPNETCORE50) +#if !(NET20 || NETFX_CORE || DNXCORE50) using System.ComponentModel.DataAnnotations; using System.Configuration; using System.Runtime.CompilerServices; @@ -46,7 +46,7 @@ using System.Text.RegularExpressions; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -85,7 +85,7 @@ using Newtonsoft.Json.Utilities.LinqBridge; #else using System.Linq; #endif -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) using System.Drawing; using System.Diagnostics; #endif @@ -146,7 +146,7 @@ namespace Newtonsoft.Json.Tests.Serialization } #endif -#if !(NETFX_CORE || ASPNETCORE50 || NET20) +#if !(NETFX_CORE || DNXCORE50 || NET20) [MetadataType(typeof(CustomerValidation))] public partial class CustomerWithMetadataType { @@ -315,7 +315,7 @@ namespace Newtonsoft.Json.Tests.Serialization public int ChildId; } -#if !(NET20 || NET35 || PORTABLE40 || PORTABLE || ASPNETCORE50) +#if !(NET20 || NET35 || PORTABLE40 || PORTABLE || DNXCORE50) [Test] public void ReadIntegerWithError() { @@ -571,7 +571,7 @@ namespace Newtonsoft.Json.Tests.Serialization serializer.ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor; Assert.AreEqual(ConstructorHandling.AllowNonPublicDefaultConstructor, serializer.ConstructorHandling); -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) serializer.Context = new StreamingContext(StreamingContextStates.Other); Assert.AreEqual(new StreamingContext(StreamingContextStates.Other), serializer.Context); #endif @@ -639,7 +639,7 @@ namespace Newtonsoft.Json.Tests.Serialization serializer.TraceWriter = traceWriter; Assert.AreEqual(traceWriter, serializer.TraceWriter); -#if !(PORTABLE || PORTABLE40 || NETFX_CORE || NET20 || ASPNETCORE50) +#if !(PORTABLE || PORTABLE40 || NETFX_CORE || NET20 || DNXCORE50) serializer.TypeNameAssemblyFormat = FormatterAssemblyStyle.Full; Assert.AreEqual(FormatterAssemblyStyle.Full, serializer.TypeNameAssemblyFormat); #endif @@ -663,7 +663,7 @@ namespace Newtonsoft.Json.Tests.Serialization settings.ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor; Assert.AreEqual(ConstructorHandling.AllowNonPublicDefaultConstructor, settings.ConstructorHandling); -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) settings.Context = new StreamingContext(StreamingContextStates.Other); Assert.AreEqual(new StreamingContext(StreamingContextStates.Other), settings.Context); #endif @@ -731,7 +731,7 @@ namespace Newtonsoft.Json.Tests.Serialization settings.TraceWriter = traceWriter; Assert.AreEqual(traceWriter, settings.TraceWriter); -#if !(PORTABLE || PORTABLE40 || NETFX_CORE || NET20 || ASPNETCORE50) +#if !(PORTABLE || PORTABLE40 || NETFX_CORE || NET20 || DNXCORE50) settings.TypeNameAssemblyFormat = FormatterAssemblyStyle.Full; Assert.AreEqual(FormatterAssemblyStyle.Full, settings.TypeNameAssemblyFormat); #endif @@ -755,7 +755,7 @@ namespace Newtonsoft.Json.Tests.Serialization serializerProxy.ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor; Assert.AreEqual(ConstructorHandling.AllowNonPublicDefaultConstructor, serializerProxy.ConstructorHandling); -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) serializerProxy.Context = new StreamingContext(StreamingContextStates.Other); Assert.AreEqual(new StreamingContext(StreamingContextStates.Other), serializerProxy.Context); #endif @@ -823,7 +823,7 @@ namespace Newtonsoft.Json.Tests.Serialization serializerProxy.TraceWriter = traceWriter; Assert.AreEqual(traceWriter, serializerProxy.TraceWriter); -#if !(PORTABLE || PORTABLE40 || NETFX_CORE || NET20 || ASPNETCORE50) +#if !(PORTABLE || PORTABLE40 || NETFX_CORE || NET20 || DNXCORE50) serializerProxy.TypeNameAssemblyFormat = FormatterAssemblyStyle.Full; Assert.AreEqual(FormatterAssemblyStyle.Full, serializerProxy.TypeNameAssemblyFormat); #endif @@ -832,7 +832,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual(TypeNameHandling.All, serializerProxy.TypeNameHandling); } -#if !(NETFX_CORE || PORTABLE || PORTABLE40 || ASPNETCORE50) +#if !(NETFX_CORE || PORTABLE || PORTABLE40 || DNXCORE50) [Test] public void DeserializeISerializableIConvertible() { @@ -1090,7 +1090,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual("value", deserialized.foo.bar); } -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) [Test] public void ConversionOperator() { @@ -1514,7 +1514,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual(executorObject2.clientGetResultFunction, "ClientBanSubsCB"); } -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) [Test] public void HashtableDeserialization() { @@ -1724,7 +1724,7 @@ keyword such as type of business."" { string json = @"[""vvv\/vvv\tvvv\""vvv\bvvv\nvvv\rvvv\\vvv\fvvv""]"; -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) JavaScriptSerializer javaScriptSerializer = new JavaScriptSerializer(); List javaScriptSerializerResult = javaScriptSerializer.Deserialize>(json); #endif @@ -1736,7 +1736,7 @@ keyword such as type of business."" Assert.AreEqual(1, jsonNetResult.Count); Assert.AreEqual(dataContractResult[0], jsonNetResult[0]); -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) Assert.AreEqual(javaScriptSerializerResult[0], jsonNetResult[0]); #endif } @@ -1955,7 +1955,7 @@ keyword such as type of business."" string json = JsonConvert.SerializeObject(new ConverableMembers(), Formatting.Indented); string expected = null; -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50) +#if !(NETFX_CORE || PORTABLE || DNXCORE50) expected = @"{ ""String"": ""string"", ""Int32"": 2147483647, @@ -1995,7 +1995,7 @@ keyword such as type of business."" ConverableMembers c = JsonConvert.DeserializeObject(json); Assert.AreEqual("string", c.String); Assert.AreEqual(double.MaxValue, c.Double); -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) Assert.AreEqual(DBNull.Value, c.DBNull); #endif } @@ -2840,7 +2840,7 @@ keyword such as type of business."" Assert.AreEqual("titleId", n.FidOrder[n.FidOrder.Count - 1]); } -#if !(NET20 || NETFX_CORE || ASPNETCORE50) +#if !(NET20 || NETFX_CORE || DNXCORE50) [MetadataType(typeof(OptInClassMetadata))] public class OptInClass { @@ -3222,7 +3222,7 @@ To fix this error either change the JSON to a JSON object (e.g. {""name"":""valu Path '', line 1, position 1."); } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50) +#if !(NETFX_CORE || PORTABLE || DNXCORE50) [Test] public void CannotDeserializeArrayIntoSerializable() { @@ -3340,7 +3340,7 @@ Path '', line 1, position 1."); { ContractResolver = new DefaultContractResolver { -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) IgnoreSerializableAttribute = true #endif } @@ -3357,7 +3357,7 @@ Path '', line 1, position 1."); { ContractResolver = new DefaultContractResolver { -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) IgnoreSerializableAttribute = true #endif } @@ -3374,7 +3374,7 @@ Path '', line 1, position 1."); { ContractResolver = new DefaultContractResolver { -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) IgnoreSerializableAttribute = true #endif } @@ -3391,7 +3391,7 @@ Path '', line 1, position 1."); { ContractResolver = new DefaultContractResolver { -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) IgnoreSerializableAttribute = true #endif } @@ -4160,7 +4160,7 @@ Path '', line 1, position 1."); Assert.AreEqual("value", newModelStateDictionary["key"]); } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) public class ISerializableTestObject : ISerializable { internal string _stringValue; @@ -4486,7 +4486,7 @@ Path '', line 1, position 1."); }", json); } -#if !(PORTABLE || ASPNETCORE50) +#if !(PORTABLE || DNXCORE50) [Test] public void DeserializeClassWithInheritedProtectedMember() { @@ -4687,7 +4687,7 @@ Path '', line 1, position 1."); } #endif -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void SerializeDeserializeXmlNodeProperties() { @@ -5009,7 +5009,7 @@ Path '', line 1, position 1."); Assert.AreEqual(0, z[1].Prop1.Length); } -#if !(NET20 || NETFX_CORE || ASPNETCORE50) +#if !(NET20 || NETFX_CORE || DNXCORE50) public class StringDictionaryTestClass { public StringDictionary StringDictionaryProperty { get; set; } @@ -5336,7 +5336,7 @@ Path '', line 1, position 1."); Assert.AreEqual(meh.IDontWork, "meh"); } -#if !(NET20 || NETFX_CORE || ASPNETCORE50) +#if !(NET20 || NETFX_CORE || DNXCORE50) [DataContract] public struct StructISerializable : ISerializable { @@ -6080,7 +6080,7 @@ Path '', line 1, position 1."); } } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void SerializeException1() { @@ -6307,7 +6307,7 @@ Path '', line 1, position 1."); Assert.AreEqual(-3, StaticTestClass.z); } -#if !(NET20 || NETFX_CORE || ASPNETCORE50) +#if !(NET20 || NETFX_CORE || DNXCORE50) [Test] public void DeserializeDecimalsWithCulture() { @@ -6404,7 +6404,7 @@ Path '', line 1, position 1."); ExceptionAssert.Throws(() => { List numbers = JsonConvert.DeserializeObject>(json); }, "Error converting value {null} to type 'System.Int32'. Path '[3]', line 5, position 7."); } -#if !(PORTABLE || ASPNETCORE50 || NETFX_CORE) +#if !(PORTABLE || DNXCORE50 || NETFX_CORE) public class ConvertableIntTestClass { public ConvertibleInt Integer { get; set; } @@ -6761,7 +6761,7 @@ Path '', line 1, position 1."); } #endif -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) [Test] public void MetroBlogPost() { @@ -7125,7 +7125,7 @@ Path '', line 1, position 1."); Assert.AreEqual("", s); } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void SerializeAndDeserializeWithAttributes() { @@ -7286,7 +7286,7 @@ Path '', line 1, position 1."); ExceptionAssert.Throws(() => { s.Deserialize>(new JsonTextReader(new StringReader(json))); }, "Additional text encountered after finished reading JSON content: {. Path '', line 1, position 7."); } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void DeserializeException() { @@ -7470,7 +7470,7 @@ Path '', line 1, position 1."); } #if !(NET20 || NET35 || NET40 || PORTABLE40) -#if !(PORTABLE || ASPNETCORE50) +#if !(PORTABLE || DNXCORE50) [Test] public void DeserializeReadOnlyListWithBigInteger() { @@ -7528,7 +7528,7 @@ Path '', line 1, position 1."); Action doStuff = () => { obj = JsonConvert.DeserializeObject>(json); }; -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) doStuff(); Assert.AreEqual(500, obj.Item1); #else @@ -7559,7 +7559,7 @@ Path '', line 1, position 1."); } #endif -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || NET35 || NET20 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || NET35 || NET20 || PORTABLE40) [Test] public void SerializeTupleWithSerializableAttribute() { @@ -7805,7 +7805,7 @@ Path '', line 1, position 1."); } #endif -#if !(PORTABLE || ASPNETCORE50 || NET35 || NET20 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || NET35 || NET20 || PORTABLE40) [Test] public void ReadTooLargeInteger() { @@ -7819,7 +7819,7 @@ Path '', line 1, position 1."); } #endif -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) [Serializable] #endif [DataContract] @@ -7848,7 +7848,7 @@ Path '', line 1, position 1."); Assert.AreEqual(@"{""First"":""One"",""Second"":2}", json); -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) DefaultContractResolver r = new DefaultContractResolver(); r.IgnoreSerializableAttribute = false; @@ -7964,7 +7964,7 @@ Path '', line 1, position 1."); Assert.AreEqual(1234567890.123456m, d); } -#if !(PORTABLE || ASPNETCORE50 || NETFX_CORE || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || NETFX_CORE || PORTABLE40) [Test] public void DontSerializeStaticFields() { @@ -7988,7 +7988,7 @@ Path '', line 1, position 1."); } #endif -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void SerializeBigInteger() { @@ -8073,7 +8073,7 @@ Path '', line 1, position 1."); ]", json); } -#if !(PORTABLE || PORTABLE40 || NETFX_CORE || ASPNETCORE50) +#if !(PORTABLE || PORTABLE40 || NETFX_CORE || DNXCORE50) [Test] public void SerializeDictionaryWithStructKey() { @@ -8126,7 +8126,7 @@ Path '', line 1, position 1."); Assert.AreEqual(jane, john.Spouse); } -#if !(NETFX_CORE || NET35 || NET20 || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || NET35 || NET20 || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void TypeConverterOnInterface() { @@ -8192,7 +8192,7 @@ Path '', line 1, position 1."); ParticipantEntity deserializedProduct = JsonConvert.DeserializeObject(json); } -#if !(PORTABLE || ASPNETCORE50 || NETFX_CORE) +#if !(PORTABLE || DNXCORE50 || NETFX_CORE) public class ConvertibleId : IConvertible { public int Value; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/MetadataPropertyHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/MetadataPropertyHandlingTests.cs index 8a493ddd..2c2c5a22 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/MetadataPropertyHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/MetadataPropertyHandlingTests.cs @@ -34,7 +34,7 @@ using Newtonsoft.Json.Utilities; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -342,7 +342,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.IsTrue(JToken.DeepEquals(t1, t2)); } -#if !(PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void DeserializeGenericObjectListWithTypeName() { diff --git a/Src/Newtonsoft.Json.Tests/Serialization/MissingMemberHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/MissingMemberHandlingTests.cs index 3e8b7f4d..9329f19b 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/MissingMemberHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/MissingMemberHandlingTests.cs @@ -31,7 +31,7 @@ using Newtonsoft.Json.Tests.TestObjects; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/NullValueHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/NullValueHandlingTests.cs index bbf629d2..9061faae 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/NullValueHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/NullValueHandlingTests.cs @@ -30,7 +30,7 @@ using Newtonsoft.Json.Tests.TestObjects; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/PopulateTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/PopulateTests.cs index bf539904..cef68449 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/PopulateTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/PopulateTests.cs @@ -31,7 +31,7 @@ using Newtonsoft.Json.Tests.TestObjects; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/PreserveReferencesHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/PreserveReferencesHandlingTests.cs index a614449c..f0fb9255 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/PreserveReferencesHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/PreserveReferencesHandlingTests.cs @@ -34,7 +34,7 @@ using Newtonsoft.Json.Tests.TestObjects; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ReferenceLoopHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ReferenceLoopHandlingTests.cs index 874b34bc..af2bbb62 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ReferenceLoopHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ReferenceLoopHandlingTests.cs @@ -29,7 +29,7 @@ using System.Collections.Generic; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -153,7 +153,7 @@ namespace Newtonsoft.Json.Tests.Serialization }", json); } -#if !(PORTABLE || ASPNETCORE50 || NETFX_CORE || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || NETFX_CORE || PORTABLE40) public class MainClass : ISerializable { public ChildClass Child { get; set; } diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ReflectionAttributeProviderTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ReflectionAttributeProviderTests.cs index 668fcc90..6f8c428e 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ReflectionAttributeProviderTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ReflectionAttributeProviderTests.cs @@ -36,7 +36,7 @@ using Newtonsoft.Json.Utilities; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/SerializationErrorHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/SerializationErrorHandlingTests.cs index 3ab7de2d..7e4bb842 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/SerializationErrorHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/SerializationErrorHandlingTests.cs @@ -39,7 +39,7 @@ using System.Linq; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/SerializationEventAttributeTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/SerializationEventAttributeTests.cs index f82d6630..1dbafda5 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/SerializationEventAttributeTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/SerializationEventAttributeTests.cs @@ -41,7 +41,7 @@ using Newtonsoft.Json.Tests.TestObjects; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -273,7 +273,7 @@ namespace Newtonsoft.Json.Tests.Serialization }", json); } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50) +#if !(NETFX_CORE || PORTABLE || DNXCORE50) public class SerializationEventContextTestObject { public string TestMember { get; set; } @@ -304,7 +304,7 @@ namespace Newtonsoft.Json.Tests.Serialization } #endif -#if !(PORTABLE || ASPNETCORE50) +#if !(PORTABLE || DNXCORE50) public void WhenSerializationErrorDetectedBySerializer_ThenCallbackIsCalled() { // Verify contract is properly finding our callback diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ShouldSerializeTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ShouldSerializeTests.cs index 1e6d0287..b24475bb 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ShouldSerializeTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ShouldSerializeTests.cs @@ -33,7 +33,7 @@ using Newtonsoft.Json.Serialization; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/TraceWriterTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/TraceWriterTests.cs index dcd33ed1..528d555e 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 || ASPNETCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) using System.Numerics; #endif using System.Runtime.Serialization; @@ -14,7 +14,7 @@ using System.Text; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -43,7 +43,7 @@ namespace Newtonsoft.Json.Tests.Serialization [TestFixture] public class TraceWriterTests : TestFixtureBase { -#if !(PORTABLE || ASPNETCORE50 || NETFX_CORE || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || NETFX_CORE || PORTABLE40) [Test] public void DiagnosticsTraceWriterTest() { @@ -604,7 +604,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 !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void DeserializeISerializable() { @@ -810,7 +810,7 @@ Newtonsoft.Json Error: 0 : Error! Assert.AreEqual(23, deserialized.FavoriteNumber); } -#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void TraceJsonWriterTest() { diff --git a/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs index 12cb2bbe..b0930963 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs @@ -47,7 +47,7 @@ using Newtonsoft.Json.Tests.TestObjects; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -332,7 +332,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual("Name!", ((EmployeeReference)employee).Name); } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50) +#if !(NETFX_CORE || PORTABLE || DNXCORE50) [Test] public void DeserializeTypeNameFromGacAssembly() { @@ -1104,7 +1104,7 @@ namespace Newtonsoft.Json.Tests.Serialization CollectionAssert.AreEquivalent(data, d); } -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) [Test] public void ISerializableTypeNameHandlingTest() { @@ -1167,7 +1167,7 @@ namespace Newtonsoft.Json.Tests.Serialization Binder = new MetroBinder(), ContractResolver = new DefaultContractResolver { -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50) +#if !(NETFX_CORE || PORTABLE || DNXCORE50) IgnoreSerializableAttribute = true #endif } @@ -1198,7 +1198,7 @@ namespace Newtonsoft.Json.Tests.Serialization public override void BindToName(Type serializedType, out string assemblyName, out string typeName) { assemblyName = "AssemblyName"; -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) typeName = ":::" + serializedType.Name.ToUpper(CultureInfo.InvariantCulture) + ":::"; #else typeName = ":::" + serializedType.Name.ToUpper() + ":::"; @@ -1643,7 +1643,7 @@ namespace Newtonsoft.Json.Tests.Serialization } #endif -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) [Test] public void SerializeDeserialize_DictionaryContextContainsGuid_DeserializesItemAsGuid() { @@ -1886,7 +1886,7 @@ namespace Newtonsoft.Json.Tests.Serialization public string SomeProperty { get; set; } } -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) public class ParentParent { [JsonProperty(ItemTypeNameHandling = TypeNameHandling.Auto)] @@ -1954,7 +1954,7 @@ namespace Newtonsoft.Json.Tests.Serialization public int Quantity { get; set; } } -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) public class SerializableWrapper { public object Content { get; set; } diff --git a/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs index a70a881c..937657ba 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs @@ -34,7 +34,7 @@ using System.Text; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -63,7 +63,7 @@ namespace Newtonsoft.Json.Tests.Serialization nonSerializedField = "Error" }; -#if !(NETFX_CORE || NET20 || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || NET20 || PORTABLE || DNXCORE50 || PORTABLE40) MemoryStream ms = new MemoryStream(); DataContractJsonSerializer dataContractJsonSerializer = new DataContractJsonSerializer(typeof(SerializableType)); dataContractJsonSerializer.WriteObject(ms, serializableType); @@ -79,7 +79,7 @@ namespace Newtonsoft.Json.Tests.Serialization { ContractResolver = new DefaultContractResolver { -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) IgnoreSerializableAttribute = false #endif } @@ -88,7 +88,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual(expected, json); } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void SerializeInheritedType() { @@ -118,7 +118,7 @@ namespace Newtonsoft.Json.Tests.Serialization } } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) [Serializable] #else [JsonObject(MemberSerialization.Fields)] @@ -142,7 +142,7 @@ namespace Newtonsoft.Json.Tests.Serialization set { privateField = value; } } -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) [NonSerialized] #else [JsonIgnore] diff --git a/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs b/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs index 8495185b..0e26ce07 100644 --- a/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs +++ b/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs @@ -41,7 +41,7 @@ using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using TestMethod = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; using SetUp = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestInitializeAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Assert = Newtonsoft.Json.Tests.XUnitAssert; using XAssert = Xunit.Assert; @@ -62,7 +62,7 @@ namespace Newtonsoft.Json.Tests { public static IEnumerable GetConstructors(Type type) { -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) return type.GetConstructors(); #else return type.GetTypeInfo().DeclaredConstructors; @@ -71,7 +71,7 @@ namespace Newtonsoft.Json.Tests public static PropertyInfo GetProperty(Type type, string name) { -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) return type.GetProperty(name); #else return type.GetTypeInfo().GetDeclaredProperty(name); @@ -80,7 +80,7 @@ namespace Newtonsoft.Json.Tests public static FieldInfo GetField(Type type, string name) { -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) return type.GetField(name); #else return type.GetTypeInfo().GetDeclaredField(name); @@ -89,7 +89,7 @@ namespace Newtonsoft.Json.Tests public static MethodInfo GetMethod(Type type, string name) { -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) return type.GetMethod(name); #else return type.GetTypeInfo().GetDeclaredMethod(name); @@ -97,7 +97,7 @@ namespace Newtonsoft.Json.Tests } } -#if ASPNETCORE50 +#if DNXCORE50 public class TestFixtureAttribute : Attribute { // xunit doesn't need a test fixture attribute @@ -254,7 +254,7 @@ namespace Newtonsoft.Json.Tests return bytes; } -#if ASPNETCORE50 +#if DNXCORE50 protected TestFixtureBase() #else [SetUp] @@ -312,7 +312,7 @@ namespace Newtonsoft.Json.Tests public static void Contains(IList collection, object value, string message) { -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) Assert.Contains(value, collection, message); #else if (!collection.Cast().Any(i => i.Equals(value))) diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/AnswerFilterModel.cs b/Src/Newtonsoft.Json.Tests/TestObjects/AnswerFilterModel.cs index 5dcffa8b..9fb1be18 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/AnswerFilterModel.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/AnswerFilterModel.cs @@ -33,7 +33,7 @@ using System.Linq; namespace Newtonsoft.Json.Tests.TestObjects { -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50) +#if !(NETFX_CORE || PORTABLE || DNXCORE50) [Serializable] public class AnswerFilterModel { diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/ConverableMembers.cs b/Src/Newtonsoft.Json.Tests/TestObjects/ConverableMembers.cs index 352ee8e1..c308d7a6 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/ConverableMembers.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/ConverableMembers.cs @@ -41,7 +41,7 @@ namespace Newtonsoft.Json.Tests.TestObjects public ulong ULong = long.MaxValue; public double Double = double.MaxValue; public float Float = float.MaxValue; -#if !(NETFX_CORE || PORTABLE || ASPNETCORE50) +#if !(NETFX_CORE || PORTABLE || DNXCORE50) public DBNull DBNull = DBNull.Value; #endif public bool Bool = true; diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/Currency.cs b/Src/Newtonsoft.Json.Tests/TestObjects/Currency.cs index 5a6585a6..c4f328f2 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/Currency.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/Currency.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET35 || NET20 || NETFX_CORE || ASPNETCORE50) +#if !(NET35 || NET20 || NETFX_CORE || DNXCORE50) using Microsoft.FSharp.Core; using System; using System.Collections; diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/CustomerDataSet.cs b/Src/Newtonsoft.Json.Tests/TestObjects/CustomerDataSet.cs index 1f3fdab3..77af124a 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 !(NETFX_CORE || PORTABLE40 || PORTABLE || ASPNETCORE50) +#if !(NETFX_CORE || PORTABLE40 || PORTABLE || DNXCORE50) using System; using System.Collections.Generic; using System.Text; diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/DefaultValueAttributeTestClass.cs b/Src/Newtonsoft.Json.Tests/TestObjects/DefaultValueAttributeTestClass.cs index 1312e493..8f731455 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/DefaultValueAttributeTestClass.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/DefaultValueAttributeTestClass.cs @@ -27,7 +27,7 @@ using System.ComponentModel; namespace Newtonsoft.Json.Tests.TestObjects { -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) [Description("DefaultValueAttributeTestClass description!")] #endif public sealed class DefaultValueAttributeTestClass diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/IMyInterface.cs b/Src/Newtonsoft.Json.Tests/TestObjects/IMyInterface.cs index b4787d93..4cf6b890 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/IMyInterface.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/IMyInterface.cs @@ -36,7 +36,7 @@ using System.Linq; namespace Newtonsoft.Json.Tests.TestObjects { -#if !(NETFX_CORE || NET35 || NET20 || PORTABLE || ASPNETCORE50 || PORTABLE40) +#if !(NETFX_CORE || NET35 || NET20 || PORTABLE || DNXCORE50 || PORTABLE40) [TypeConverter(typeof(MyInterfaceConverter))] internal interface IMyInterface { diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/MetroPropertyNameResolver.cs b/Src/Newtonsoft.Json.Tests/TestObjects/MetroPropertyNameResolver.cs index 0c339fe2..d44ed1bd 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/MetroPropertyNameResolver.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/MetroPropertyNameResolver.cs @@ -32,7 +32,7 @@ namespace Newtonsoft.Json.Tests.TestObjects { protected internal override string ResolvePropertyName(string propertyName) { -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) return ":::" + propertyName.ToUpper(CultureInfo.InvariantCulture) + ":::"; #else return ":::" + propertyName.ToUpper() + ":::"; diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/MetroStringConverter.cs b/Src/Newtonsoft.Json.Tests/TestObjects/MetroStringConverter.cs index 47e2d35a..0e18ff96 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/MetroStringConverter.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/MetroStringConverter.cs @@ -32,7 +32,7 @@ namespace Newtonsoft.Json.Tests.TestObjects { public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) { -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) writer.WriteValue(":::" + value.ToString().ToUpper(CultureInfo.InvariantCulture) + ":::"); #else writer.WriteValue(":::" + value.ToString().ToUpper() + ":::"); @@ -45,7 +45,7 @@ namespace Newtonsoft.Json.Tests.TestObjects if (s == null) return null; -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) return s.ToLower(CultureInfo.InvariantCulture).Trim(new[] { ':' }); #else return s.ToLower().Trim(new[] { ':' }); diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/Person.cs b/Src/Newtonsoft.Json.Tests/TestObjects/Person.cs index b75a3e19..abc6f331 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/Person.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/Person.cs @@ -31,7 +31,7 @@ using System.ComponentModel; namespace Newtonsoft.Json.Tests.TestObjects { [JsonObject(Id = "Person", Title = "Title!", Description = "JsonObjectAttribute description!", MemberSerialization = MemberSerialization.OptIn)] -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) [Description("DescriptionAttribute description!")] #endif public class Person diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/PersonSerializable.cs b/Src/Newtonsoft.Json.Tests/TestObjects/PersonSerializable.cs index 9ba38c7c..4c96e818 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 !(NETFX_CORE || PORTABLE || ASPNETCORE50) +#if !(NETFX_CORE || PORTABLE || DNXCORE50) [Serializable] public class PersonSerializable { diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/Ratio.cs b/Src/Newtonsoft.Json.Tests/TestObjects/Ratio.cs index 348b84f1..03c3efec 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/Ratio.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/Ratio.cs @@ -29,7 +29,7 @@ using System.Runtime.Serialization; namespace Newtonsoft.Json.Tests.TestObjects { -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) public struct Ratio : IConvertible, IFormattable, ISerializable { private readonly int _numerator; diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/Shape.cs b/Src/Newtonsoft.Json.Tests/TestObjects/Shape.cs index 82e9c11a..98b4eccf 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/Shape.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/Shape.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET35 || NET20 || NETFX_CORE || ASPNETCORE50) +#if !(NET35 || NET20 || NETFX_CORE || DNXCORE50) using System; using System.Collections; using System.Collections.Generic; diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/TypedSubHashtable.cs b/Src/Newtonsoft.Json.Tests/TestObjects/TypedSubHashtable.cs index 24bed902..e006c8b2 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/TypedSubHashtable.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/TypedSubHashtable.cs @@ -27,7 +27,7 @@ using System.Collections; namespace Newtonsoft.Json.Tests.TestObjects { -#if !(NETFX_CORE || ASPNETCORE50) +#if !(NETFX_CORE || DNXCORE50) public class TypedSubHashtable { public string Name; diff --git a/Src/Newtonsoft.Json.Tests/Utilities/DateTimeUtilsTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/DateTimeUtilsTests.cs index 218459e4..58aa9c5f 100644 --- a/Src/Newtonsoft.Json.Tests/Utilities/DateTimeUtilsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Utilities/DateTimeUtilsTests.cs @@ -32,7 +32,7 @@ using System.Text; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Utilities/DynamicReflectionDelegateFactoryTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/DynamicReflectionDelegateFactoryTests.cs index b2b90f0e..949ffb5e 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 || ASPNETCORE50 || NETFX_CORE || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || NETFX_CORE || PORTABLE40) using System; using System.Diagnostics; using System.Reflection; @@ -31,7 +31,7 @@ using System.Reflection; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Utilities/ExpressionReflectionDelegateFactoryTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/ExpressionReflectionDelegateFactoryTests.cs index f374831c..de998c2d 100644 --- a/Src/Newtonsoft.Json.Tests/Utilities/ExpressionReflectionDelegateFactoryTests.cs +++ b/Src/Newtonsoft.Json.Tests/Utilities/ExpressionReflectionDelegateFactoryTests.cs @@ -33,7 +33,7 @@ using System.Reflection; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Utilities/LateboundReflectionDelegateFactoryTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/LateboundReflectionDelegateFactoryTests.cs index e14d1ea1..84e47e32 100644 --- a/Src/Newtonsoft.Json.Tests/Utilities/LateboundReflectionDelegateFactoryTests.cs +++ b/Src/Newtonsoft.Json.Tests/Utilities/LateboundReflectionDelegateFactoryTests.cs @@ -4,7 +4,7 @@ using Newtonsoft.Json.Utilities; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Utilities/ReflectionUtilsTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/ReflectionUtilsTests.cs index de5bfcb9..21b7979d 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 || ASPNETCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) using System; using System.Collections.Generic; using System.Runtime.Serialization.Formatters; @@ -31,7 +31,7 @@ using System.Runtime.Serialization.Formatters; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Utilities/StringUtilsTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/StringUtilsTests.cs index 09720b35..bba8a132 100644 --- a/Src/Newtonsoft.Json.Tests/Utilities/StringUtilsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Utilities/StringUtilsTests.cs @@ -27,7 +27,7 @@ using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif ASPNETCORE50 +#elif DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/project.json b/Src/Newtonsoft.Json.Tests/project.json index 645e0f30..d2388900 100644 --- a/Src/Newtonsoft.Json.Tests/project.json +++ b/Src/Newtonsoft.Json.Tests/project.json @@ -16,7 +16,7 @@ "test": "Xunit.KRunner" }, "frameworks": { - "aspnetcore50": { + "dnxcore50": { "dependencies": { "Microsoft.CSharp": "4.0.0-beta-*", "System.Collections": "4.0.10-beta-*",