Merge branch 'master' of github.com:JamesNK/Newtonsoft.Json

Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Metro.csproj

@@ -172,6 +172,7 @@
     <Compile Include="Serialization\SerializationErrorHandlingTests.cs" />
     <Compile Include="Serialization\SerializationEventAttributeTests.cs" />
     <Compile Include="Serialization\TypeNameHandlingTests.cs" />
+    <Compile Include="Serialization\WebApiIntegrationTests.cs" />
     <Compile Include="SilverlightTests.cs" />
     <Compile Include="TestFixtureBase.cs" />
     <Compile Include="TestObjects\AbstractGenericBase.cs" />

Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs

@@ -519,7 +519,7 @@ namespace Newtonsoft.Json.Tests.Schema
 }", json);
     }
 
-#if !SILVERLIGHT
+#if !(SILVERLIGHT || NETFX_CORE)
     [Test]
     public void GenerateSchemaSerializable()
     {

Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs

@@ -5,7 +5,13 @@ using System.IO;
 using System.Linq;
 #endif
 using System.Text;
+#if !NETFX_CORE
 using NUnit.Framework;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute;
+using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
+#endif
 #if !(SILVERLIGHT || NETFX_CORE || NET20)
 using System.Runtime.Serialization.Json;
 #endif
@@ -53,7 +59,7 @@ namespace Newtonsoft.Json.Tests.Serialization
       Assert.AreEqual(expected, json);
     }
 
-#if !SILVERLIGHT
+#if !(SILVERLIGHT || NETFX_CORE)
     [Test]
     public void SerializeInheritedType()
     {