LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,057 Commits 1 Branch 0 Tags
7d4790589ff0e9f4115c149d00a15855d21024c4
Commit Graph
1057 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Newton-King 7d4790589f Merge branch 'barsgroup-master' 2015-11-28 19:46:46 +13:00
James Newton-King 0b251cd063 Merge branch 'master' of https://github.com/barsgroup/Newtonsoft.Json into barsgroup-master 2015-11-28 19:46:21 +13:00
James Newton-King b2827d3ddb -Tests 2015-11-28 19:46:00 +13:00
James Newton-King 226832ff5d -Fixed error when deserializing ignored property with mismatched type 2015-11-28 18:13:10 +13:00
Dmitry Kalyanov f3706313ef Compare BaseDefinition for properties when adding private properties. 
Due to difference in mono vs .net (see https://bugzilla.xamarin.com/show_bug.cgi?id=36305),
MethodInfo.GetBaseDefinition() does not actually return base class (it returns partially-instantiated
generic class) in mono when overriding property from generic base class. Because of this, lookup
of matching property in ReflectionUtils.GetChildPrivateProperties() fails to find
already added property and adds the same property multiple times. Comparing GetBaseDefinition()'s
compensates for this: since the same function is applied to both PropertyInfo's, matching property
will be found.

This fixes issue #726.
 2015-11-27 15:58:15 +03:00
James Newton-King 425c1d8402 -Fixed converting null string JValues to XML 2015-11-25 01:18:59 +13:00
James Newton-King 2c3dafd62d -Fixed bug when converting an integer JValue to a nullable enum 2015-11-23 22:02:47 +13:00
James Newton-King a9c7d60d22 -Improved JArray bad indexer message 2015-11-23 20:31:28 +13:00
James Newton-King 331fcc0ebb -Added support for 24 hour ISO dates 2015-11-23 20:15:37 +13:00
James Newton-King 7903b4b2e2 -Added JsonLoadSettings.LineInfoHandling 2015-11-21 19:31:17 +13:00
James Newton-King 000407f610 -Added Required.DisallowNull 2015-11-15 21:25:47 +13:00
James Newton-King 5ae9edc926 -Increment version to beta2 2015-11-14 16:26:06 +13:00
James Newton-King a3eb2d596c -Fixed DateTimeZoneHandling not being used when writing DateTime dictionary keys 
-Buffer pooling fixes
-Improved date parsing performance
 2015-11-14 15:22:59 +13:00
James Newton-King f3822513df -Improve ignore case get property performance 2015-11-14 10:46:16 +13:00
James Newton-King 8e1a59b8e6 -Fixed error when ReferenceResolver is set to null 2015-11-12 23:53:10 +13:00
James Newton-King ac1a46bd14 -Added IJsonBufferPool, performance stuff 2015-11-12 22:08:39 +13:00
James Newton-King d91e8f4425 -Fixed NZ culture tests on Windows 10 2015-11-02 10:12:19 -08:00
James Newton-King d4916a76b5 -Build 2015-10-18 15:06:56 +13:00
James Newton-King a5e516bb5d -Build 2015-10-18 14:36:37 +13:00
James Newton-King ab2906874f -Changed DateTimeOffset JValue to return TypeCode.Object 
-Incremented version to 8.0.1-beta1
 2015-10-18 13:42:31 +13:00
James Newton-King 18e45e2b75 -Build 2015-10-17 18:26:11 +13:00
James Newton-King a48ccc781c -Build 2015-10-16 21:42:59 +13:00
James Newton-King 88468c4e6e Merge branch 'vontangen-master' 2015-10-12 21:43:30 +13:00
James Newton-King 723704464f -ShouldDeserialize PR cleanup 2015-10-12 21:40:00 +13:00
James Newton-King 74af3a8ba9 Merge branch 'master' of https://github.com/vontangen/Newtonsoft.Json into vontangen-master 2015-10-12 20:27:21 +13:00
James Newton-King 57f4f98162 -Added support for deserializing Version from string 2015-10-10 23:20:20 +13:00
James Newton-King e1c00f0995 -Documentation 2015-10-10 12:02:14 +13:00
James Newton-King 2bf31b9605 -Added JsonLoadSettings 
-Added CommentsHandling
-Changed LINQ to JSON load to ignore array comments by default
 2015-10-06 22:17:25 +13:00
James Newton-King 172c1d8f30 -Fixed inconsistent JsonTextReader.LinePosition 
-Fixed JsonReader.Path with escaped property names
 2015-10-03 17:11:45 +13:00
James Newton-King a3193a9523 -Documentation 2015-10-03 15:12:14 +13:00
James Newton-King 4db2137adf Merge branch 'VictorNicollet-patch-1' 2015-10-03 15:06:00 +13:00
James Newton-King 1bad45e686 Merge branch 'patch-1' of https://github.com/VictorNicollet/Newtonsoft.Json into VictorNicollet-patch-1 2015-10-03 15:05:40 +13:00
James Newton-King a2f9acf917 -Fixed potential error when writing escaped unicode character 2015-10-03 14:28:13 +13:00
James Newton-King ad68ea8780 -Added JsonConstructorAttribute support for lists and dictionaries 2015-10-03 14:10:39 +13:00
James Newton-King 352c9e0e9f Merge branch 'master' of github.com:JamesNK/Newtonsoft.Json 2015-10-02 21:50:26 +13:00
James Newton-King 6d91522d6b -Documentation 2015-10-02 21:49:58 +13:00
James Newton-King 5b7584dd90 Merge pull request #649 from alexhardwicke/master 
Fix null reference in Json.NET with F# and WinRT
 2015-09-30 18:20:01 +13:00
James Newton-King 239cde86f0 -Added support for immutable collections to Portable .NET 4.0 build 2015-09-30 18:04:18 +13:00
James Newton-King eccdf4bf95 -Fixed converting JSON to XML 
-Fixed not including line data with many XmlNodeConverter exceptions
 2015-09-30 17:35:53 +13:00
James Newton-King c007f066a1 -Removed dependency on System.Diagnostics.Tools in portable projects 2015-09-30 15:52:35 +13:00
James Newton-King b30e1a178b -Fixed JsonConvert.PopulateObject error with starting comment 2015-09-30 15:38:33 +13:00
James Newton-King 2eed44a2f8 -Build 2015-09-27 13:59:24 +13:00
James Newton-King 6b98123913 -Build 2015-09-27 13:04:13 +13:00
James Newton-King d86d2fa23d -Added project specific project.json files 2015-09-22 11:38:13 +12:00
Alex Hardwicke a1a66ba711 Fix null reference in Json.NET with F# and WinRT 
The problem seems to be that the methods that Json.NET wants are NonPublic
in the F# library available to F# Portable40 class libraries. Adding the
NonPublic BindingFlag resolves the crash.
 2015-09-13 22:40:44 +02:00
James Newton-King ddfd52f79c -Fixed 32 bit integer number parsing bug 2015-09-11 17:48:41 +12:00
James Newton-King 38fe3c38f6 -Build 2015-09-05 15:38:09 +12:00
James Newton-King 35450475ff -Build 2015-09-05 15:24:57 +12:00
James Newton-King 4baf2a751f -Fixed writing Uri JValues to use OriginalString to be consistant with serializer 
-Fixed comparing non-string JValues with JPath queries
 2015-09-05 15:24:30 +12:00
James Newton-King 30265076bb -Fixed writing raw values twice with a trace writer 2015-09-03 23:13:36 +12:00