Commit Graph
116 Commits
Author SHA1 Message Date
Davi Paulino fa3b038acf Fixing JToken line info set (#1250) 2017-03-23 21:03:17 +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
Florian Greinacher b8e60c773b Change ifdefs to be by feature, not by platform (#1146)
* First pass

* Second pass

* Third pass

* Temporarily change build script to build only portable

* Add portable features for release build

* Add feature constants to build script

* Add more feature constants to build script

* Fix build issues

* Fix build issues

* Get rid of constants in build.ps1

* HAVE_NUMERICS -> HAVE_BIG_INTEGER

* Remove HAVE_NULLABLE

* Remove HAVE_NUMERICS from csprojs

* Add missing ifdef

* Add feature defines to pj

* Re-enable netstd builds

* Fix defines in pj

* Trying to get better build outputs

* Trying to get the build error

* Use newer cli

* Address review feedback; make netstd build work

* Introduce HAVE_DB_NULL_TYPE

* Adapt to upstream changes; address remaining review feedback

* Adapt to upstream changes; address remaining review feedback

* Rename some constants for constistency

* Address review feedback

* -Fixed build with signed assembly

* Fix merge erorr

* Address review feedback

* Introduce HAVE_NON_SERIALIZED_ATTRIBUTE

* HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE
2017-01-12 11:07:02 +13:00
Jon Hanna c9b2ec8055 Async JToken methods 2017-01-09 23:44:08 +13:00
Jon Hanna ea6a21c4f3 Optimise DynamicProxyMetaObject (#1152)
* Remove unnecessary ToArray call.

* Remove Value property.

One use compares with null, so cast to T is a waste.

This leaves just one other use, so it can be inlined.

* Remove _dontFallbackFirst

Is always true. Remove it and branches for it being false.

* Don't use Expression.Convert to reference types to object.

The end-result is a no-op, so don't waste the allocation.
2017-01-09 14:44:56 +13:00
Jon Hanna a95665b481 Replace is-and-cast with as-and-nullcheck
Gives slightly better performance, so applying across the board
adds up.
2017-01-05 01:52:04 +00:00
stakx e19ac3f28c Add & fix crefs in XML document comments
* Add references to types where they are missing.

 * Fix incorrect references to closed generic types.

 * Convert member ID strings to proper references where they can be
   converted without breaking the build. The remaining member ID
   strings usually mean that the comment would have to be rephrased
   for at least one build target / platform.

 * Drop namespaces from type names where they are unnecessary.

 * Fix the odd typo and add additional <c> markup in a few places.
2016-12-23 16:15:24 +01:00
stakx 937d5a53bb XML comments: consistent formatting of C# keywords 2016-12-19 09:29:22 +01:00
stakx 2e6d2ecd4c Fix typos, punctuation, etc. in XML doc comments
* Simple stuff: typos and missing punctuation and line breaks.

 * Sometimes, two method overloads have quite different documentation.
   Rephrase these to make them more similar.

 * Minor rephrasings like in a previous commit (e.g. "...how output
   should be formatted", "initializes a new instance of...").

 * Obvious incorrect type references in comments. These appear mostly
   in `Utilities/LinqBridge.cs` (nullable vs non-nullable).

 * Remove factually incorrect statement about exceptions thrown.

 * Remove comments for explicitly implemented interface methods.
2016-12-18 01:01:46 +01:00
Dan Carter b234eafbf2 Fix return type for SByte and SByteNullable in ToObject 2016-11-04 13:33:05 -04: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
Discosultan 3bfc8223a1 Unify the usage of <c> tags for true/false values in XML docs 2016-05-24 17:29:03 +03:00
James Newton-King 5aa75ae595 -Reduced allocations of JToken.Path++ 2016-03-28 19:44:05 +13:00
James Newton-King 795ef28e0a -Reduced allocations of JToken.Path 2016-03-28 19:26:27 +13:00
James Newton-King 3a412e5ab2 -Improved large JArray performance
-Improved JTokenReader performance
2016-03-28 14:14:07 +13:00
James Newton-King ce2a08dba2 -Formatting 2015-12-27 14:31:36 +13:00
James Newton-King a7046b0f6c -Refactor 2015-12-20 18:07:25 +13:00
Jon Hanna a06716c6a6 Refactor some cases of repeated code into separate methods.
Make the MoveToContent() and ReadToContent() produced from this public.
2015-12-20 00:28:40 +00:00
James Newton-King 815b283e58 -Refactored buffer pool 2015-12-13 15:40:37 +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 7903b4b2e2 -Added JsonLoadSettings.LineInfoHandling 2015-11-21 19:31:17 +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 fe7b7a6c7b -Added dotnet build
-Removed WinRT files
-Updated solution files to VS2015
-Updated psake
2015-08-02 23:56:26 +12:00
James Newton-King a2e15adf80 -Added AttributeProvider
-Increament version to 7.0.1
2014-12-23 10:57:17 +00:00
James Newton-King f760b78fbe -Added JToken.AncestorsAndSelf
-Added Extensions.AncestorsAndSelf and Extensions.DescendantsAndSelf
-Tests
2014-12-22 17:05:13 +13:00
James Newton-King 82025bc5b7 -Added JContainer.DescendantsAndSelf
-Added CurrentToken to JTokenReader
2014-12-07 16:08:27 +13:00
James Newton-King fea3ffddeb -Fixed array XML documentation references 2014-11-29 16:25:16 +13:00
James Newton-King 68ebba03fb -Fixed casting a nullable negative SByte value 2014-11-29 00:28:33 +13:00
James Newton-King 88a29704da -Fixed jsonpath error when parsing a property that follows an escaped property
-Changed reader/writer/token path to escape property names containing special characters
2014-10-18 15:36:42 +13:00
James Newton-King 57ccaf00bf -Improved Portable40 assembly performance by using compiled expression reflection
-Fixed converting string JValues to enums with JToken.ToObject
2014-08-24 23:33:08 +12:00
Bruce Bowyer-Smyth 432d262dcd Symbol chars used instead of single length strings 2014-07-28 16:30:10 +10:00
James Newton-King 9203e97312 -Refactored dynamic type wrapping
-Improved KeyValuePairConverter performance
2014-06-20 19:03:36 +12:00
James Newton-King bbcc7e4d54 -Added JValue.CreateNull and JValue.CreateUndefined 2014-04-29 12:20:44 +12:00
James Newton-King 7458cefe95 -Fixed JToken.ReadFrom creating a string value for a comment 2014-04-28 17:11:02 +12:00
James Newton-King 9133626388 -Changed blank XML elements to be written as an empty string instead of null
-Added support for XML document type
-Changed string JValue with a null value to be written as null instead of empty string
-Fixed StringEnumConverter thread safety
2014-04-25 22:36:35 +12:00
James Newton-King 0f77cd1b03 -Added SpecialPropertiesHandling 2014-02-12 01:43:46 +13:00
James Newton-King 0a5fc77966 -Updated readme.txt 2014-01-11 12:18:04 +13:00
James Newton-King d529190b46 -Fixed error on no result for JSON Path queries
-Fixed not disposing JsonReader/JsonWriter in some places
2013-12-22 13:52:56 +13:00
James Newton-King 5ce7d8d3dc -JsonPath++ 2013-11-16 12:30:47 +13:00
James Newton-King d8ddf1b433 -Initial JsonPath 2013-11-15 00:20:20 +13:00
James Newton-King 44bc7ea246 -Removed SL/WP code and fiels 2013-10-20 16:41:15 +13:00
James Newton-King bcd6982419 -Code reformat 2013-10-20 15:08:39 +13:00
James Newton-King e77fdf285b -Upgraded to Immutable Collections RTM
-Added missing CLSCompliant attributes
2013-09-30 21:53:19 +13:00
James Newton-King 5512e2623c -Added missing casts to JToken
-Upgraded to Immutable Collections RC
-Tests
2013-09-13 20:15:30 +12:00
= 6eeedbddd0 Fix typo 2013-07-15 12:19:09 +01:00
James Newton-King f68794d206 -Added serialized/deserialized JSON when verbose tracing
-Fixed not using default serializer settings with primitive values and JToken.ToObject
-Fixed error writing BigIntegers with JsonWriter.WriteToken
2013-05-19 22:34:21 +12:00
James Newton-King a7d47558d8 -Added default serializer settings 2013-04-28 12:27:47 +12:00