-Added Windows Phone 7 build

4 files changed, 451 insertions, 6 deletions

diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Phone.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Phone.csproj
new file mode 100644
index 0000000..034f400
--- /dev/null
+++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Phone.csproj
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="utf-8"?>

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

+  <PropertyGroup>

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

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

+    <ProductVersion>10.0.20506</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{5ED71C8C-D0A6-487C-9A8C-BB855ECEAF75}</ProjectGuid>

+    <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>

+    <OutputType>Library</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>Newtonsoft.Json.Tests.Phone</RootNamespace>

+    <AssemblyName>Newtonsoft.Json.Tests.Phone</AssemblyName>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>

+    <TargetFrameworkProfile>WindowsPhone</TargetFrameworkProfile>

+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>

+    <SilverlightApplication>false</SilverlightApplication>

+    <ValidateXaml>true</ValidateXaml>

+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>

+  </PropertyGroup>

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

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>Bin\Debug\Phone\</OutputPath>

+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>

+    <NoStdLib>true</NoStdLib>

+    <NoConfig>true</NoConfig>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+  </PropertyGroup>

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

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>Bin\Release\Phone\</OutputPath>

+    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>

+    <NoStdLib>true</NoStdLib>

+    <NoConfig>true</NoConfig>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="nunit.framework">

+      <HintPath>..\Lib\NUnit\Silverlight\nunit.framework.dll</HintPath>

+    </Reference>

+    <Reference Include="System.Runtime.Serialization">

+      <Private>True</Private>

+    </Reference>

+    <Reference Include="System.Windows">

+      <Private>True</Private>

+    </Reference>

+    <Reference Include="system">

+      <Private>True</Private>

+    </Reference>

+    <Reference Include="System.Core">

+      <Private>True</Private>

+    </Reference>

+    <Reference Include="System.Xml">

+      <Private>True</Private>

+    </Reference>

+    <Reference Include="System.Net">

+      <Private>True</Private>

+    </Reference>

+  </ItemGroup>

+  <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+    <Compile Include="TestObjects\AbstractGenericBase.cs" />

+    <Compile Include="TestObjects\ArgumentConverterPrecedenceClassConverter.cs" />

+    <Compile Include="TestObjects\BadJsonPropertyClass.cs" />

+    <Compile Include="TestObjects\Bar.cs" />

+    <Compile Include="TestObjects\Car.cs" />

+    <Compile Include="TestObjects\CircularReferenceClass.cs" />

+    <Compile Include="TestObjects\ClassAndMemberConverterClass.cs" />

+    <Compile Include="TestObjects\ClassConverterPrecedenceClassConverter.cs" />

+    <Compile Include="TestObjects\Computer.cs" />

+    <Compile Include="TestObjects\ConstructorCaseSensitivityClass.cs" />

+    <Compile Include="TestObjects\ConstructorReadonlyFields.cs" />

+    <Compile Include="TestObjects\Container.cs" />

+    <Compile Include="TestObjects\Content.cs" />

+    <Compile Include="TestObjects\ContentBaseClass.cs" />

+    <Compile Include="TestObjects\ContentSubClass.cs" />

+    <Compile Include="TestObjects\ConverterPrecedenceClass.cs" />

+    <Compile Include="TestObjects\ConverterPrecedenceClassConverter.cs" />

+    <Compile Include="TestObjects\CircularReferenceWithIdClass.cs" />

+    <Compile Include="TestObjects\DateTimeErrorObjectCollection.cs" />

+    <Compile Include="TestObjects\DefaultValueAttributeTestClass.cs" />

+    <Compile Include="TestObjects\DictionaryInterfaceClass.cs" />

+    <Compile Include="TestObjects\DoubleClass.cs" />

+    <Compile Include="TestObjects\EmployeeReference.cs" />

+    <Compile Include="TestObjects\Event.cs" />

+    <Compile Include="TestObjects\Foo.cs" />

+    <Compile Include="TestObjects\GenericImpl.cs" />

+    <Compile Include="TestObjects\GenericListAndDictionaryInterfaceProperties.cs" />

+    <Compile Include="TestObjects\GetOnlyPropertyClass.cs" />

+    <Compile Include="TestObjects\GoogleMapGeocoderStructure.cs" />

+    <Compile Include="TestObjects\HolderClass.cs" />

+    <Compile Include="TestObjects\IncompatibleJsonAttributeClass.cs" />

+    <Compile Include="TestObjects\InterfacePropertyTestClass.cs" />

+    <Compile Include="TestObjects\Invoice.cs" />

+    <Compile Include="TestObjects\JaggedArray.cs" />

+    <Compile Include="TestObjects\JsonIgnoreAttributeTestClass.cs" />

+    <Compile Include="TestObjects\JsonPropertyClass.cs" />

+    <Compile Include="TestObjects\JsonPropertyWithHandlingValues.cs" />

+    <Compile Include="TestObjects\ListErrorObject.cs" />

+    <Compile Include="TestObjects\ListErrorObjectCollection.cs" />

+    <Compile Include="TestObjects\ListOfIds.cs" />

