Commit Graph
100 Commits
Author SHA1 Message Date
James Newton-King 211b3b0db2 Merge pull request #1132 from JonHanna/favour_as_over_is
Replace is-and-cast with as-and-nullcheck
2017-01-05 17:00:42 +13:00
James Newton-King 5bd69fe8be Merge pull request #1131 from JonHanna/opt_extensions_values
Optimise Extensions.Values
2017-01-05 16:58:12 +13:00
James Newton-King 008a3c7655 Merge pull request #1126 from JonHanna/remove_list_array
Remove some unnecessary list and array allocations.
2017-01-05 11:32:37 +13:00
James Newton-King 306c3a812b Merge pull request #1125 from JonHanna/null_propogate
Use null-propogation where applicable and useful.
2017-01-05 11:15:49 +13:00
James Newton-King 60651dbd59 Merge pull request #1127 from stakx/issue-typos
Fix typos
2017-01-05 11:06:24 +13:00
James Newton-King 1a70298696 Merge pull request #1130 from JonHanna/linq_bridge_optimise
Linq bridge optimise
2017-01-05 11:01:06 +13:00
James Newton-King 3ae09a80f0 Merge branch 'master' of https://github.com/JamesNK/Newtonsoft.Json 2017-01-03 12:24:15 +13:00
James Newton-King 9feab13f7e -Build 2017-01-03 12:24:01 +13:00
James Newton-King ba23c14d57 Merge pull request #1124 from JonHanna/lazier_largeByteBuffer
Don't assign _largeByteBuffer until clear it will be used.
2017-01-01 15:06:06 +13:00
James Newton-King 0c24088279 Merge pull request #1121 from JonHanna/fix_1120
Don't write duplicate nulls to trace for object or Uri
2016-12-31 12:07:43 +13:00
James Newton-King 322252a989 Merge branch 'master' of https://github.com/JamesNK/Newtonsoft.Json 2016-12-29 20:47:37 +13:00
James Newton-King 2da811b021 -Added support for extension data names to NamingStrategy
-Added ProcessExtensionDataNames to NamingStrategy
2016-12-29 20:46:29 +13:00
James Newton-King f38ce92306 Merge pull request #1113 from stakx/issue-1112-jsonvalidatingreader-close
Make JsonValidatingReader close underlying JsonReader when CloseInput is true
2016-12-28 12:17:39 +13:00
James Newton-King ee5a229922 Merge branch 'master' of https://github.com/JamesNK/Newtonsoft.Json 2016-12-26 15:01:15 +13:00
James Newton-King 5d7300f5b4 -Fixed tests 2016-12-26 15:00:40 +13:00
James Newton-King 4099870390 -Added support for any combination of paths and values in JSONPath filter expressions 2016-12-26 14:43:07 +13:00
James Newton-King bf88603c92 Merge pull request #1111 from stakx/issue-1097-clean-up-xml-documentation
Clean up XML documentation comments (continued)
2016-12-25 20:49:20 +13:00
James Newton-King cf6a917a46 Merge pull request #1109 from stakx/issue-1097-clean-up-xml-documentation
Clean up XML documentation comments (continued)
2016-12-24 10:19:05 +13:00
James Newton-King 780100b81f Merge pull request #1106 from stakx/issue-1097-clean-up-xml-documentation
Clean up XML documentation comments (continued)
2016-12-19 22:14:42 +13:00
James Newton-King d244812522 Merge pull request #1105 from stakx/issue-1097-clean-up-xml-documentation
Clean up XML documentation comments (continued)
2016-12-18 15:17:01 +13:00
James Newton-King 5456067b11 Merge pull request #1098 from stakx/issue-1097-clean-up-xml-documentation-comments
Fix minor issues in XML documentation comments
2016-12-11 13:47:59 +13:00
James Newton-King 133bbc2d38 -Fixed roundtripping double.MaxValue and float.MaxValue as dictionary keys 2016-12-10 17:23:43 +13:00
James Newton-King 3c1fdf9fdd -Derp 2016-12-08 09:50:07 +13:00
James Newton-King 4d425ccd06 -Fix merging null with complex type and MergeNullValueHandling.Ignore 2016-12-08 09:47:01 +13:00
James Newton-King be8ca7a870 -Refactor 2016-11-27 13:58:21 +13:00
James Newton-King 5269ce81c0 -Fixed serializing protected override properties 2016-11-27 13:33:52 +13:00
James Newton-King 38809c68e8 -Refactor away var 2016-11-07 13:33:53 -08:00
James Newton-King b2afa9d674 -Fixed StringEnumConverter when EnumMember defines members that differ only by case 2016-11-06 20:58:32 -08:00
James Newton-King a8ab6b3436 Merge pull request #1073 from Rantanen/master
Fix null reference error when deserializing bytes
2016-11-06 09:03:54 +13:00
James Newton-King e2dc61b8f3 -Test 2016-11-05 23:42:40 +13:00
James Newton-King b2e30121db Merge pull request #1072 from recycleddan/master
Fix return type for SByte and SByteNullable in ToObject
2016-11-05 23:41:15 +13:00
James Newton-King 803403ae21 -Fixed deserializing generic only IList types with a constructor override 2016-11-05 23:21:34 +13:00
James Newton-King 989d980be6 Merge pull request #1064 from hughbe/implicit-conversion
Add a test for deserializing an IEnumerable with implicit conversion
2016-10-31 23:22:30 +13:00
James Newton-King ae074a3469 -Fixed incorrectly parsing scan filter when name is quoted
-Added support for multiple names in scan filter
2016-10-28 13:25:52 +13:00
James Newton-King 26d8871254 Merge pull request #1044 from pyitphyoaung/Breaking-up-JsonTextReaderTest
Break up JsonTextReaderTest class into smaller test classes
2016-10-25 17:02:37 +13:00
James Newton-King 07b070065a -Refactor 2016-10-25 16:30:30 +13:00
James Newton-King 2d4b86b08e Merge branch 'is-reference-bug' of https://github.com/TylerBrinkley/Newtonsoft.Json into TylerBrinkley-is-reference-bug 2016-10-25 16:09:36 +13:00
James Newton-King 29c84fd7c2 -Improved error when attempting to convert root JSON object property to an XML attribute 2016-10-25 14:43:27 +13:00
James Newton-King 0e0918b143 -Derp 2016-10-24 16:13:23 +13:00
James Newton-King b7e77700ac -Added auto outlines to many documentation pages 2016-10-24 16:12:52 +13:00
James Newton-King 0721bd4dec -Fixed not erroring when deserializing incomplete JSON with a parameterized constructor 2016-10-24 14:20:59 +13:00
James Newton-King 570a7ca078 -Fixed deserializing a duplicate dictionary key from a parameterized constructor 2016-10-24 12:57:17 +13:00
James Newton-King fb1acd0c83 Merge pull request #1051 from TylerBrinkley/nullable-struct-typename-bug
Stops including typename for nullable structs using TypeNameHandling.Auto
2016-10-19 10:15:15 +13:00
James Newton-King 6890cfcc6c Merge pull request #1043 from pyitphyoaung/Move-classes-to-files-under-TestObjects
Move more classes to files under TestObjects
2016-10-13 16:08:01 +13:00
James Newton-King ae291d6b3b Merge pull request #1042 from pyitphyoaung/Issue774-Removal-of-netfx-core-directive-usage
Clean up NETFX_CORE directive usage
2016-10-13 13:07:09 +13:00
James Newton-King e74d6c5a4b -Test 2016-10-06 14:04:46 +13:00
James Newton-King 69ae589622 -Increment version to 9.0.2-beta1 2016-10-02 21:02:40 +13:00
James Newton-King 7388358e0a -Clean up 2016-10-02 20:42:42 +13:00
James Newton-King 17f87f5321 -Build 2016-09-18 16:04:38 +12:00
James Newton-King d7125908ca -Merge 2016-09-17 17:15:35 +12:00
James Newton-King ca27a0fc3a -Added TypeNameAssemblyFormatHandling
-Added TypeNameAssemblyFormatHandling properties to JsonSerializer and JsonSerializerSettings
-Changed TypeNameAssemblyFormat properties on JsonSerializer and JsonSerializerSettings to obsolete
2016-09-17 15:57:03 +12:00
James Newton-King 4f8a22594f -Added ISerializationBinder
-Added SerializationBinder properties to JsonSerializer and JsonSerializerSettings
-Changed Binder properties on JsonSerializer and JsonSerializerSettings to obsolete
2016-09-16 16:10:13 +12:00
James Newton-King a0403492ad -Tests 2016-09-13 16:51:39 +12:00
James Newton-King 867f4a7d43 Merge branch 'corefx-converter-args' of https://github.com/pieceofsummer/Newtonsoft.Json into pieceofsummer-corefx-converter-args 2016-09-13 16:15:20 +12:00
James Newton-King 6c272eac6e -Fixed StringEnumConverter.AllowIntegerValues to reject integer strings 2016-09-12 17:25:19 +12:00
James Newton-King 39ecc359eb -Fixed date XML precision on portable builds 2016-09-12 09:45:37 +12:00
James Newton-King 5fdfdff453 -Tests
-Fixed regression
2016-09-11 22:07:19 +12:00
James Newton-King 12b38ccb19 -Fixed error handling skipping reading the next object value 2016-09-11 19:37:44 +12:00
James Newton-King ca3af212de -Fixed double parsing bug 2016-09-11 17:06:53 +12:00
James Newton-King 304136a60e Merge branch 'master' into eisber-master 2016-09-11 16:19:27 +12:00
James Newton-King 5dd9f0a904 -Change double parsing validation to match JSON spec 2016-09-11 16:09:08 +12:00
James Newton-King a297e6758e -Build 2016-09-11 00:26:52 +12:00
James Newton-King 68d160f3c6 -Added netstandard1.1 with BigInteger support 2016-09-10 23:54:44 +12:00
James Newton-King 5e278bdbae Merge branch 'master' into wojtpl2-master 2016-09-10 18:41:51 +12:00
James Newton-King 73d3594762 Merge branch 'master' of https://github.com/wojtpl2/Newtonsoft.Json into wojtpl2-master 2016-09-10 18:41:45 +12:00
James Newton-King 216ff4ab8b -Tests 2016-09-10 18:41:30 +12:00
James Newton-King ac2d619474 -Added support for root object in JSONPath filters 2016-09-10 16:54:29 +12:00
James Newton-King 59618df631 -Documentation 2016-09-10 14:56:20 +12:00
James Newton-King fac72ad50c Merge branch 'master' of https://github.com/JamesNK/Newtonsoft.Json 2016-08-18 21:32:35 +12:00
James Newton-King f1587f073d -Documentation 2016-08-18 21:32:13 +12:00
James Newton-King d26b66f4b4 -Removed old KVM files 2016-08-11 13:05:11 +12:00
James Newton-King c42d46fb4c -Improved Autofac sample to resolve contract from Autofac 2016-08-09 21:35:30 +12:00
James Newton-King d6277bf5d8 -Tests 2016-08-09 18:58:22 +12:00
James Newton-King ba52ef1b85 -Merge 2016-08-09 18:41:12 +12:00
James Newton-King a8a9429b47 -DefaultSerializationBinder WIP 2016-08-09 18:30:17 +12:00
James Newton-King 1860418cfd -Test 2016-08-09 18:27:09 +12:00
James Newton-King 12d4e1632d -Tests 2016-08-09 12:58:11 +12:00
James Newton-King a98ffca811 -DoubleTryParse WIP 2016-08-09 12:36:37 +12:00
James Newton-King 8621a71e19 Merge branch 'master' into eisber-master 2016-08-09 12:09:02 +12:00
James Newton-King 7191c3a4e7 Merge pull request #740 from mausch/master
Add exception information to xmldocs for JObject parsing.
2016-08-08 08:27:22 +10:00
James Newton-King 4f86f6b79e -Tests 2016-07-25 19:53:40 +12:00
James Newton-King fbcac63b1b Merge branch 'master' into eisber-master 2016-07-24 15:07:51 +12:00
James Newton-King 3c028dd443 -Build 2016-07-24 15:07:37 +12:00
James Newton-King 38a687f683 -DoubleTryParse fixes and tests 2016-07-24 12:29:43 +12:00
James Newton-King 018589cd6b Merge branch 'master' of https://github.com/eisber/Newtonsoft.Json into eisber-master 2016-07-23 16:51:46 +12:00
James Newton-King 6d7ac14313 -Fixed DynamicReflectionDelegateFactory creating typed value type constructors 2016-07-20 14:09:56 +12:00
James Newton-King 7ac27587c0 -Documentation
-Test
2016-07-20 12:14:10 +12:00
James Newton-King dada8ea0e3 -Fixed deserializing DataTable with error handling 2016-07-19 18:46:33 +12:00
James Newton-King b83e1fab4c -Fixed deserializing null Regex 2016-07-18 21:46:07 +12:00
James Newton-King 0546ded719 -Fixed using a TraceWriter with nullable bytes 2016-07-18 21:38:45 +12:00
James Newton-King 7f6a01001d -Fixed StringEnumConverter reading specified enum names that contain a comma 2016-07-15 16:52:59 +10:00
James Newton-King 172f2122d4 -Tests 2016-07-05 14:01:02 +12:00
James Newton-King e490a0d640 -Build 2016-07-05 13:01:03 +12:00
James Newton-King 8dae7a7dab -Build 2016-07-01 17:11:00 +12:00
James Newton-King 3a0b272b83 -Build 2016-06-30 00:47:44 +12:00
James Newton-King 98678ebef4 Merge branch 'docs' 2016-06-28 19:00:22 +12:00
James Newton-King 146e582fc5 -Documentation 2016-06-28 00:39:32 +12:00
James Newton-King e5ac9a8473 -Build 2016-06-13 23:03:56 +12:00
James Newton-King 61e2a1e315 -Updated to NetCore RTM 2016-06-13 22:43:04 +12:00
James Newton-King c4cea92a3f -Formatting 2016-06-13 21:56:01 +12:00