LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Fixed WinRT build

Browse Source
This commit is contained in:
James Newton-King
2014-08-03 19:06:51 +12:00
parent 3327a6954c
commit dd07fdff93
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs
+1 -1
View File
@@ -75,4 +75,4 @@ using System.Security;
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("6.0.0.0")] [assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.4.17602")] [assembly: AssemblyFileVersion("6.0.4.17603")]
Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs
+4 -4
View File
@@ -389,16 +389,16 @@ namespace Newtonsoft.Json.Tests.Serialization
p = new JsonProperty { PropertyName = Environment.NewLine }; p = new JsonProperty { PropertyName = Environment.NewLine };
Assert.IsFalse(p._skipPropertyNameEscape); Assert.IsFalse(p._skipPropertyNameEscape);
p = new JsonProperty { PropertyName = '\0'.ToString(CultureInfo.InvariantCulture) }; p = new JsonProperty { PropertyName = "\0" };
Assert.IsFalse(p._skipPropertyNameEscape); Assert.IsFalse(p._skipPropertyNameEscape);
p = new JsonProperty { PropertyName = '\n'.ToString(CultureInfo.InvariantCulture) }; p = new JsonProperty { PropertyName = "\n" };
Assert.IsFalse(p._skipPropertyNameEscape); Assert.IsFalse(p._skipPropertyNameEscape);
p = new JsonProperty { PropertyName = '\v'.ToString(CultureInfo.InvariantCulture) }; p = new JsonProperty { PropertyName = "\v" };
Assert.IsFalse(p._skipPropertyNameEscape); Assert.IsFalse(p._skipPropertyNameEscape);
p = new JsonProperty { PropertyName = '\u00B9'.ToString(CultureInfo.InvariantCulture) }; p = new JsonProperty { PropertyName = "\u00B9" };
Assert.IsFalse(p._skipPropertyNameEscape); Assert.IsFalse(p._skipPropertyNameEscape);
} }
Src/Newtonsoft.Json/Newtonsoft.Json.WinRT.csproj
+2 -1
View File
@@ -183,6 +183,7 @@
<Compile Include="Linq\JPropertyDescriptor.cs" /> <Compile Include="Linq\JPropertyDescriptor.cs" />
<Compile Include="Linq\JPropertyKeyedCollection.cs" /> <Compile Include="Linq\JPropertyKeyedCollection.cs" />
<Compile Include="Linq\JRaw.cs" /> <Compile Include="Linq\JRaw.cs" />
<Compile Include="Linq\JsonMergeSettings.cs" />
<Compile Include="Linq\JsonPath\ArrayIndexFilter.cs" /> <Compile Include="Linq\JsonPath\ArrayIndexFilter.cs" />
<Compile Include="Linq\JsonPath\ArrayMultipleIndexFilter.cs" /> <Compile Include="Linq\JsonPath\ArrayMultipleIndexFilter.cs" />
<Compile Include="Linq\JsonPath\ArraySliceFilter.cs" /> <Compile Include="Linq\JsonPath\ArraySliceFilter.cs" />
@@ -199,6 +200,7 @@
<Compile Include="Linq\JTokenType.cs" /> <Compile Include="Linq\JTokenType.cs" />
<Compile Include="Linq\JTokenWriter.cs" /> <Compile Include="Linq\JTokenWriter.cs" />
<Compile Include="Linq\JValue.cs" /> <Compile Include="Linq\JValue.cs" />
<Compile Include="Linq\MergeArrayHandling.cs" />
<Compile Include="MemberSerialization.cs" /> <Compile Include="MemberSerialization.cs" />
<Compile Include="MissingMemberHandling.cs" /> <Compile Include="MissingMemberHandling.cs" />
<Compile Include="NullValueHandling.cs" /> <Compile Include="NullValueHandling.cs" />
@@ -280,7 +282,6 @@
<Compile Include="Utilities\DynamicUtils.cs" /> <Compile Include="Utilities\DynamicUtils.cs" />
<Compile Include="Utilities\EnumUtils.cs" /> <Compile Include="Utilities\EnumUtils.cs" />
<Compile Include="Utilities\EnumValue.cs" /> <Compile Include="Utilities\EnumValue.cs" />
<Compile Include="Utilities\EnumValues.cs" />
<Compile Include="Utilities\ExpressionReflectionDelegateFactory.cs" /> <Compile Include="Utilities\ExpressionReflectionDelegateFactory.cs" />
<Compile Include="Utilities\ILGeneratorExtensions.cs" /> <Compile Include="Utilities\ILGeneratorExtensions.cs" />
<Compile Include="Utilities\ImmutableCollectionsUtils.cs" /> <Compile Include="Utilities\ImmutableCollectionsUtils.cs" />
Src/Newtonsoft.Json/Properties/AssemblyInfo.cs
+1 -1
View File
@@ -91,5 +91,5 @@ using System.Security;
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("6.0.0.0")] [assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.4.17602")] [assembly: AssemblyFileVersion("6.0.4.17603")]
[assembly: CLSCompliant(true)] [assembly: CLSCompliant(true)]