-Fixed Metro build

5 files changed, 285 insertions, 277 deletions

diff --git a/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs b/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs
index fbf09f3..05610d1 100644
--- a/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs
+++ b/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs
@@ -43,6 +43,7 @@ using Newtonsoft.Json.Utilities.LinqBridge;
 #else

 using System.Linq;

 #endif

+using System.IO;

 

 namespace Newtonsoft.Json.Tests.Linq

 {

diff --git a/Src/Newtonsoft.Json.Tests/Serialization/SerializationEventAttributeTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/SerializationEventAttributeTests.cs
index 16b2b63..09d7f6e 100644
--- a/Src/Newtonsoft.Json.Tests/Serialization/SerializationEventAttributeTests.cs
+++ b/Src/Newtonsoft.Json.Tests/Serialization/SerializationEventAttributeTests.cs
@@ -39,6 +39,7 @@ using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttrib
 using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;

 #endif

 using Newtonsoft.Json.Linq;

+using Newtonsoft.Json.Utilities;

 

 namespace Newtonsoft.Json.Tests.Serialization

 {

diff --git a/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs b/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs
index c40987a..ea7d33a 100644
--- a/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs
+++ b/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs
@@ -42,6 +42,11 @@ using TestMethod = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttrib
 #endif

 using Newtonsoft.Json.Utilities;

 using System.Collections;

+#if NET20

+using Newtonsoft.Json.Utilities.LinqBridge;

+#else

+using System.Linq;

+#endif

 

 namespace Newtonsoft.Json.Tests

 {

diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.Metro.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.Metro.csproj
index aa54ccb..4a9d96e 100644
--- a/Src/Newtonsoft.Json/Newtonsoft.Json.Metro.csproj
+++ b/Src/Newtonsoft.Json/Newtonsoft.Json.Metro.csproj
@@ -1,282 +1,283 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{263136A2-B89B-424E-A87A-F988CAA8D032}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Newtonsoft.Json</RootNamespace>
-    <AssemblyName>Newtonsoft.Json</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>3</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>ExpressRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>ExpressRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>ExpressRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>ExpressRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>ExpressRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>ExpressRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Bson\BsonBinaryType.cs" />
-    <Compile Include="Bson\BsonBinaryWriter.cs" />
-    <Compile Include="Bson\BsonObjectId.cs" />
-    <Compile Include="Bson\BsonReader.cs" />
-    <Compile Include="Bson\BsonToken.cs" />
-    <Compile Include="Bson\BsonType.cs" />
-    <Compile Include="Bson\BsonWriter.cs" />
-    <Compile Include="ConstructorHandling.cs" />
-    <Compile Include="Converters\BinaryConverter.cs" />
-    <Compile Include="Converters\BsonObjectIdConverter.cs" />
-    <Compile Include="Converters\CustomCreationConverter.cs" />
-    <Compile Include="Converters\DataSetConverter.cs" />
-    <Compile Include="Converters\DataTableConverter.cs" />
-    <Compile Include="Converters\DateTimeConverterBase.cs" />
-    <Compile Include="Converters\EntityKeyMemberConverter.cs" />
-    <Compile Include="Converters\ExpandoObjectConverter.cs" />
-    <Compile Include="Converters\IsoDateTimeConverter.cs" />
-    <Compile Include="Converters\JavaScriptDateTimeConverter.cs" />
-    <Compile Include="Converters\KeyValuePairConverter.cs" />
-    <Compile Include="Converters\RegexConverter.cs" />
-    <Compile Include="Converters\StringEnumConverter.cs" />
-    <Compile Include="Converters\VersionConverter.cs" />
-    <Compile Include="Converters\XmlNodeConverter.cs" />
-    <Compile Include="DateFormatHandling.cs" />
-    <Compile Include="DateTimeZoneHandling.cs" />
-    <Compile Include="DefaultValueHandling.cs" />
-    <Compile Include="FormatterAssemblyStyle.cs" />
-    <Compile Include="Formatting.cs" />
-    <Compile Include="IJsonLineInfo.cs" />
-    <Compile Include="JsonArrayAttribute.cs" />
-    <Compile Include="JsonConstructorAttribute.cs" />
-    <Compile Include="JsonContainerAttribute.cs" />
-    <Compile Include="JsonConvert.cs" />
-    <Compile Include="JsonConverter.cs" />
-    <Compile Include="JsonConverterAttribute.cs" />
-    <Compile Include="JsonConverterCollection.cs" />
-    <Compile Include="JsonIgnoreAttribute.cs" />
-    <Compile Include="JsonObjectAttribute.cs" />
-    <Compile Include="JsonPosition.cs" />
-    <Compile Include="JsonPropertyAttribute.cs" />
-    <Compile Include="JsonReader.cs" />
-    <Compile Include="JsonReaderException.cs" />
-    <Compile Include="JsonSerializationException.cs" />
-    <Compile Include="JsonSerializer.cs" />
-    <Compile Include="JsonSerializerSettings.cs" />
-    <Compile Include="JsonTextReader.cs" />
-    <Compile Include="JsonTextWriter.cs" />
-    <Compile Include="JsonToken.cs" />
-    <Compile Include="JsonValidatingReader.cs" />
-    <Compile Include="JsonWriter.cs" />
-    <Compile Include="JsonWriterException.cs" />
-    <Compile Include="Linq\Extensions.cs" />
-    <Compile Include="Linq\IJEnumerable.cs" />
-    <Compile Include="Linq\JArray.cs" />
-    <Compile Include="Linq\JConstructor.cs" />
-    <Compile Include="Linq\JContainer.cs" />
-    <Compile Include="Linq\JEnumerable.cs" />
-    <Compile Include="Linq\JObject.cs" />
-    <Compile Include="Linq\JPath.cs" />
-    <Compile Include="Linq\JProperty.cs" />
-    <Compile Include="Linq\JPropertyDescriptor.cs" />
-    <Compile Include="Linq\JRaw.cs" />
-    <Compile Include="Linq\JToken.cs" />
-    <Compile Include="Linq\JTokenEqualityComparer.cs" />
-    <Compile Include="Linq\JTokenReader.cs" />
-    <Compile Include="Linq\JTokenType.cs" />
-    <Compile Include="Linq\JTokenWriter.cs" />
-    <Compile Include="Linq\JValue.cs" />
-    <Compile Include="MemberSerialization.cs" />
-    <Compile Include="MissingMemberHandling.cs" />
-    <Compile Include="NullValueHandling.cs" />
-    <Compile Include="ObjectCreationHandling.cs" />
-    <Compile Include="PreserveReferencesHandling.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ReferenceLoopHandling.cs" />
-    <Compile Include="Required.cs" />
-    <Compile Include="Schema\Extensions.cs" />
-    <Compile Include="Schema\JsonSchema.cs" />
-    <Compile Include="Schema\JsonSchemaBuilder.cs" />
-    <Compile Include="Schema\JsonSchemaConstants.cs" />
-    <Compile Include="Schema\JsonSchemaException.cs" />
-    <Compile Include="Schema\JsonSchemaGenerator.cs" />
-    <Compile Include="Schema\JsonSchemaModel.cs" />
-    <Compile Include="Schema\JsonSchemaModelBuilder.cs" />
-    <Compile Include="Schema\JsonSchemaNode.cs" />
-    <Compile Include="Schema\JsonSchemaNodeCollection.cs" />
-    <Compile Include="Schema\JsonSchemaResolver.cs" />
-    <Compile Include="Schema\JsonSchemaType.cs" />
-    <Compile Include="Schema\JsonSchemaWriter.cs" />
-    <Compile Include="Schema\UndefinedSchemaIdHandling.cs" />
-    <Compile Include="Schema\ValidationEventArgs.cs" />
-    <Compile Include="Schema\ValidationEventHandler.cs" />
-    <Compile Include="SerializationBinder.cs" />
-    <Compile Include="Serialization\CachedAttributeGetter.cs" />
-    <Compile Include="Serialization\CamelCasePropertyNamesContractResolver.cs" />
-    <Compile Include="Serialization\DefaultContractResolver.cs" />
-    <Compile Include="Serialization\DefaultReferenceResolver.cs" />
-    <Compile Include="Serialization\DefaultSerializationBinder.cs" />
-    <Compile Include="Serialization\DynamicValueProvider.cs" />
-    <Compile Include="Serialization\ErrorContext.cs" />
-    <Compile Include="Serialization\ErrorEventArgs.cs" />
-    <Compile Include="Serialization\IContractResolver.cs" />
-    <Compile Include="Serialization\IReferenceResolver.cs" />
-    <Compile Include="Serialization\IValueProvider.cs" />
-    <Compile Include="Serialization\JsonArrayContract.cs" />
-    <Compile Include="Serialization\JsonContract.cs" />
-    <Compile Include="Serialization\JsonDictionaryContract.cs" />
-    <Compile Include="Serialization\JsonDynamicContract.cs" />
-    <Compile Include="Serialization\JsonFormatterConverter.cs" />
-    <Compile Include="Serialization\JsonISerializableContract.cs" />
-    <Compile Include="Serialization\JsonLinqContract.cs" />
-    <Compile Include="Serialization\JsonObjectContract.cs" />
-    <Compile Include="Serialization\JsonPrimitiveContract.cs" />
-    <Compile Include="Serialization\JsonProperty.cs" />
-    <Compile Include="Serialization\JsonPropertyCollection.cs" />
-    <Compile Include="Serialization\JsonSerializerInternalBase.cs" />
-    <Compile Include="Serialization\JsonSerializerInternalReader.cs" />
-    <Compile Include="Serialization\JsonSerializerInternalWriter.cs" />
-    <Compile Include="Serialization\JsonSerializerProxy.cs" />
-    <Compile Include="Serialization\JsonStringContract.cs" />
-    <Compile Include="Serialization\JsonTypeReflector.cs" />
-    <Compile Include="Serialization\LateBoundMetadataTypeAttribute.cs" />
-    <Compile Include="Serialization\ObjectConstructor.cs" />
-    <Compile Include="Serialization\OnErrorAttribute.cs" />
-    <Compile Include="Serialization\ReflectionValueProvider.cs" />
-    <Compile Include="StreamingContext.cs" />
-    <Compile Include="TypeNameHandling.cs" />
-    <Compile Include="Utilities\Base64Encoder.cs" />
-    <Compile Include="Utilities\BidirectionalDictionary.cs" />
-    <Compile Include="Utilities\CollectionUtils.cs" />
-    <Compile Include="Utilities\CollectionWrapper.cs" />
-    <Compile Include="Utilities\ConvertUtils.cs" />
-    <Compile Include="Utilities\DateTimeUtils.cs" />
-    <Compile Include="Utilities\DictionaryWrapper.cs" />
-    <Compile Include="Utilities\DynamicProxy.cs" />
-    <Compile Include="Utilities\DynamicProxyMetaObject.cs" />
-    <Compile Include="Utilities\DynamicReflectionDelegateFactory.cs" />
-    <Compile Include="Utilities\DynamicUtils.cs" />
-    <Compile Include="Utilities\DynamicWrapper.cs" />
-    <Compile Include="Utilities\EnumUtils.cs" />
-    <Compile Include="Utilities\EnumValue.cs" />
-    <Compile Include="Utilities\EnumValues.cs" />
-    <Compile Include="Utilities\ILGeneratorExtensions.cs" />
-    <Compile Include="Utilities\JavaScriptUtils.cs" />
-    <Compile Include="Utilities\LateBoundReflectionDelegateFactory.cs" />
-    <Compile Include="Utilities\LinqBridge.cs" />
-    <Compile Include="Utilities\ListWrapper.cs" />
-    <Compile Include="Utilities\MathUtils.cs" />
-    <Compile Include="Utilities\MethodCall.cs" />
-    <Compile Include="Utilities\MiscellaneousUtils.cs" />
-    <Compile Include="Utilities\ReflectionDelegateFactory.cs" />
-    <Compile Include="Utilities\ReflectionUtils.cs" />
-    <Compile Include="Utilities\StringBuffer.cs" />
-    <Compile Include="Utilities\StringReference.cs" />
-    <Compile Include="Utilities\StringUtils.cs" />
-    <Compile Include="Utilities\ThreadSafeStore.cs" />
-    <Compile Include="Utilities\TypeExtensions.cs" />
-    <Compile Include="Utilities\ValidationUtils.cs" />
-    <Compile Include="WriteState.cs" />
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' ">
-    <VisualStudioVersion>11.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ProductVersion>8.0.30703</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{263136A2-B89B-424E-A87A-F988CAA8D032}</ProjectGuid>

+    <OutputType>Library</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>Newtonsoft.Json</RootNamespace>

+    <AssemblyName>Newtonsoft.Json</AssemblyName>

+    <DefaultLanguage>en-US</DefaultLanguage>

+    <FileAlignment>512</FileAlignment>

+    <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>bin\Debug\</OutputPath>

+    <DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>3</WarningLevel>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\Release\</OutputPath>

+    <DefineConstants>TRACE;NETFX_CORE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">

+    <DebugSymbols>true</DebugSymbols>

+    <OutputPath>bin\ARM\Debug\</OutputPath>

+    <DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>

+    <NoWarn>;2008</NoWarn>

+    <DebugType>full</DebugType>

+    <PlatformTarget>ARM</PlatformTarget>

+    <UseVSHostingProcess>false</UseVSHostingProcess>

+    <ErrorReport>prompt</ErrorReport>

+    <CodeAnalysisRuleSet>ExpressRules.ruleset</CodeAnalysisRuleSet>

+    <Prefer32Bit>true</Prefer32Bit>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">

+    <OutputPath>bin\ARM\Release\</OutputPath>

+    <DefineConstants>TRACE;NETFX_CORE</DefineConstants>

+    <Optimize>true</Optimize>

+    <NoWarn>;2008</NoWarn>

+    <DebugType>pdbonly</DebugType>

+    <PlatformTarget>ARM</PlatformTarget>

+    <UseVSHostingProcess>false</UseVSHostingProcess>

+    <ErrorReport>prompt</ErrorReport>

+    <CodeAnalysisRuleSet>ExpressRules.ruleset</CodeAnalysisRuleSet>

+    <Prefer32Bit>true</Prefer32Bit>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">

+    <DebugSymbols>true</DebugSymbols>

+    <OutputPath>bin\x64\Debug\</OutputPath>

+    <DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>

+    <NoWarn>;2008</NoWarn>

+    <DebugType>full</DebugType>

+    <PlatformTarget>x64</PlatformTarget>

+    <UseVSHostingProcess>false</UseVSHostingProcess>

+    <ErrorReport>prompt</ErrorReport>

+    <CodeAnalysisRuleSet>ExpressRules.ruleset</CodeAnalysisRuleSet>

+    <Prefer32Bit>true</Prefer32Bit>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">

+    <OutputPath>bin\x64\Release\</OutputPath>

+    <DefineConstants>TRACE;NETFX_CORE</DefineConstants>

+    <Optimize>true</Optimize>

+    <NoWarn>;2008</NoWarn>

+    <DebugType>pdbonly</DebugType>

+    <PlatformTarget>x64</PlatformTarget>

+    <UseVSHostingProcess>false</UseVSHostingProcess>

+    <ErrorReport>prompt</ErrorReport>

+    <CodeAnalysisRuleSet>ExpressRules.ruleset</CodeAnalysisRuleSet>

+    <Prefer32Bit>true</Prefer32Bit>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">

+    <DebugSymbols>true</DebugSymbols>

+    <OutputPath>bin\x86\Debug\</OutputPath>

+    <DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>

+    <NoWarn>;2008</NoWarn>

+    <DebugType>full</DebugType>

+    <PlatformTarget>x86</PlatformTarget>

+    <UseVSHostingProcess>false</UseVSHostingProcess>

+    <ErrorReport>prompt</ErrorReport>

+    <CodeAnalysisRuleSet>ExpressRules.ruleset</CodeAnalysisRuleSet>

+    <Prefer32Bit>true</Prefer32Bit>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">

+    <OutputPath>bin\x86\Release\</OutputPath>

+    <DefineConstants>TRACE;NETFX_CORE</DefineConstants>

+    <Optimize>true</Optimize>

+    <NoWarn>;2008</NoWarn>

+    <DebugType>pdbonly</DebugType>

+    <PlatformTarget>x86</PlatformTarget>

+    <UseVSHostingProcess>false</UseVSHostingProcess>

+    <ErrorReport>prompt</ErrorReport>

+    <CodeAnalysisRuleSet>ExpressRules.ruleset</CodeAnalysisRuleSet>

+    <Prefer32Bit>true</Prefer32Bit>

+  </PropertyGroup>

+  <ItemGroup>

+    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="Bson\BsonBinaryType.cs" />

+    <Compile Include="Bson\BsonBinaryWriter.cs" />

+    <Compile Include="Bson\BsonObjectId.cs" />

+    <Compile Include="Bson\BsonReader.cs" />

+    <Compile Include="Bson\BsonToken.cs" />

+    <Compile Include="Bson\BsonType.cs" />

+    <Compile Include="Bson\BsonWriter.cs" />

+    <Compile Include="ConstructorHandling.cs" />

+    <Compile Include="Converters\BinaryConverter.cs" />

+    <Compile Include="Converters\BsonObjectIdConverter.cs" />

+    <Compile Include="Converters\CustomCreationConverter.cs" />

+    <Compile Include="Converters\DataSetConverter.cs" />

+    <Compile Include="Converters\DataTableConverter.cs" />

+    <Compile Include="Converters\DateTimeConverterBase.cs" />

+    <Compile Include="Converters\EntityKeyMemberConverter.cs" />

+    <Compile Include="Converters\ExpandoObjectConverter.cs" />

+    <Compile Include="Converters\IsoDateTimeConverter.cs" />

+    <Compile Include="Converters\JavaScriptDateTimeConverter.cs" />

+    <Compile Include="Converters\KeyValuePairConverter.cs" />

+    <Compile Include="Converters\RegexConverter.cs" />

+    <Compile Include="Converters\StringEnumConverter.cs" />

+    <Compile Include="Converters\VersionConverter.cs" />

+    <Compile Include="Converters\XmlNodeConverter.cs" />

+    <Compile Include="DateFormatHandling.cs" />

+    <Compile Include="DateTimeZoneHandling.cs" />

+    <Compile Include="DefaultValueHandling.cs" />

+    <Compile Include="FormatterAssemblyStyle.cs" />

+    <Compile Include="Formatting.cs" />

+    <Compile Include="IJsonLineInfo.cs" />

+    <Compile Include="JsonArrayAttribute.cs" />

+    <Compile Include="JsonConstructorAttribute.cs" />

+    <Compile Include="JsonContainerAttribute.cs" />

+    <Compile Include="JsonConvert.cs" />

+    <Compile Include="JsonConverter.cs" />

+    <Compile Include="JsonConverterAttribute.cs" />

+    <Compile Include="JsonConverterCollection.cs" />

+    <Compile Include="JsonIgnoreAttribute.cs" />

+    <Compile Include="JsonObjectAttribute.cs" />

+    <Compile Include="JsonPosition.cs" />

+    <Compile Include="JsonPropertyAttribute.cs" />

+    <Compile Include="JsonReader.cs" />

+    <Compile Include="JsonReaderException.cs" />

+    <Compile Include="JsonSerializationException.cs" />

+    <Compile Include="JsonSerializer.cs" />

+    <Compile Include="JsonSerializerSettings.cs" />

+    <Compile Include="JsonTextReader.cs" />

+    <Compile Include="JsonTextWriter.cs" />

+    <Compile Include="JsonToken.cs" />

+    <Compile Include="JsonValidatingReader.cs" />

+    <Compile Include="JsonWriter.cs" />

+    <Compile Include="JsonWriterException.cs" />

+    <Compile Include="Linq\Extensions.cs" />

+    <Compile Include="Linq\IJEnumerable.cs" />

+    <Compile Include="Linq\JArray.cs" />

+    <Compile Include="Linq\JConstructor.cs" />

+    <Compile Include="Linq\JContainer.cs" />

+    <Compile Include="Linq\JEnumerable.cs" />

+    <Compile Include="Linq\JObject.cs" />

+    <Compile Include="Linq\JPath.cs" />

+    <Compile Include="Linq\JProperty.cs" />

+    <Compile Include="Linq\JPropertyDescriptor.cs" />

+    <Compile Include="Linq\JRaw.cs" />

+    <Compile Include="Linq\JToken.cs" />

+    <Compile Include="Linq\JTokenEqualityComparer.cs" />

+    <Compile Include="Linq\JTokenReader.cs" />

+    <Compile Include="Linq\JTokenType.cs" />

+    <Compile Include="Linq\JTokenWriter.cs" />

+    <Compile Include="Linq\JValue.cs" />

+    <Compile Include="MemberSerialization.cs" />

+    <Compile Include="MissingMemberHandling.cs" />

+    <Compile Include="NullValueHandling.cs" />

+    <Compile Include="ObjectCreationHandling.cs" />

+    <Compile Include="PreserveReferencesHandling.cs" />

+    <Compile Include="Properties\AssemblyInfo.cs" />

+    <Compile Include="ReferenceLoopHandling.cs" />

+    <Compile Include="Required.cs" />

+    <Compile Include="Schema\Extensions.cs" />

+    <Compile Include="Schema\JsonSchema.cs" />

+    <Compile Include="Schema\JsonSchemaBuilder.cs" />

+    <Compile Include="Schema\JsonSchemaConstants.cs" />

+    <Compile Include="Schema\JsonSchemaException.cs" />

+    <Compile Include="Schema\JsonSchemaGenerator.cs" />

+    <Compile Include="Schema\JsonSchemaModel.cs" />

+    <Compile Include="Schema\JsonSchemaModelBuilder.cs" />

+    <Compile Include="Schema\JsonSchemaNode.cs" />

+    <Compile Include="Schema\JsonSchemaNodeCollection.cs" />

+    <Compile Include="Schema\JsonSchemaResolver.cs" />

+    <Compile Include="Schema\JsonSchemaType.cs" />

+    <Compile Include="Schema\JsonSchemaWriter.cs" />

+    <Compile Include="Schema\UndefinedSchemaIdHandling.cs" />

+    <Compile Include="Schema\ValidationEventArgs.cs" />

+    <Compile Include="Schema\ValidationEventHandler.cs" />

+    <Compile Include="SerializationBinder.cs" />

+    <Compile Include="Serialization\CachedAttributeGetter.cs" />

+    <Compile Include="Serialization\CamelCasePropertyNamesContractResolver.cs" />

+    <Compile Include="Serialization\DefaultContractResolver.cs" />

+    <Compile Include="Serialization\DefaultReferenceResolver.cs" />

+    <Compile Include="Serialization\DefaultSerializationBinder.cs" />

+    <Compile Include="Serialization\DynamicValueProvider.cs" />

+    <Compile Include="Serialization\ErrorContext.cs" />

+    <Compile Include="Serialization\ErrorEventArgs.cs" />

+    <Compile Include="Serialization\IContractResolver.cs" />

+    <Compile Include="Serialization\IReferenceResolver.cs" />

+    <Compile Include="Serialization\IValueProvider.cs" />

+    <Compile Include="Serialization\JPropertyKeyedCollection.cs" />

+    <Compile Include="Serialization\JsonArrayContract.cs" />

+    <Compile Include="Serialization\JsonContract.cs" />

+    <Compile Include="Serialization\JsonDictionaryContract.cs" />

+    <Compile Include="Serialization\JsonDynamicContract.cs" />

+    <Compile Include="Serialization\JsonFormatterConverter.cs" />

+    <Compile Include="Serialization\JsonISerializableContract.cs" />

+    <Compile Include="Serialization\JsonLinqContract.cs" />

+    <Compile Include="Serialization\JsonObjectContract.cs" />

+    <Compile Include="Serialization\JsonPrimitiveContract.cs" />

+    <Compile Include="Serialization\JsonProperty.cs" />

+    <Compile Include="Serialization\JsonPropertyCollection.cs" />

+    <Compile Include="Serialization\JsonSerializerInternalBase.cs" />

+    <Compile Include="Serialization\JsonSerializerInternalReader.cs" />

+    <Compile Include="Serialization\JsonSerializerInternalWriter.cs" />

+    <Compile Include="Serialization\JsonSerializerProxy.cs" />

+    <Compile Include="Serialization\JsonStringContract.cs" />

+    <Compile Include="Serialization\JsonTypeReflector.cs" />

+    <Compile Include="Serialization\LateBoundMetadataTypeAttribute.cs" />

+    <Compile Include="Serialization\ObjectConstructor.cs" />

+    <Compile Include="Serialization\OnErrorAttribute.cs" />

+    <Compile Include="Serialization\ReflectionValueProvider.cs" />

+    <Compile Include="StreamingContext.cs" />

+    <Compile Include="TypeNameHandling.cs" />

+    <Compile Include="Utilities\Base64Encoder.cs" />

+    <Compile Include="Utilities\BidirectionalDictionary.cs" />

+    <Compile Include="Utilities\CollectionUtils.cs" />

+    <Compile Include="Utilities\CollectionWrapper.cs" />

+    <Compile Include="Utilities\ConvertUtils.cs" />

+    <Compile Include="Utilities\DateTimeUtils.cs" />

+    <Compile Include="Utilities\DictionaryWrapper.cs" />

+    <Compile Include="Utilities\DynamicProxy.cs" />

+    <Compile Include="Utilities\DynamicProxyMetaObject.cs" />

+    <Compile Include="Utilities\DynamicReflectionDelegateFactory.cs" />

+    <Compile Include="Utilities\DynamicUtils.cs" />

+    <Compile Include="Utilities\DynamicWrapper.cs" />

+    <Compile Include="Utilities\EnumUtils.cs" />

+    <Compile Include="Utilities\EnumValue.cs" />

+    <Compile Include="Utilities\EnumValues.cs" />

+    <Compile Include="Utilities\ILGeneratorExtensions.cs" />

+    <Compile Include="Utilities\JavaScriptUtils.cs" />

+    <Compile Include="Utilities\LateBoundReflectionDelegateFactory.cs" />

+    <Compile Include="Utilities\LinqBridge.cs" />

+    <Compile Include="Utilities\ListWrapper.cs" />

+    <Compile Include="Utilities\MathUtils.cs" />

+    <Compile Include="Utilities\MethodCall.cs" />

+    <Compile Include="Utilities\MiscellaneousUtils.cs" />

+    <Compile Include="Utilities\ReflectionDelegateFactory.cs" />

+    <Compile Include="Utilities\ReflectionUtils.cs" />

+    <Compile Include="Utilities\StringBuffer.cs" />

+    <Compile Include="Utilities\StringReference.cs" />

+    <Compile Include="Utilities\StringUtils.cs" />

+    <Compile Include="Utilities\ThreadSafeStore.cs" />

+    <Compile Include="Utilities\TypeExtensions.cs" />

+    <Compile Include="Utilities\ValidationUtils.cs" />

+    <Compile Include="WriteState.cs" />

+  </ItemGroup>

+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' ">

+    <VisualStudioVersion>11.0</VisualStudioVersion>

+  </PropertyGroup>

+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->

 </Project>
\ No newline at end of file
diff --git a/Src/Newtonsoft.Json/Serialization/JsonTypeReflector.cs b/Src/Newtonsoft.Json/Serialization/JsonTypeReflector.cs
index 180ce08..627a9e5 100644
--- a/Src/Newtonsoft.Json/Serialization/JsonTypeReflector.cs
+++ b/Src/Newtonsoft.Json/Serialization/JsonTypeReflector.cs
@@ -28,7 +28,6 @@ using System.ComponentModel;
 using System.Globalization;

 using System.Reflection;

 #if !NETFX_CORE

-using System.Runtime.Serialization;

 using System.Security.Permissions;

 #endif

 using Newtonsoft.Json.Utilities;

@@ -40,6 +39,7 @@ using Newtonsoft.Json.Utilities.LinqBridge;
 #else

 using System.Linq;

 #endif

+using System.Runtime.Serialization;

 

 namespace Newtonsoft.Json.Serialization

 {

@@ -403,7 +403,7 @@ namespace Newtonsoft.Json.Serialization
       {

         if (_fullyTrusted == null)

         {

-#if !(NET20 || NET35 || SILVERLIGHT)

+#if !(NET20 || NET35 || SILVERLIGHT || NETFX_CORE)

           AppDomain appDomain = AppDomain.CurrentDomain;

 

           _fullyTrusted = appDomain.IsHomogenous && appDomain.IsFullyTrusted;