LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
1,086 Commits 1 Branch 0 Tags
24f230c1823fa2bdcdfb098b2eae8086aa759a30
Commit Graph
778 Commits
Author SHA1 Message Date
James Newton-King 24f230c182 Merge pull request #754 from JonHanna/fix_752 
Null Check on JsonWriter.WriteToken
 2015-12-21 21:57:46 +13:00
Jon Hanna d764cfae1a Null Check on JsonWriter.WriteToken 
Fixes #752
 2015-12-20 14:23:01 +00:00
Jon Hanna a06716c6a6 Refactor some cases of repeated code into separate methods. 
Make the MoveToContent() and ReadToContent() produced from this public.
 2015-12-20 00:28:40 +00:00
James Newton-King dca5260334 -Fixed JsonWriter IDisposable implementation 2015-12-19 15:25:33 +13:00
Jon Hanna 40bd051809 Suppress finaliser in Dispose if there's a protected Dispose(bool) 
Fixes #746
 2015-12-18 19:03:36 +00:00
James Newton-King 60cce16d43 -Documentation 2015-12-13 20:40:33 +13:00
James Newton-King 4c256e7afd -Fixed casting dynamic JValue to JToken 2015-12-13 18:56:10 +13:00
James Newton-King 815b283e58 -Refactored buffer pool 2015-12-13 15:40:37 +13:00
James Newton-King a5d1a41e14 -Removed generic SerializeObject methods 2015-12-12 18:14:57 +13:00
James Newton-King 2c7a51c50a -Added generic JsonConvert.SerializeObject methods 
-Fixed JToken.ToObject not using StringEnumConverter on enums
 2015-12-09 08:45:36 +13:00
James Newton-King 45936d58a2 -Fixed converting JSON to XML with invalid XML name characters 2015-12-06 22:10:58 +13:00
James Newton-King 709dd8cea6 -Merge 2015-12-06 21:08:04 +13:00
James Newton-King a64616f9f9 -Fixed setting default values onto properties already set in constructor when deserializing 2015-12-06 20:26:55 +13:00
Oleg Deribas 7ce78833f4 When converting JSON to XML encode characters in JSON property names which are not compatible with XML and decode when converting back. 2015-12-05 20:09:03 +00:00
James Newton-King 92102f9a33 -Fixed deserializing to a type when setting JToken extension data 2015-12-05 13:01:46 +13:00
James Newton-King eb0cbd6a75 -Formatting 
-Build
 2015-12-04 23:54:38 +13:00
James Newton-King c96779dc10 -Fixed deserializing certain Microsoft formated dates 2015-11-28 21:48:10 +13:00
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 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 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 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 723704464f -ShouldDeserialize PR cleanup 2015-10-12 21:40:00 +13:00
James Newton-King 57f4f98162 -Added support for deserializing Version from string 2015-10-10 23:20:20 +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 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 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 b30e1a178b -Fixed JsonConvert.PopulateObject error with starting comment 2015-09-30 15:38:33 +13:00
James Newton-King d86d2fa23d -Added project specific project.json files 2015-09-22 11:38:13 +12: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