Commit Graph
1118 Commits
Author SHA1 Message Date
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
Mikko Rantanen b47f7440d1 Fix null reference error when deserializing bytes
If the JSON contained empty object "{}" for a byte[] property, the `JsonReader` ended up trying to read the object content despite the fact that the content didn't exist. This caused a null reference exception.

The fix ensures the value exists before trying to read it. If the value doesn't exist, the execution ends up in "Unexpected token" exception with way more informative error message.
2016-11-05 15:38:52 +02: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
Dan Carter b234eafbf2 Fix return type for SByte and SByteNullable in ToObject 2016-11-04 13:33:05 -04:00
Hugh Bellamy 123e8a54c5 Add a test for deserializing an IEnumerable with implicit conversion 2016-10-31 09:29:26 +00: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 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
TylerBrinkley 53278cbe57 Added deserialization test and cleaned up the tests 2016-10-18 12:05:49 -05:00
TylerBrinkley 2a28dcc544 Stops including the typename for nullable structs using TypeNameHandling.Auto, fixes #1050 2016-10-18 11:34:43 -05:00
Pyit Phyo Aung 26ae7d07fc Break up JsonTextReaderTest class into smaller test classes 2016-10-14 00:20:09 +13:00
Pyit Phyo Aung 0115df6e39 Merge branch 'master' into Move-classes-to-files-under-TestObjects
# Conflicts:
#	Src/Newtonsoft.Json.Tests/Converters/IsoDateTimeConverterTests.cs
#	Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs
#	Src/Newtonsoft.Json.Tests/Schema/ExtensionsTests.cs
#	Src/Newtonsoft.Json.Tests/Serialization/DependencyInjectionTests.cs
#	Src/Newtonsoft.Json.Tests/Serialization/ExtensionDataTests.cs
#	Src/Newtonsoft.Json.Tests/Serialization/PopulateTests.cs
#	Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs
#	Src/Newtonsoft.Json.Tests/TestObjects/Money/Currency.cs
2016-10-13 14:49:15 +13:00
Pyit Phyo Aung 42d6225acd Move more classes to files under TestObjects 2016-10-13 12:29:26 +13:00
Pyit Phyo Aung f50f276b76 Clean up NETFX_CORE directive usage 2016-10-11 14:14:13 +13:00
James Newton-King e74d6c5a4b -Test 2016-10-06 14:04:46 +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
TylerBrinkley 954057ad17 Allow readonly properties to serialize as references if they have corresponding creator parameters 2016-09-15 09:33:44 -05: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
Alexey Skalozub 04c429a15d Use ValidationUtils.ArgumentNotNull, code cleanup 2016-09-11 19:14:32 +03: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
Alexey Skalozub 7b0331725c Speed up expression delegates when widening types is not needed 2016-09-11 03:35:36 +03:00
Alexey Skalozub deefe2e006 Removed Convert.ChangeType calls because of poor performance (DynamicReflectionDelegateFactory now uses IConvertible.ToTypeName, while ExpressionReflectionDelegateFactory uses Convert.ToTypeName). Method binder moved to a separate file and documented, + code style fixes. 2016-09-10 20:19:22 +03: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