From d1601aa77277fa37d99071474b498d6d2092e342 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Wed, 11 Apr 2012 19:56:33 +1200 Subject: [PATCH] -Fixed Metro build --- .gitignore | 9 +++++---- .../Newtonsoft.Json.Tests.Metro.csproj | 1 + .../Schema/JsonSchemaGeneratorTests.cs | 2 +- .../Serialization/WebApiIntegrationTests.cs | 8 +++++++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c3673c23..75f3a362 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ -[Bb]in/ -[Oo]bj/ -[Ww]orking/ -*.suo +[Bb]in/ +[Oo]bj/ +[Ww]orking/ +TestResults/ +*.suo *.user \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Metro.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Metro.csproj index 66cd2133..c133e8e8 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Metro.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Metro.csproj @@ -172,6 +172,7 @@ + diff --git a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs index 93378013..dd53c5b7 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs +++ b/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() { diff --git a/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs index 7e0ea8e1..10fef6a6 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs +++ b/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 @@ -44,7 +50,7 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual(expected, json); } -#if !SILVERLIGHT +#if !(SILVERLIGHT || NETFX_CORE) [Test] public void SerializeInheritedType() {