Commit Graph
1654 Commits
Author SHA1 Message Date
James Newton-King 4e47aa8e9a -Build 2018-01-28 16:08:23 +13:00
James Newton-King d6c3794556 -Fixed using extension data with dictionary that explicitly implements Add method 2018-01-27 19:20:02 +13:00
James Newton-King 6360cc4c4b -Fixed escaping special characters in generated JSONPaths
-Fixed reading escaped special characters in JSONPaths
2018-01-27 18:39:44 +13:00
James Newton-King 0b975a2087 -Cleaned up UnixDateTimeConverter 2018-01-21 12:16:48 +13:00
James Newton-King d7786d86c1 Merge branch 'master' of https://github.com/pouladpld/Newtonsoft.Json into pouladpld-master 2018-01-21 11:23:09 +13:00
James Newton-King 8ece2b31b9 -Fixed error when deserializing null value into ConcurrentDictionary 2018-01-20 17:23:38 +13:00
testfirstcoder e1dfefe00b serialization of a property which was defined in several interfaces (#1586) 2018-01-19 16:31:03 +13:00
James Newton-King 6dfc5c46e5 -Tests 2018-01-18 18:55:31 +13:00
Zoltán Tamási 92833289a0 Removed unrelated test and codes 2018-01-15 15:27:13 +01:00
Zoltán Tamási 5f2f5fd7b0 Fix indentation 2018-01-15 13:13:28 +01:00
Zoltán Tamási 9f74b979aa Fix support for custom list converters when input is not an array or object 2018-01-15 13:08:58 +01:00
James Newton-King 312508358f -Tests 2018-01-15 19:36:29 +13:00
James Newton-King a54b0fe4dd -Build 2018-01-12 19:25:17 +13:00
James Newton-King 4f7fc79571 -Test 2018-01-12 15:07:03 +13:00
James Newton-King 474a53e031 -Test 2018-01-11 22:18:31 +13:00
James Newton-King 66c41b5937 -Refactor 2018-01-11 22:03:21 +13:00
James Newton-King c445141fc6 -Fixed JsonTextReader sync read in async method 2018-01-11 16:18:04 +13:00
James Newton-King 2c90c2740d -Test 2018-01-09 12:00:08 +13:00
James Newton-King f92e11b079 -Increment version to 11.0.1-beta3 2018-01-03 10:23:16 +13:00
James Newton-King e57cb6acea -Fixed regression serializing decimal value 2018-01-03 10:22:19 +13:00
Poulad 577ba03aa1 Add unix date converter 2018-01-01 21:18:22 -05:00
James Newton-King ed52a0eb0f -Increment version to 11.0.1-beta2 2018-01-02 09:43:55 +13:00
James Newton-King 3274b9ab67 -Fixed serializing nullable collections 2018-01-01 20:38:31 +13:00
James Newton-King 92fea48779 -Improved error when serializing FileInfo/DirectoryInfo without ISerializable 2018-01-01 18:47:12 +13:00
James Newton-King eb85ba3f7c -Refactored enum name writing
-Improved performance of reading and writing enum names
-Tests
2018-01-01 13:15:08 +13:00
James Newton-King 2244a82282 -Refactor enum parsing 2017-12-28 15:35:27 +13:00
James Newton-King b49f6bc0ec -Improved error message when serialize ByRef properties 2017-12-28 15:06:19 +13:00
James Newton-King 33022960b6 -Tests 2017-12-28 11:45:20 +13:00
James Newton-King 51c9547dbc -Refactor enum parsing 2017-12-28 10:48:56 +13:00
gilad61 e5e901c6d0 Update initialDepth for error handling (#1550)
* Fix target depth when skipping over handled errors

Keep reading until the reader reaches the initial depth rather than initial depth + 1

* Fix the initialDepth when handling errors in lists

The initialDepth should be +1 when handling deserialization errors in lists and arrays in order to not skip subsequent items

* Add unit tests for dictionary error handling

Ignoring errors in dictionary object by completely removing the bad items from the dictionary
2017-12-26 08:47:41 +13:00
James Newton-King 69640e88d8 -Tests 2017-12-22 12:26:28 +13:00
Yang Wang f386cc2c48 Fixed issue #1545 (#1548) 2017-12-22 12:11:27 +13:00
James Newton-King 2f87c2cdda -Tests 2017-12-20 16:16:27 +13:00
Jon Hanna 1b40ebfe26 Apply fix to #1460 to async writing. (#1540)
* Apply fix to #1460 to async writing.

* Replace recursion with iteration.

* Test for 1460 in async use.

* Change infinite loop style.
2017-12-20 16:06:07 +13:00
Mark Pflug 3ea750d6d6 Performance optimization for integer value serialization. (#1544)
* Performance optimization for integer serialization.

* Add int32 overloads for integer formatter.

* fix parameter name

* Prefer using the faster, 32 bit division code path, when possible.

* fix code formatting

* fix uint range check, add test coverage
2017-12-20 11:08:09 +13:00
Jon Hanna a8245a5b9e Use cancellationToken in two places it was missed. (#1539)
I'm not sure if this was a simple slip up, or if I was thinking of
skipping the check for speed reasons when I did this, but as these
two calls can both often happen at as the first actual write to stream,
which can have the longest delay waiting for the underlying layer,
they should both have the opportunity to cancel.
2017-12-17 08:25:43 +13:00
James Newton-King fde0fef06f -Build 2017-12-15 15:27:01 +13:00
Jon Hanna cc084e1127 Spelling fix asychronousity → asynchronicity (#1538) 2017-12-15 08:22:21 +13:00
James Newton-King 90514188c0 -Test 2017-12-05 14:25:15 +13:00
James Newton-King d0d01f2a36 -Fixed merging null string values 2017-12-04 18:53:50 +13:00
James Newton-King 977884d779 -Test 2017-11-29 17:02:25 +13:00
James Newton-King a6d1351c4c -Build 2017-11-26 13:31:27 +13:00
James Newton-King efb4f3d64f -Build 2017-11-26 13:22:30 +13:00
James Newton-King 2c9d9b9598 -Updated NuGet packages
-Fixed xunit warnings
2017-11-26 13:00:07 +13:00
James Newton-King df3c1caef2 Merge branch 'master' of https://github.com/JamesNK/Newtonsoft.Json 2017-11-26 10:13:36 +13:00
James Newton-King a138852994 -Changed JObject.ContainsKey to public 2017-11-26 10:13:13 +13:00
James Newton-King 60f66d9c96 -Changed version to 11.0.1 2017-11-17 18:23:31 +13:00
James Newton-King f19418f9e3 -Badges 2017-11-13 20:11:42 +13:00
James Newton-King 9138c140ec -Badges 2017-11-13 20:10:34 +13:00
Ben Adams b55b315f53 Badges? 2017-11-11 16:19:56 +00:00