Skip to content
This repository
Browse code

-Fixed Metro build

  • Loading branch information...
commit d1601aa77277fa37d99071474b498d6d2092e342 1 parent 11310fd
James Newton-King authored April 11, 2012
9  .gitignore
... ...
@@ -1,5 +1,6 @@
1  
-[Bb]in/
2  
-[Oo]bj/
3  
-[Ww]orking/
4  
-*.suo
  1
+[Bb]in/
  2
+[Oo]bj/
  3
+[Ww]orking/
  4
+TestResults/
  5
+*.suo
5 6
 *.user
1  Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Metro.csproj
@@ -172,6 +172,7 @@
172 172
     <Compile Include="Serialization\SerializationErrorHandlingTests.cs" />
173 173
     <Compile Include="Serialization\SerializationEventAttributeTests.cs" />
174 174
     <Compile Include="Serialization\TypeNameHandlingTests.cs" />
  175
+    <Compile Include="Serialization\WebApiIntegrationTests.cs" />
175 176
     <Compile Include="SilverlightTests.cs" />
176 177
     <Compile Include="TestFixtureBase.cs" />
177 178
     <Compile Include="TestObjects\AbstractGenericBase.cs" />
2  Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs
@@ -519,7 +519,7 @@ public void GenerateSchemaCamelCase()
519 519
 }", json);
520 520
     }
521 521
 
522  
-#if !SILVERLIGHT
  522
+#if !(SILVERLIGHT || NETFX_CORE)
523 523
     [Test]
524 524
     public void GenerateSchemaSerializable()
525 525
     {
8  Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs
@@ -5,7 +5,13 @@
5 5
 using System.Linq;
6 6
 #endif
7 7
 using System.Text;
  8
+#if !NETFX_CORE
8 9
 using NUnit.Framework;
  10
+#else
  11
+using Microsoft.VisualStudio.TestTools.UnitTesting;
  12
+using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute;
  13
+using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
  14
+#endif
9 15
 #if !(SILVERLIGHT || NETFX_CORE || NET20)
10 16
 using System.Runtime.Serialization.Json;
11 17
 #endif
@@ -44,7 +50,7 @@ public void SerializeSerializableType()
44 50
       Assert.AreEqual(expected, json);
45 51
     }
46 52
 
47  
-#if !SILVERLIGHT
  53
+#if !(SILVERLIGHT || NETFX_CORE)
48 54
     [Test]
49 55
     public void SerializeInheritedType()
50 56
     {

0 notes on commit d1601aa

Please sign in to comment.
Something went wrong with that request. Please try again.