Commit Graph
258 Commits
Author SHA1 Message Date
Adrien Siffermann 35f7f505e2 Fix RootFilter to proper return an IEnumerable containing the root JToken rather than the root JToken itself as an IEnumerable 2017-05-02 23:54:56 +02:00
James Newton-King b3d514b617 -Fixed JSONPath recursive descent queries 2017-04-26 11:09:15 +12:00
James Newton-King d56b2fa55b -Tests 2017-04-08 16:22:13 +12:00
James Newton-King aa5f28c097 -Added Portable40 back 2017-04-02 10:24:09 +12:00
James Newton-King 39c03ea0e9 -Test 2017-03-23 21:08:15 +13:00
James Newton-King 68533cdc19 -Additional JToken line info settings fixes 2017-03-23 21:04:04 +13:00
James Newton-King ba514c4610 -Cleaned up preprocessor symbols 2017-03-05 15:12:52 +13:00
James Newton-King febdb8188b -Changed netstandard1.1 to netstandard1.3
-Added support for ISerializable interface to netstandard1.3+
-Added support for SerializableAttribute and NonSerializedAttribute to netstandard1.3+
2017-03-05 14:29:24 +13:00
Jon Hanna 8956d3ca9c Fix issues that are variants of those #1182 (#1184)
* Catch excessive objects in json being parsed, even if following a comment.

* Include line info on excessive content for deserialisation.
2017-01-19 10:33:30 +13:00
Jon Hanna c9b2ec8055 Async JToken methods 2017-01-09 23:44:08 +13:00
stakx 8639ac94ae Typos
Running a spell checker on the whole solution revealed a couple more
typos. This fixes all of those (although internal // line comments are
mostly left alone).

Additionally, convert a very few string.Format occurrences to the pre-
dominant .FormatWith pattern and fix some incorrect message strings.
2017-01-04 03:01:26 +01: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 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 e2dc61b8f3 -Test 2016-11-05 23:42:40 +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
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 68d160f3c6 -Added netstandard1.1 with BigInteger support 2016-09-10 23:54:44 +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 7ac27587c0 -Documentation
-Test
2016-07-20 12:14:10 +12:00
James Newton-King ad7752fedf -Test 2016-04-29 19:19:22 +12:00
James Newton-King 092dc7da58 -Fixed JValue.WriteTo losing type information with JTokenWriter 2016-04-29 19:18:06 +12:00
James Newton-King 5b04a61dd9 -Fixed JsonReader.ReadAsDouble with a JValue BigInteger 2016-04-29 18:49:22 +12:00
James Newton-King 86c2f80311 -Fixed JTokenWriter sometimes losing types when writing JToken 2016-04-29 16:21:41 +12:00
James Newton-King 029e36e7e4 -Additional JSONPath NotEquals fix 2016-03-23 21:22:17 +13:00
James Newton-King 031222d4f4 -Fixed JSON Path not equal null with non-primative values 2016-03-21 21:00:44 +13:00
James Newton-King 8b0db33b7e -Tests 2016-03-04 20:31:43 +13:00
James Newton-King a31c30d50a -Added MergeNullValueHandling 2016-02-14 17:48:02 +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 fc06cd918c -Tests 2016-01-09 13:31:12 +13:00
James Newton-King 3773eb5be7 -Added ReadAsDouble 2015-12-26 15:53:27 +13:00
James Newton-King d1451bd4ae -JsonReader refactor 2015-12-26 01:55:36 +13:00
James Newton-King 4c256e7afd -Fixed casting dynamic JValue to JToken 2015-12-13 18:56:10 +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 eb0cbd6a75 -Formatting
-Build
2015-12-04 23:54:38 +13:00
James Newton-King 2c3dafd62d -Fixed bug when converting an integer JValue to a nullable enum 2015-11-23 22:02:47 +13:00
James Newton-King a9c7d60d22 -Improved JArray bad indexer message 2015-11-23 20:31:28 +13:00
James Newton-King 7903b4b2e2 -Added JsonLoadSettings.LineInfoHandling 2015-11-21 19:31:17 +13:00
James Newton-King ab2906874f -Changed DateTimeOffset JValue to return TypeCode.Object
-Incremented version to 8.0.1-beta1
2015-10-18 13:42:31 +13:00
James Newton-King a48ccc781c -Build 2015-10-16 21:42:59 +13:00
James Newton-King 2bf31b9605 -Added JsonLoadSettings
-Added CommentsHandling
-Changed LINQ to JSON load to ignore array comments by default
2015-10-06 22:17:25 +13:00
James Newton-King 172c1d8f30 -Fixed inconsistent JsonTextReader.LinePosition
-Fixed JsonReader.Path with escaped property names
2015-10-03 17:11:45 +13:00
James Newton-King 35450475ff -Build 2015-09-05 15:24:57 +12:00
James Newton-King 4baf2a751f -Fixed writing Uri JValues to use OriginalString to be consistant with serializer
-Fixed comparing non-string JValues with JPath queries
2015-09-05 15:24:30 +12:00
James Newton-King a9ea63da59 -Added additional frameworks to project.json files 2015-08-22 19:08:40 +12:00
James Newton-King 6b02abe20c -Fixed JTokenWriter error with duplicate properties 2015-08-16 22:48:45 +12:00
James Newton-King fe7b7a6c7b -Added dotnet build
-Removed WinRT files
-Updated solution files to VS2015
-Updated psake
2015-08-02 23:56:26 +12:00