From dd07fdff936490d5433e52847a0bf8212dc573f8 Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Sun, 3 Aug 2014 19:06:51 +1200
Subject: [PATCH] -Fixed WinRT build

---
 Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs      | 2 +-
 .../Serialization/ContractResolverTests.cs                | 8 ++++----
 Src/Newtonsoft.Json/Newtonsoft.Json.WinRT.csproj          | 3 ++-
 Src/Newtonsoft.Json/Properties/AssemblyInfo.cs            | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs
index 6e067e48..13ad467a 100644
--- a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs
+++ b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs
@@ -75,4 +75,4 @@ using System.Security;
 // by using the '*' as shown below:
 
 [assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.0.4.17602")]
+[assembly: AssemblyFileVersion("6.0.4.17603")]
diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs
index c4b32372..1cee6b3f 100644
--- a/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs
+++ b/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs
@@ -389,16 +389,16 @@ namespace Newtonsoft.Json.Tests.Serialization
             p = new JsonProperty { PropertyName = Environment.NewLine };
             Assert.IsFalse(p._skipPropertyNameEscape);
 
-            p = new JsonProperty { PropertyName = '\0'.ToString(CultureInfo.InvariantCulture) };
+            p = new JsonProperty { PropertyName = "\0" };
             Assert.IsFalse(p._skipPropertyNameEscape);
 
-            p = new JsonProperty { PropertyName = '\n'.ToString(CultureInfo.InvariantCulture) };
+            p = new JsonProperty { PropertyName = "\n" };
             Assert.IsFalse(p._skipPropertyNameEscape);
 
-            p = new JsonProperty { PropertyName = '\v'.ToString(CultureInfo.InvariantCulture) };
+            p = new JsonProperty { PropertyName = "\v" };
             Assert.IsFalse(p._skipPropertyNameEscape);
 
-            p = new JsonProperty { PropertyName = '\u00B9'.ToString(CultureInfo.InvariantCulture) };
+            p = new JsonProperty { PropertyName = "\u00B9" };
             Assert.IsFalse(p._skipPropertyNameEscape);
         }
 
diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.WinRT.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.WinRT.csproj
index d244c8b6..8a9992e4 100644
--- a/Src/Newtonsoft.Json/Newtonsoft.Json.WinRT.csproj
+++ b/Src/Newtonsoft.Json/Newtonsoft.Json.WinRT.csproj
@@ -183,6 +183,7 @@
     <Compile Include="Linq\JPropertyDescriptor.cs" />
     <Compile Include="Linq\JPropertyKeyedCollection.cs" />
     <Compile Include="Linq\JRaw.cs" />
+    <Compile Include="Linq\JsonMergeSettings.cs" />
     <Compile Include="Linq\JsonPath\ArrayIndexFilter.cs" />
     <Compile Include="Linq\JsonPath\ArrayMultipleIndexFilter.cs" />
     <Compile Include="Linq\JsonPath\ArraySliceFilter.cs" />
@@ -199,6 +200,7 @@
     <Compile Include="Linq\JTokenType.cs" />
     <Compile Include="Linq\JTokenWriter.cs" />
     <Compile Include="Linq\JValue.cs" />
+    <Compile Include="Linq\MergeArrayHandling.cs" />
     <Compile Include="MemberSerialization.cs" />
     <Compile Include="MissingMemberHandling.cs" />
     <Compile Include="NullValueHandling.cs" />
@@ -280,7 +282,6 @@
     <Compile Include="Utilities\DynamicUtils.cs" />
     <Compile Include="Utilities\EnumUtils.cs" />
     <Compile Include="Utilities\EnumValue.cs" />
-    <Compile Include="Utilities\EnumValues.cs" />
     <Compile Include="Utilities\ExpressionReflectionDelegateFactory.cs" />
     <Compile Include="Utilities\ILGeneratorExtensions.cs" />
     <Compile Include="Utilities\ImmutableCollectionsUtils.cs" />
diff --git a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs
index eca9a3a0..5e88bb9a 100644
--- a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs
+++ b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs
@@ -91,5 +91,5 @@ using System.Security;
 // by using the '*' as shown below:
 
 [assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.0.4.17602")]
+[assembly: AssemblyFileVersion("6.0.4.17603")]
 [assembly: CLSCompliant(true)]