Commit Graph
14 Commits
Author SHA1 Message Date
James Newton-King 84b5c15eab Clean up merge changes 2019-08-18 18:07:53 +12:00
iRumba da0f0d8dd1 Fixed merging with self bug. 2019-08-18 18:07:53 +12:00
James Newton-King 9fe2448320 Add JObject.Property overload with a StringComparison and JsonMergeSettings.PropertyNameComparison (#1843) 2018-09-20 00:21:16 -07:00
James Newton-King d0d01f2a36 -Fixed merging null string values 2017-12-04 18:53:50 +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
Pyit Phyo Aung f50f276b76 Clean up NETFX_CORE directive usage 2016-10-11 14:14:13 +13:00
James Newton-King a31c30d50a -Added MergeNullValueHandling 2016-02-14 17:48:02 +13:00
James Newton-King eb0cbd6a75 -Formatting
-Build
2015-12-04 23:54:38 +13:00
MiNG b8400f8fb3 New features:
Optional handles the "null" and "undefined" value for JObject.Merge() by setting MergeObjectHandling flag in JsonMergeSettings.
2015-04-15 16:34:45 +08:00
James Newton-King 0552affb83 -Renamed aspnetcore50 to dnxcore50
-Documentation
2015-04-04 16:13:37 +13:00
James Newton-King 88eeb8ba92 -Fixed MetadataTypeAttribute reflection bug by using CustomAttributeData
-Fixed immutable collections bug by getting type from known assembly
-Added support from running tests on aspnetcore50
2014-10-18 00:00:26 +13:00
James Newton-King 99df43eb4d -Tests line endings 2014-09-12 23:34:20 +12:00
James Newton-King 5fc738247f -Added Merge to LINQ to JSON 2014-08-01 21:27:38 +12:00