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

.gitattributes

@@ -41,6 +41,8 @@
 *.fs text
 *.fsx text
 *.hs text
+*.ps1 text
+*.psm1 text
 
 *.csproj text merge=union 
 *.vbproj text merge=union 

.gitignore

@@ -1,5 +1,7 @@
-[Bb]in/
-[Oo]bj/
-[Ww]orking/
-*.suo
+[Bb]in/
+[Oo]bj/
+[Ww]orking/
+TestResults/
+AppPackages/
+*.suo
 *.user

Build/build.ps1

@@ -17,7 +17,7 @@
   $workingDir = "$baseDir\Working"
   $builds = @(
     @{Name = "Newtonsoft.Json"; TestsName = "Newtonsoft.Json.Tests"; Constants=""; FinalDir="Net40"; NuGetDir = "net40"; Framework="net-4.0"; Sign=$true},
-    #@{Name = "Newtonsoft.Json.Metro"; TestsName = $null; Constants="NETFX_CORE"; FinalDir="Metro"; NuGetDir = "winrt45"; Framework="net-4.5"; Sign=$true},
+    @{Name = "Newtonsoft.Json.Metro"; TestsName = $null; Constants="NETFX_CORE"; FinalDir="Metro"; NuGetDir = "winrt45"; Framework="net-4.5"; Sign=$true},
     
     # unsigned SL/WP
     @{Name = "Newtonsoft.Json.WindowsPhone"; TestsName = $null; Constants="SILVERLIGHT;WINDOWS_PHONE"; FinalDir="WindowsPhone"; NuGetDir = "sl3-wp,sl4-windowsphone71"; Framework="net-4.0"; Sign=$false},

Doc/readme.txt

@@ -20,25 +20,34 @@ Versions:
 
 Json.NET comes in different versions for the various .NET frameworks.
 
--DotNet:
-  .NET latest (4.0)
+-Net40:
+  .NET latest (4.0 & 4.5)
 
--DotNet35:
+-Net35:
   .NET 3.5 SP1, Mono
 
--DotNet20:
+-Net20:
   .NET 2.0
 
 -Silverlight:
-  Silverlight 4.0
+  Silverlight 4 & 5
 
 -WindowsPhone:
-  Windows Phone 7
+  Windows Phone 7 & 7.1
+
+-Metro
+  Windows 8 Metro, WinRT 4.5
+
+
+Notes:
+
+The Silverlight and Windows Phone builds are not strong-named.
+Use the assemblies in the Signed sub-directories for the strong-named versions.
 
 Microsoft stopped support for the Compact Framework in Visual Studio 2010.
 For a Compact Framework 3.5 build download Json.NET 3.5.
 
-For a Silverlight 3.0 build down download Json.NET 3.5.
+For a Silverlight 3.0 build download Json.NET 3.5.
 
 
 Instructions:

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()
     {