Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

-Fixed Metro build

  • Loading branch information...
commit d1601aa77277fa37d99071474b498d6d2092e342 1 parent 11310fd
@JamesNK authored
View
9 .gitignore
@@ -1,5 +1,6 @@
-[Bb]in/
-[Oo]bj/
-[Ww]orking/
-*.suo
+[Bb]in/
+[Oo]bj/
+[Ww]orking/
+TestResults/
+*.suo
*.user
View
1  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" />
View
2  Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs
@@ -519,7 +519,7 @@ public void GenerateSchemaCamelCase()
}", json);
}
-#if !SILVERLIGHT
+#if !(SILVERLIGHT || NETFX_CORE)
[Test]
public void GenerateSchemaSerializable()
{
View
8 Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs
@@ -5,7 +5,13 @@
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 @@ public void SerializeSerializableType()
Assert.AreEqual(expected, json);
}
-#if !SILVERLIGHT
+#if !(SILVERLIGHT || NETFX_CORE)
[Test]
public void SerializeInheritedType()
{
Please sign in to comment.
Something went wrong with that request. Please try again.