-Added additional frameworks to project.json files

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/CustomContractResolver.cs

@@ -25,10 +25,20 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using Newtonsoft.Json.Serialization;
+#if NET20
+using Newtonsoft.Json.Utilities.LinqBridge;
+#else
+using System.Linq;
+#endif
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/CustomJsonConverter.cs

@@ -26,9 +26,19 @@
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
+#if NET20
+using Newtonsoft.Json.Utilities.LinqBridge;
+#else
+using System.Linq;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/CustomTraceWriter.cs

@@ -27,16 +27,23 @@ using Newtonsoft.Json.Serialization;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
+
+#if !(DNXCORE50 || NET20 || NET35)
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {
     [TestFixture]
     public class CustomTraceWriter : TestFixtureBase
     {
-        #region Types
+#region Types
         public class NLogTraceWriter : ITraceWriter
         {
             private static readonly Logger Logger = LogManager.GetLogger("NLogTraceWriter");
@@ -77,12 +84,12 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
                 }
             }
         }
-        #endregion
+#endregion
 
         [Test]
         public void Example()
         {
-            #region Usage
+#region Usage
             IList<string> countries = new List<string>
             {
                 "New Zealand",
@@ -103,7 +110,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
             //   "Denmark",
             //   "China"
             // ]
-            #endregion
+#endregion
 
             Assert.AreEqual(@"[
   ""New Zealand"",
@@ -113,4 +120,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 ]", json);
         }
     }
-}
+}
+
+#endif

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DataContractAndDataMember.cs

@@ -23,12 +23,19 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 #endregion
 
+#if !NET20
+
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {
@@ -77,4 +84,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 }", json);
         }
     }
-}
+}
+
+#endif

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DefaultSettings.cs

@@ -25,15 +25,18 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 using System.Runtime.Serialization;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
-using Autofac;
 using Newtonsoft.Json.Tests.Serialization;
-using System.Collections.Immutable;
 using Staff = Newtonsoft.Json.Tests.TestObjects.Employee;
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DefaultValueAttributeIgnore.cs

@@ -26,9 +26,14 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DefaultValueHandlingIgnore.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeAnonymousType.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeCollection.cs

@@ -25,9 +25,19 @@
 
 using System;
 using System.Collections.Generic;
+#if NET20
+using Newtonsoft.Json.Utilities.LinqBridge;
+#else
 using System.Linq;
+#endif
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {
@@ -42,11 +52,11 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 
             List<string> videogames = JsonConvert.DeserializeObject<List<string>>(json);
 
-            Console.WriteLine(string.Join(", ", videogames));
+            Console.WriteLine(string.Join(", ", videogames.ToArray()));
             // Starcraft, Halo, Legend of Zelda
             #endregion
 
-            Assert.AreEqual("Starcraft, Halo, Legend of Zelda", string.Join(", ", videogames));
+            Assert.AreEqual("Starcraft, Halo, Legend of Zelda", string.Join(", ", videogames.ToArray()));
         }
     }
 }

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeConstructorHandling.cs

@@ -25,10 +25,15 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeCustomCreationConverter.cs

@@ -25,10 +25,15 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using Newtonsoft.Json.Converters;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeDataSet.cs

@@ -23,12 +23,19 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 #endregion
 
+#if !DNXCORE50
+
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {
@@ -70,4 +77,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
             Assert.AreEqual(2, dataTable.Rows.Count);
         }
     }
-}
+}
+
+#endif

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeDateFormatString.cs

@@ -23,11 +23,18 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 #endregion
 
+#if !DNXCORE50
+
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {
@@ -63,4 +70,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
             Assert.AreEqual(new DateTime(2010, 2, 10, 0, 0, 0, DateTimeKind.Utc), dateList[2]);
         }
     }
-}
+}
+
+#endif

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeDictionary.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeExtensionData.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 using System.Runtime.Serialization;
 using Newtonsoft.Json.Linq;
 

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeImmutableCollections.cs

@@ -23,15 +23,21 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 #endregion
 
+#if !(NET20 || NET35 || NET40)
+
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 using System.Runtime.Serialization;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
-using Autofac;
 using Newtonsoft.Json.Tests.Serialization;
 using System.Collections.Immutable;
 
@@ -67,4 +73,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
             Assert.AreEqual("3", l[2]);
         }
     }
-}
+}
+
+#endif

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeMetadataPropertyHandling.cs

@@ -24,11 +24,16 @@
 #endregion
 
 using Newtonsoft.Json.Serialization;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using System.Text;
 using User = Newtonsoft.Json.Tests.Serialization.MetadataPropertyHandlingTests.User;
 

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeMissingMemberHandling.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeObject.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeObjectCreationHandling.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeWithDependencyInjection.cs

@@ -23,11 +23,18 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 #endregion
 
+#if !(NET20 || NET35 || NET40 || DNXCORE50)
+
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 using System.Runtime.Serialization;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
@@ -121,4 +128,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
             Assert.AreEqual("Debug", controller.Logger.Level);
         }
     }
-}
+}
+
+#endif

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeWithJsonSerializerFromFile.cs

@@ -26,9 +26,14 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 using File = System.IO.File;
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/ErrorHandlingAttribute.cs

@@ -26,10 +26,15 @@
 using Newtonsoft.Json.Serialization;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/ErrorHandlingEvent.cs

@@ -25,11 +25,16 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonConstructorAttribute.cs

@@ -25,10 +25,15 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using Newtonsoft.Json.Converters;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 using JsonConstructor = Newtonsoft.Json.JsonConstructorAttribute;
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonConverterAttributeClass.cs