+    <Compile Include="TestObjects\ListTestClass.cs" />

+    <Compile Include="TestObjects\LogEntry.cs" />

+    <Compile Include="TestObjects\MemberConverterPrecedenceClassConverter.cs" />

+    <Compile Include="TestObjects\MethodExecutorObject.cs" />

+    <Compile Include="TestObjects\Movie.cs" />

+    <Compile Include="TestObjects\MyClass.cs" />

+    <Compile Include="TestObjects\Name.cs" />

+    <Compile Include="TestObjects\NonRequest.cs" />

+    <Compile Include="TestObjects\NullableDateTimeTestClass.cs" />

+    <Compile Include="TestObjects\ObjectArrayPropertyTest.cs" />

+    <Compile Include="TestObjects\PersonError.cs" />

+    <Compile Include="TestObjects\PersonPropertyClass.cs" />

+    <Compile Include="TestObjects\PersonRaw.cs" />

+    <Compile Include="TestObjects\PhoneNumber.cs" />

+    <Compile Include="TestObjects\PrivateConstructorTestClass.cs" />

+    <Compile Include="TestObjects\PrivateConstructorWithPublicParametizedConstructorTestClass.cs" />

+    <Compile Include="TestObjects\PrivateMembersClass.cs" />

+    <Compile Include="TestObjects\PropertyCase.cs" />

+    <Compile Include="TestObjects\RequestOnly.cs" />

+    <Compile Include="TestObjects\RequiredMembersClass.cs" />

+    <Compile Include="TestObjects\RoleTransfer.cs" />

+    <Compile Include="TestObjects\SearchResult.cs" />

+    <Compile Include="TestObjects\SerializationEventTestDictionary.cs" />

+    <Compile Include="TestObjects\SerializationEventTestList.cs" />

+    <Compile Include="TestObjects\SerializationEventTestObject.cs" />

+    <Compile Include="TestObjects\SerializationEventTestObjectWithConstructor.cs" />

+    <Compile Include="TestObjects\SetOnlyPropertyClass.cs" />

+    <Compile Include="TestObjects\Article.cs" />

+    <Compile Include="TestObjects\ArticleCollection.cs" />

+    <Compile Include="TestObjects\ClassWithArray.cs" />

+    <Compile Include="TestObjects\ClassWithGuid.cs" />

+    <Compile Include="TestObjects\ConverableMembers.cs" />

+    <Compile Include="TestObjects\JsonIgnoreAttributeOnClassTestClass.cs" />

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

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

+    <Compile Include="TestObjects\MemberConverterClass.cs" />

+    <Compile Include="TestObjects\Product.cs" />

+    <Compile Include="TestObjects\ProductCollection.cs" />

+    <Compile Include="TestObjects\ProductShort.cs" />

+    <Compile Include="TestObjects\SetOnlyPropertyClass2.cs" />

+    <Compile Include="TestObjects\Shortie.cs" />

+    <Compile Include="TestObjects\Store.cs" />

+    <Compile Include="TestObjects\StoreColor.cs" />

+    <Compile Include="TestObjects\Person.cs" />

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

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

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

+    <Compile Include="TestObjects\DateTimeTestClass.cs" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+    <Compile Include="TestObjects\StructTest.cs" />

+    <Compile Include="TestObjects\SubKlass.cs" />

+    <Compile Include="TestObjects\SuperKlass.cs" />

+    <Compile Include="TestObjects\TypeClass.cs" />

+    <Compile Include="TestObjects\TypedSubHashtable.cs" />

+    <Compile Include="TestObjects\UserNullable.cs" />

+    <Compile Include="TestObjects\VersionKeyedCollection.cs" />

+    <Compile Include="TestObjects\WagePerson.cs" />

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

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

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\Newtonsoft.Json\Newtonsoft.Json.Phone.csproj">

+      <Project>{7A7F70AB-5C07-47ED-BDD2-ECC14DBACA5E}</Project>

+      <Name>Newtonsoft.Json.Phone</Name>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />

+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />

+  <ProjectExtensions />

+  <!-- 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.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
index 09587b8..a49318f 100644
--- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
+++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
@@ -41,7 +41,7 @@ using System.Collections.ObjectModel;
 using Newtonsoft.Json.Linq;

 using System.Linq;

 using Newtonsoft.Json.Converters;

-#if !PocketPC && !NET20

+#if !PocketPC && !NET20 && !WINDOWS_PHONE

 using System.Runtime.Serialization.Json;

 #endif

 using Newtonsoft.Json.Tests.TestObjects;

@@ -149,7 +149,7 @@ namespace Newtonsoft.Json.Tests.Serialization
 

       string jsonText = JsonConvert.SerializeObject(testDictionary);

 

-#if !PocketPC && !NET20

+#if !PocketPC && !NET20 && !WINDOWS_PHONE

       MemoryStream ms = new MemoryStream();

       DataContractJsonSerializer serializer = new DataContractJsonSerializer(typeof(Dictionary<string, object>));

       serializer.WriteObject(ms, testDictionary);

