-Fixed Metro and Portable builds
This commit is contained in:
@@ -24,8 +24,8 @@
|
|||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
#if !NETFX_CORE
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
#if !NETFX_CORE
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
#else
|
#else
|
||||||
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||||
|
|||||||
@@ -169,6 +169,7 @@
|
|||||||
<Compile Include="Serialization\NullValueHandlingTests.cs" />
|
<Compile Include="Serialization\NullValueHandlingTests.cs" />
|
||||||
<Compile Include="Serialization\PopulateTests.cs" />
|
<Compile Include="Serialization\PopulateTests.cs" />
|
||||||
<Compile Include="Serialization\PreserveReferencesHandlingTests.cs" />
|
<Compile Include="Serialization\PreserveReferencesHandlingTests.cs" />
|
||||||
|
<Compile Include="Serialization\ReferenceLoopHandlingTests.cs" />
|
||||||
<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" />
|
||||||
|
|||||||
@@ -133,6 +133,7 @@
|
|||||||
<Compile Include="Serialization\ContractResolverTests.cs" />
|
<Compile Include="Serialization\ContractResolverTests.cs" />
|
||||||
<Compile Include="Serialization\DefaultValueHandlingTests.cs" />
|
<Compile Include="Serialization\DefaultValueHandlingTests.cs" />
|
||||||
<Compile Include="Serialization\DynamicTests.cs" />
|
<Compile Include="Serialization\DynamicTests.cs" />
|
||||||
|
<Compile Include="Serialization\ReferenceLoopHandlingTests.cs" />
|
||||||
<Compile Include="Serialization\WebApiIntegrationTests.cs" />
|
<Compile Include="Serialization\WebApiIntegrationTests.cs" />
|
||||||
<Compile Include="Serialization\JsonPropertyCollectionTests.cs" />
|
<Compile Include="Serialization\JsonPropertyCollectionTests.cs" />
|
||||||
<Compile Include="Serialization\NullValueHandlingTests.cs" />
|
<Compile Include="Serialization\NullValueHandlingTests.cs" />
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
#if !NETFX_CORE
|
|
||||||
using System.Runtime.Serialization;
|
using System.Runtime.Serialization;
|
||||||
|
#if !NETFX_CORE
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
#else
|
#else
|
||||||
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
#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
|
||||||
|
|
||||||
namespace Newtonsoft.Json.Tests.Serialization
|
namespace Newtonsoft.Json.Tests.Serialization
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -146,6 +146,7 @@
|
|||||||
<Compile Include="JsonConverter.cs" />
|
<Compile Include="JsonConverter.cs" />
|
||||||
<Compile Include="JsonConverterAttribute.cs" />
|
<Compile Include="JsonConverterAttribute.cs" />
|
||||||
<Compile Include="JsonConverterCollection.cs" />
|
<Compile Include="JsonConverterCollection.cs" />
|
||||||
|
<Compile Include="JsonDictionaryAttribute.cs" />
|
||||||
<Compile Include="JsonException.cs" />
|
<Compile Include="JsonException.cs" />
|
||||||
<Compile Include="JsonIgnoreAttribute.cs" />
|
<Compile Include="JsonIgnoreAttribute.cs" />
|
||||||
<Compile Include="JsonObjectAttribute.cs" />
|
<Compile Include="JsonObjectAttribute.cs" />
|
||||||
@@ -217,6 +218,7 @@
|
|||||||
<Compile Include="Serialization\IReferenceResolver.cs" />
|
<Compile Include="Serialization\IReferenceResolver.cs" />
|
||||||
<Compile Include="Serialization\IValueProvider.cs" />
|
<Compile Include="Serialization\IValueProvider.cs" />
|
||||||
<Compile Include="Serialization\JsonArrayContract.cs" />
|
<Compile Include="Serialization\JsonArrayContract.cs" />
|
||||||
|
<Compile Include="Serialization\JsonContainerContract.cs" />
|
||||||
<Compile Include="Serialization\JsonContract.cs" />
|
<Compile Include="Serialization\JsonContract.cs" />
|
||||||
<Compile Include="Serialization\JsonDictionaryContract.cs" />
|
<Compile Include="Serialization\JsonDictionaryContract.cs" />
|
||||||
<Compile Include="Serialization\JsonDynamicContract.cs" />
|
<Compile Include="Serialization\JsonDynamicContract.cs" />
|
||||||
|
|||||||
@@ -77,6 +77,7 @@
|
|||||||
<Compile Include="JsonConverter.cs" />
|
<Compile Include="JsonConverter.cs" />
|
||||||
<Compile Include="JsonConverterAttribute.cs" />
|
<Compile Include="JsonConverterAttribute.cs" />
|
||||||
<Compile Include="JsonConverterCollection.cs" />
|
<Compile Include="JsonConverterCollection.cs" />
|
||||||
|
<Compile Include="JsonDictionaryAttribute.cs" />
|
||||||
<Compile Include="JsonException.cs" />
|
<Compile Include="JsonException.cs" />
|
||||||
<Compile Include="JsonIgnoreAttribute.cs" />
|
<Compile Include="JsonIgnoreAttribute.cs" />
|
||||||
<Compile Include="JsonObjectAttribute.cs" />
|
<Compile Include="JsonObjectAttribute.cs" />
|
||||||
@@ -148,6 +149,7 @@
|
|||||||
<Compile Include="Serialization\IReferenceResolver.cs" />
|
<Compile Include="Serialization\IReferenceResolver.cs" />
|
||||||
<Compile Include="Serialization\IValueProvider.cs" />
|
<Compile Include="Serialization\IValueProvider.cs" />
|
||||||
<Compile Include="Serialization\JsonArrayContract.cs" />
|
<Compile Include="Serialization\JsonArrayContract.cs" />
|
||||||
|
<Compile Include="Serialization\JsonContainerContract.cs" />
|
||||||
<Compile Include="Serialization\JsonContract.cs" />
|
<Compile Include="Serialization\JsonContract.cs" />
|
||||||
<Compile Include="Serialization\JsonDictionaryContract.cs" />
|
<Compile Include="Serialization\JsonDictionaryContract.cs" />
|
||||||
<Compile Include="Serialization\JsonDynamicContract.cs" />
|
<Compile Include="Serialization\JsonDynamicContract.cs" />
|
||||||
|
|||||||
Reference in New Issue
Block a user