@@ -25,10 +25,15 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using Newtonsoft.Json.Converters;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonConverterAttributeProperty.cs

@@ -25,10 +25,15 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using Newtonsoft.Json.Converters;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonObjectAttributeOptIn.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonObjectAttributeOverrideIEnumerable.cs

@@ -25,10 +25,15 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Collections;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyItemLevelSetting.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyName.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyOrder.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyPropertyLevelSetting.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyRequired.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/MaxDepth.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/NullValueHandlingIgnore.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/PopulateObject.cs

@@ -25,9 +25,19 @@
 
 using System;
 using System.Collections.Generic;
+#if NET20
+using Newtonsoft.Json.Utilities.LinqBridge;
+#else
 using System.Linq;
+#endif
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {
@@ -40,7 +50,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
             public string Email { get; set; }
             public bool Active { get; set; }
             public DateTime CreatedDate { get; set; }
-            public IList<string> Roles { get; set; }
+            public List<string> Roles { get; set; }
         }
         #endregion
 
@@ -75,11 +85,11 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
             Console.WriteLine(account.Active);
             // false
 
-            Console.WriteLine(string.Join(", ", account.Roles));
+            Console.WriteLine(string.Join(", ", account.Roles.ToArray()));
             // User, Admin, Expired
             #endregion
 
-            Assert.AreEqual("User, Admin, Expired", string.Join(", ", account.Roles));
+            Assert.AreEqual("User, Admin, Expired", string.Join(", ", account.Roles.ToArray()));
         }
     }
 }

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/PreserveReferencesHandlingObject.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/PropertyJsonIgnore.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/ReferenceLoopHandlingIgnore.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializationCallbackAttributes.cs

@@ -25,10 +25,15 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeCollection.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeConditionalProperty.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeContractResolver.cs

@@ -25,10 +25,15 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using Newtonsoft.Json.Serialization;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDataSet.cs

@@ -23,12 +23,19 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 #endregion
 
+#if !DNXCORE50
+
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {
@@ -90,4 +97,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 }", json);
         }
     }
-}
+}
+
+#endif

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDateFormatHandling.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDateFormatString.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDateTimeZoneHandling.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDictionary.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeExtensionData.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 using System.Runtime.Serialization;
 using Newtonsoft.Json.Linq;
 

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeImmutableCollections.cs

@@ -23,15 +23,22 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 #endregion
 
+#if !(NET20 || NET35 || NET40)
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 using System.Runtime.Serialization;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
-using Autofac;
 using Newtonsoft.Json.Tests.Serialization;
 using System.Collections.Immutable;
 
@@ -66,4 +73,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 ]", json);
         }
     }
-}
+}
+
+#endif

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeObject.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeRawJson.cs

@@ -25,10 +25,15 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using Newtonsoft.Json.Linq;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeSerializationBinder.cs

@@ -23,12 +23,24 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 #endregion
 
+#if !(NET20 || NET35)
+
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
+#if NET20
+using Newtonsoft.Json.Utilities.LinqBridge;
+#else
+using System.Linq;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {
@@ -100,4 +112,6 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
             Assert.AreEqual("Car", newValue.GetType().Name);
         }
     }
-}
+}
+
+#endif

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeTypeNameHandling.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeUnindentedJson.cs

@@ -25,9 +25,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeWithJsonConverters.cs

@@ -25,10 +25,20 @@
 
 using System;
 using System.Collections.Generic;
+#if NET20
+using Newtonsoft.Json.Utilities.LinqBridge;
+#else
 using System.Linq;
+#endif
 using System.Text;
 using Newtonsoft.Json.Converters;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {
@@ -42,28 +52,28 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
             List<StringComparison> stringComparisons = new List<StringComparison>
             {
                 StringComparison.CurrentCulture,
-                StringComparison.InvariantCulture
+                StringComparison.Ordinal
             };
 
             string jsonWithoutConverter = JsonConvert.SerializeObject(stringComparisons);
 
             Console.WriteLine(jsonWithoutConverter);
-            // [0,2]
+            // [0,4]
 
             string jsonWithConverter = JsonConvert.SerializeObject(stringComparisons, new StringEnumConverter());
 
             Console.WriteLine(jsonWithConverter);
-            // ["CurrentCulture","InvariantCulture"]
+            // ["CurrentCulture","Ordinal"]
 
             List<StringComparison> newStringComparsions = JsonConvert.DeserializeObject<List<StringComparison>>(
                 jsonWithConverter,
                 new StringEnumConverter());
 
-            Console.WriteLine(string.Join(", ", newStringComparsions.Select(c => c.ToString())));
-            // CurrentCulture, InvariantCulture
+            Console.WriteLine(string.Join(", ", newStringComparsions.Select(c => c.ToString()).ToArray()));
+            // CurrentCulture, Ordinal
             #endregion
 
-            Assert.AreEqual("CurrentCulture, InvariantCulture", string.Join(", ", newStringComparsions.Select(c => c.ToString())));
+            Assert.AreEqual("CurrentCulture, Ordinal", string.Join(", ", newStringComparsions.Select(c => c.ToString()).ToArray()));
         }
     }
 }

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeWithJsonSerializerToFile.cs

@@ -26,9 +26,14 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 using File = System.IO.File;
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer

Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/TraceWriter.cs

@@ -25,10 +25,20 @@
 
 using System;
 using System.Collections.Generic;
+#if NET20
+using Newtonsoft.Json.Utilities.LinqBridge;
+#else
 using System.Linq;
+#endif
 using System.Text;
 using Newtonsoft.Json.Serialization;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
 using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
 {