@@ -409,7 +409,7 @@ keyword such as type of business.""
       CollectionAssert.AreEqual(r1, r2);

     }

 

-#if !PocketPC && !NET20

+#if !PocketPC && !NET20 && !WINDOWS_PHONE

     [Test]

     public void Unicode()

     {

@@ -2374,7 +2374,7 @@ keyword such as type of business.""
       public string Ethnicity { get; set; }

     }

 

-#if !NET20 && !PocketPC

+#if !NET20 && !PocketPC && !WINDOWS_PHONE

     public class DataContractJsonSerializerTestClass

     {

       public TimeSpan TimeSpanProperty { get; set; }

diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.Phone.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.Phone.csproj
new file mode 100644
index 0000000..c6bfcdb
--- /dev/null
+++ b/Src/Newtonsoft.Json/Newtonsoft.Json.Phone.csproj
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>

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

+  <PropertyGroup>

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

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

+    <ProductVersion>10.0.20506</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{7A7F70AB-5C07-47ED-BDD2-ECC14DBACA5E}</ProjectGuid>

+    <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>

+    <OutputType>Library</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>Newtonsoft.Json.Phone</RootNamespace>

+    <AssemblyName>Newtonsoft.Json.Phone</AssemblyName>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>

+    <TargetFrameworkProfile>WindowsPhone</TargetFrameworkProfile>

+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>

+    <SilverlightApplication>false</SilverlightApplication>

+    <ValidateXaml>true</ValidateXaml>

+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>

+  </PropertyGroup>

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

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>Bin\Debug\Phone\</OutputPath>

+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>

+    <NoStdLib>true</NoStdLib>

+    <NoConfig>true</NoConfig>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <DocumentationFile>

+    </DocumentationFile>

+  </PropertyGroup>

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

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>Bin\Release\Phone\</OutputPath>

+    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>

+    <NoStdLib>true</NoStdLib>

+    <NoConfig>true</NoConfig>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <DocumentationFile>Bin\Release\Phone\Newtonsoft.Json.Phone.xml</DocumentationFile>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="System.Runtime.Serialization" />

+    <Reference Include="System.Windows" />

+    <Reference Include="system" />

+    <Reference Include="System.Core" />

+    <Reference Include="System.Xml" />

+    <Reference Include="System.Net" />

+  </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\IsoDateTimeConverter.cs" />

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

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

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

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

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

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

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

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

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

+    <Compile Include="JsonArrayAttribute.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="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\ComponentModel\JPropertyDescriptor.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\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="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\JsonSerializerProxy.cs" />

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

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

+    <Compile Include="Serialization\JsonStringContract.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\DynamicReflectionDelegateFactory.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\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\StringUtils.cs" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+  </ItemGroup>

+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />

+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />

+  <ProjectExtensions />

+  <!-- 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/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs
index 8862465..386816f 100644
--- a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs
+++ b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs
@@ -43,7 +43,9 @@ using System.Security;
 

 #if !SIGNED

 

-#if SILVERLIGHT

+#if WINDOWS_PHONE

+[assembly: InternalsVisibleTo("Newtonsoft.Json.Tests.Phone")]

+#elif SILVERLIGHT

 [assembly: InternalsVisibleTo("Newtonsoft.Json.Tests.Silverlight")]

 #elif PocketPC

 [assembly: InternalsVisibleTo("Newtonsoft.Json.Tests.Compact")]

@@ -57,7 +59,9 @@ using System.Security;
 

 #else

 

-#if SILVERLIGHT

+#if WINDOWS_PHONE

+[assembly: InternalsVisibleTo("Newtonsoft.Json.Tests.Phone, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f561df277c6c0b497d629032b410cdcf286e537c054724f7ffa0164345f62b3e642029d7a80cc351918955328c4adc8a048823ef90b0cf38ea7db0d729caf2b633c3babe08b0310198c1081995c19029bc675193744eab9d7345b8a67258ec17d112cebdbbb2a281487dceeafb9d83aa930f32103fbe1d2911425bc5744002c7")]

+#elif SILVERLIGHT

 [assembly: InternalsVisibleTo("Newtonsoft.Json.Tests.Silverlight, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f561df277c6c0b497d629032b410cdcf286e537c054724f7ffa0164345f62b3e642029d7a80cc351918955328c4adc8a048823ef90b0cf38ea7db0d729caf2b633c3babe08b0310198c1081995c19029bc675193744eab9d7345b8a67258ec17d112cebdbbb2a281487dceeafb9d83aa930f32103fbe1d2911425bc5744002c7")]

 #elif PocketPC

 [assembly: InternalsVisibleTo("Newtonsoft.Json.Tests.Compact, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f561df277c6c0b497d629032b410cdcf286e537c054724f7ffa0164345f62b3e642029d7a80cc351918955328c4adc8a048823ef90b0cf38ea7db0d729caf2b633c3babe08b0310198c1081995c19029bc675193744eab9d7345b8a67258ec17d112cebdbbb2a281487dceeafb9d83aa930f32103fbe1d2911425bc5744002c7")]