From a9ea63da59cc90b474bee5a6f351e9fad55a44bf Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sat, 22 Aug 2015 19:08:40 +1200 Subject: [PATCH] -Added additional frameworks to project.json files --- Build/build.ps1 | 8 +- Src/Newtonsoft.Json.Tests/DemoTests.cs | 2 - .../JsonNetVsWindowsDataJsonTests.cs | 1 - .../Samples/Bson/DeserializeFromBson.cs | 7 +- .../Bson/DeserializeFromBsonCollection.cs | 7 +- .../Samples/Bson/SerializeToBson.cs | 7 +- .../Samples/Json/CustomJsonReader.cs | 21 ++-- .../Samples/Json/CustomJsonWriter.cs | 21 ++-- .../Json/ReadJsonWithJsonTextReader.cs | 7 +- .../Json/ReadMultipleContentWithJsonReader.cs | 8 +- .../Json/WriteJsonWithJsonTextWriter.cs | 7 +- .../Documentation/Samples/Linq/Clone.cs | 7 +- .../Samples/Linq/CreateJsonAnonymousObject.cs | 10 ++ .../Linq/CreateJsonCollectionInitializer.cs | 7 +- .../Samples/Linq/CreateJsonDeclaratively.cs | 10 ++ .../Samples/Linq/CreateJsonDynamic.cs | 7 +- .../Samples/Linq/CreateJsonJTokenWriter.cs | 7 +- .../Samples/Linq/CreateJsonManually.cs | 7 +- .../Samples/Linq/CreateReader.cs | 7 +- .../Samples/Linq/CreateWriter.cs | 7 +- .../Documentation/Samples/Linq/DeepEquals.cs | 7 +- .../Samples/Linq/DeserializeWithLinq.cs | 16 ++- .../Documentation/Samples/Linq/FromObject.cs | 7 +- .../Samples/Linq/JObjectProperties.cs | 7 +- .../Samples/Linq/JTokenAnnotation.cs | 13 ++- .../Documentation/Samples/Linq/JValueCast.cs | 7 +- .../Documentation/Samples/Linq/JValueValue.cs | 7 +- .../Documentation/Samples/Linq/MergeJson.cs | 6 ++ .../Documentation/Samples/Linq/ModifyJson.cs | 7 +- .../Samples/Linq/ParseJsonAny.cs | 7 +- .../Samples/Linq/ParseJsonArray.cs | 7 +- .../Samples/Linq/ParseJsonObject.cs | 7 +- .../Documentation/Samples/Linq/QueryJson.cs | 12 ++- .../Samples/Linq/QueryJsonDynamic.cs | 11 ++- .../Samples/Linq/QueryJsonLinq.cs | 10 ++ .../Samples/Linq/QueryJsonSelectToken.cs | 10 ++ .../Linq/QueryJsonSelectTokenJsonPath.cs | 10 ++ .../Linq/QueryJsonSelectTokenWithLinq.cs | 16 ++- .../Samples/Linq/ReadJTokenFromBson.cs | 7 +- .../Documentation/Samples/Linq/ReadJson.cs | 7 +- .../Samples/Linq/SerializeWithLinq.cs | 18 +++- .../Samples/Linq/ToObjectComplex.cs | 7 +- .../Samples/Linq/ToObjectGeneric.cs | 7 +- .../Samples/Linq/ToObjectType.cs | 7 +- .../Documentation/Samples/Linq/ToString.cs | 7 +- .../Samples/Linq/ToStringJsonConverter.cs | 7 +- .../Samples/Linq/WriteJTokenToBson.cs | 7 +- .../Samples/Linq/WriteToJsonFile.cs | 7 +- .../Schema/CreateJsonSchemaManually.cs | 1 - .../Samples/Schema/JTokenIsValid.cs | 1 - .../Schema/JTokenIsValidWithMessages.cs | 1 - .../Samples/Schema/JTokenValidateWithEvent.cs | 1 - .../Samples/Schema/JsonSchemaParse.cs | 1 - .../JsonValidatingReaderAndSerializer.cs | 1 - .../Samples/Schema/LoadJsonSchemaFromFile.cs | 1 - .../Samples/Schema/RefJsonSchemaResolver.cs | 1 - .../Samples/Schema/SaveJsonSchemaToFile.cs | 1 - .../Serializer/CustomContractResolver.cs | 12 ++- .../Samples/Serializer/CustomJsonConverter.cs | 12 ++- .../Samples/Serializer/CustomTraceWriter.cs | 21 ++-- .../Serializer/DataContractAndDataMember.cs | 13 ++- .../Samples/Serializer/DefaultSettings.cs | 9 +- .../Serializer/DefaultValueAttributeIgnore.cs | 7 +- .../Serializer/DefaultValueHandlingIgnore.cs | 7 +- .../Serializer/DeserializeAnonymousType.cs | 7 +- .../Serializer/DeserializeCollection.cs | 14 ++- .../DeserializeConstructorHandling.cs | 7 +- .../DeserializeCustomCreationConverter.cs | 7 +- .../Samples/Serializer/DeserializeDataSet.cs | 13 ++- .../Serializer/DeserializeDateFormatString.cs | 13 ++- .../Serializer/DeserializeDictionary.cs | 7 +- .../Serializer/DeserializeExtensionData.cs | 7 +- .../DeserializeImmutableCollections.cs | 14 ++- .../DeserializeMetadataPropertyHandling.cs | 7 +- .../DeserializeMissingMemberHandling.cs | 7 +- .../Samples/Serializer/DeserializeObject.cs | 7 +- .../DeserializeObjectCreationHandling.cs | 7 +- .../DeserializeWithDependencyInjection.cs | 13 ++- .../DeserializeWithJsonSerializerFromFile.cs | 7 +- .../Serializer/ErrorHandlingAttribute.cs | 7 +- .../Samples/Serializer/ErrorHandlingEvent.cs | 7 +- .../Serializer/JsonConstructorAttribute.cs | 7 +- .../Serializer/JsonConverterAttributeClass.cs | 7 +- .../JsonConverterAttributeProperty.cs | 7 +- .../Serializer/JsonObjectAttributeOptIn.cs | 7 +- .../JsonObjectAttributeOverrideIEnumerable.cs | 7 +- .../JsonPropertyItemLevelSetting.cs | 7 +- .../Samples/Serializer/JsonPropertyName.cs | 7 +- .../Samples/Serializer/JsonPropertyOrder.cs | 7 +- .../JsonPropertyPropertyLevelSetting.cs | 7 +- .../Serializer/JsonPropertyRequired.cs | 7 +- .../Samples/Serializer/MaxDepth.cs | 7 +- .../Serializer/NullValueHandlingIgnore.cs | 7 +- .../Samples/Serializer/PopulateObject.cs | 16 ++- .../PreserveReferencesHandlingObject.cs | 7 +- .../Samples/Serializer/PropertyJsonIgnore.cs | 7 +- .../Serializer/ReferenceLoopHandlingIgnore.cs | 7 +- .../SerializationCallbackAttributes.cs | 7 +- .../Samples/Serializer/SerializeCollection.cs | 7 +- .../SerializeConditionalProperty.cs | 7 +- .../Serializer/SerializeContractResolver.cs | 7 +- .../Samples/Serializer/SerializeDataSet.cs | 13 ++- .../Serializer/SerializeDateFormatHandling.cs | 7 +- .../Serializer/SerializeDateFormatString.cs | 7 +- .../SerializeDateTimeZoneHandling.cs | 7 +- .../Samples/Serializer/SerializeDictionary.cs | 7 +- .../Serializer/SerializeExtensionData.cs | 7 +- .../SerializeImmutableCollections.cs | 13 ++- .../Samples/Serializer/SerializeObject.cs | 7 +- .../Samples/Serializer/SerializeRawJson.cs | 7 +- .../SerializeSerializationBinder.cs | 18 +++- .../Serializer/SerializeTypeNameHandling.cs | 7 +- .../Serializer/SerializeUnindentedJson.cs | 7 +- .../Serializer/SerializeWithJsonConverters.cs | 22 +++-- .../SerializeWithJsonSerializerToFile.cs | 7 +- .../Samples/Serializer/TraceWriter.cs | 10 ++ .../Samples/Xml/ConvertJsonToXml.cs | 13 ++- .../Samples/Xml/ConvertXmlToJson.cs | 17 +++- .../Samples/Xml/ConvertXmlToJsonForceArray.cs | 13 ++- .../FileSystemEntityModel.Designer.cs | 6 +- .../Linq/AnnotationsTests.cs | 7 +- .../Linq/DynamicTests.cs | 2 +- .../Linq/JPropertyTests.cs | 23 +++++ .../LinqToSql/Department.cs | 4 +- .../LinqToSql/DepartmentConverter.cs | 10 +- .../LinqToSql/GuidByteArrayConverter.cs | 6 +- .../LinqToSql/LinqToSqlClasses.designer.cs | 6 +- .../LinqToSqlClassesSerializationTests.cs | 2 +- Src/Newtonsoft.Json.Tests/LinqToSql/Person.cs | 7 +- Src/Newtonsoft.Json.Tests/LinqToSql/Role.cs | 6 +- .../Schema/JsonSchemaSpecTests.cs | 12 ++- .../Schema/PerformanceTests.cs | 2 - .../Serialization/JsonSerializerTest.cs | 26 ++--- .../Serialization/WebApiIntegrationTests.cs | 4 +- Src/Newtonsoft.Json.Tests/TestFixtureBase.cs | 4 +- .../TestObjects/SqlTypesDataSet.Designer.cs | 8 +- Src/Newtonsoft.Json.Tests/project.json | 98 ++++++++++++++++--- .../JsonSerializerInternalBase.cs | 1 - .../Utilities/ReflectionObject.cs | 1 - Src/Newtonsoft.Json/project.json | 79 +++++++++++++++ Src/NuGet.Config | 4 +- Src/global.json | 2 +- 142 files changed, 1090 insertions(+), 222 deletions(-) diff --git a/Build/build.ps1 b/Build/build.ps1 index 8e8c092d..f1a886bf 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -210,8 +210,8 @@ function DnxBuild($build) { $name = $build.Name - exec { dnvm install 1.0.0-beta6 | Out-Default } - exec { dnvm use 1.0.0-beta6 -r clr | Out-Default } + exec { dnvm install 1.0.0-beta8-15120 -u | Out-Default } + exec { dnvm use 1.0.0-beta8-15120 -r clr | Out-Default } Write-Host -ForegroundColor Green "Restoring packages for $name" Write-Host @@ -228,7 +228,7 @@ function DnxTests($build) #Write-Host #exec { & $toolsDir\Kvm\kvm.ps1 upgrade -r CoreCLR -NoNative | Out-Default } - exec { dnvm use 1.0.0-beta6 -r coreclr | Out-Default } + exec { dnvm use 1.0.0-beta8-15120 -r coreclr | Out-Default } Write-Host -ForegroundColor Green "Restoring packages for $name" Write-Host @@ -240,7 +240,7 @@ function DnxTests($build) try { Set-Location "$workingSourceDir\Newtonsoft.Json.Tests" - exec { dnx "$workingSourceDir\Newtonsoft.Json.Tests\project.json" --configuration Release test | Out-Default } + exec { dnx -p "$workingSourceDir\Newtonsoft.Json.Tests\project.json" --configuration Release test | Out-Default } } finally { diff --git a/Src/Newtonsoft.Json.Tests/DemoTests.cs b/Src/Newtonsoft.Json.Tests/DemoTests.cs index e74e8f84..9d797159 100644 --- a/Src/Newtonsoft.Json.Tests/DemoTests.cs +++ b/Src/Newtonsoft.Json.Tests/DemoTests.cs @@ -25,9 +25,7 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; -using System.Threading.Tasks; using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Schema; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/JsonNetVsWindowsDataJsonTests.cs b/Src/Newtonsoft.Json.Tests/Documentation/JsonNetVsWindowsDataJsonTests.cs index 2a262cac..91e63788 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/JsonNetVsWindowsDataJsonTests.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/JsonNetVsWindowsDataJsonTests.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Bson/DeserializeFromBson.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Bson/DeserializeFromBson.cs index b049f335..341a9ec4 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Bson/DeserializeFromBson.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Bson/DeserializeFromBson.cs @@ -26,10 +26,15 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; using Newtonsoft.Json.Bson; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Bson { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Bson/DeserializeFromBsonCollection.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Bson/DeserializeFromBsonCollection.cs index fa0ffa4e..e4d57fb2 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Bson/DeserializeFromBsonCollection.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Bson/DeserializeFromBsonCollection.cs @@ -26,10 +26,15 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; using Newtonsoft.Json.Bson; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Bson { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Bson/SerializeToBson.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Bson/SerializeToBson.cs index 71e1c50f..25929592 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Bson/SerializeToBson.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Bson/SerializeToBson.cs @@ -26,11 +26,16 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; using Newtonsoft.Json.Bson; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Bson { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/CustomJsonReader.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/CustomJsonReader.cs index 07cd6700..f46c8da2 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/CustomJsonReader.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/CustomJsonReader.cs @@ -27,15 +27,10 @@ using System; using System.Collections.Generic; using System.Globalization; using System.IO; -using System.Linq; using System.Text; using System.Xml; using Newtonsoft.Json.Linq; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif DNXCORE50 +#if DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -43,9 +38,11 @@ using Assert = Newtonsoft.Json.Tests.XUnitAssert; using NUnit.Framework; #endif +#if !(DNXCORE50 || NET20) + namespace Newtonsoft.Json.Tests.Documentation.Samples.Json { - #region Types +#region Types public class XmlJsonReader : JsonReader { private readonly Stack _stateStack; @@ -244,7 +241,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Json return (Value != null) ? (DateTimeOffset?)Convert.ToDateTime(Value) : null; } } - #endregion +#endregion [TestFixture] public class CustomJsonReader : TestFixtureBase @@ -252,7 +249,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Json [Test] public void Example() { - #region Usage +#region Usage string xml = @" This is a string! @@ -311,7 +308,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Json // "Constructor": new Date(2000, 12, 30) //} } - #endregion +#endregion using (XmlReader xmlReader = XmlReader.Create(new StringReader(xml), new XmlReaderSettings { IgnoreWhitespace = true })) using (XmlJsonReader reader = new XmlJsonReader(xmlReader)) @@ -483,4 +480,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Json } } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/CustomJsonWriter.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/CustomJsonWriter.cs index 57182f2d..34fe3acf 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/CustomJsonWriter.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/CustomJsonWriter.cs @@ -27,15 +27,22 @@ using System; using System.Collections.Generic; using System.Globalization; using System.IO; -using System.Linq; using System.Text; using System.Xml; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif + +#if !(DNXCORE50 || NET20) namespace Newtonsoft.Json.Tests.Documentation.Samples.Json { - #region Types +#region Types public class XmlJsonWriter : JsonWriter { private readonly XmlWriter _writer; @@ -299,7 +306,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Json } } } - #endregion +#endregion [TestFixture] public class CustomJsonWriter : TestFixtureBase @@ -307,7 +314,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Json [Test] public void Example() { - #region Usage +#region Usage var user = new { Name = "James", @@ -341,7 +348,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Json // Administrator // // - #endregion +#endregion sw = new StringWriter(); @@ -443,4 +450,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Json // } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/ReadJsonWithJsonTextReader.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/ReadJsonWithJsonTextReader.cs index 6ea69cd8..f3d3c94d 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/ReadJsonWithJsonTextReader.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/ReadJsonWithJsonTextReader.cs @@ -26,9 +26,14 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Json { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/ReadMultipleContentWithJsonReader.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/ReadMultipleContentWithJsonReader.cs index e7c62035..de65e897 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/ReadMultipleContentWithJsonReader.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/ReadMultipleContentWithJsonReader.cs @@ -26,14 +26,8 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; - -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif DNXCORE50 +#if DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/WriteJsonWithJsonTextWriter.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/WriteJsonWithJsonTextWriter.cs index 1f1314be..18b3cf07 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/WriteJsonWithJsonTextWriter.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/WriteJsonWithJsonTextWriter.cs @@ -26,9 +26,14 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Json { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/Clone.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/Clone.cs index f5ea170f..9659ed5b 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/Clone.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/Clone.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonAnonymousObject.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonAnonymousObject.cs index 4c6ec536..9eda1c3c 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonAnonymousObject.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonAnonymousObject.cs @@ -25,10 +25,20 @@ using System; using System.Collections.Generic; +#if NET20 +using Newtonsoft.Json.Utilities.LinqBridge; +#else using System.Linq; +#endif using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonCollectionInitializer.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonCollectionInitializer.cs index 9286c588..e953d6b4 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonCollectionInitializer.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonCollectionInitializer.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonDeclaratively.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonDeclaratively.cs index 6c77d826..1480d437 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonDeclaratively.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonDeclaratively.cs @@ -25,10 +25,20 @@ using System; using System.Collections.Generic; +#if NET20 +using Newtonsoft.Json.Utilities.LinqBridge; +#else using System.Linq; +#endif using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonDynamic.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonDynamic.cs index 87108485..a4c72175 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonDynamic.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonDynamic.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonJTokenWriter.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonJTokenWriter.cs index ba195094..128982ae 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonJTokenWriter.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonJTokenWriter.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonManually.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonManually.cs index 24f087ca..021c7746 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonManually.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonManually.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateReader.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateReader.cs index 86e47d9a..3bdf430e 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateReader.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateReader.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateWriter.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateWriter.cs index 33d1ea63..e8388b39 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateWriter.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateWriter.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/DeepEquals.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/DeepEquals.cs index 4b7db035..6daad3a4 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/DeepEquals.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/DeepEquals.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/DeserializeWithLinq.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/DeserializeWithLinq.cs index 2d17efe2..2b6c669f 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/DeserializeWithLinq.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/DeserializeWithLinq.cs @@ -23,13 +23,25 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion +#if !DNXCORE50 + using System; using System.Collections.Generic; +#if NET20 +using Newtonsoft.Json.Utilities.LinqBridge; +#else using System.Linq; +#endif using System.Text; using System.Web; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { @@ -84,4 +96,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq

Content!

", blogPosts[0].Body); } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/FromObject.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/FromObject.cs index 2111377f..149b1cf4 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/FromObject.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/FromObject.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/JObjectProperties.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/JObjectProperties.cs index 66e468f3..fcdb0535 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/JObjectProperties.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/JObjectProperties.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/JTokenAnnotation.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/JTokenAnnotation.cs index 813b3823..bb1eb932 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/JTokenAnnotation.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/JTokenAnnotation.cs @@ -24,12 +24,19 @@ #endregion using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if !NET20 + namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { [TestFixture] @@ -62,4 +69,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq Assert.AreEqual(true, changedProperties.Contains("employer")); } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/JValueCast.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/JValueCast.cs index 8cff2f0b..4b5c90a7 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/JValueCast.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/JValueCast.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/JValueValue.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/JValueValue.cs index 4e8c78d3..dabc8a6e 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/JValueValue.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/JValueValue.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/MergeJson.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/MergeJson.cs index 934a997b..15f19374 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/MergeJson.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/MergeJson.cs @@ -24,7 +24,13 @@ #endregion using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ModifyJson.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ModifyJson.cs index 796ba86b..76ad12b3 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ModifyJson.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ModifyJson.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ParseJsonAny.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ParseJsonAny.cs index c46d5121..b1d115e7 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ParseJsonAny.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ParseJsonAny.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ParseJsonArray.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ParseJsonArray.cs index 8083cfe1..d6f9fba9 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ParseJsonArray.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ParseJsonArray.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ParseJsonObject.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ParseJsonObject.cs index fd4dcabc..0579a80e 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ParseJsonObject.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ParseJsonObject.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJson.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJson.cs index 704f7ec1..b6afc56d 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJson.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJson.cs @@ -26,9 +26,19 @@ using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; +#if NET20 +using Newtonsoft.Json.Utilities.LinqBridge; +#else using System.Linq; +#endif using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { @@ -87,7 +97,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq // "CodePlex" // ] - IList categoriesText = categories.Select(c => (string)c).ToList(); + string[] categoriesText = categories.Select(c => (string)c).ToArray(); Console.WriteLine(string.Join(", ", categoriesText)); // Json.NET, CodePlex diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonDynamic.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonDynamic.cs index 66623515..81cfbce2 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonDynamic.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonDynamic.cs @@ -25,11 +25,20 @@ using System; using System.Collections.Generic; +#if NET20 +using Newtonsoft.Json.Utilities.LinqBridge; +#else using System.Linq; +#endif using System.Text; -using System.Web; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonLinq.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonLinq.cs index 71e77b1f..317d5970 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonLinq.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonLinq.cs @@ -26,9 +26,19 @@ using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; +#if NET20 +using Newtonsoft.Json.Utilities.LinqBridge; +#else using System.Linq; +#endif using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonSelectToken.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonSelectToken.cs index 2133d4aa..7bc7d123 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonSelectToken.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonSelectToken.cs @@ -26,9 +26,19 @@ using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; +#if NET20 +using Newtonsoft.Json.Utilities.LinqBridge; +#else using System.Linq; +#endif using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonSelectTokenJsonPath.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonSelectTokenJsonPath.cs index 700c75ba..ba548115 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonSelectTokenJsonPath.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonSelectTokenJsonPath.cs @@ -24,10 +24,20 @@ #endregion using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif using System; using System.Collections.Generic; +#if NET20 +using Newtonsoft.Json.Utilities.LinqBridge; +#else using System.Linq; +#endif using System.Text; namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonSelectTokenWithLinq.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonSelectTokenWithLinq.cs index e5de238d..53ad3e7b 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonSelectTokenWithLinq.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonSelectTokenWithLinq.cs @@ -26,9 +26,19 @@ using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; +#if NET20 +using Newtonsoft.Json.Utilities.LinqBridge; +#else using System.Linq; +#endif using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { @@ -70,13 +80,13 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq ] }"); - IList storeNames = o.SelectToken("Stores").Select(s => (string)s).ToList(); + string[] storeNames = o.SelectToken("Stores").Select(s => (string)s).ToArray(); Console.WriteLine(string.Join(", ", storeNames)); // Lambton Quay, Willis Street - IList firstProductNames = o["Manufacturers"].Select(m => (string)m.SelectToken("Products[1].Name")) - .Where(n => n != null).ToList(); + string[] firstProductNames = o["Manufacturers"].Select(m => (string)m.SelectToken("Products[1].Name")) + .Where(n => n != null).ToArray(); Console.WriteLine(string.Join(", ", firstProductNames)); // Headlight Fluid diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ReadJTokenFromBson.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ReadJTokenFromBson.cs index 1658fa77..441b9508 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ReadJTokenFromBson.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ReadJTokenFromBson.cs @@ -28,9 +28,14 @@ using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ReadJson.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ReadJson.cs index a71aa6c7..b14d120b 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ReadJson.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ReadJson.cs @@ -26,10 +26,15 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/SerializeWithLinq.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/SerializeWithLinq.cs index 190db29b..e9838f1e 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/SerializeWithLinq.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/SerializeWithLinq.cs @@ -23,13 +23,25 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion +#if !DNXCORE50 + using System; using System.Collections.Generic; -using System.Linq; using System.Text; using System.Web; using Newtonsoft.Json.Linq; +#if NET20 +using Newtonsoft.Json.Utilities.LinqBridge; +#else +using System.Linq; +#endif +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { @@ -107,4 +119,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq ]", blogPostsArray.ToString()); } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ToObjectComplex.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ToObjectComplex.cs index ae268b6e..67152497 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ToObjectComplex.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ToObjectComplex.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ToObjectGeneric.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ToObjectGeneric.cs index 84270ec3..68856e25 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ToObjectGeneric.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ToObjectGeneric.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ToObjectType.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ToObjectType.cs index c7295abd..611b1369 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ToObjectType.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ToObjectType.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ToString.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ToString.cs index 277b0704..d7edd749 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ToString.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ToString.cs @@ -25,11 +25,16 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ToStringJsonConverter.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ToStringJsonConverter.cs index c44de525..d7d3181d 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ToStringJsonConverter.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ToStringJsonConverter.cs @@ -25,11 +25,16 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/WriteJTokenToBson.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/WriteJTokenToBson.cs index f5de7d8d..4e6020c5 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/WriteJTokenToBson.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/WriteJTokenToBson.cs @@ -28,9 +28,14 @@ using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/WriteToJsonFile.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/WriteToJsonFile.cs index 7ef6a7eb..43ba1328 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/WriteToJsonFile.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/WriteToJsonFile.cs @@ -26,10 +26,15 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/CreateJsonSchemaManually.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/CreateJsonSchemaManually.cs index f68607d1..9a94bb5d 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/CreateJsonSchemaManually.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/CreateJsonSchemaManually.cs @@ -28,7 +28,6 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json.Schema; using System; using System.Collections.Generic; -using System.Linq; using System.Text; namespace Newtonsoft.Json.Tests.Documentation.Samples.Schema diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/JTokenIsValid.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/JTokenIsValid.cs index 2ca6e5ef..40989227 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/JTokenIsValid.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/JTokenIsValid.cs @@ -28,7 +28,6 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json.Schema; using System; using System.Collections.Generic; -using System.Linq; using System.Text; namespace Newtonsoft.Json.Tests.Documentation.Samples.Schema diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/JTokenIsValidWithMessages.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/JTokenIsValidWithMessages.cs index 03faa522..34869910 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/JTokenIsValidWithMessages.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/JTokenIsValidWithMessages.cs @@ -28,7 +28,6 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json.Schema; using System; using System.Collections.Generic; -using System.Linq; using System.Text; namespace Newtonsoft.Json.Tests.Documentation.Samples.Schema diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/JTokenValidateWithEvent.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/JTokenValidateWithEvent.cs index a92f0830..7010ad4f 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/JTokenValidateWithEvent.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/JTokenValidateWithEvent.cs @@ -28,7 +28,6 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json.Schema; using System; using System.Collections.Generic; -using System.Linq; using System.Text; namespace Newtonsoft.Json.Tests.Documentation.Samples.Schema diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/JsonSchemaParse.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/JsonSchemaParse.cs index 422a5dac..5ae67e02 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/JsonSchemaParse.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/JsonSchemaParse.cs @@ -28,7 +28,6 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json.Schema; using System; using System.Collections.Generic; -using System.Linq; using System.Text; namespace Newtonsoft.Json.Tests.Documentation.Samples.Schema diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/JsonValidatingReaderAndSerializer.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/JsonValidatingReaderAndSerializer.cs index 4114722e..bc64ed2c 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/JsonValidatingReaderAndSerializer.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/JsonValidatingReaderAndSerializer.cs @@ -28,7 +28,6 @@ using Newtonsoft.Json.Schema; using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; namespace Newtonsoft.Json.Tests.Documentation.Samples.Schema diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/LoadJsonSchemaFromFile.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/LoadJsonSchemaFromFile.cs index 6342f46d..2ddb4d2e 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/LoadJsonSchemaFromFile.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/LoadJsonSchemaFromFile.cs @@ -28,7 +28,6 @@ using Newtonsoft.Json.Schema; using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; namespace Newtonsoft.Json.Tests.Documentation.Samples.Schema diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/RefJsonSchemaResolver.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/RefJsonSchemaResolver.cs index b5b6b992..a82cd1ca 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/RefJsonSchemaResolver.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/RefJsonSchemaResolver.cs @@ -28,7 +28,6 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json.Schema; using System; using System.Collections.Generic; -using System.Linq; using System.Text; namespace Newtonsoft.Json.Tests.Documentation.Samples.Schema diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/SaveJsonSchemaToFile.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/SaveJsonSchemaToFile.cs index cec3208f..24accfd0 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/SaveJsonSchemaToFile.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Schema/SaveJsonSchemaToFile.cs @@ -28,7 +28,6 @@ using Newtonsoft.Json.Schema; using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; namespace Newtonsoft.Json.Tests.Documentation.Samples.Schema diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/CustomContractResolver.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/CustomContractResolver.cs index 56f3f848..49c3b8df 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/CustomContractResolver.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/CustomContractResolver.cs @@ -25,10 +25,20 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Serialization; +#if NET20 +using Newtonsoft.Json.Utilities.LinqBridge; +#else +using System.Linq; +#endif +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/CustomJsonConverter.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/CustomJsonConverter.cs index e9753b00..782decd5 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/CustomJsonConverter.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/CustomJsonConverter.cs @@ -26,9 +26,19 @@ using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif +#if NET20 +using Newtonsoft.Json.Utilities.LinqBridge; +#else +using System.Linq; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/CustomTraceWriter.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/CustomTraceWriter.cs index dd72f56a..11edc9d1 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/CustomTraceWriter.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/CustomTraceWriter.cs @@ -27,16 +27,23 @@ using Newtonsoft.Json.Serialization; using System; using System.Collections.Generic; using System.Diagnostics; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif + +#if !(DNXCORE50 || NET20 || NET35) namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { [TestFixture] public class CustomTraceWriter : TestFixtureBase { - #region Types +#region Types public class NLogTraceWriter : ITraceWriter { private static readonly Logger Logger = LogManager.GetLogger("NLogTraceWriter"); @@ -77,12 +84,12 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer } } } - #endregion +#endregion [Test] public void Example() { - #region Usage +#region Usage IList countries = new List { "New Zealand", @@ -103,7 +110,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer // "Denmark", // "China" // ] - #endregion +#endregion Assert.AreEqual(@"[ ""New Zealand"", @@ -113,4 +120,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer ]", json); } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DataContractAndDataMember.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DataContractAndDataMember.cs index ae800404..46af7d38 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DataContractAndDataMember.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DataContractAndDataMember.cs @@ -23,12 +23,19 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion +#if !NET20 + using System; using System.Collections.Generic; -using System.Linq; using System.Runtime.Serialization; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { @@ -77,4 +84,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer }", json); } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DefaultSettings.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DefaultSettings.cs index 87f9c114..a9d2bd9e 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DefaultSettings.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DefaultSettings.cs @@ -25,15 +25,18 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif using System.Runtime.Serialization; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; -using Autofac; using Newtonsoft.Json.Tests.Serialization; -using System.Collections.Immutable; using Staff = Newtonsoft.Json.Tests.TestObjects.Employee; namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DefaultValueAttributeIgnore.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DefaultValueAttributeIgnore.cs index 7053839b..cd33e45a 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DefaultValueAttributeIgnore.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DefaultValueAttributeIgnore.cs @@ -26,9 +26,14 @@ using System; using System.Collections.Generic; using System.ComponentModel; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DefaultValueHandlingIgnore.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DefaultValueHandlingIgnore.cs index 595769fe..d4613fbe 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DefaultValueHandlingIgnore.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DefaultValueHandlingIgnore.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeAnonymousType.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeAnonymousType.cs index 0c29dbd2..64bdf201 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeAnonymousType.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeAnonymousType.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeCollection.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeCollection.cs index 64433beb..4978ac72 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeCollection.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeCollection.cs @@ -25,9 +25,19 @@ using System; using System.Collections.Generic; +#if NET20 +using Newtonsoft.Json.Utilities.LinqBridge; +#else using System.Linq; +#endif using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { @@ -42,11 +52,11 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer List videogames = JsonConvert.DeserializeObject>(json); - Console.WriteLine(string.Join(", ", videogames)); + Console.WriteLine(string.Join(", ", videogames.ToArray())); // Starcraft, Halo, Legend of Zelda #endregion - Assert.AreEqual("Starcraft, Halo, Legend of Zelda", string.Join(", ", videogames)); + Assert.AreEqual("Starcraft, Halo, Legend of Zelda", string.Join(", ", videogames.ToArray())); } } } \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeConstructorHandling.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeConstructorHandling.cs index 5d2c04e1..0dabecc5 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeConstructorHandling.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeConstructorHandling.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Reflection; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeCustomCreationConverter.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeCustomCreationConverter.cs index 53e6d738..47907e6a 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeCustomCreationConverter.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeCustomCreationConverter.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Converters; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeDataSet.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeDataSet.cs index 15c2ef31..afd0b366 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeDataSet.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeDataSet.cs @@ -23,12 +23,19 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion +#if !DNXCORE50 + using System; using System.Collections.Generic; using System.Data; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { @@ -70,4 +77,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer Assert.AreEqual(2, dataTable.Rows.Count); } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeDateFormatString.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeDateFormatString.cs index b19b3ed2..5f49f782 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeDateFormatString.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeDateFormatString.cs @@ -23,11 +23,18 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion +#if !DNXCORE50 + using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { @@ -63,4 +70,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer Assert.AreEqual(new DateTime(2010, 2, 10, 0, 0, 0, DateTimeKind.Utc), dateList[2]); } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeDictionary.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeDictionary.cs index 37cd7bb0..bc11d465 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeDictionary.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeDictionary.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeExtensionData.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeExtensionData.cs index f0c8f6fa..c3720a81 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeExtensionData.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeExtensionData.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif using System.Runtime.Serialization; using Newtonsoft.Json.Linq; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeImmutableCollections.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeImmutableCollections.cs index 864912ca..d76e60b4 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeImmutableCollections.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeImmutableCollections.cs @@ -23,15 +23,21 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion +#if !(NET20 || NET35 || NET40) + using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif using System.Runtime.Serialization; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; -using Autofac; using Newtonsoft.Json.Tests.Serialization; using System.Collections.Immutable; @@ -67,4 +73,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer Assert.AreEqual("3", l[2]); } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeMetadataPropertyHandling.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeMetadataPropertyHandling.cs index 91fd0a94..0cac1b93 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeMetadataPropertyHandling.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeMetadataPropertyHandling.cs @@ -24,11 +24,16 @@ #endregion using Newtonsoft.Json.Serialization; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif using System; using System.Collections.Generic; using System.Diagnostics; -using System.Linq; using System.Text; using User = Newtonsoft.Json.Tests.Serialization.MetadataPropertyHandlingTests.User; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeMissingMemberHandling.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeMissingMemberHandling.cs index cf97af2f..6b3697a1 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeMissingMemberHandling.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeMissingMemberHandling.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeObject.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeObject.cs index 81f904fe..25a38506 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeObject.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeObject.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeObjectCreationHandling.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeObjectCreationHandling.cs index 4ff59447..bc4baac5 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeObjectCreationHandling.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeObjectCreationHandling.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeWithDependencyInjection.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeWithDependencyInjection.cs index 3bc0812c..747026f1 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeWithDependencyInjection.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeWithDependencyInjection.cs @@ -23,11 +23,18 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion +#if !(NET20 || NET35 || NET40 || DNXCORE50) + using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif using System.Runtime.Serialization; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; @@ -121,4 +128,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer Assert.AreEqual("Debug", controller.Logger.Level); } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeWithJsonSerializerFromFile.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeWithJsonSerializerFromFile.cs index ad56981f..7253506e 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeWithJsonSerializerFromFile.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeWithJsonSerializerFromFile.cs @@ -26,9 +26,14 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif using File = System.IO.File; namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/ErrorHandlingAttribute.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/ErrorHandlingAttribute.cs index 946b56cd..0bbe8e9a 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/ErrorHandlingAttribute.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/ErrorHandlingAttribute.cs @@ -26,10 +26,15 @@ using Newtonsoft.Json.Serialization; using System; using System.Collections.Generic; -using System.Linq; using System.Runtime.Serialization; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/ErrorHandlingEvent.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/ErrorHandlingEvent.cs index e1b6d445..ad5ba271 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/ErrorHandlingEvent.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/ErrorHandlingEvent.cs @@ -25,11 +25,16 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Converters; using Newtonsoft.Json.Serialization; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonConstructorAttribute.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonConstructorAttribute.cs index d8aa935f..00c5466f 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonConstructorAttribute.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonConstructorAttribute.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Converters; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif using JsonConstructor = Newtonsoft.Json.JsonConstructorAttribute; namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonConverterAttributeClass.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonConverterAttributeClass.cs index f21f0fbd..a6da12c0 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonConverterAttributeClass.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonConverterAttributeClass.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Converters; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonConverterAttributeProperty.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonConverterAttributeProperty.cs index fc1dc3dc..0cc05e17 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonConverterAttributeProperty.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonConverterAttributeProperty.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Converters; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonObjectAttributeOptIn.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonObjectAttributeOptIn.cs index ce12aaf1..1f4f5bd4 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonObjectAttributeOptIn.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonObjectAttributeOptIn.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonObjectAttributeOverrideIEnumerable.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonObjectAttributeOverrideIEnumerable.cs index eb9d0b62..25712b22 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonObjectAttributeOverrideIEnumerable.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonObjectAttributeOverrideIEnumerable.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using System.Collections; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyItemLevelSetting.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyItemLevelSetting.cs index 117d3450..b76fcbcc 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyItemLevelSetting.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyItemLevelSetting.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyName.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyName.cs index 6cc50410..7bc65942 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyName.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyName.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyOrder.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyOrder.cs index 6b8fb3e7..128c241a 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyOrder.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyOrder.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyPropertyLevelSetting.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyPropertyLevelSetting.cs index c6497ba7..6def5973 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyPropertyLevelSetting.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyPropertyLevelSetting.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyRequired.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyRequired.cs index f56ea673..f5e10dcb 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyRequired.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyRequired.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/MaxDepth.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/MaxDepth.cs index 1cc3b083..9f31e2e6 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/MaxDepth.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/MaxDepth.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/NullValueHandlingIgnore.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/NullValueHandlingIgnore.cs index 2078c18f..71d7acd5 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/NullValueHandlingIgnore.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/NullValueHandlingIgnore.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/PopulateObject.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/PopulateObject.cs index 88b50da8..d0d7387f 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/PopulateObject.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/PopulateObject.cs @@ -25,9 +25,19 @@ using System; using System.Collections.Generic; +#if NET20 +using Newtonsoft.Json.Utilities.LinqBridge; +#else using System.Linq; +#endif using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { @@ -40,7 +50,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer public string Email { get; set; } public bool Active { get; set; } public DateTime CreatedDate { get; set; } - public IList Roles { get; set; } + public List Roles { get; set; } } #endregion @@ -75,11 +85,11 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer Console.WriteLine(account.Active); // false - Console.WriteLine(string.Join(", ", account.Roles)); + Console.WriteLine(string.Join(", ", account.Roles.ToArray())); // User, Admin, Expired #endregion - Assert.AreEqual("User, Admin, Expired", string.Join(", ", account.Roles)); + Assert.AreEqual("User, Admin, Expired", string.Join(", ", account.Roles.ToArray())); } } } \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/PreserveReferencesHandlingObject.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/PreserveReferencesHandlingObject.cs index 02bf9aee..c4e44145 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/PreserveReferencesHandlingObject.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/PreserveReferencesHandlingObject.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/PropertyJsonIgnore.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/PropertyJsonIgnore.cs index 4e02f727..eccfd3ed 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/PropertyJsonIgnore.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/PropertyJsonIgnore.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/ReferenceLoopHandlingIgnore.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/ReferenceLoopHandlingIgnore.cs index 4782aed8..bb1ff8b7 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/ReferenceLoopHandlingIgnore.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/ReferenceLoopHandlingIgnore.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializationCallbackAttributes.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializationCallbackAttributes.cs index ce3d82f0..b698f077 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializationCallbackAttributes.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializationCallbackAttributes.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Runtime.Serialization; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeCollection.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeCollection.cs index e1430e14..762cfd57 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeCollection.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeCollection.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeConditionalProperty.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeConditionalProperty.cs index cbe1d924..493c8320 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeConditionalProperty.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeConditionalProperty.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeContractResolver.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeContractResolver.cs index 2084967a..e13ad69d 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeContractResolver.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeContractResolver.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Serialization; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDataSet.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDataSet.cs index 665ae6f4..b80bcb0d 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDataSet.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDataSet.cs @@ -23,12 +23,19 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion +#if !DNXCORE50 + using System; using System.Collections.Generic; using System.Data; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { @@ -90,4 +97,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer }", json); } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDateFormatHandling.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDateFormatHandling.cs index e6336b42..f57b0113 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDateFormatHandling.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDateFormatHandling.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDateFormatString.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDateFormatString.cs index f252e263..0b6e1fcd 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDateFormatString.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDateFormatString.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDateTimeZoneHandling.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDateTimeZoneHandling.cs index 99b50cd6..844c1d31 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDateTimeZoneHandling.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDateTimeZoneHandling.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDictionary.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDictionary.cs index 1c8d49ce..78239fc3 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDictionary.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDictionary.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeExtensionData.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeExtensionData.cs index c67a2c94..f1f2b0bf 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeExtensionData.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeExtensionData.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif using System.Runtime.Serialization; using Newtonsoft.Json.Linq; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeImmutableCollections.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeImmutableCollections.cs index 6b9f4c4d..5bf51c38 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeImmutableCollections.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeImmutableCollections.cs @@ -23,15 +23,22 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion +#if !(NET20 || NET35 || NET40) + using System; using System.Collections.Generic; using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif using System.Runtime.Serialization; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; -using Autofac; using Newtonsoft.Json.Tests.Serialization; using System.Collections.Immutable; @@ -66,4 +73,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer ]", json); } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeObject.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeObject.cs index 2b893bef..c7c84e6e 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeObject.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeObject.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeRawJson.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeRawJson.cs index 64a72b24..179b830f 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeRawJson.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeRawJson.cs @@ -25,10 +25,15 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Newtonsoft.Json.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeSerializationBinder.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeSerializationBinder.cs index 1ca273b1..2baae0b8 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeSerializationBinder.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeSerializationBinder.cs @@ -23,12 +23,24 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion +#if !(NET20 || NET35) + using System; using System.Collections.Generic; -using System.Linq; using System.Runtime.Serialization; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif +#if NET20 +using Newtonsoft.Json.Utilities.LinqBridge; +#else +using System.Linq; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { @@ -100,4 +112,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer Assert.AreEqual("Car", newValue.GetType().Name); } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeTypeNameHandling.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeTypeNameHandling.cs index 1866f688..6ce4fce2 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeTypeNameHandling.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeTypeNameHandling.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeUnindentedJson.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeUnindentedJson.cs index 819cca90..ae740583 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeUnindentedJson.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeUnindentedJson.cs @@ -25,9 +25,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeWithJsonConverters.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeWithJsonConverters.cs index fcd1ea9f..1289f28a 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeWithJsonConverters.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeWithJsonConverters.cs @@ -25,10 +25,20 @@ using System; using System.Collections.Generic; +#if NET20 +using Newtonsoft.Json.Utilities.LinqBridge; +#else using System.Linq; +#endif using System.Text; using Newtonsoft.Json.Converters; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { @@ -42,28 +52,28 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer List stringComparisons = new List { StringComparison.CurrentCulture, - StringComparison.InvariantCulture + StringComparison.Ordinal }; string jsonWithoutConverter = JsonConvert.SerializeObject(stringComparisons); Console.WriteLine(jsonWithoutConverter); - // [0,2] + // [0,4] string jsonWithConverter = JsonConvert.SerializeObject(stringComparisons, new StringEnumConverter()); Console.WriteLine(jsonWithConverter); - // ["CurrentCulture","InvariantCulture"] + // ["CurrentCulture","Ordinal"] List newStringComparsions = JsonConvert.DeserializeObject>( jsonWithConverter, new StringEnumConverter()); - Console.WriteLine(string.Join(", ", newStringComparsions.Select(c => c.ToString()))); - // CurrentCulture, InvariantCulture + Console.WriteLine(string.Join(", ", newStringComparsions.Select(c => c.ToString()).ToArray())); + // CurrentCulture, Ordinal #endregion - Assert.AreEqual("CurrentCulture, InvariantCulture", string.Join(", ", newStringComparsions.Select(c => c.ToString()))); + Assert.AreEqual("CurrentCulture, Ordinal", string.Join(", ", newStringComparsions.Select(c => c.ToString()).ToArray())); } } } \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeWithJsonSerializerToFile.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeWithJsonSerializerToFile.cs index 2758f104..38015a74 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeWithJsonSerializerToFile.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeWithJsonSerializerToFile.cs @@ -26,9 +26,14 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif using File = System.IO.File; namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/TraceWriter.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/TraceWriter.cs index 26837f7c..20703e76 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/TraceWriter.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/TraceWriter.cs @@ -25,10 +25,20 @@ using System; using System.Collections.Generic; +#if NET20 +using Newtonsoft.Json.Utilities.LinqBridge; +#else using System.Linq; +#endif using System.Text; using Newtonsoft.Json.Serialization; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer { diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Xml/ConvertJsonToXml.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Xml/ConvertJsonToXml.cs index a6302875..6eeff5c9 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Xml/ConvertJsonToXml.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Xml/ConvertJsonToXml.cs @@ -23,12 +23,19 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion +#if !NET20 + using System; using System.Collections.Generic; -using System.Linq; using System.Text; using System.Xml.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif namespace Newtonsoft.Json.Tests.Documentation.Samples.Xml { @@ -84,4 +91,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Xml ", node.ToString()); } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Xml/ConvertXmlToJson.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Xml/ConvertXmlToJson.cs index 75b3b9d1..404424fc 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Xml/ConvertXmlToJson.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Xml/ConvertXmlToJson.cs @@ -25,10 +25,17 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using System.Xml; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif + +#if !(DNXCORE50 || NET20) namespace Newtonsoft.Json.Tests.Documentation.Samples.Xml { @@ -38,7 +45,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Xml [Test] public void Example() { - #region Usage +#region Usage string xml = @" @@ -77,9 +84,11 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Xml // ] // } // } - #endregion +#endregion Assert.AreEqual(@"{""?xml"":{""@version"":""1.0"",""@standalone"":""no""},""root"":{""person"":[{""@id"":""1"",""name"":""Alan"",""url"":""http://www.google.com""},{""@id"":""2"",""name"":""Louis"",""url"":""http://www.yahoo.com""}]}}", json); } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Xml/ConvertXmlToJsonForceArray.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Xml/ConvertXmlToJsonForceArray.cs index 960fabb5..41fd8a67 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Xml/ConvertXmlToJsonForceArray.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Xml/ConvertXmlToJsonForceArray.cs @@ -25,10 +25,17 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using System.Xml; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else using NUnit.Framework; +#endif + +#if !(NET20 || DNXCORE50) namespace Newtonsoft.Json.Tests.Documentation.Samples.Xml { @@ -87,4 +94,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Xml Assert.AreEqual(@"{""person"":{""@id"":""1"",""name"":""Alan"",""url"":""http://www.google.com"",""role"":[""Admin""]}}", json); } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/FileSystemEntityModel.Designer.cs b/Src/Newtonsoft.Json.Tests/FileSystemEntityModel.Designer.cs index c5b4667d..2a431e37 100644 --- a/Src/Newtonsoft.Json.Tests/FileSystemEntityModel.Designer.cs +++ b/Src/Newtonsoft.Json.Tests/FileSystemEntityModel.Designer.cs @@ -1,4 +1,6 @@ -//------------------------------------------------------------------------------ +#if !(DNXCORE50 || NET35 || NET20) + +//------------------------------------------------------------------------------ // // This code was generated from a template. // @@ -531,3 +533,5 @@ namespace Newtonsoft.Json.Tests } + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Linq/AnnotationsTests.cs b/Src/Newtonsoft.Json.Tests/Linq/AnnotationsTests.cs index e61c5ac6..35d36199 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/AnnotationsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/AnnotationsTests.cs @@ -1,8 +1,11 @@ using System; using System.Collections.Generic; +#if NET20 +using Newtonsoft.Json.Utilities.LinqBridge; +#else using System.Linq; +#endif using System.Text; -using System.Threading.Tasks; using Newtonsoft.Json.Linq; #if NETFX_CORE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; @@ -257,6 +260,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual(new Uri("http://www.google.com/"), i); } +#if !NET20 [Test] public void Example() { @@ -280,5 +284,6 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual(2, changedProperties.Count); } +#endif } } \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Linq/DynamicTests.cs b/Src/Newtonsoft.Json.Tests/Linq/DynamicTests.cs index d19caacc..1252ed26 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/DynamicTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/DynamicTests.cs @@ -82,6 +82,7 @@ namespace Newtonsoft.Json.Tests.Linq } } +#if !NETFX_CORE private void UpdateValueCount(IDictionary counts, dynamic d) { string s = d.ToString(); @@ -96,7 +97,6 @@ namespace Newtonsoft.Json.Tests.Linq counts[s] = c; } -#if !NETFX_CORE [Test] public void DeserializeLargeDynamic() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JPropertyTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JPropertyTests.cs index 9eea3c6a..954a1eec 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JPropertyTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JPropertyTests.cs @@ -221,5 +221,28 @@ namespace Newtonsoft.Json.Tests.Linq ExceptionAssert.Throws(() => { t.Add(1); }, "Newtonsoft.Json.Linq.JProperty cannot have multiple values."); } + + [Test] + public void NullParent() + { + var json = @"{ + ""prop1"": { + ""foo"": ""bar"" + }, + }"; + + var obj = JsonConvert.DeserializeObject(json); + + var property = obj.Property("prop1"); + var value = property.Value; + + // remove value so it has no parent + property.Value = null; + + property.Remove(); + obj.Add(new JProperty("prop2", value)); + + Assert.AreEqual(((JProperty)value.Parent).Name, "prop2"); + } } } \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/LinqToSql/Department.cs b/Src/Newtonsoft.Json.Tests/LinqToSql/Department.cs index 1dc6c5af..2ef99598 100644 --- a/Src/Newtonsoft.Json.Tests/LinqToSql/Department.cs +++ b/Src/Newtonsoft.Json.Tests/LinqToSql/Department.cs @@ -23,6 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion +#if !(DNXCORE50 || NET20) using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -40,4 +41,5 @@ namespace Newtonsoft.Json.Tests.LinqToSql { } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/LinqToSql/DepartmentConverter.cs b/Src/Newtonsoft.Json.Tests/LinqToSql/DepartmentConverter.cs index afaa3d79..d1704037 100644 --- a/Src/Newtonsoft.Json.Tests/LinqToSql/DepartmentConverter.cs +++ b/Src/Newtonsoft.Json.Tests/LinqToSql/DepartmentConverter.cs @@ -23,9 +23,15 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion +#if !(NET20 || DNXCORE50) + using System; using System.Collections.Generic; +#if NET20 +using Newtonsoft.Json.Utilities.LinqBridge; +#else using System.Linq; +#endif using System.Text; using Newtonsoft.Json.Linq; @@ -60,4 +66,6 @@ namespace Newtonsoft.Json.Tests.LinqToSql return (objectType == typeof(Department)); } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/LinqToSql/GuidByteArrayConverter.cs b/Src/Newtonsoft.Json.Tests/LinqToSql/GuidByteArrayConverter.cs index b6e324dc..b9bad20d 100644 --- a/Src/Newtonsoft.Json.Tests/LinqToSql/GuidByteArrayConverter.cs +++ b/Src/Newtonsoft.Json.Tests/LinqToSql/GuidByteArrayConverter.cs @@ -23,6 +23,8 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion +#if !(NET20 || DNXCORE50) + using System; using System.Collections.Generic; using System.Linq; @@ -50,4 +52,6 @@ namespace Newtonsoft.Json.Tests.LinqToSql return (objectType == typeof(Guid)); } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/LinqToSql/LinqToSqlClasses.designer.cs b/Src/Newtonsoft.Json.Tests/LinqToSql/LinqToSqlClasses.designer.cs index c4c29e3e..23e2324e 100644 --- a/Src/Newtonsoft.Json.Tests/LinqToSql/LinqToSqlClasses.designer.cs +++ b/Src/Newtonsoft.Json.Tests/LinqToSql/LinqToSqlClasses.designer.cs @@ -1,4 +1,6 @@ -#pragma warning disable 1591 +#if !(DNXCORE50 || NET20) + +#pragma warning disable 1591 //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -724,3 +726,5 @@ namespace Newtonsoft.Json.Tests.LinqToSql } } #pragma warning restore 1591 + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/LinqToSql/LinqToSqlClassesSerializationTests.cs b/Src/Newtonsoft.Json.Tests/LinqToSql/LinqToSqlClassesSerializationTests.cs index 8e8ae170..26dcfb3b 100644 --- a/Src/Newtonsoft.Json.Tests/LinqToSql/LinqToSqlClassesSerializationTests.cs +++ b/Src/Newtonsoft.Json.Tests/LinqToSql/LinqToSqlClassesSerializationTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(DNXCORE50 || NETFX_CORE || PORTABLE40 || PORTABLE40) +#if !(DNXCORE50 || NETFX_CORE || PORTABLE40 || PORTABLE40 || NET20) using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/Src/Newtonsoft.Json.Tests/LinqToSql/Person.cs b/Src/Newtonsoft.Json.Tests/LinqToSql/Person.cs index b797a13d..10b0c594 100644 --- a/Src/Newtonsoft.Json.Tests/LinqToSql/Person.cs +++ b/Src/Newtonsoft.Json.Tests/LinqToSql/Person.cs @@ -23,10 +23,11 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion +#if !(NET20 || DNXCORE50) + using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Linq; using System.Text; namespace Newtonsoft.Json.Tests.LinqToSql @@ -40,4 +41,6 @@ namespace Newtonsoft.Json.Tests.LinqToSql public string FirstName { get; set; } } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/LinqToSql/Role.cs b/Src/Newtonsoft.Json.Tests/LinqToSql/Role.cs index 039722bf..ddf6c7dc 100644 --- a/Src/Newtonsoft.Json.Tests/LinqToSql/Role.cs +++ b/Src/Newtonsoft.Json.Tests/LinqToSql/Role.cs @@ -23,6 +23,8 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion +#if !(NET20 || DNXCORE50) + using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -44,4 +46,6 @@ namespace Newtonsoft.Json.Tests.LinqToSql public EntitySet PersonRoles { get; set; } } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaSpecTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaSpecTests.cs index 5138cf91..b7b83db6 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaSpecTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaSpecTests.cs @@ -28,7 +28,11 @@ using System; using System.Collections.Generic; using System.IO; +#if NET20 +using Newtonsoft.Json.Utilities.LinqBridge; +#else using System.Linq; +#endif using System.Reflection; using System.Text; using NUnit.Framework; @@ -61,9 +65,9 @@ namespace Newtonsoft.Json.Tests.Schema { JsonSchema s = JsonSchema.Read(jsonSchemaSpecTest.Schema.CreateReader()); - IList errorMessages; - bool v = jsonSchemaSpecTest.Data.IsValid(s, out errorMessages); - errorMessages = errorMessages ?? new List(); + IList e; + bool v = jsonSchemaSpecTest.Data.IsValid(s, out e); + string[] errorMessages = ((e != null) ? e.ToArray() : null) ?? new string[0]; Assert.AreEqual(jsonSchemaSpecTest.IsValid, v, jsonSchemaSpecTest.TestCaseDescription + " - " + jsonSchemaSpecTest.TestDescription + " - errors: " + string.Join(", ", errorMessages)); } @@ -74,7 +78,7 @@ namespace Newtonsoft.Json.Tests.Schema // get test files location relative to the test project dll string baseDirectory = AppDomain.CurrentDomain.BaseDirectory; - string baseTestPath = Path.Combine(baseDirectory, "Schema", "Specs"); + string baseTestPath = Path.Combine(baseDirectory, Path.Combine("Schema", "Specs")); string[] testFiles = Directory.GetFiles(baseTestPath, "*.json", SearchOption.AllDirectories); diff --git a/Src/Newtonsoft.Json.Tests/Schema/PerformanceTests.cs b/Src/Newtonsoft.Json.Tests/Schema/PerformanceTests.cs index 246b2b22..fee730c5 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/PerformanceTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/PerformanceTests.cs @@ -28,9 +28,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; -using System.Linq; using System.Text; -using System.Threading.Tasks; using Newtonsoft.Json.Schema; #if NETFX_CORE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs index 0f19c2e8..a75ea035 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs @@ -63,7 +63,7 @@ using System.Diagnostics; using Newtonsoft.Json.Bson; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Converters; -#if !NET20 +#if !(NET20 || NET35) using System.Runtime.Serialization.Json; #endif using Newtonsoft.Json.Serialization; @@ -1409,7 +1409,7 @@ namespace Newtonsoft.Json.Tests.Serialization } } -#if !NET20 +#if !(NET20 || NET35) [DataContract] public class BaseDataContractWithHidden { @@ -1750,7 +1750,7 @@ namespace Newtonsoft.Json.Tests.Serialization string jsonText = JsonConvert.SerializeObject(testDictionary); -#if !NET20 +#if !(NET20 || NET35) MemoryStream ms = new MemoryStream(); DataContractJsonSerializer serializer = new DataContractJsonSerializer(typeof(Dictionary)); serializer.WriteObject(ms, testDictionary); @@ -1974,7 +1974,15 @@ keyword such as type of business."" ExceptionAssert.Throws(() => { JsonConvert.SerializeObject(new BadJsonPropertyClass()); }, @"A member with the name 'pie' already exists on 'Newtonsoft.Json.Tests.TestObjects.BadJsonPropertyClass'. Use the JsonPropertyAttribute to specify another name."); } -#if !NET20 + [Test] + public void InvalidBackslash() + { + string json = @"[""vvv\jvvv""]"; + + ExceptionAssert.Throws(() => { JsonConvert.DeserializeObject>(json); }, @"Bad JSON escape sequence: \j. Path '', line 1, position 7."); + } + +#if !(NET20 || NET35) [Test] public void Unicode() { @@ -2011,14 +2019,6 @@ keyword such as type of business."" #endif } - [Test] - public void InvalidBackslash() - { - string json = @"[""vvv\jvvv""]"; - - ExceptionAssert.Throws(() => { JsonConvert.DeserializeObject>(json); }, @"Bad JSON escape sequence: \j. Path '', line 1, position 7."); - } - [Test] public void DateTimeTest() { @@ -4259,7 +4259,7 @@ Path '', line 1, position 1."); public string Ethnicity { get; set; } } -#if !NET20 +#if !(NET20 || NET35) public class DataContractJsonSerializerTestClass { public TimeSpan TimeSpanProperty { get; set; } diff --git a/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs index 937657ba..4f49a77c 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs @@ -41,7 +41,7 @@ using Assert = Newtonsoft.Json.Tests.XUnitAssert; #else using NUnit.Framework; #endif -#if !(NETFX_CORE || NET20) +#if !(NETFX_CORE || NET20 || NET35) using System.Runtime.Serialization.Json; #endif using Newtonsoft.Json.Serialization; @@ -63,7 +63,7 @@ namespace Newtonsoft.Json.Tests.Serialization nonSerializedField = "Error" }; -#if !(NETFX_CORE || NET20 || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(NETFX_CORE || NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) MemoryStream ms = new MemoryStream(); DataContractJsonSerializer dataContractJsonSerializer = new DataContractJsonSerializer(typeof(SerializableType)); dataContractJsonSerializer.WriteObject(ms, serializableType); diff --git a/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs b/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs index 32f2bf2e..52e694e4 100644 --- a/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs +++ b/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs @@ -29,7 +29,7 @@ using System.Globalization; using System.IO; using System.Reflection; using System.Text.RegularExpressions; -#if NET20 +#if (NET20 || NET35) using Newtonsoft.Json.Serialization; #else using System.Runtime.Serialization.Json; @@ -196,7 +196,7 @@ namespace Newtonsoft.Json.Tests [TestFixture] public abstract class TestFixtureBase { -#if !NET20 +#if !(NET20 || NET35) protected string GetDataContractJsonSerializeResult(object o) { MemoryStream ms = new MemoryStream(); diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/SqlTypesDataSet.Designer.cs b/Src/Newtonsoft.Json.Tests/TestObjects/SqlTypesDataSet.Designer.cs index 7202908e..c320f421 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/SqlTypesDataSet.Designer.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/SqlTypesDataSet.Designer.cs @@ -1,4 +1,6 @@ -//------------------------------------------------------------------------------ +#if !(DNXCORE50 || NET20) + +//------------------------------------------------------------------------------ // // This code was generated by a tool. // Runtime Version:4.0.30319.34209 @@ -598,4 +600,6 @@ namespace Newtonsoft.Json.Tests.TestObjects { } } -#pragma warning restore 1591 \ No newline at end of file +#pragma warning restore 1591 + +#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/project.json b/Src/Newtonsoft.Json.Tests/project.json index 474976fc..1f460807 100644 --- a/Src/Newtonsoft.Json.Tests/project.json +++ b/Src/Newtonsoft.Json.Tests/project.json @@ -1,24 +1,96 @@ { "version": "1.0.0-*", "exclude": [ - "LinqToSql", - "Documentation", - "**/*.Designer.cs" ], "dependencies": { - "Newtonsoft.Json": "", - "System.Collections.Immutable": "1.1.37" + "Newtonsoft.Json": "" }, "commands": { "test": "xunit.runner.dnx -parallel none" }, "frameworks": { + "net45": { + "frameworkAssemblies": { + "System.Collections": "", + "System.ComponentModel.DataAnnotations": "", + "System.Data": "", + "System.Data.DataSetExtensions": "", + "System.Data.Entity": "", + "System.Data.Linq": "", + "System.Drawing": "", + "System.Numerics": "", + "System.Runtime": "", + "System.Runtime.Serialization": "", + "System.Web": "", + "System.Web.Extensions": "", + "System.Xml": "", + "System.Xml.Linq": "" + }, + "dependencies": { + "Autofac": "3.5.0", + "FSharp.Core": "4.0.0.1", + "NUnit": "2.6.4", + "System.Collections.Immutable": "1.1.37" + } + }, + "net40": { + "frameworkAssemblies": { + "System.Collections": "", + "System.ComponentModel.DataAnnotations": "", + "System.Data": "", + "System.Data.DataSetExtensions": "", + "System.Data.Entity": "", + "System.Data.Linq": "", + "System.Drawing": "", + "System.Numerics": "", + "System.Runtime": "", + "System.Runtime.Serialization": "", + "System.Web": "", + "System.Web.Extensions": "", + "System.Xml": "", + "System.Xml.Linq": "" + }, + "dependencies": { + "Autofac": "3.5.0", + "FSharp.Core": "4.0.0.1", + "NUnit": "2.6.4" + } + }, + "net35": { + "frameworkAssemblies": { + "System.ComponentModel.DataAnnotations": "", + "System.Core": "", + "System.Data": "", + "System.Data.DataSetExtensions": "", + "System.Data.Entity": "", + "System.Data.Linq": "", + "System.Drawing": "", + "System.Runtime.Serialization": "", + "System.Web": "", + "System.Web.Extensions": "", + "System.Xml": "", + "System.Xml.Linq": "" + }, + "dependencies": { + "NUnit": "2.6.4" + } + }, + "net20": { + "frameworkAssemblies": { + "System.Data": "", + "System.Drawing": "", + "System.Web": "", + "System.Xml": "" + }, + "dependencies": { + "NUnit": "2.6.4" + } + }, "dnxcore50": { "dependencies": { - "xunit": "2.1.0-*", - "xunit.runner.dnx": "2.1.0-*", "Microsoft.CSharp": "4.0.0", "System.Collections": "4.0.10", + "System.Collections.Immutable": "1.1.37", "System.ComponentModel.TypeConverter": "4.0.0", "System.Diagnostics.Debug": "4.0.10", "System.Dynamic.Runtime": "4.0.10", @@ -26,24 +98,26 @@ "System.IO": "4.0.10", "System.Linq": "4.0.0", "System.Linq.Expressions": "4.0.10", + "System.Reflection.Emit.ILGeneration": "4.0.0", "System.Reflection.Extensions": "4.0.0", "System.Reflection.TypeExtensions": "4.0.0", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", - "System.Runtime.Serialization.Primitives": "4.0.10", "System.Runtime.Numerics": "4.0.0", "System.Runtime.Serialization.Json": "4.0.0", + "System.Runtime.Serialization.Primitives": "4.0.10", "System.Runtime.Serialization.Xml": "4.0.10", - "System.Reflection.Emit.ILGeneration": "4.0.0", "System.Text.Encoding": "4.0.10", - "System.Text.RegularExpressions": "4.0.10", - "System.Text.Encoding.Extensions": "4.0.10", "System.Text.Encoding.CodePages": "4.0.0", + "System.Text.Encoding.Extensions": "4.0.10", + "System.Text.RegularExpressions": "4.0.10", "System.Threading": "4.0.10", + "System.Xml.ReaderWriter": "4.0.10", "System.Xml.XDocument": "4.0.10", "System.Xml.XmlDocument": "4.0.0", "System.Xml.XmlSerializer": "4.0.10", - "System.Xml.ReaderWriter": "4.0.10" + "xunit": "2.1.0-*", + "xunit.runner.dnx": "2.1.0-*" } } } diff --git a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalBase.cs b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalBase.cs index 8c1e18b4..11be9c75 100644 --- a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalBase.cs +++ b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalBase.cs @@ -26,7 +26,6 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using System.Net; using System.Runtime.CompilerServices; using Newtonsoft.Json.Utilities; diff --git a/Src/Newtonsoft.Json/Utilities/ReflectionObject.cs b/Src/Newtonsoft.Json/Utilities/ReflectionObject.cs index 7da01e0c..0a175538 100644 --- a/Src/Newtonsoft.Json/Utilities/ReflectionObject.cs +++ b/Src/Newtonsoft.Json/Utilities/ReflectionObject.cs @@ -28,7 +28,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Reflection; -using System.Resources; using System.Globalization; #if NET20 using Newtonsoft.Json.Utilities.LinqBridge; diff --git a/Src/Newtonsoft.Json/project.json b/Src/Newtonsoft.Json/project.json index 1b97b00f..fd5eec61 100644 --- a/Src/Newtonsoft.Json/project.json +++ b/Src/Newtonsoft.Json/project.json @@ -10,6 +10,85 @@ "language": "en-US", "frameworks": { + "net45": { + "frameworkAssemblies": { + "System.Data": "", + "System.Numerics": "", + "System.Runtime.Serialization": "", + "System.Xml": "", + "System.Xml.Linq": "" + } + }, + "net40": { + "frameworkAssemblies": { + "System.Data": "", + "System.Numerics": "", + "System.Runtime.Serialization": "", + "System.Xml": "", + "System.Xml.Linq": "" + } + }, + "net35": { + "frameworkAssemblies": { + "System.Core": "", + "System.Data": "", + "System.Runtime.Serialization": "", + "System.Xml": "", + "System.Xml.Linq": "" + } + }, + "net20": { + "frameworkAssemblies": { + "System.Data": "", + "System.Xml": "" + } + }, + "net45+win+wp80+wpa81": { + "compilationOptions": { + "define": [ "PORTABLE" ] + }, + "frameworkAssemblies": { + "Microsoft.CSharp": "", + "System": "", + "System.Collections": "", + "System.Core": "", + "System.Diagnostics.Debug": "", + "System.Diagnostics.Tools": "", + "System.Dynamic.Runtime": "", + "System.Globalization": "", + "System.IO": "", + "System.Linq": "", + "System.Linq.Expressions": "", + "System.ObjectModel": "", + "System.Reflection": "", + "System.Reflection.Extensions": "", + "System.Runtime": "", + "System.Runtime.Extensions": "", + "System.Runtime.Serialization": "", + "System.Runtime.Serialization.Primitives": "", + "System.Text.Encoding": "", + "System.Text.Encoding.Extensions": "", + "System.Text.RegularExpressions": "", + "System.Threading": "", + "System.Threading.Tasks": "", + "System.Xml": "", + "System.Xml.Linq": "", + "System.Xml.ReaderWriter": "", + "System.Xml.XDocument": "" + } + }, + ".NETPortable,Version=v4.0,Profile=Profile328": { + "compilationOptions": { + "define": [ "PORTABLE40" ] + }, + "frameworkAssemblies": { + "mscorlib": "", + "System": "", + "System.Core": "", + "System.Runtime.Serialization": "", + "System.Xml": "" + } + }, "dotnet": { "dependencies": { "Microsoft.CSharp": "4.0.0", diff --git a/Src/NuGet.Config b/Src/NuGet.Config index 5ea93d1c..0257b60e 100644 --- a/Src/NuGet.Config +++ b/Src/NuGet.Config @@ -3,6 +3,8 @@ + + - + \ No newline at end of file diff --git a/Src/global.json b/Src/global.json index 1039ef51..17aa4a29 100644 --- a/Src/global.json +++ b/Src/global.json @@ -1,6 +1,6 @@ { "projects": [ "src" ], "sdk": { - "version": "1.0.0-beta6" + "version": "1.0.0-beta8-15120" } }