Commit Graph
966 Commits
Author SHA1 Message Date
James Newton-King db49e4aed8 -Derp 2017-02-26 11:00:46 +13:00
James Newton-King 69638744f8 -Changed perf tests to BenchmarkDotNet 2017-02-26 10:59:14 +13:00
James Newton-King ce04999633 -Tests 2017-02-25 17:32:59 +13:00
Tyler Brinkley 4600bc54b8 Optimized decimal parsing (#1204) 2017-02-25 10:31:50 +13:00
James Newton-King 1a67b34deb -Build 2017-02-22 21:21:40 +13:00
James Newton-King 354249822a -Marked BSON classes as obsolete 2017-02-19 20:39:23 +13:00
James Newton-King 7a7027a779 -Obsoleted FormatterAssemblyStyle in non-full .NET assemblies
-Tests
2017-02-18 19:15:38 +13:00
James Newton-King 751c030da3 Merge branch 'master' of https://github.com/reinaldoarrosi/Newtonsoft.Json into reinaldoarrosi-master 2017-02-16 22:17:58 +13:00
James Newton-King 93b0249db9 -Build 2017-02-16 21:27:08 +13:00
reinaldoarrosi 918d693017 fixes xml serialization to json when json:Array and xmlns:json attributes are used directly on the xml element that represents the array 2017-02-15 15:08:14 -02:00
Arun Mahapatra f676d1f179 Pull up common references to NUnit and NUnit3TestAdapter. 2017-02-13 16:49:46 +05:30
Arun Mahapatra ba5d84ef4f Fix test discovery in VS for NewtonSoft.Json.Roslyn.sln.
Add a reference to NUnit3TestAdapter.
Emit full symbols for test project. Workaround for https://github.com/nunit/nunit3-vs-adapter/issues/296.
2017-02-13 16:42:49 +05:30
James Newton-King cc6d99aa60 Migrate project.json to csproj (#1212) 2017-02-13 23:46:43 +13:00
James Newton-King 635feb1549 -Tests 2017-02-06 20:22:09 +13:00
James Newton-King 4d0545fe0e -Test 2017-02-06 13:02:40 +13:00
James Newton-King b7be55ef81 -Build 2017-02-06 09:26:56 +13:00
James Newton-King c9bbe2f188 -Fixed JsonWriter.ReadAsXXX methods not erroring on missing commas 2017-02-06 09:08:47 +13:00
James Newton-King 744be1a712 -Use static nametable in camel case contract resolver 2017-01-29 16:10:43 +13:00
James Newton-King 1914b91bdb -Removed obsolete constructor from DefaultContractResolver
-Removed obsolete async methods from JsonConvert
-Moved contract sharing logic from DefaultContractResolver to CamelCasePropertyNamesContractResolver
2017-01-28 20:25:01 +13:00
James Newton-King bfddda84f4 -Tests 2017-01-23 17:56:31 +13:00
James Newton-King 73b5d2c409 -Test 2017-01-23 15:10:10 +13:00
James Newton-King c9cfff4fed -Changed exception thrown when parsing invalid Unicode escape sequence to JsonReaderException 2017-01-23 15:07:16 +13:00
James Newton-King 07b513cb83 -Removed obsolete JsonConverter.GetSchema
-Removed obsolete OnDeserialized, OnDeserializing, OnSerialized, OnSerializing, OnError from JsonContract
-Removed obsolete JsonDictionaryContract.PropertyNameResolver
-Removed obsolete ConstructorParameters, OverrideConstructor, ParametrizedConstructor from JsonObjectContract
2017-01-22 22:28:22 +13:00
James Newton-King 304607a37b Merge branch 'master' of https://github.com/JamesNK/Newtonsoft.Json 2017-01-19 19:24:57 +13:00
James Newton-King c4104766ed -Derp 2017-01-19 19:24:46 +13:00
James Newton-King 2e7b24e9b1 -Added support for TypeConverters to netstandard1.0+ 2017-01-19 17:43:07 +13:00
James Newton-King 55afb9aa72 -Added AutoCompleteOnClose to JsonWriter to control whether JSON is auto-completed on JsonWriter.Close 2017-01-19 14:19:52 +13:00
James Newton-King 56e3d7575b -Fixed deserializing non-string values in some XML nodes 2017-01-19 11:49:09 +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 9727996b1a Throw for CheckAdditionalContent when extra content is preceded by comments. (#1183)
Fixes #1182
2017-01-16 14:48:52 +13:00
James Newton-King 473baa639b -Optimized IXmlNode memory usage when no child nodes or attributes 2017-01-15 18:37:06 +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 82bfde49e0 Don't eat exceptions from faulted Tasks.
If explicitly testing for IsCompleted then one must also test for
IsFaulted and if not handling the exception, return the faulted Task.
2017-01-10 11:12:46 +00:00
James Newton-King 5fefa723ad -Perf tests 2017-01-09 23:44:08 +13:00
Jon Hanna c9b2ec8055 Async JToken methods 2017-01-09 23:44:08 +13:00
James Newton-King de82488549 -Minor code cleanup
-Fixed CA warning
2017-01-09 16:46:11 +13:00
Jon Hanna 218c25c859 Call nullable WriteValue overloads in TraceJsonWriter (#1139)
Fixes #1138
2017-01-07 20:25:46 +13:00
Jon Hanna 260dfedac5 Don't throw on BsonWriter.WriteValue for null Uri or byte[] (#1143)
Fixes #1142
2017-01-07 18:38:38 +13:00
Jon Hanna f663060005 Asynchronous methods in readers and writers. (#1122)
Contributes to #650
2017-01-06 15:33:39 +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
Jon Hanna 5648cb50f7 Don't write duplicate nulls to trace for byte[] 2016-12-30 15:20:09 +00:00
Jon Hanna 2abc38a0ad Don't write duplicate nulls to trace for object or Uri
Fixes #1120
2016-12-30 15:06:52 +00: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
stakx 7644768580 Make JsonValidatingReader close underlying reader
Add `Close` method override in `JsonValidatingReader` so that the
`CloseInput` property is observed properly. Also add a corresponding
unit test.
2016-12-26 12:21:45 +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 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