diff --git a/Src/Newtonsoft.Json.Tests/Bson/BsonReaderTests.cs b/Src/Newtonsoft.Json.Tests/Bson/BsonReaderTests.cs index f687d18c..882fb03b 100644 --- a/Src/Newtonsoft.Json.Tests/Bson/BsonReaderTests.cs +++ b/Src/Newtonsoft.Json.Tests/Bson/BsonReaderTests.cs @@ -35,11 +35,7 @@ using System.Numerics; #endif using System.Text; using System.Text.RegularExpressions; -#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; @@ -59,7 +55,6 @@ namespace Newtonsoft.Json.Tests.Bson { private const char Euro = '\u20ac'; -#if !NETFX_CORE [Test] public void DeserializeLargeBsonObject() { @@ -72,7 +67,6 @@ namespace Newtonsoft.Json.Tests.Bson Assert.AreEqual("1", (string)o["$id"]); } -#endif public class MyTest { @@ -1488,8 +1482,7 @@ namespace Newtonsoft.Json.Tests.Bson CollectionAssert.AreEquivalent(new byte[] { 72, 63, 62, 71, 92, 55 }, newObject.Data); } } - -#if !(NETFX_CORE) + public void Utf8Text() { string badText = System.IO.File.ReadAllText(@"PoisonText.txt"); @@ -1506,7 +1499,6 @@ namespace Newtonsoft.Json.Tests.Bson Assert.AreEqual(badText, (string)o["test"]); } -#endif #if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1 public class BigIntegerTestClass diff --git a/Src/Newtonsoft.Json.Tests/Bson/BsonWriterTests.cs b/Src/Newtonsoft.Json.Tests/Bson/BsonWriterTests.cs index e0ca4cf6..3b73ab44 100644 --- a/Src/Newtonsoft.Json.Tests/Bson/BsonWriterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Bson/BsonWriterTests.cs @@ -30,11 +30,7 @@ using System.Numerics; #endif using System.Text; using System.Text.RegularExpressions; -#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/Converters/BinaryConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/BinaryConverterTests.cs index 29cd42dd..391a5900 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/BinaryConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/BinaryConverterTests.cs @@ -33,11 +33,7 @@ using System.Data.SqlTypes; #endif using System.Text; using Newtonsoft.Json.Converters; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif DNXCORE50 +#if DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Converters/CustomCreationConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/CustomCreationConverterTests.cs index 3589c930..0b0d8836 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/CustomCreationConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/CustomCreationConverterTests.cs @@ -26,11 +26,7 @@ using System; using System.Collections.Generic; using Newtonsoft.Json.Converters; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif DNXCORE50 +#if DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs index cda7decb..41b8528e 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs @@ -23,14 +23,10 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) using System; using Newtonsoft.Json.Converters; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif DNXCORE50 +#if DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs index 44da723d..4d81000d 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs @@ -28,23 +28,17 @@ using System.Text; using Newtonsoft.Json.Bson; using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) using System; using System.Collections.Generic; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif DNXCORE50 +#if DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; #else using NUnit.Framework; #endif -#if !NETFX_CORE using System.Data; -#endif using Newtonsoft.Json.Tests.TestObjects; namespace Newtonsoft.Json.Tests.Converters diff --git a/Src/Newtonsoft.Json.Tests/Converters/ExpandoObjectConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/ExpandoObjectConverterTests.cs index b2588f5d..dec67f4a 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/ExpandoObjectConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/ExpandoObjectConverterTests.cs @@ -30,11 +30,7 @@ using System.Dynamic; using System.Linq; using System.Text; using Newtonsoft.Json.Converters; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif DNXCORE50 +#if DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Converters/IsoDateTimeConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/IsoDateTimeConverterTests.cs index c9b81b5d..01835668 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/IsoDateTimeConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/IsoDateTimeConverterTests.cs @@ -25,11 +25,7 @@ using System; using Newtonsoft.Json.Tests.TestObjects; -#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; @@ -126,7 +122,7 @@ namespace Newtonsoft.Json.Tests.Converters Assert.AreEqual(2006, d.Year); } -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) [Test] public void SerializeFormattedDateTimeNewZealandCulture() { diff --git a/Src/Newtonsoft.Json.Tests/Converters/JavaScriptDateTimeConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/JavaScriptDateTimeConverterTests.cs index 4bf0501a..23b38b90 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/JavaScriptDateTimeConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/JavaScriptDateTimeConverterTests.cs @@ -25,11 +25,7 @@ using System; using System.Collections.Generic; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif DNXCORE50 +#if DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Converters/JsonValueConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/JsonValueConverterTests.cs deleted file mode 100644 index b6b28b17..00000000 --- a/Src/Newtonsoft.Json.Tests/Converters/JsonValueConverterTests.cs +++ /dev/null @@ -1,460 +0,0 @@ -#region License -// Copyright (c) 2007 James Newton-King -// -// Permission is hereby granted, free of charge, to any person -// obtaining a copy of this software and associated documentation -// files (the "Software"), to deal in the Software without -// restriction, including without limitation the rights to use, -// copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following -// conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -// OTHER DEALINGS IN THE SOFTWARE. -#endregion - - -#if NETFX_CORE -using System; -using Newtonsoft.Json.Converters; -#if !NETFX_CORE -using NUnit.Framework; -#else -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#endif -using Windows.Data.Json; -using System.IO; -using System.Diagnostics; -using Newtonsoft.Json.Linq; -using System.Collections.Generic; -using System.Linq; - -namespace Newtonsoft.Json.Tests.Converters -{ - [TestFixture] - public class JsonValueConverterTests : TestFixtureBase - { - public class Computer - { - public string Cpu { get; set; } - public List Drives { get; set; } - } - - [Test] - public void WriteJson() - { - JsonObject o = JsonObject.Parse(@"{ - ""CPU"": ""Intel"", - ""Drives"": [ - ""DVD read/writer"", - ""500 gigabyte hard drive"" - ] -}"); - - StringWriter sw = new StringWriter(); - JsonTextWriter writer = new JsonTextWriter(sw); - - JsonValueConverter converter = new JsonValueConverter(); - converter.WriteJson(writer, o, null); - - string json = sw.ToString(); - - Assert.AreEqual(@"{""Drives"":[""DVD read/writer"",""500 gigabyte hard drive""],""CPU"":""Intel""}", json); - } - - [Test] - public void ReadJson() - { - string json = @"{ - ""CPU"": ""Intel"", - ""Drives"": [ - ""DVD read/writer"", - ""500 gigabyte hard drive"" - ] -}"; - - JsonTextReader writer = new JsonTextReader(new StringReader(json)); - - JsonValueConverter converter = new JsonValueConverter(); - JsonObject o = (JsonObject) converter.ReadJson(writer, typeof (JsonObject), null, null); - - Assert.AreEqual(2, o.Count); - Assert.AreEqual("Intel", o.GetNamedString("CPU")); - Assert.AreEqual("DVD read/writer", o.GetNamedArray("Drives")[0].GetString()); - Assert.AreEqual("500 gigabyte hard drive", o.GetNamedArray("Drives")[1].GetString()); - } - - [Test] - public void ReadJsonComments() - { - string json = @"{/*comment!*/ - ""CPU"": ""Intel"",/*comment!*/ - ""Drives"": [/*comment!*/ - ""DVD read/writer"", - /*comment!*/""500 gigabyte hard drive"" - ]/*comment!*/ -}"; - - JsonTextReader writer = new JsonTextReader(new StringReader(json)); - - JsonValueConverter converter = new JsonValueConverter(); - JsonObject o = (JsonObject) converter.ReadJson(writer, typeof (JsonObject), null, null); - - Assert.AreEqual(2, o.Count); - Assert.AreEqual("Intel", o.GetNamedString("CPU")); - Assert.AreEqual("DVD read/writer", o.GetNamedArray("Drives")[0].GetString()); - Assert.AreEqual("500 gigabyte hard drive", o.GetNamedArray("Drives")[1].GetString()); - } - - [Test] - public void ReadJsonNullValue() - { - string json = "null"; - - JsonTextReader writer = new JsonTextReader(new StringReader(json)); - - JsonValueConverter converter = new JsonValueConverter(); - JsonValue v = (JsonValue) converter.ReadJson(writer, typeof (JsonValue), null, null); - - Assert.AreEqual(JsonValueType.Null, v.ValueType); - } - - [Test] - public void ReadJsonUnsupportedValue() - { - string json = "undefined"; - - JsonTextReader writer = new JsonTextReader(new StringReader(json)); - - JsonValueConverter converter = new JsonValueConverter(); - - ExceptionAssert.Throws(() => - { - converter.ReadJson(writer, typeof (JsonValue), null, null); - }, "Unexpected or unsupported token: Undefined. Path '', line 1, position 9."); - } - - [Test] - public void ReadJsonUnexpectedEndInArray() - { - string json = "["; - - JsonTextReader writer = new JsonTextReader(new StringReader(json)); - - JsonValueConverter converter = new JsonValueConverter(); - - ExceptionAssert.Throws(() => - { - converter.ReadJson(writer, typeof (JsonValue), null, null); - }, "Unexpected end when reading JSON. Path '', line 1, position 1."); - } - - [Test] - public void ReadJsonUnexpectedEndAfterComment() - { - string json = "[/*comment!*/"; - - JsonTextReader writer = new JsonTextReader(new StringReader(json)); - - JsonValueConverter converter = new JsonValueConverter(); - - ExceptionAssert.Throws(() => - { - converter.ReadJson(writer, typeof (JsonValue), null, null); - }, "Unexpected end when reading JSON. Path '', line 1, position 13."); - } - - [Test] - public void ReadJsonUnexpectedEndInObject() - { - string json = "{'hi':"; - - JsonTextReader writer = new JsonTextReader(new StringReader(json)); - - JsonValueConverter converter = new JsonValueConverter(); - - ExceptionAssert.Throws(() => - { - converter.ReadJson(writer, typeof (JsonValue), null, null); - }, "Unexpected end when reading JSON. Path 'hi', line 1, position 6."); - } - - [Test] - public void ReadJsonBadJsonType() - { - string json = "null"; - - JsonTextReader writer = new JsonTextReader(new StringReader(json)); - - JsonValueConverter converter = new JsonValueConverter(); - - ExceptionAssert.Throws(() => - { - converter.ReadJson(writer, typeof (JsonObject), null, null); - }, - "Could not convert 'Windows.Data.Json.JsonValue' to 'Windows.Data.Json.JsonObject'. Path '', line 1, position 4."); - } - - [Test] - public void JsonConvertDeserialize() - { - string json = @"[ - ""DVD read/writer"", - ""500 gigabyte hard drive"" -]"; - - JsonArray a = JsonConvert.DeserializeObject(json); - - Assert.AreEqual(2, a.Count); - Assert.AreEqual("DVD read/writer", a[0].GetString()); - Assert.AreEqual("500 gigabyte hard drive", a[1].GetString()); - } - - [Test] - public void JsonConvertSerialize() - { - JsonArray a = JsonArray.Parse(@"[ - ""DVD read/writer"", - ""500 gigabyte hard drive"" -]"); - - string json = JsonConvert.SerializeObject(a, Formatting.Indented); - - Assert.AreEqual(@"[ - ""DVD read/writer"", - ""500 gigabyte hard drive"" -]", json); - } - - [Test] - public void SerializeDouble() - { - JsonObject o = new JsonObject(); - o["zero"] = JsonValue.CreateNumberValue(0); - o["int"] = JsonValue.CreateNumberValue(1); - o["smallfraction"] = JsonValue.CreateNumberValue(3.0000000000000009); - o["double"] = JsonValue.CreateNumberValue(1.1); - o["probablyint"] = JsonValue.CreateNumberValue(1.0); - o["Epsilon"] = JsonValue.CreateNumberValue(double.Epsilon); - o["MinValue"] = JsonValue.CreateNumberValue(double.MinValue); - o["MaxValue"] = JsonValue.CreateNumberValue(double.MaxValue); - o["NaN"] = JsonValue.CreateNumberValue(double.NaN); - o["NegativeInfinity"] = JsonValue.CreateNumberValue(double.NegativeInfinity); - o["PositiveInfinity"] = JsonValue.CreateNumberValue(double.PositiveInfinity); - - string json = JsonConvert.SerializeObject(o, Formatting.Indented); - - Assert.AreEqual(@"{ - ""PositiveInfinity"": ""Infinity"", - ""NegativeInfinity"": ""-Infinity"", - ""MinValue"": -1.7976931348623157E+308, - ""double"": 1.1, - ""int"": 1, - ""zero"": 0, - ""Epsilon"": 4.94065645841247E-324, - ""MaxValue"": 1.7976931348623157E+308, - ""NaN"": ""NaN"", - ""smallfraction"": 3.0000000000000009, - ""probablyint"": 1 -}", json); - } - - [Test] - public void DeserializePerformance() - { - string json = @"{ - ""CPU"": ""Intel"", - ""Drives"": [ - ""DVD read/writer"", - ""500 gigabyte hard drive"" - ] -}"; - - Stopwatch timer = new Stopwatch(); - timer.Start(); - for (int i = 0; i < 100000; i++) - { - JsonObject o = JsonObject.Parse(json); - } - timer.Stop(); - - string winrt = timer.Elapsed.TotalSeconds.ToString(); - - timer = new Stopwatch(); - timer.Start(); - for (int i = 0; i < 100000; i++) - { - JObject o = JObject.Parse(json); - } - timer.Stop(); - - string linq = timer.Elapsed.TotalSeconds.ToString(); - - // warm up - JsonConvert.DeserializeObject(json); - - timer = new Stopwatch(); - timer.Start(); - for (int i = 0; i < 100000; i++) - { - Computer o = JsonConvert.DeserializeObject(json); - } - timer.Stop(); - - string jsonnet = timer.Elapsed.TotalSeconds.ToString(); - - Debug.WriteLine("winrt: {0}, jsonnet: {1}, jsonnet linq: {2}", winrt, jsonnet, linq); - } - - [Test] - public void SerializePerformance() - { - string json = @"{ - ""CPU"": ""Intel"", - ""Drives"": [ - ""DVD read/writer"", - ""500 gigabyte hard drive"" - ] -}"; - - JsonObject o = JsonObject.Parse(json); - JObject o1 = JObject.Parse(json); - Computer o2 = JsonConvert.DeserializeObject(json); - - Stopwatch timer = new Stopwatch(); - timer.Start(); - for (int i = 0; i < 100000; i++) - { - o.Stringify(); - } - timer.Stop(); - - string winrt = timer.Elapsed.TotalSeconds.ToString(); - - timer.Start(); - for (int i = 0; i < 100000; i++) - { - o1.ToString(Formatting.None); - } - timer.Stop(); - - string linq = timer.Elapsed.TotalSeconds.ToString(); - - timer = new Stopwatch(); - timer.Start(); - for (int i = 0; i < 100000; i++) - { - JsonConvert.SerializeObject(o); - } - timer.Stop(); - - string jsonnet = timer.Elapsed.TotalSeconds.ToString(); - - Debug.WriteLine("winrt: {0}, jsonnet: {1}, jsonnet linq: {2}", winrt, jsonnet, linq); - } - - [Test] - public void ParseJson() - { - string json = @"{ - ""channel"": { - ""title"": ""James Newton-King"", - ""link"": ""http://james.newtonking.com"", - ""description"": ""James Newton-King's blog."", - ""item"": [ - { - ""title"": ""Json.NET 1.3 + New license + Now on CodePlex"", - ""description"": ""Annoucing the release of Json.NET 1.3, the MIT license and the source being available on CodePlex"", - ""link"": ""http://james.newtonking.com/projects/json-net.aspx"", - ""category"": [ - ""Json.NET"", - ""CodePlex"" - ] - } - ] - } - }"; - - // Windows.Data.Json - // ----------------- - JsonObject jsonObject = JsonObject.Parse(json); - string itemTitle1 = jsonObject["channel"].GetObject()["item"].GetArray()[0].GetObject()["title"].GetString(); - - // LINQ to JSON - // ------------ - JObject jObject = JObject.Parse(json); - string itemTitle2 = (string) jObject["channel"]["item"][0]["title"]; - } - - [Test] - public void CreateJson() - { - // Windows.Data.Json - // ----------------- - JsonObject jsonObject = new JsonObject - { - {"CPU", JsonValue.CreateStringValue("Intel")}, - { - "Drives", new JsonArray - { - JsonValue.CreateStringValue("DVD read/writer"), - JsonValue.CreateStringValue("500 gigabyte hard drive") - } - } - }; - string json1 = jsonObject.Stringify(); - - // LINQ to JSON - // ------------ - JObject jObject = new JObject - { - {"CPU", "Intel"}, - { - "Drives", new JArray - { - "DVD read/writer", - "500 gigabyte hard drive" - } - } - }; - string json2 = jObject.ToString(); - } - - [Test] - public void Converting() - { - JsonObject jsonObject = new JsonObject - { - {"CPU", JsonValue.CreateStringValue("Intel")}, - { - "Drives", new JsonArray - { - JsonValue.CreateStringValue("DVD read/writer"), - JsonValue.CreateStringValue("500 gigabyte hard drive") - } - } - }; - - // convert Windows.Data.Json to LINQ to JSON - JObject o = JObject.FromObject(jsonObject); - - // convert LINQ to JSON to Windows.Data.Json - JArray a = (JArray) o["Drives"]; - JsonArray jsonArray = a.ToObject(); - } - } -} - -#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Converters/KeyValuePairConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/KeyValuePairConverterTests.cs index 83a10171..1aee01aa 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/KeyValuePairConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/KeyValuePairConverterTests.cs @@ -3,11 +3,7 @@ using System.Collections.Generic; using System.Text; using Newtonsoft.Json.Converters; using Newtonsoft.Json.Serialization; -#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/Converters/ObjectIdConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/ObjectIdConverterTests.cs index c4573303..d5fc5a15 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/ObjectIdConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/ObjectIdConverterTests.cs @@ -26,11 +26,7 @@ using System.IO; using Newtonsoft.Json.Bson; using Newtonsoft.Json.Utilities; -#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/Converters/RegexConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/RegexConverterTests.cs index 8c58ac7d..0c054262 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/RegexConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/RegexConverterTests.cs @@ -31,11 +31,7 @@ using Newtonsoft.Json.Bson; using Newtonsoft.Json.Converters; using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Utilities; -#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/Converters/StringEnumConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/StringEnumConverterTests.cs index dea31862..af911045 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/StringEnumConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/StringEnumConverterTests.cs @@ -31,11 +31,7 @@ using System.Runtime.Serialization; using System.Text; using System.Text.RegularExpressions; using Newtonsoft.Json.Converters; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif DNXCORE50 +#if DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Converters/VersionConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/VersionConverterTests.cs index f75c2797..8664d9ef 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/VersionConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/VersionConverterTests.cs @@ -25,11 +25,7 @@ using System; using Newtonsoft.Json.Converters; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif DNXCORE50 +#if DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs b/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs index e9f6a19a..10521a17 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs @@ -30,16 +30,12 @@ using Newtonsoft.Json.Utilities.LinqBridge; using System.Linq; #endif using System.Text; -#if !(NETFX_CORE || DNXCORE50 || PORTABLE40) +#if !(DNXCORE50 || PORTABLE40) using System; using System.Collections.Generic; using Newtonsoft.Json.Tests.Serialization; using Newtonsoft.Json.Tests.TestObjects; -#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/DemoTests.cs b/Src/Newtonsoft.Json.Tests/DemoTests.cs index 2214bd8d..d0ff58b4 100644 --- a/Src/Newtonsoft.Json.Tests/DemoTests.cs +++ b/Src/Newtonsoft.Json.Tests/DemoTests.cs @@ -24,7 +24,7 @@ #endregion using System; -#if !(NET20 || NET35 || NET40 || NETFX_CORE || PORTABLE || PORTABLE40 || DNXCORE50) +#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40 || DNXCORE50) using System.Buffers; #endif using System.Collections.Generic; @@ -34,11 +34,7 @@ using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Schema; using Newtonsoft.Json.Serialization; -#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; @@ -593,7 +589,7 @@ namespace Newtonsoft.Json.Tests }", json); } -#if !(NET20 || NET35 || NET40 || NETFX_CORE || PORTABLE || PORTABLE40 || DNXCORE50) +#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40 || DNXCORE50) [Test] public void ArrayPooling() { @@ -612,7 +608,7 @@ namespace Newtonsoft.Json.Tests #endif } -#if !(NET20 || NET35 || NET40 || NETFX_CORE || PORTABLE || PORTABLE40 || DNXCORE50) +#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40 || DNXCORE50) public class JsonArrayPool : IArrayPool { public static readonly JsonArrayPool Instance = new JsonArrayPool(); diff --git a/Src/Newtonsoft.Json.Tests/Documentation/ConditionalPropertiesTests.cs b/Src/Newtonsoft.Json.Tests/Documentation/ConditionalPropertiesTests.cs index 87cfe484..da5deaf9 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/ConditionalPropertiesTests.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/ConditionalPropertiesTests.cs @@ -37,11 +37,7 @@ using System.Text; using System.Threading.Tasks; using Newtonsoft.Json.Converters; 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; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/ConvertingJsonAndXmlTests.cs b/Src/Newtonsoft.Json.Tests/Documentation/ConvertingJsonAndXmlTests.cs index c43a4c05..e8145f7c 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/ConvertingJsonAndXmlTests.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/ConvertingJsonAndXmlTests.cs @@ -35,11 +35,7 @@ using System.Text; using System.Xml; using Newtonsoft.Json.Converters; 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; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/JsonNetVsWindowsDataJsonTests.cs b/Src/Newtonsoft.Json.Tests/Documentation/JsonNetVsWindowsDataJsonTests.cs deleted file mode 100644 index 91e63788..00000000 --- a/Src/Newtonsoft.Json.Tests/Documentation/JsonNetVsWindowsDataJsonTests.cs +++ /dev/null @@ -1,107 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Newtonsoft.Json.Linq; - -namespace Newtonsoft.Json.Tests.Documentation -{ - public class JsonNetVsWindowsDataJsonTests - { - public void CreatingJson() - { -#if NETFX_CORE - #region CreatingJSON - // Windows.Data.Json - // ----------------- - JsonObject jsonObject = new JsonObject - { - {"CPU", JsonValue.CreateStringValue("Intel")}, - { - "Drives", new JsonArray - { - JsonValue.CreateStringValue("DVD read/writer"), - JsonValue.CreateStringValue("500 gigabyte hard drive") - } - } - }; - string json1 = jsonObject.Stringify(); - - // LINQ to JSON - // ------------ - JObject jObject = new JObject - { - {"CPU", "Intel"}, - { - "Drives", new JArray - { - "DVD read/writer", - "500 gigabyte hard drive" - } - } - }; - string json2 = jObject.ToString(); - #endregion -#endif - } - - public void QueryingJson() - { -#if NETFX_CORE - #region QueryingJSON - string json = @"{ - 'channel': { - 'title': 'James Newton-King', - 'link': 'http://james.newtonking.com', - 'description': 'James Newton-King's blog.', - 'item': [ - { - 'title': 'Json.NET 1.3 + New license + Now on CodePlex', - 'description': 'Annoucing the release of Json.NET 1.3, the MIT license and the source on CodePlex', - 'link': 'http://james.newtonking.com/projects/json-net.aspx', - 'category': [ - 'Json.NET', - 'CodePlex' - ] - } - ] - } - }"; - - // Windows.Data.Json - // ----------------- - JsonObject jsonObject = JsonObject.Parse(json); - string itemTitle1 = jsonObject["channel"].GetObject()["item"].GetArray()[0].GetObject()["title"].GetString(); - - // LINQ to JSON - // ------------ - JObject jObject = JObject.Parse(json); - string itemTitle2 = (string)jObject["channel"]["item"][0]["title"]; - #endregion -#endif - } - - public void Converting() - { -#if NETFX_CORE - #region Converting - JsonObject jsonObject = new JsonObject - { - {"CPU", JsonValue.CreateStringValue("Intel")}, - {"Drives", new JsonArray { - JsonValue.CreateStringValue("DVD read/writer"), - JsonValue.CreateStringValue("500 gigabyte hard drive") - } - } - }; - - // convert Windows.Data.Json to LINQ to JSON - JObject o = JObject.FromObject(jsonObject); - - // convert LINQ to JSON to Windows.Data.Json - JArray a = (JArray)o["Drives"]; - JsonArray jsonArray = a.ToObject(); - #endregion -#endif - } - } -} \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Documentation/JsonSchemaTests.cs b/Src/Newtonsoft.Json.Tests/Documentation/JsonSchemaTests.cs index e8cd9f36..2b7d7280 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/JsonSchemaTests.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/JsonSchemaTests.cs @@ -35,11 +35,7 @@ using System.Runtime.Serialization; using System.Text; using Newtonsoft.Json.Converters; 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; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/LinqToJsonTests.cs b/Src/Newtonsoft.Json.Tests/Documentation/LinqToJsonTests.cs index 6ae04a70..c7afa7ef 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/LinqToJsonTests.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/LinqToJsonTests.cs @@ -34,11 +34,7 @@ using System.Runtime.Serialization; using System.Text; using Newtonsoft.Json.Converters; 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; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/PerformanceTests.cs b/Src/Newtonsoft.Json.Tests/Documentation/PerformanceTests.cs index a9f6d721..b8b0c8bc 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/PerformanceTests.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/PerformanceTests.cs @@ -36,11 +36,7 @@ using System.Text; using System.Threading.Tasks; using Newtonsoft.Json.Converters; 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; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/ReadingAndWritingJsonTests.cs b/Src/Newtonsoft.Json.Tests/Documentation/ReadingAndWritingJsonTests.cs index 3edd483d..49caec6d 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/ReadingAndWritingJsonTests.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/ReadingAndWritingJsonTests.cs @@ -34,11 +34,7 @@ using System.Runtime.Serialization; using System.Text; using Newtonsoft.Json.Converters; 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; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/SerializationTests.cs b/Src/Newtonsoft.Json.Tests/Documentation/SerializationTests.cs index 8861d22d..d2586663 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/SerializationTests.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/SerializationTests.cs @@ -34,11 +34,7 @@ using System.Runtime.Serialization; using System.Text; using Newtonsoft.Json.Converters; 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; diff --git a/Src/Newtonsoft.Json.Tests/Documentation/TraceWriterTests.cs b/Src/Newtonsoft.Json.Tests/Documentation/TraceWriterTests.cs index 6eae67bb..d50d8662 100644 --- a/Src/Newtonsoft.Json.Tests/Documentation/TraceWriterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Documentation/TraceWriterTests.cs @@ -38,11 +38,7 @@ using System.Text; using System.Threading.Tasks; using Newtonsoft.Json.Converters; 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; diff --git a/Src/Newtonsoft.Json.Tests/ExceptionTests.cs b/Src/Newtonsoft.Json.Tests/ExceptionTests.cs index 669299b5..04813f9f 100644 --- a/Src/Newtonsoft.Json.Tests/ExceptionTests.cs +++ b/Src/Newtonsoft.Json.Tests/ExceptionTests.cs @@ -25,11 +25,7 @@ using System; using Newtonsoft.Json.Schema; -#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/JsonArrayAttributeTests.cs b/Src/Newtonsoft.Json.Tests/JsonArrayAttributeTests.cs index 7f63c492..989c7cea 100644 --- a/Src/Newtonsoft.Json.Tests/JsonArrayAttributeTests.cs +++ b/Src/Newtonsoft.Json.Tests/JsonArrayAttributeTests.cs @@ -23,11 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#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/JsonConvertTest.cs b/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs index 31010e1b..a246ff93 100644 --- a/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs +++ b/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs @@ -43,11 +43,7 @@ using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Tests.Serialization; using Newtonsoft.Json.Tests.TestObjects; using Newtonsoft.Json.Utilities; -#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; @@ -610,7 +606,7 @@ namespace Newtonsoft.Json.Tests value = null; Assert.AreEqual("null", JsonConvert.ToString(value)); -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) value = DBNull.Value; Assert.AreEqual("null", JsonConvert.ToString(value)); #endif @@ -907,8 +903,7 @@ namespace Newtonsoft.Json.Tests } TestDateTimeFormat(value, new IsoDateTimeConverter()); - -#if !NETFX_CORE + if (value is DateTime) { Console.WriteLine(XmlConvert.ToString((DateTime)(object)value, XmlDateTimeSerializationMode.RoundtripKind)); @@ -917,7 +912,6 @@ namespace Newtonsoft.Json.Tests { Console.WriteLine(XmlConvert.ToString((DateTimeOffset)(object)value)); } -#endif #if !NET20 MemoryStream ms = new MemoryStream(); diff --git a/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs b/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs index 55d24729..caaf848b 100644 --- a/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs +++ b/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs @@ -32,11 +32,7 @@ using Newtonsoft.Json.Linq; using System.Numerics; #endif 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/JsonTextWriterTest.cs b/Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs index fe76b379..ce2695df 100644 --- a/Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs +++ b/Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs @@ -35,11 +35,7 @@ using System.Linq; using System.Runtime.Serialization; using System.Text; using System.Xml; -#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; @@ -137,7 +133,7 @@ namespace Newtonsoft.Json.Tests Assert.AreEqual(1, arrayPool.FreeArrays.Count); } -#if !(NET20 || NET35 || NET40 || NETFX_CORE || PORTABLE || PORTABLE40 || DNXCORE50) +#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40 || DNXCORE50) [Test] public void BufferErroringWithInvalidSize() { @@ -1715,7 +1711,7 @@ null//comment } } -#if !(PORTABLE || NETFX_CORE) +#if !(PORTABLE) public struct ConvertibleInt : IConvertible { private readonly int _value; diff --git a/Src/Newtonsoft.Json.Tests/JsonValidatingReaderTests.cs b/Src/Newtonsoft.Json.Tests/JsonValidatingReaderTests.cs index d4dc768c..68002707 100644 --- a/Src/Newtonsoft.Json.Tests/JsonValidatingReaderTests.cs +++ b/Src/Newtonsoft.Json.Tests/JsonValidatingReaderTests.cs @@ -34,11 +34,7 @@ using Newtonsoft.Json.Utilities.LinqBridge; using System.Numerics; #endif 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/Linq/AnnotationsTests.cs b/Src/Newtonsoft.Json.Tests/Linq/AnnotationsTests.cs index cce50368..ff3657dc 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/AnnotationsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/AnnotationsTests.cs @@ -7,11 +7,7 @@ using System.Linq; #endif using System.Text; 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 TestAttribute = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Linq/ComponentModel/BindingTests.cs b/Src/Newtonsoft.Json.Tests/Linq/ComponentModel/BindingTests.cs index 6ebb1ccb..3461dadf 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/ComponentModel/BindingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/ComponentModel/BindingTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NETFX_CORE || PORTABLE || PORTABLE40 || DNXCORE50) +#if !(PORTABLE || PORTABLE40 || DNXCORE50) using NUnit.Framework; using System.Web.UI; using Newtonsoft.Json.Linq; diff --git a/Src/Newtonsoft.Json.Tests/Linq/ComponentModel/JPropertyDescriptorTests.cs b/Src/Newtonsoft.Json.Tests/Linq/ComponentModel/JPropertyDescriptorTests.cs index 589d8848..96aee34e 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/ComponentModel/JPropertyDescriptorTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/ComponentModel/JPropertyDescriptorTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NETFX_CORE || PORTABLE || PORTABLE40 || DNXCORE50) +#if !(PORTABLE || PORTABLE40 || DNXCORE50) using NUnit.Framework; using Newtonsoft.Json.Linq; diff --git a/Src/Newtonsoft.Json.Tests/Linq/DynamicTests.cs b/Src/Newtonsoft.Json.Tests/Linq/DynamicTests.cs index dc9f863a..4f6a114b 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/DynamicTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/DynamicTests.cs @@ -34,11 +34,7 @@ using System.Numerics; #endif using System.Text; 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; @@ -81,8 +77,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.Pass(); } } - -#if !NETFX_CORE + private void UpdateValueCount(IDictionary counts, dynamic d) { string s = d.ToString(); @@ -133,7 +128,6 @@ namespace Newtonsoft.Json.Tests.Linq Console.WriteLine("Time (secs): " + sw.Elapsed.TotalSeconds); } -#endif [Test] public void JObjectPropertyNames() diff --git a/Src/Newtonsoft.Json.Tests/Linq/JArrayTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JArrayTests.cs index 13fc4c1f..331a6e05 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JArrayTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JArrayTests.cs @@ -26,11 +26,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; -#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; @@ -435,7 +431,7 @@ Parameter name: index"); } } -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void ITypedListGetItemProperties() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JConstructorTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JConstructorTests.cs index 8725012c..9fa234f7 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JConstructorTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JConstructorTests.cs @@ -26,11 +26,7 @@ using System; using System.Collections.Generic; 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; diff --git a/Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs index 753acf87..76051e07 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs @@ -32,11 +32,7 @@ using System.Numerics; #endif using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Tests.TestObjects; -#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; @@ -46,7 +42,7 @@ using NUnit.Framework; using Newtonsoft.Json.Linq; using System.IO; using System.Collections; -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) using System.Web.UI; #endif #if NET20 @@ -1262,7 +1258,7 @@ Parameter name: arrayIndex"); }, "Can not add property Test3 to Newtonsoft.Json.Linq.JObject. Property with the same name already exists on object."); } -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void IBindingListSortDirection() { @@ -1586,7 +1582,7 @@ Parameter name: arrayIndex"); Assert.AreEqual("Name2", value); } -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void WriteObjectNullDBNullValue() { @@ -1698,7 +1694,7 @@ Parameter name: arrayIndex"); }, "Unexpected end of content while loading JObject. Path 'short.error.code', line 6, position 14."); } -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void GetProperties() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JPropertyTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JPropertyTests.cs index 954a1eec..49b74c61 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JPropertyTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JPropertyTests.cs @@ -33,11 +33,7 @@ using Newtonsoft.Json.Utilities.LinqBridge; using System.Linq; #endif 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; @@ -65,7 +61,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual(p, p.Value.Parent); } -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void ListChanged() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JRawTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JRawTests.cs index f5444769..cfeb102b 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JRawTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JRawTests.cs @@ -23,11 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#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/Linq/JTokenEqualityComparerTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenEqualityComparerTests.cs index 3ccc5a98..41424e68 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JTokenEqualityComparerTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JTokenEqualityComparerTests.cs @@ -24,11 +24,7 @@ #endregion using System.Collections.Generic; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif DNXCORE50 +#if DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Linq/JTokenReaderTest.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenReaderTest.cs index 501eea21..e2b6ba33 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JTokenReaderTest.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JTokenReaderTest.cs @@ -26,11 +26,7 @@ using System; using System.Collections.Generic; 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/Linq/JTokenTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs index 823c5e79..a2418fa7 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs @@ -30,11 +30,7 @@ using System.Numerics; #endif using System.Text; using Newtonsoft.Json.Converters; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif DNXCORE50 +#if DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -1149,7 +1145,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.IsTrue(a.DeepEquals(a2)); } -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void Clone() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterTest.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterTest.cs index 7a86e3d0..4ad23556 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterTest.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterTest.cs @@ -29,11 +29,7 @@ using System.Collections.Generic; using System.Numerics; #endif 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/Linq/JValueTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs index bafe8275..d0db3600 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs @@ -32,11 +32,7 @@ using Newtonsoft.Json.Tests.TestObjects; using System.Numerics; #endif 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; @@ -154,7 +150,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual("Pie", v.Value); Assert.AreEqual(JTokenType.String, v.Type); -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) v.Value = DBNull.Value; Assert.AreEqual(DBNull.Value, v.Value); Assert.AreEqual(JTokenType.Null, v.Type); @@ -498,7 +494,7 @@ namespace Newtonsoft.Json.Tests.Linq } #endif -#if !(NETFX_CORE || PORTABLE) +#if !(PORTABLE) [Test] public void ConvertsToBoolean() { diff --git a/Src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathExecuteTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathExecuteTests.cs index d4cea700..72dcc15d 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathExecuteTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathExecuteTests.cs @@ -31,11 +31,7 @@ using System.Numerics; #endif using Newtonsoft.Json.Linq.JsonPath; using Newtonsoft.Json.Tests.Bson; -#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/Linq/JsonPath/JPathParseTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathParseTests.cs index e8d1d94a..3a113d68 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathParseTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JsonPath/JPathParseTests.cs @@ -26,11 +26,7 @@ using System; using System.Collections.Generic; using Newtonsoft.Json.Linq.JsonPath; -#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/Linq/JsonPath/QueryExpressionTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JsonPath/QueryExpressionTests.cs index f64fe387..10dc218b 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JsonPath/QueryExpressionTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JsonPath/QueryExpressionTests.cs @@ -28,11 +28,7 @@ using System.Collections.Generic; using System.Text; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq.JsonPath; -#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/Linq/LinqToJsonTest.cs b/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs index ebd12a0b..ba0f6094 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs @@ -27,11 +27,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Globalization; -#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/Linq/MergeTests.cs b/Src/Newtonsoft.Json.Tests/Linq/MergeTests.cs index 487ea8d7..9005d69f 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/MergeTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/MergeTests.cs @@ -32,11 +32,7 @@ using System.Linq; #endif using System.Text; 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; diff --git a/Src/Newtonsoft.Json.Tests/LinqToSql/LinqToSqlClassesSerializationTests.cs b/Src/Newtonsoft.Json.Tests/LinqToSql/LinqToSqlClassesSerializationTests.cs index e35f59e4..09568bfa 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 || NET20) +#if !(DNXCORE50 || PORTABLE40 || PORTABLE40 || NET20) using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj index 4fa4587a..705105fb 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj @@ -81,7 +81,6 @@ - diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net35.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net35.csproj index a1f79940..30529bb5 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net35.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net35.csproj @@ -108,7 +108,6 @@ - @@ -172,9 +171,7 @@ - - Component - + diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net40.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net40.csproj index e9635d0e..aeed9981 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net40.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net40.csproj @@ -111,7 +111,6 @@ - @@ -223,7 +222,6 @@ - diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj index 2be23499..fb563d75 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj @@ -112,7 +112,6 @@ - diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable40.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable40.csproj index 2eda8590..b7bf48c1 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable40.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable40.csproj @@ -111,7 +111,6 @@ - diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj index 1ae55cff..78106ea2 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj @@ -59,7 +59,6 @@ - @@ -69,7 +68,6 @@ - diff --git a/Src/Newtonsoft.Json.Tests/PerformanceTests.cs b/Src/Newtonsoft.Json.Tests/PerformanceTests.cs index e094b442..c58da075 100644 --- a/Src/Newtonsoft.Json.Tests/PerformanceTests.cs +++ b/Src/Newtonsoft.Json.Tests/PerformanceTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET20 || NET35 || NET40 || NETFX_CORE || PORTABLE40 || DNXCORE50) +#if !(NET20 || NET35 || NET40 || PORTABLE40 || DNXCORE50) using System.Xml; using System; using System.Collections; diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs index 1e670b15..c39c48bb 100644 --- a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs @@ -39,8 +39,6 @@ using System.Security; [assembly: AssemblyTitle("Json.NET Tests Portable .NET 4.0")] #elif PORTABLE [assembly: AssemblyTitle("Json.NET Tests Portable")] -#elif NETFX_CORE -[assembly: AssemblyTitle("Json.NET Tests WinRT")] #elif NET20 [assembly: AssemblyTitle("Json.NET Tests .NET 2.0")] #elif NET35 diff --git a/Src/Newtonsoft.Json.Tests/Schema/ExtensionsTests.cs b/Src/Newtonsoft.Json.Tests/Schema/ExtensionsTests.cs index 42acfd49..9c135d90 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/ExtensionsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/ExtensionsTests.cs @@ -26,11 +26,7 @@ #pragma warning disable 618 using System; using System.Collections.Generic; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif DNXCORE50 +#if DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; @@ -41,7 +37,7 @@ using Newtonsoft.Json.Schema; using Newtonsoft.Json.Linq; using System.IO; using Newtonsoft.Json.Tests.TestObjects; -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) using System.Data; #endif @@ -207,7 +203,7 @@ namespace Newtonsoft.Json.Tests.Schema #if !NET20 GenerateSchemaAndSerializeFromType(new NullableDateTimeTestClass()); #endif -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) GenerateSchemaAndSerializeFromType(new DataSet()); #endif GenerateSchemaAndSerializeFromType(new object()); @@ -215,7 +211,7 @@ namespace Newtonsoft.Json.Tests.Schema GenerateSchemaAndSerializeFromType("Hi"); GenerateSchemaAndSerializeFromType(new DateTime(2000, 12, 29, 23, 59, 0, DateTimeKind.Utc)); GenerateSchemaAndSerializeFromType(TimeSpan.FromTicks(1000000)); -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) GenerateSchemaAndSerializeFromType(DBNull.Value); #endif GenerateSchemaAndSerializeFromType(new JsonPropertyWithHandlingValues()); diff --git a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaBuilderTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaBuilderTests.cs index 85d5f4d7..dff60ce2 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaBuilderTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaBuilderTests.cs @@ -25,11 +25,7 @@ #pragma warning disable 618 using System; -#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/Schema/JsonSchemaGeneratorTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs index e935400a..6a39a70c 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs @@ -32,11 +32,7 @@ using Newtonsoft.Json.Converters; using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Tests.TestObjects; using Newtonsoft.Json.Utilities; -#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; @@ -96,7 +92,7 @@ namespace Newtonsoft.Json.Tests.Schema Assert.IsTrue(o.IsValid(schema)); } -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void Generate_DefaultValueAttributeTestClass() { @@ -315,7 +311,7 @@ namespace Newtonsoft.Json.Tests.Schema Assert.IsTrue(v.IsValid(schema)); } -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void GenerateSchemaForISerializable() { @@ -330,7 +326,7 @@ namespace Newtonsoft.Json.Tests.Schema } #endif -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void GenerateSchemaForDBNull() { @@ -379,7 +375,7 @@ namespace Newtonsoft.Json.Tests.Schema generator.UndefinedSchemaIdHandling = UndefinedSchemaIdHandling.UseTypeName; generator.ContractResolver = new CustomDirectoryInfoMapper { -#if !(NETFX_CORE || PORTABLE || DNXCORE50) +#if !(PORTABLE || DNXCORE50) IgnoreSerializableAttribute = true #endif }; @@ -463,7 +459,7 @@ namespace Newtonsoft.Json.Tests.Schema serializer.Converters.Add(new IsoDateTimeConverter()); serializer.ContractResolver = new CustomDirectoryInfoMapper { -#if !(NETFX_CORE || PORTABLE || DNXCORE50) +#if !(PORTABLE || DNXCORE50) IgnoreSerializableInterface = true #endif }; @@ -483,7 +479,7 @@ namespace Newtonsoft.Json.Tests.Schema generator.UndefinedSchemaIdHandling = UndefinedSchemaIdHandling.UseTypeName; generator.ContractResolver = new CamelCasePropertyNamesContractResolver() { -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) IgnoreSerializableAttribute = true #endif }; @@ -528,7 +524,7 @@ namespace Newtonsoft.Json.Tests.Schema }", json); } -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void GenerateSchemaSerializable() { diff --git a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaModelBuilderTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaModelBuilderTests.cs index 50ac5ce8..f2558090 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaModelBuilderTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaModelBuilderTests.cs @@ -25,11 +25,7 @@ #pragma warning disable 618 using Newtonsoft.Json.Schema; -#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/Schema/JsonSchemaNodeTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaNodeTests.cs index b22be7a9..5efdb0be 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaNodeTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaNodeTests.cs @@ -25,11 +25,7 @@ #pragma warning disable 618 using Newtonsoft.Json.Schema; -#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/Schema/JsonSchemaSpecTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaSpecTests.cs index ff54fec6..8aafa1f7 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaSpecTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaSpecTests.cs @@ -24,7 +24,7 @@ #endregion #pragma warning disable 618 -#if !(DNXCORE50 || NETFX_CORE) +#if !(DNXCORE50) using System; using System.Collections.Generic; using System.IO; diff --git a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaTests.cs index 835d3de3..27c98590 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaTests.cs @@ -29,11 +29,7 @@ using System.Collections.Generic; using System.IO; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Schema; -#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/Schema/PerformanceTests.cs b/Src/Newtonsoft.Json.Tests/Schema/PerformanceTests.cs index 0f2ccbdb..55d664ad 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/PerformanceTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/PerformanceTests.cs @@ -30,11 +30,7 @@ using System.Diagnostics; using System.IO; using System.Text; using Newtonsoft.Json.Schema; -#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/Serialization/CamelCaseNamingStrategyTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/CamelCaseNamingStrategyTests.cs index d0822a3b..563f5cff 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/CamelCaseNamingStrategyTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/CamelCaseNamingStrategyTests.cs @@ -26,11 +26,7 @@ using System; using System.Collections.Generic; using Newtonsoft.Json.Serialization; -#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/Serialization/CamelCasePropertyNamesContractResolverTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/CamelCasePropertyNamesContractResolverTests.cs index 0efad3e6..119fc123 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/CamelCasePropertyNamesContractResolverTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/CamelCasePropertyNamesContractResolverTests.cs @@ -26,11 +26,7 @@ using System; using System.Collections.Generic; using Newtonsoft.Json.Serialization; -#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; @@ -105,7 +101,7 @@ namespace Newtonsoft.Json.Tests.Serialization string json = o.ToString(); } -#if !(NETFX_CORE || PORTABLE || PORTABLE40) +#if !(PORTABLE || PORTABLE40) #pragma warning disable 618 [Test] public void MemberSearchFlags() diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ConstructorHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ConstructorHandlingTests.cs index ca4538b8..83ac01a9 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ConstructorHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ConstructorHandlingTests.cs @@ -29,11 +29,7 @@ using System.ComponentModel; using System.Reflection; using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Tests.TestObjects; -#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/Serialization/ContractResolverTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs index f0b9ed75..516a56f3 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs @@ -28,11 +28,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.IO; using System.Runtime.Serialization; -#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; @@ -568,7 +564,7 @@ namespace Newtonsoft.Json.Tests.Serialization }", startingWithB); } -#if !(NETFX_CORE || PORTABLE || PORTABLE40) +#if !(PORTABLE || PORTABLE40) #pragma warning disable 618 [Test] public void SerializeCompilerGeneratedMembers() diff --git a/Src/Newtonsoft.Json.Tests/Serialization/DefaultValueHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/DefaultValueHandlingTests.cs index ec1092f4..6019be62 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/DefaultValueHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/DefaultValueHandlingTests.cs @@ -27,16 +27,12 @@ using System; using System.ComponentModel; using System.IO; using System.Runtime.Serialization; -#if !(NET20 || NET35 || NETFX_CORE || PORTABLE || DNXCORE50) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50) using System.Runtime.Serialization.Json; #endif using System.Text; using Newtonsoft.Json.Tests.TestObjects; -#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; @@ -278,7 +274,7 @@ namespace Newtonsoft.Json.Tests.Serialization { EmitDefaultValueClass c = new EmitDefaultValueClass(); -#if !(NET20 || NET35 || NETFX_CORE || PORTABLE) +#if !(NET20 || NET35 || PORTABLE) DataContractJsonSerializer jsonSerializer = new DataContractJsonSerializer(typeof(EmitDefaultValueClass)); MemoryStream ms = new MemoryStream(); diff --git a/Src/Newtonsoft.Json.Tests/Serialization/DependencyInjectionTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/DependencyInjectionTests.cs index 3fb8f06c..c899d347 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/DependencyInjectionTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/DependencyInjectionTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET40 || NET35 || NET20 || DNXCORE50 || PORTABLE || PORTABLE40 || NETFX_CORE) +#if !(NET40 || NET35 || NET20 || DNXCORE50 || PORTABLE || PORTABLE40) using Autofac; using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Tests.TestObjects; @@ -36,11 +36,7 @@ using System.Threading.Tasks; using Autofac.Core; using Autofac.Core.Activators.Reflection; using Microsoft.FSharp.Collections; -#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/Serialization/DynamicConcreteTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/DynamicConcreteTests.cs index 4c6f7417..69bc7143 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/DynamicConcreteTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/DynamicConcreteTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NETFX_CORE || PORTABLE || DNXCORE50) +#if !(PORTABLE || DNXCORE50) using System.Reflection; using System.Reflection.Emit; using Newtonsoft.Json.Serialization; @@ -34,11 +34,7 @@ using Newtonsoft.Json.Utilities.LinqBridge; #else using System.Linq; #endif -#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/Serialization/DynamicTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/DynamicTests.cs index a5d6d743..84096969 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/DynamicTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/DynamicTests.cs @@ -37,11 +37,7 @@ using System.Text; using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Tests.TestObjects; using Newtonsoft.Json.Utilities; -#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/Serialization/EntitiesSerializationTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/EntitiesSerializationTests.cs index e4e2c1bc..f3af3b15 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/EntitiesSerializationTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/EntitiesSerializationTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET35 || NET20 || NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(NET35 || NET20 || PORTABLE || DNXCORE50 || PORTABLE40) using Newtonsoft.Json.Serialization; using System; using System.Collections.Generic; @@ -31,11 +31,7 @@ using System.Data; using System.Linq; using System.Text; using Newtonsoft.Json.Converters; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -#elif DNXCORE50 +#if DNXCORE50 using Xunit; using Test = Xunit.FactAttribute; using Assert = Newtonsoft.Json.Tests.XUnitAssert; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ExtensionDataTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ExtensionDataTests.cs index 0a366552..5d3467ee 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ExtensionDataTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ExtensionDataTests.cs @@ -29,11 +29,7 @@ using System.IO; using System.Text; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Tests.TestObjects; -#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/Serialization/FSharpTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/FSharpTests.cs index e3e0ce42..0f500687 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/FSharpTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/FSharpTests.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET35 || NET20 || NETFX_CORE || DNXCORE50) +#if !(NET35 || NET20 || DNXCORE50) using NUnit.Framework; using System; using System.Collections.Generic; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ImmutableCollectionsTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ImmutableCollectionsTests.cs index 1d61ae87..81876c5d 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ImmutableCollectionsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ImmutableCollectionsTests.cs @@ -30,11 +30,7 @@ using System.Collections.Immutable; using System.Linq; using System.Text; using System.Threading.Tasks; -#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/Serialization/JsonPropertyCollectionTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonPropertyCollectionTests.cs index ff0923ca..4f05c4c3 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/JsonPropertyCollectionTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonPropertyCollectionTests.cs @@ -23,11 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#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/Serialization/JsonSerializerCollectionsTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerCollectionsTests.cs index b0c481b8..1a95b3c4 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerCollectionsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerCollectionsTests.cs @@ -44,11 +44,7 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Tests.TestObjects; using Newtonsoft.Json.Utilities; -#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; @@ -304,7 +300,7 @@ namespace Newtonsoft.Json.Tests.Serialization } #endif -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) public class NameValueCollectionTestClass { public NameValueCollection Collection { get; set; } @@ -1675,7 +1671,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual(1, (int)((JObject)o.Data[2])["one"]); } -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) [Test] public void SerializeArrayAsArrayList() { diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs index 66e2cf46..f945b971 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs @@ -32,7 +32,7 @@ using System.Collections.Generic; #if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1 using System.Numerics; #endif -#if !(NET20 || NETFX_CORE || DNXCORE50) +#if !(NET20 || DNXCORE50) using System.ComponentModel.DataAnnotations; using System.Configuration; using System.Runtime.CompilerServices; @@ -42,11 +42,7 @@ using System.Web.Script.Serialization; #endif using System.Text; using System.Text.RegularExpressions; -#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; @@ -86,7 +82,7 @@ using Newtonsoft.Json.Utilities.LinqBridge; #else using System.Linq; #endif -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) using System.Drawing; #endif @@ -736,7 +732,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual("Name!", c2.Name); } -#if !(NETFX_CORE || DNXCORE50 || NET20) +#if !(DNXCORE50 || NET20) [MetadataType(typeof(CustomerValidation))] public partial class CustomerWithMetadataType { @@ -1202,7 +1198,7 @@ namespace Newtonsoft.Json.Tests.Serialization serializer.ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor; Assert.AreEqual(ConstructorHandling.AllowNonPublicDefaultConstructor, serializer.ConstructorHandling); -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) serializer.Context = new StreamingContext(StreamingContextStates.Other); Assert.AreEqual(new StreamingContext(StreamingContextStates.Other), serializer.Context); #endif @@ -1273,7 +1269,7 @@ namespace Newtonsoft.Json.Tests.Serialization serializer.TraceWriter = traceWriter; Assert.AreEqual(traceWriter, serializer.TraceWriter); -#if !(PORTABLE || PORTABLE40 || NETFX_CORE || NET20 || DNXCORE50) +#if !(PORTABLE || PORTABLE40 || NET20 || DNXCORE50) #pragma warning disable 618 serializer.TypeNameAssemblyFormat = FormatterAssemblyStyle.Full; Assert.AreEqual(FormatterAssemblyStyle.Full, serializer.TypeNameAssemblyFormat); @@ -1311,7 +1307,7 @@ namespace Newtonsoft.Json.Tests.Serialization settings.ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor; Assert.AreEqual(ConstructorHandling.AllowNonPublicDefaultConstructor, settings.ConstructorHandling); -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) settings.Context = new StreamingContext(StreamingContextStates.Other); Assert.AreEqual(new StreamingContext(StreamingContextStates.Other), settings.Context); #endif @@ -1388,7 +1384,7 @@ namespace Newtonsoft.Json.Tests.Serialization settings.TraceWriter = traceWriter; Assert.AreEqual(traceWriter, settings.TraceWriter); -#if !(PORTABLE || PORTABLE40 || NETFX_CORE || NET20 || DNXCORE50) +#if !(PORTABLE || PORTABLE40 || NET20 || DNXCORE50) #pragma warning disable 618 settings.TypeNameAssemblyFormat = FormatterAssemblyStyle.Full; Assert.AreEqual(FormatterAssemblyStyle.Full, settings.TypeNameAssemblyFormat); @@ -1439,7 +1435,7 @@ namespace Newtonsoft.Json.Tests.Serialization serializerProxy.ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor; Assert.AreEqual(ConstructorHandling.AllowNonPublicDefaultConstructor, serializerProxy.ConstructorHandling); -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) serializerProxy.Context = new StreamingContext(StreamingContextStates.Other); Assert.AreEqual(new StreamingContext(StreamingContextStates.Other), serializerProxy.Context); #endif @@ -1510,7 +1506,7 @@ namespace Newtonsoft.Json.Tests.Serialization serializerProxy.TraceWriter = traceWriter; Assert.AreEqual(traceWriter, serializerProxy.TraceWriter); -#if !(PORTABLE || PORTABLE40 || NETFX_CORE || NET20 || DNXCORE50) +#if !(PORTABLE || PORTABLE40 || NET20 || DNXCORE50) #pragma warning disable 618 serializerProxy.TypeNameAssemblyFormat = FormatterAssemblyStyle.Full; Assert.AreEqual(FormatterAssemblyStyle.Full, serializerProxy.TypeNameAssemblyFormat); @@ -1531,7 +1527,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual(TypeNameHandling.All, serializerProxy.TypeNameHandling); } -#if !(NETFX_CORE || PORTABLE || PORTABLE40 || DNXCORE50) +#if !(PORTABLE || PORTABLE40 || DNXCORE50) [Test] public void DeserializeISerializableIConvertible() { @@ -1790,8 +1786,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.IsNotNull(deserialized.foo); Assert.AreEqual("value", deserialized.foo.bar); } - -#if !(NETFX_CORE) + [Test] public void ConversionOperator() { @@ -1815,7 +1810,6 @@ namespace Newtonsoft.Json.Tests.Serialization var deserialize = jsonSerializer.Deserialize(new StreamReader(ms), typeof(Dictionary)); stopWatch.Stop(); } -#endif internal class DictionaryKeyCast { @@ -2215,7 +2209,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual(executorObject2.clientGetResultFunction, "ClientBanSubsCB"); } -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) [Test] public void HashtableDeserialization() { @@ -2433,7 +2427,7 @@ keyword such as type of business."" { string json = @"[""vvv\/vvv\tvvv\""vvv\bvvv\nvvv\rvvv\\vvv\fvvv""]"; -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) JavaScriptSerializer javaScriptSerializer = new JavaScriptSerializer(); List javaScriptSerializerResult = javaScriptSerializer.Deserialize>(json); #endif @@ -2445,7 +2439,7 @@ keyword such as type of business."" Assert.AreEqual(1, jsonNetResult.Count); Assert.AreEqual(dataContractResult[0], jsonNetResult[0]); -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) Assert.AreEqual(javaScriptSerializerResult[0], jsonNetResult[0]); #endif } @@ -2656,7 +2650,7 @@ keyword such as type of business."" string json = JsonConvert.SerializeObject(new ConverableMembers(), Formatting.Indented); string expected = null; -#if !(NETFX_CORE || PORTABLE || DNXCORE50) +#if !(PORTABLE || DNXCORE50) expected = @"{ ""String"": ""string"", ""Int32"": 2147483647, @@ -2696,7 +2690,7 @@ keyword such as type of business."" ConverableMembers c = JsonConvert.DeserializeObject(json); Assert.AreEqual("string", c.String); Assert.AreEqual(double.MaxValue, c.Double); -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) Assert.AreEqual(DBNull.Value, c.DBNull); #endif } @@ -3540,7 +3534,7 @@ keyword such as type of business."" Assert.AreEqual("titleId", n.FidOrder[n.FidOrder.Count - 1]); } -#if !(NET20 || NETFX_CORE || DNXCORE50) +#if !(NET20 || DNXCORE50) [MetadataType(typeof(OptInClassMetadata))] public class OptInClass { @@ -3922,7 +3916,7 @@ To fix this error either change the JSON to a JSON object (e.g. {""name"":""valu Path '', line 1, position 1."); } -#if !(NETFX_CORE || PORTABLE || DNXCORE50) +#if !(PORTABLE || DNXCORE50) [Test] public void CannotDeserializeArrayIntoSerializable() { @@ -4040,7 +4034,7 @@ Path '', line 1, position 1."); { ContractResolver = new DefaultContractResolver { -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) IgnoreSerializableAttribute = true #endif } @@ -4057,7 +4051,7 @@ Path '', line 1, position 1."); { ContractResolver = new DefaultContractResolver { -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) IgnoreSerializableAttribute = true #endif } @@ -4074,7 +4068,7 @@ Path '', line 1, position 1."); { ContractResolver = new DefaultContractResolver { -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) IgnoreSerializableAttribute = true #endif } @@ -4091,7 +4085,7 @@ Path '', line 1, position 1."); { ContractResolver = new DefaultContractResolver { -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) IgnoreSerializableAttribute = true #endif } @@ -4865,7 +4859,7 @@ Path '', line 1, position 1."); Assert.AreEqual("value", newModelStateDictionary["key"]); } -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) public class ISerializableTestObject : ISerializable { internal string _stringValue; @@ -5354,7 +5348,7 @@ Path '', line 1, position 1."); } #endif -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) public class XmlNodeTestObject { public XmlDocument Document { get; set; } @@ -5392,7 +5386,7 @@ Path '', line 1, position 1."); } #endif -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void SerializeDeserializeXmlNodeProperties() { @@ -5720,7 +5714,7 @@ Path '', line 1, position 1."); Assert.AreEqual(0, z[1].Prop1.Length); } -#if !(NET20 || NETFX_CORE || DNXCORE50) +#if !(NET20 || DNXCORE50) public class StringDictionaryTestClass { public StringDictionary StringDictionaryProperty { get; set; } @@ -6047,7 +6041,7 @@ Path '', line 1, position 1."); Assert.AreEqual(meh.IDontWork, "meh"); } -#if !(NET20 || NETFX_CORE || DNXCORE50) +#if !(NET20 || DNXCORE50) [DataContract] public struct StructISerializable : ISerializable { @@ -6790,7 +6784,7 @@ Path '', line 1, position 1."); } } -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void SerializeException1() { @@ -7017,7 +7011,7 @@ Path '', line 1, position 1."); Assert.AreEqual(-3, StaticTestClass.z); } -#if !(NET20 || NETFX_CORE || DNXCORE50) +#if !(NET20 || DNXCORE50) [Test] public void DeserializeDecimalsWithCulture() { @@ -7178,7 +7172,7 @@ Path '', line 1, position 1."); ExceptionAssert.Throws(() => { List numbers = JsonConvert.DeserializeObject>(json); }, "Error converting value {null} to type 'System.Int32'. Path '[3]', line 5, position 6."); } -#if !(PORTABLE || NETFX_CORE) +#if !(PORTABLE) public class ConvertableIntTestClass { public ConvertibleInt Integer { get; set; } @@ -7537,7 +7531,7 @@ Path '', line 1, position 1."); } #endif -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) [Test] public void MetroBlogPost() { @@ -7931,7 +7925,7 @@ Path '', line 1, position 1."); Assert.AreEqual("", s); } -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void SerializeAndDeserializeWithAttributes() { @@ -8092,7 +8086,7 @@ Path '', line 1, position 1."); ExceptionAssert.Throws(() => { s.Deserialize>(new JsonTextReader(new StringReader(json))); }, "Additional text encountered after finished reading JSON content: {. Path '', line 1, position 7."); } -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void DeserializeException() { @@ -8334,7 +8328,7 @@ Path '', line 1, position 1."); Action doStuff = () => { obj = JsonConvert.DeserializeObject>(json); }; -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) doStuff(); Assert.AreEqual(500, obj.Item1); #else @@ -8365,7 +8359,7 @@ Path '', line 1, position 1."); } #endif -#if !(NETFX_CORE || PORTABLE || NET35 || NET20 || PORTABLE40 || DNXCORE50) +#if !(PORTABLE || NET35 || NET20 || PORTABLE40 || DNXCORE50) [Test] public void SerializeTupleWithSerializableAttribute() { @@ -8392,29 +8386,6 @@ Path '', line 1, position 1."); } #endif -#if NETFX_CORE - [Test] - public void SerializeWinRTJsonObject() - { - var o = Windows.Data.Json.JsonObject.Parse(@"{ - ""CPU"": ""Intel"", - ""Drives"": [ - ""DVD read/writer"", - ""500 gigabyte hard drive"" - ] -}"); - - string json = JsonConvert.SerializeObject(o, Formatting.Indented); - Assert.AreEqual(@"{ - ""Drives"": [ - ""DVD read/writer"", - ""500 gigabyte hard drive"" - ], - ""CPU"": ""Intel"" -}", json); - } -#endif - #if !NET20 [Test] public void RoundtripOfDateTimeOffset() @@ -8633,7 +8604,7 @@ Path '', line 1, position 1."); } #endif -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) [Serializable] #endif [DataContract] @@ -8662,7 +8633,7 @@ Path '', line 1, position 1."); Assert.AreEqual(@"{""First"":""One"",""Second"":2}", json); -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) DefaultContractResolver r = new DefaultContractResolver(); r.IgnoreSerializableAttribute = false; @@ -8778,7 +8749,7 @@ Path '', line 1, position 1."); Assert.AreEqual(1234567890.123456m, d); } -#if !(PORTABLE || DNXCORE50 || NETFX_CORE || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void DontSerializeStaticFields() { @@ -8942,7 +8913,7 @@ Path '', line 1, position 1."); ]", json); } -#if !(PORTABLE || PORTABLE40 || NETFX_CORE || DNXCORE50) +#if !(PORTABLE || PORTABLE40 || DNXCORE50) [Test] public void SerializeDictionaryWithStructKey() { @@ -9033,7 +9004,7 @@ Path '', line 1, position 1."); Assert.AreEqual(jane, john.Spouse); } -#if !(NETFX_CORE || NET35 || NET20 || PORTABLE || PORTABLE40) +#if !(NET35 || NET20 || PORTABLE || PORTABLE40) [Test] public void TypeConverterOnInterface() { @@ -9099,7 +9070,7 @@ Path '', line 1, position 1."); ParticipantEntity deserializedProduct = JsonConvert.DeserializeObject(json); } -#if !(PORTABLE || NETFX_CORE) +#if !(PORTABLE) public class ConvertibleId : IConvertible { public int Value; @@ -9631,7 +9602,7 @@ Path '', line 1, position 1."); } #endif -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) [Test] public void MailMessageConverterTest() { diff --git a/Src/Newtonsoft.Json.Tests/Serialization/MetadataPropertyHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/MetadataPropertyHandlingTests.cs index 2317362f..b591d752 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/MetadataPropertyHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/MetadataPropertyHandlingTests.cs @@ -31,11 +31,7 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Tests.TestObjects; using Newtonsoft.Json.Utilities; -#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; @@ -115,7 +111,6 @@ namespace Newtonsoft.Json.Tests.Serialization }, @"Cannot preserve reference to array or readonly list, or list created from a non-default constructor: System.String[][]. Path '$values', line 3, position 14."); } -#if !NETFX_CORE [Test] public void SerializeDeserialize_DictionaryContextContainsGuid_DeserializesItemAsGuid() { @@ -142,7 +137,6 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual(someValue, deserializedObject[contextKey]); } -#endif [Test] public void DeserializeGuid() diff --git a/Src/Newtonsoft.Json.Tests/Serialization/MissingMemberHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/MissingMemberHandlingTests.cs index 07c04343..23748d85 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/MissingMemberHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/MissingMemberHandlingTests.cs @@ -28,11 +28,7 @@ using System.Collections.Generic; using System.IO; using Newtonsoft.Json.Converters; using Newtonsoft.Json.Tests.TestObjects; -#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/Serialization/NullValueHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/NullValueHandlingTests.cs index 5361a968..18eb4ea4 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/NullValueHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/NullValueHandlingTests.cs @@ -26,11 +26,7 @@ using System; using System.IO; using Newtonsoft.Json.Tests.TestObjects; -#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/Serialization/PopulateTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/PopulateTests.cs index 438b0676..ba2a5377 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/PopulateTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/PopulateTests.cs @@ -27,11 +27,7 @@ using System; using System.Collections.Generic; using System.IO; using Newtonsoft.Json.Tests.TestObjects; -#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/Serialization/PreserveReferencesHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/PreserveReferencesHandlingTests.cs index 3ea9915d..e63b073f 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/PreserveReferencesHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/PreserveReferencesHandlingTests.cs @@ -32,11 +32,7 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Tests.TestObjects; using Newtonsoft.Json.Utilities; -#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/Serialization/ReferenceLoopHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ReferenceLoopHandlingTests.cs index a2e28b54..56163d4d 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ReferenceLoopHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ReferenceLoopHandlingTests.cs @@ -27,11 +27,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Runtime.CompilerServices; -#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; @@ -155,7 +151,7 @@ namespace Newtonsoft.Json.Tests.Serialization }", json); } -#if !(PORTABLE || DNXCORE50 || NETFX_CORE || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) public class MainClass : ISerializable { public ChildClass Child { get; set; } @@ -313,13 +309,8 @@ namespace Newtonsoft.Json.Tests.Serialization int IEqualityComparer.GetHashCode(object obj) { -#if !(NETFX_CORE) // put objects in a bucket based on their reference return RuntimeHelpers.GetHashCode(obj); -#else - // put all objects in the same bucket so ReferenceEquals is called on all - return -1; -#endif } } diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ReflectionAttributeProviderTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ReflectionAttributeProviderTests.cs index d16dc63f..226539a6 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ReflectionAttributeProviderTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ReflectionAttributeProviderTests.cs @@ -32,11 +32,7 @@ using System.Text; using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Tests.TestObjects; using Newtonsoft.Json.Utilities; -#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/Serialization/SerializationErrorHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/SerializationErrorHandlingTests.cs index 8d1df730..9ef77bda 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/SerializationErrorHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/SerializationErrorHandlingTests.cs @@ -35,11 +35,7 @@ using Newtonsoft.Json.Utilities.LinqBridge; #else using System.Linq; #endif -#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/Serialization/SerializationEventAttributeTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/SerializationEventAttributeTests.cs index 3f2f9c74..23ceaa9c 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/SerializationEventAttributeTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/SerializationEventAttributeTests.cs @@ -37,11 +37,7 @@ using System.Runtime.Serialization; using System.Text; using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Tests.TestObjects; -#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; @@ -276,7 +272,7 @@ namespace Newtonsoft.Json.Tests.Serialization }", json); } -#if !(NETFX_CORE || PORTABLE || DNXCORE50) +#if !(PORTABLE || DNXCORE50) public class SerializationEventContextTestObject { public string TestMember { get; set; } diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ShouldSerializeTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ShouldSerializeTests.cs index 3dfbceb2..1b4a3942 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ShouldSerializeTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ShouldSerializeTests.cs @@ -36,11 +36,7 @@ using System.Reflection; using System.Text; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; -#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/Serialization/SnakeCaseNamingStrategyTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/SnakeCaseNamingStrategyTests.cs index 9c254b7d..d858b11c 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/SnakeCaseNamingStrategyTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/SnakeCaseNamingStrategyTests.cs @@ -26,11 +26,7 @@ using System; using System.Collections.Generic; using Newtonsoft.Json.Serialization; -#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/Serialization/TraceWriterTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/TraceWriterTests.cs index 7619c716..bcd6532a 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/TraceWriterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/TraceWriterTests.cs @@ -10,11 +10,7 @@ using System.Numerics; using System.Runtime.Serialization; using System.Runtime.Serialization.Formatters; 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; @@ -44,7 +40,7 @@ namespace Newtonsoft.Json.Tests.Serialization [TestFixture] public class TraceWriterTests : TestFixtureBase { -#if !(PORTABLE || DNXCORE50 || NETFX_CORE || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void DiagnosticsTraceWriterTest() { @@ -673,7 +669,7 @@ Newtonsoft.Json Error: 0 : Error! Assert.IsTrue(traceWriter.TraceRecords[9].Message.StartsWith("Finished deserializing System.Collections.Generic.List`1[System.Object]. Path '$values'")); } -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void DeserializeISerializable() { diff --git a/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs index 239f3230..6199926f 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs @@ -43,11 +43,7 @@ using System.Runtime.Serialization.Formatters; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Tests.TestObjects; -#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; @@ -360,7 +356,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual("Name!", ((EmployeeReference)employee).Name); } -#if !(NETFX_CORE || PORTABLE || DNXCORE50) +#if !(PORTABLE || DNXCORE50) [Test] public void DeserializeTypeNameFromGacAssembly() { @@ -1242,7 +1238,7 @@ namespace Newtonsoft.Json.Tests.Serialization CollectionAssert.AreEquivalent(data, d); } -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) [Test] public void ISerializableTypeNameHandlingTest() { @@ -1307,7 +1303,7 @@ namespace Newtonsoft.Json.Tests.Serialization #pragma warning restore CS0618 // Type or member is obsolete ContractResolver = new DefaultContractResolver { -#if !(NETFX_CORE || PORTABLE || DNXCORE50) +#if !(PORTABLE || DNXCORE50) IgnoreSerializableAttribute = true #endif } @@ -1338,7 +1334,7 @@ namespace Newtonsoft.Json.Tests.Serialization public override void BindToName(Type serializedType, out string assemblyName, out string typeName) { assemblyName = "AssemblyName"; -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) typeName = ":::" + serializedType.Name.ToUpper(CultureInfo.InvariantCulture) + ":::"; #else typeName = ":::" + serializedType.Name.ToUpper() + ":::"; @@ -1783,7 +1779,7 @@ namespace Newtonsoft.Json.Tests.Serialization } #endif -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) [Test] public void SerializeDeserialize_DictionaryContextContainsGuid_DeserializesItemAsGuid() { @@ -2078,7 +2074,7 @@ namespace Newtonsoft.Json.Tests.Serialization public string SomeProperty { get; set; } } -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) public class ParentParent { [JsonProperty(ItemTypeNameHandling = TypeNameHandling.Auto)] @@ -2146,7 +2142,7 @@ namespace Newtonsoft.Json.Tests.Serialization public int Quantity { get; set; } } -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) public class SerializableWrapper { public object Content { get; set; } diff --git a/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs index 915e837f..0e0a6c6c 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs @@ -30,18 +30,14 @@ using System.IO; using System.Linq; #endif 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; #else using NUnit.Framework; #endif -#if !(NETFX_CORE || NET20 || NET35 || DNXCORE50) +#if !(NET20 || NET35 || DNXCORE50) using System.Runtime.Serialization.Json; #endif using Newtonsoft.Json.Serialization; @@ -63,7 +59,7 @@ namespace Newtonsoft.Json.Tests.Serialization nonSerializedField = "Error" }; -#if !(NETFX_CORE || NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40) MemoryStream ms = new MemoryStream(); DataContractJsonSerializer dataContractJsonSerializer = new DataContractJsonSerializer(typeof(SerializableType)); dataContractJsonSerializer.WriteObject(ms, serializableType); @@ -79,7 +75,7 @@ namespace Newtonsoft.Json.Tests.Serialization { ContractResolver = new DefaultContractResolver { -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) IgnoreSerializableAttribute = false #endif } @@ -88,7 +84,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual(expected, json); } -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [Test] public void SerializeInheritedType() { @@ -118,7 +114,7 @@ namespace Newtonsoft.Json.Tests.Serialization } } -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [Serializable] #else [JsonObject(MemberSerialization.Fields)] @@ -142,7 +138,7 @@ namespace Newtonsoft.Json.Tests.Serialization set { privateField = value; } } -#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) [NonSerialized] #else [JsonIgnore] diff --git a/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs b/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs index 8003d024..5e9c1deb 100644 --- a/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs +++ b/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs @@ -36,12 +36,7 @@ using System.Runtime.Serialization.Json; #endif using System.Text; using System.Threading; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; -using TestMethod = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; -using SetUp = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestInitializeAttribute; -#elif DNXCORE50 +#if DNXCORE50 using Xunit; using Assert = Newtonsoft.Json.Tests.XUnitAssert; using XAssert = Xunit.Assert; @@ -63,7 +58,7 @@ namespace Newtonsoft.Json.Tests { public static IEnumerable GetConstructors(Type type) { -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) return type.GetConstructors(); #else return type.GetTypeInfo().DeclaredConstructors; @@ -72,7 +67,7 @@ namespace Newtonsoft.Json.Tests public static PropertyInfo GetProperty(Type type, string name) { -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) return type.GetProperty(name); #else return type.GetTypeInfo().GetDeclaredProperty(name); @@ -81,7 +76,7 @@ namespace Newtonsoft.Json.Tests public static FieldInfo GetField(Type type, string name) { -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) return type.GetField(name); #else return type.GetTypeInfo().GetDeclaredField(name); @@ -90,7 +85,7 @@ namespace Newtonsoft.Json.Tests public static MethodInfo GetMethod(Type type, string name) { -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) return type.GetMethod(name); #else return type.GetTypeInfo().GetDeclaredMethod(name); @@ -274,7 +269,7 @@ namespace Newtonsoft.Json.Tests protected void TestSetup() #endif { -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) //CultureInfo turkey = CultureInfo.CreateSpecificCulture("tr"); //Thread.CurrentThread.CurrentCulture = turkey; //Thread.CurrentThread.CurrentUICulture = turkey; @@ -297,25 +292,11 @@ namespace Newtonsoft.Json.Tests } } -#if NETFX_CORE - public static class Console - { - public static void WriteLine(params object[] args) - { - } - } -#endif - public static class CustomAssert { public static void IsInstanceOfType(Type t, object instance) { -#if NETFX_CORE - if (!instance.GetType().IsAssignableFrom(t)) - throw new Exception("Not instance of type"); -#else Assert.IsInstanceOf(t, instance); -#endif } public static void Contains(IList collection, object value) @@ -325,7 +306,7 @@ namespace Newtonsoft.Json.Tests public static void Contains(IList collection, object value, string message) { -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) Assert.Contains(value, collection, message); #else if (!collection.Cast().Any(i => i.Equals(value))) diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/AnswerFilterModel.cs b/Src/Newtonsoft.Json.Tests/TestObjects/AnswerFilterModel.cs index 2679de1e..d0859ecc 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/AnswerFilterModel.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/AnswerFilterModel.cs @@ -34,7 +34,7 @@ using System.Linq; namespace Newtonsoft.Json.Tests.TestObjects { -#if !(NETFX_CORE || PORTABLE || DNXCORE50) +#if !(PORTABLE || DNXCORE50) [Serializable] public class AnswerFilterModel { diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/ConverableMembers.cs b/Src/Newtonsoft.Json.Tests/TestObjects/ConverableMembers.cs index c308d7a6..2ba240b7 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/ConverableMembers.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/ConverableMembers.cs @@ -41,7 +41,7 @@ namespace Newtonsoft.Json.Tests.TestObjects public ulong ULong = long.MaxValue; public double Double = double.MaxValue; public float Float = float.MaxValue; -#if !(NETFX_CORE || PORTABLE || DNXCORE50) +#if !(PORTABLE || DNXCORE50) public DBNull DBNull = DBNull.Value; #endif public bool Bool = true; diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/Currency.cs b/Src/Newtonsoft.Json.Tests/TestObjects/Currency.cs index 0f6706c2..9c6af0f7 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/Currency.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/Currency.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET35 || NET20 || NETFX_CORE || DNXCORE50) +#if !(NET35 || NET20 || DNXCORE50) using Microsoft.FSharp.Core; using System; using System.Collections; diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/CustomerDataSet.cs b/Src/Newtonsoft.Json.Tests/TestObjects/CustomerDataSet.cs index 77af124a..0d938b6c 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/CustomerDataSet.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/CustomerDataSet.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NETFX_CORE || PORTABLE40 || PORTABLE || DNXCORE50) +#if !(PORTABLE40 || PORTABLE || DNXCORE50) using System; using System.Collections.Generic; using System.Text; diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/DefaultValueAttributeTestClass.cs b/Src/Newtonsoft.Json.Tests/TestObjects/DefaultValueAttributeTestClass.cs index 8f731455..94c312ae 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/DefaultValueAttributeTestClass.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/DefaultValueAttributeTestClass.cs @@ -27,7 +27,7 @@ using System.ComponentModel; namespace Newtonsoft.Json.Tests.TestObjects { -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) [Description("DefaultValueAttributeTestClass description!")] #endif public sealed class DefaultValueAttributeTestClass diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/IMyInterface.cs b/Src/Newtonsoft.Json.Tests/TestObjects/IMyInterface.cs index c99aaae2..1a3f7e57 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/IMyInterface.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/IMyInterface.cs @@ -38,7 +38,7 @@ using Newtonsoft.Json.Utilities; namespace Newtonsoft.Json.Tests.TestObjects { -#if !(NETFX_CORE || NET35 || NET20 || PORTABLE || PORTABLE40) +#if !(NET35 || NET20 || PORTABLE || PORTABLE40) [TypeConverter(typeof(MyInterfaceConverter))] internal interface IMyInterface { diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/MetroPropertyNameResolver.cs b/Src/Newtonsoft.Json.Tests/TestObjects/MetroPropertyNameResolver.cs index 7db0e3f9..7f4d2bba 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/MetroPropertyNameResolver.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/MetroPropertyNameResolver.cs @@ -32,7 +32,7 @@ namespace Newtonsoft.Json.Tests.TestObjects { protected override string ResolvePropertyName(string propertyName) { -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) return ":::" + propertyName.ToUpper(CultureInfo.InvariantCulture) + ":::"; #else return ":::" + propertyName.ToUpper() + ":::"; diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/MetroStringConverter.cs b/Src/Newtonsoft.Json.Tests/TestObjects/MetroStringConverter.cs index 7b07e898..4238dbfc 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/MetroStringConverter.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/MetroStringConverter.cs @@ -32,7 +32,7 @@ namespace Newtonsoft.Json.Tests.TestObjects { public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) { -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) writer.WriteValue(":::" + value.ToString().ToUpper(CultureInfo.InvariantCulture) + ":::"); #else writer.WriteValue(":::" + value.ToString().ToUpper() + ":::"); @@ -47,7 +47,7 @@ namespace Newtonsoft.Json.Tests.TestObjects return null; } -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) return s.ToLower(CultureInfo.InvariantCulture).Trim(new[] { ':' }); #else return s.ToLower().Trim(new[] { ':' }); diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/Person.cs b/Src/Newtonsoft.Json.Tests/TestObjects/Person.cs index abc6f331..b92f9aa8 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/Person.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/Person.cs @@ -31,7 +31,7 @@ using System.ComponentModel; namespace Newtonsoft.Json.Tests.TestObjects { [JsonObject(Id = "Person", Title = "Title!", Description = "JsonObjectAttribute description!", MemberSerialization = MemberSerialization.OptIn)] -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) [Description("DescriptionAttribute description!")] #endif public class Person diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/PersonSerializable.cs b/Src/Newtonsoft.Json.Tests/TestObjects/PersonSerializable.cs index 4c96e818..8c6694ac 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/PersonSerializable.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/PersonSerializable.cs @@ -27,7 +27,7 @@ using System; namespace Newtonsoft.Json.Tests.TestObjects { -#if !(NETFX_CORE || PORTABLE || DNXCORE50) +#if !(PORTABLE || DNXCORE50) [Serializable] public class PersonSerializable { diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/Ratio.cs b/Src/Newtonsoft.Json.Tests/TestObjects/Ratio.cs index 03c3efec..f34791ae 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/Ratio.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/Ratio.cs @@ -29,7 +29,7 @@ using System.Runtime.Serialization; namespace Newtonsoft.Json.Tests.TestObjects { -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) public struct Ratio : IConvertible, IFormattable, ISerializable { private readonly int _numerator; diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/Shape.cs b/Src/Newtonsoft.Json.Tests/TestObjects/Shape.cs index dc097338..cf508a3c 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/Shape.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/Shape.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET35 || NET20 || NETFX_CORE || DNXCORE50) +#if !(NET35 || NET20 || DNXCORE50) using System; using System.Collections; using System.Collections.Generic; diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/TypedSubHashtable.cs b/Src/Newtonsoft.Json.Tests/TestObjects/TypedSubHashtable.cs index e006c8b2..0f5b7755 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/TypedSubHashtable.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/TypedSubHashtable.cs @@ -27,7 +27,7 @@ using System.Collections; namespace Newtonsoft.Json.Tests.TestObjects { -#if !(NETFX_CORE || DNXCORE50) +#if !(DNXCORE50) public class TypedSubHashtable { public string Name; diff --git a/Src/Newtonsoft.Json.Tests/Utilities/ConvertUtilsTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/ConvertUtilsTests.cs index 4088d58b..3bb476cc 100644 --- a/Src/Newtonsoft.Json.Tests/Utilities/ConvertUtilsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Utilities/ConvertUtilsTests.cs @@ -25,11 +25,7 @@ using System; using System.Globalization; -#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/Utilities/DateTimeUtilsTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/DateTimeUtilsTests.cs index 4f628036..0ecc15d8 100644 --- a/Src/Newtonsoft.Json.Tests/Utilities/DateTimeUtilsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Utilities/DateTimeUtilsTests.cs @@ -28,11 +28,7 @@ using System.Collections.Generic; using System.Globalization; using System.IO; 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/Utilities/DynamicReflectionDelegateFactoryTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/DynamicReflectionDelegateFactoryTests.cs index f11ff2cb..949c5c35 100644 --- a/Src/Newtonsoft.Json.Tests/Utilities/DynamicReflectionDelegateFactoryTests.cs +++ b/Src/Newtonsoft.Json.Tests/Utilities/DynamicReflectionDelegateFactoryTests.cs @@ -23,15 +23,11 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(PORTABLE || DNXCORE50 || NETFX_CORE || PORTABLE40) +#if !(PORTABLE || DNXCORE50 || PORTABLE40) using System; using System.Diagnostics; using System.Reflection; -#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/Utilities/ExpressionReflectionDelegateFactoryTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/ExpressionReflectionDelegateFactoryTests.cs index ab02925c..1e2fcf5a 100644 --- a/Src/Newtonsoft.Json.Tests/Utilities/ExpressionReflectionDelegateFactoryTests.cs +++ b/Src/Newtonsoft.Json.Tests/Utilities/ExpressionReflectionDelegateFactoryTests.cs @@ -29,11 +29,7 @@ using System.Linq; using System; using System.Diagnostics; using System.Reflection; -#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/Utilities/LateboundReflectionDelegateFactoryTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/LateboundReflectionDelegateFactoryTests.cs index 7d029ed1..ec023ff8 100644 --- a/Src/Newtonsoft.Json.Tests/Utilities/LateboundReflectionDelegateFactoryTests.cs +++ b/Src/Newtonsoft.Json.Tests/Utilities/LateboundReflectionDelegateFactoryTests.cs @@ -1,10 +1,6 @@ using System.Reflection; using Newtonsoft.Json.Utilities; -#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/Utilities/ReflectionUtilsTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/ReflectionUtilsTests.cs index c219d165..b1dc6afa 100644 --- a/Src/Newtonsoft.Json.Tests/Utilities/ReflectionUtilsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Utilities/ReflectionUtilsTests.cs @@ -27,11 +27,7 @@ using System; using System.Collections.Generic; using System.Runtime.Serialization.Formatters; -#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/Utilities/StringUtilsTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/StringUtilsTests.cs index bdc8e7e6..ef1b7737 100644 --- a/Src/Newtonsoft.Json.Tests/Utilities/StringUtilsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Utilities/StringUtilsTests.cs @@ -23,11 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#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/Converters/JsonValueConverter.cs b/Src/Newtonsoft.Json/Converters/JsonValueConverter.cs deleted file mode 100644 index 25f979fa..00000000 --- a/Src/Newtonsoft.Json/Converters/JsonValueConverter.cs +++ /dev/null @@ -1,225 +0,0 @@ -#region License -// Copyright (c) 2007 James Newton-King -// -// Permission is hereby granted, free of charge, to any person -// obtaining a copy of this software and associated documentation -// files (the "Software"), to deal in the Software without -// restriction, including without limitation the rights to use, -// copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following -// conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -// OTHER DEALINGS IN THE SOFTWARE. -#endregion - - -#if NETFX_CORE -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Security; -using Newtonsoft.Json.Utilities; -using Windows.Data.Json; - -namespace Newtonsoft.Json.Converters -{ - /// - /// Converts a to and from JSON. - /// - public class JsonValueConverter : JsonConverter - { - /// - /// Writes the JSON representation of the object. - /// - /// The to write to. - /// The value. - /// The calling serializer. - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) - { - WriteJsonValue(writer, (IJsonValue)value); - } - - private void WriteJsonValue(JsonWriter writer, IJsonValue value) - { - switch (value.ValueType) - { - case JsonValueType.Array: - { - JsonArray a = value.GetArray(); - writer.WriteStartArray(); - for (int i = 0; i < a.Count; i++) - { - WriteJsonValue(writer, a[i]); - } - writer.WriteEndArray(); - } - break; - case JsonValueType.Boolean: - { - writer.WriteValue(value.GetBoolean()); - } - break; - case JsonValueType.Null: - { - writer.WriteNull(); - } - break; - case JsonValueType.Number: - { - // JsonValue doesn't support integers - // serialize whole numbers without a decimal point - double d = value.GetNumber(); - bool isInteger = (d % 1 == 0); - if (isInteger && d <= long.MaxValue && d >= long.MinValue) - writer.WriteValue(Convert.ToInt64(d)); - else - writer.WriteValue(d); - } - break; - case JsonValueType.Object: - { - JsonObject o = value.GetObject(); - writer.WriteStartObject(); - foreach (KeyValuePair v in o) - { - writer.WritePropertyName(v.Key); - WriteJsonValue(writer, v.Value); - } - writer.WriteEndObject(); - } - break; - case JsonValueType.String: - { - writer.WriteValue(value.GetString()); - } - break; - default: - throw new ArgumentOutOfRangeException("ValueType"); - } - } - - /// - /// Reads the JSON representation of the object. - /// - /// The to read from. - /// Type of the object. - /// The existing value of object being read. - /// The calling serializer. - /// The object value. - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) - { - if (reader.TokenType == JsonToken.None) - reader.Read(); - - IJsonValue value = CreateJsonValue(reader); - - if (!objectType.IsAssignableFrom(value.GetType())) - throw JsonSerializationException.Create(reader, "Could not convert '{0}' to '{1}'.".FormatWith(CultureInfo.InvariantCulture, value.GetType(), objectType)); - - return value; - } - - private IJsonValue CreateJsonValue(JsonReader reader) - { - while (reader.TokenType == JsonToken.Comment) - { - if (!reader.Read()) - throw JsonSerializationException.Create(reader, "Unexpected end."); - } - - switch (reader.TokenType) - { - case JsonToken.StartObject: - { - return CreateJsonObject(reader); - } - case JsonToken.StartArray: - { - JsonArray a = new JsonArray(); - - while (reader.Read()) - { - switch (reader.TokenType) - { - case JsonToken.EndArray: - return a; - default: - IJsonValue value = CreateJsonValue(reader); - a.Add(value); - break; - } - } - } - break; - case JsonToken.Integer: - case JsonToken.Float: - return JsonValue.CreateNumberValue(Convert.ToDouble(reader.Value, CultureInfo.InvariantCulture)); - case JsonToken.String: - return JsonValue.CreateStringValue(reader.Value.ToString()); - case JsonToken.Boolean: - return JsonValue.CreateBooleanValue(Convert.ToBoolean(reader.Value, CultureInfo.InvariantCulture)); - case JsonToken.Null: - // surely there is a better way to create a null value than this? - return JsonValue.Parse("null"); - case JsonToken.Date: - return JsonValue.CreateStringValue(reader.Value.ToString()); - case JsonToken.Bytes: - return JsonValue.CreateStringValue(reader.Value.ToString()); - default: - throw JsonSerializationException.Create(reader, "Unexpected or unsupported token: {0}".FormatWith(CultureInfo.InvariantCulture, reader.TokenType)); - } - - throw JsonSerializationException.Create(reader, "Unexpected end."); - } - - private JsonObject CreateJsonObject(JsonReader reader) - { - JsonObject o = new JsonObject(); - string propertyName = null; - - while (reader.Read()) - { - switch (reader.TokenType) - { - case JsonToken.PropertyName: - propertyName = (string)reader.Value; - break; - case JsonToken.EndObject: - return o; - case JsonToken.Comment: - break; - default: - IJsonValue propertyValue = CreateJsonValue(reader); - o.Add(propertyName, propertyValue); - break; - } - } - - throw JsonSerializationException.Create(reader, "Unexpected end."); - } - - /// - /// Determines whether this instance can convert the specified object type. - /// - /// Type of the object. - /// - /// true if this instance can convert the specified object type; otherwise, false. - /// - public override bool CanConvert(Type objectType) - { - return typeof(IJsonValue).IsAssignableFrom(objectType); - } - } -} -#endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json/Converters/XmlNodeConverter.cs b/Src/Newtonsoft.Json/Converters/XmlNodeConverter.cs index ee56c1ff..731be23b 100644 --- a/Src/Newtonsoft.Json/Converters/XmlNodeConverter.cs +++ b/Src/Newtonsoft.Json/Converters/XmlNodeConverter.cs @@ -31,7 +31,6 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Xml; -using System.Reflection; using Newtonsoft.Json.Serialization; #if !(NET20 || PORTABLE40) using System.Xml.Linq; diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj index e4caafbc..44f7694b 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj @@ -67,7 +67,6 @@ -