Commit Graph
810 Commits
Author SHA1 Message Date
timotei ce480a21f4 Properly handle ISet on Portable40 config
Up until now ISet members would not be
properly deserialized, getting an exception
that ISet cannot be instantiated.
2016-02-28 22:11:54 +02:00
James Newton-King a31c30d50a -Added MergeNullValueHandling 2016-02-14 17:48:02 +13:00
James Newton-King 0311bc0f24 -Added constructor to StringEnumConverter for setting camelcase from attribute 2016-02-06 16:27:33 +13:00
James Newton-King 04f7bb5d65 -Test 2016-02-06 16:05:01 +13:00
James Newton-King 14c0428df7 -Fixed JSONPath queries combining wildcard with property search 2016-02-06 11:19:17 +13:00
James Newton-King b3edfbdc01 Merge branch 'MerickOWA-enumerablefix' 2016-02-06 10:50:21 +13:00
James Newton-King 196d6a274b -Fixed iterating over extension data multiple times 2016-02-06 10:47:44 +13:00
James Newton-King d93f112ee0 Merge branch 'master' of https://github.com/JamesNK/Newtonsoft.Json 2016-02-06 10:29:22 +13:00
James Newton-King 78f5587403 -Documentation 2016-02-06 10:28:57 +13:00
Lowell Smith 29567c5b5d Fixed an issue where iterating extensionDataGetter's enumerable multiple times or using LINQ statement on it caused inconsistant data to be returned. 2016-02-05 15:05:42 -05:00
Taylor Wood 38ebf96655 Fix DU converter exception typo. 2016-01-28 22:02:39 -06:00
James Newton-King fc06cd918c -Tests 2016-01-09 13:31:12 +13:00
James Newton-King 2491737e52 -Tests 2016-01-09 13:14:58 +13:00
James Newton-King cfafebe1e5 -Tests 2016-01-09 08:53:19 +13:00
James Newton-King 7b79ef5bf6 -Tests 2016-01-09 08:38:43 +13:00
James Newton-King 70120ce077 -Fixed ReadAsBytes with type name handling 2016-01-08 22:37:05 +13:00
James Newton-King 2c5322c302 -Increment version to 8.0.2
-Tests
2016-01-08 21:31:18 +13:00
James Newton-King 9021858293 -Added ReadAsBoolean
-Fixed reading booleans as strings
-Fixed reading large integers as booleans
2016-01-05 22:12:01 +13:00
James Newton-King 1ada613903 -Fixed serializing certain objects with events 2016-01-05 16:26:22 +13:00
James Newton-King 48f7e1d91e -Test 2015-12-29 10:05:22 +13:00
James Newton-King ce2a08dba2 -Formatting 2015-12-27 14:31:36 +13:00
James Newton-King dc07e59b0b -Tests 2015-12-26 18:01:24 +13:00
James Newton-King 3773eb5be7 -Added ReadAsDouble 2015-12-26 15:53:27 +13:00
James Newton-King 7f290b5a85 -JsonReader ReadAsBytes refactor 2015-12-26 13:14:31 +13:00
James Newton-King 027bfe46cb -JsonReader refactor fixes 2015-12-26 09:37:50 +13:00
James Newton-King d1451bd4ae -JsonReader refactor 2015-12-26 01:55:36 +13:00
James Newton-King 68fa401d70 -Array pool perf test 2015-12-25 20:01:13 +13:00
James Newton-King 58fff8c2f8 -Updated to .NET Core RC1 2015-12-24 11:44:36 +13:00
James Newton-King f2f87880be -Tests 2015-12-22 14:19:13 +13:00
James Newton-King 9c1dbfe44d -Resolve conflict 2015-12-21 22:08:09 +13:00
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 bf2e5a29aa Correct ParamName in exception for invalid JsonToken on ‎WriteToken
Fixes #755

Also consolidates WriteTokenInternal into matching WriteToken (slightly reduce
assembly size).

Also extend ExceptionAssert.Throws to return exception for further examination.
2015-12-20 21:34:21 +00: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