-Fixed Metro build
This commit is contained in:
+5
-4
@@ -1,5 +1,6 @@
|
|||||||
[Bb]in/
|
[Bb]in/
|
||||||
[Oo]bj/
|
[Oo]bj/
|
||||||
[Ww]orking/
|
[Ww]orking/
|
||||||
*.suo
|
TestResults/
|
||||||
|
*.suo
|
||||||
*.user
|
*.user
|
||||||
@@ -172,6 +172,7 @@
|
|||||||
<Compile Include="Serialization\SerializationErrorHandlingTests.cs" />
|
<Compile Include="Serialization\SerializationErrorHandlingTests.cs" />
|
||||||
<Compile Include="Serialization\SerializationEventAttributeTests.cs" />
|
<Compile Include="Serialization\SerializationEventAttributeTests.cs" />
|
||||||
<Compile Include="Serialization\TypeNameHandlingTests.cs" />
|
<Compile Include="Serialization\TypeNameHandlingTests.cs" />
|
||||||
|
<Compile Include="Serialization\WebApiIntegrationTests.cs" />
|
||||||
<Compile Include="SilverlightTests.cs" />
|
<Compile Include="SilverlightTests.cs" />
|
||||||
<Compile Include="TestFixtureBase.cs" />
|
<Compile Include="TestFixtureBase.cs" />
|
||||||
<Compile Include="TestObjects\AbstractGenericBase.cs" />
|
<Compile Include="TestObjects\AbstractGenericBase.cs" />
|
||||||
|
|||||||
@@ -519,7 +519,7 @@ namespace Newtonsoft.Json.Tests.Schema
|
|||||||
}", json);
|
}", json);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !SILVERLIGHT
|
#if !(SILVERLIGHT || NETFX_CORE)
|
||||||
[Test]
|
[Test]
|
||||||
public void GenerateSchemaSerializable()
|
public void GenerateSchemaSerializable()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -5,7 +5,13 @@ using System.IO;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
#endif
|
#endif
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
#if !NETFX_CORE
|
||||||
using NUnit.Framework;
|
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)
|
#if !(SILVERLIGHT || NETFX_CORE || NET20)
|
||||||
using System.Runtime.Serialization.Json;
|
using System.Runtime.Serialization.Json;
|
||||||
#endif
|
#endif
|
||||||
@@ -44,7 +50,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
Assert.AreEqual(expected, json);
|
Assert.AreEqual(expected, json);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !SILVERLIGHT
|
#if !(SILVERLIGHT || NETFX_CORE)
|
||||||
[Test]
|
[Test]
|
||||||
public void SerializeInheritedType()
|
public void SerializeInheritedType()
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user