-Fixed Metro build

This commit is contained in:
James Newton-King
2012-03-19 00:03:20 +13:00
parent 8471c4ffe1
commit 60004065fd
5 changed files with 285 additions and 277 deletions
@@ -43,6 +43,7 @@ using Newtonsoft.Json.Utilities.LinqBridge;
#else #else
using System.Linq; using System.Linq;
#endif #endif
using System.IO;
namespace Newtonsoft.Json.Tests.Linq namespace Newtonsoft.Json.Tests.Linq
{ {
@@ -39,6 +39,7 @@ using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttrib
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Utilities;
namespace Newtonsoft.Json.Tests.Serialization namespace Newtonsoft.Json.Tests.Serialization
{ {
@@ -42,6 +42,11 @@ using TestMethod = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttrib
#endif #endif
using Newtonsoft.Json.Utilities; using Newtonsoft.Json.Utilities;
using System.Collections; using System.Collections;
#if NET20
using Newtonsoft.Json.Utilities.LinqBridge;
#else
using System.Linq;
#endif
namespace Newtonsoft.Json.Tests namespace Newtonsoft.Json.Tests
{ {
@@ -212,6 +212,7 @@
<Compile Include="Serialization\IContractResolver.cs" /> <Compile Include="Serialization\IContractResolver.cs" />
<Compile Include="Serialization\IReferenceResolver.cs" /> <Compile Include="Serialization\IReferenceResolver.cs" />
<Compile Include="Serialization\IValueProvider.cs" /> <Compile Include="Serialization\IValueProvider.cs" />
<Compile Include="Serialization\JPropertyKeyedCollection.cs" />
<Compile Include="Serialization\JsonArrayContract.cs" /> <Compile Include="Serialization\JsonArrayContract.cs" />
<Compile Include="Serialization\JsonContract.cs" /> <Compile Include="Serialization\JsonContract.cs" />
<Compile Include="Serialization\JsonDictionaryContract.cs" /> <Compile Include="Serialization\JsonDictionaryContract.cs" />
@@ -28,7 +28,6 @@ using System.ComponentModel;
using System.Globalization; using System.Globalization;
using System.Reflection; using System.Reflection;
#if !NETFX_CORE #if !NETFX_CORE
using System.Runtime.Serialization;
using System.Security.Permissions; using System.Security.Permissions;
#endif #endif
using Newtonsoft.Json.Utilities; using Newtonsoft.Json.Utilities;
@@ -40,6 +39,7 @@ using Newtonsoft.Json.Utilities.LinqBridge;
#else #else
using System.Linq; using System.Linq;
#endif #endif
using System.Runtime.Serialization;
namespace Newtonsoft.Json.Serialization namespace Newtonsoft.Json.Serialization
{ {
@@ -403,7 +403,7 @@ namespace Newtonsoft.Json.Serialization
{ {
if (_fullyTrusted == null) if (_fullyTrusted == null)
{ {
#if !(NET20 || NET35 || SILVERLIGHT) #if !(NET20 || NET35 || SILVERLIGHT || NETFX_CORE)
AppDomain appDomain = AppDomain.CurrentDomain; AppDomain appDomain = AppDomain.CurrentDomain;
_fullyTrusted = appDomain.IsHomogenous && appDomain.IsFullyTrusted; _fullyTrusted = appDomain.IsHomogenous && appDomain.IsFullyTrusted;