Commit Graph
100 Commits
Author SHA1 Message Date
James Newton-King b65807bbd2 -Added JsonReaderException ctor with path, line number, line position
-Added JsonWriterException ctor with path
2017-02-18 21:49:35 +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 a1c5441e1d -Refactor 2017-02-16 22:35:56 +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
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 20f59f7d70 -Build 2017-02-06 12:12:40 +13:00
James Newton-King 60ac1ea3a4 -Build 2017-02-06 10:57:11 +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 e1ec6e9a18 -Build 2017-01-19 20:01:53 +13:00
James Newton-King b35988c31f -Updated pre-release to beta2 2017-01-19 19:26:18 +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
James Newton-King 76600dcc5b Merge branch 'master' of https://github.com/JamesNK/Newtonsoft.Json 2017-01-17 11:44:24 +13:00
James Newton-King ecd137eefa -Optimized serializing XML elements to JSON 2017-01-17 11:44:04 +13:00
James Newton-King 285b4c9a85 -Marked SerializationBinder as obsolete 2017-01-16 19:55:21 +13:00
James Newton-King 7e4b3448c7 -Optimized XML serialization memory usage for elements with one child element name 2017-01-16 11:09:11 +13:00
James Newton-King 473baa639b -Optimized IXmlNode memory usage when no child nodes or attributes 2017-01-15 18:37:06 +13:00
James Newton-King 1513b11d73 -JsonTextReader new line async performance (#1172) 2017-01-15 09:45:24 +13:00
James Newton-King ba04246a16 -Improved SplitFullyQualifiedTypeName allocations 2017-01-13 01:07:13 +13:00
James Newton-King eb96cb9f62 Merge pull request #1159 from JonHanna/fault_on_fault
Don't eat exceptions from faulted Tasks.
2017-01-11 09:30:42 +13:00
James Newton-King 21f4d95263 Merge pull request #1158 from JonHanna/pass_cancellation
Pass CancellationToken in JObject and JConstructor.WriteToAsync
2017-01-10 08:30:54 +13:00
James Newton-King 0654fa5833 -Derp 2017-01-09 23:44:08 +13:00
James Newton-King b29b7e8483 -Derp 2017-01-09 23:44:08 +13:00
James Newton-King 08eb6845e2 -Async write performance 2017-01-09 23:44:08 +13:00
James Newton-King 5fefa723ad -Perf tests 2017-01-09 23:44:08 +13:00
James Newton-King dde1d905df -Build 2017-01-09 17:16:56 +13:00
James Newton-King de82488549 -Minor code cleanup
-Fixed CA warning
2017-01-09 16:46:11 +13:00
James Newton-King 6c7e41537b Merge pull request #1153 from JonHanna/shortcircuit_same_compared
Short-circuit on reference equality in ValueEquals and JValue.Compare
2017-01-09 15:17:53 +13:00
James Newton-King ba79136e4e Merge pull request #1151 from JonHanna/singleton_empty_array
Use singleton for zero-element arrays.
2017-01-09 15:11:14 +13:00
James Newton-King 211b3b0db2 Merge pull request #1132 from JonHanna/favour_as_over_is
Replace is-and-cast with as-and-nullcheck
2017-01-05 17:00:42 +13:00
James Newton-King 5bd69fe8be Merge pull request #1131 from JonHanna/opt_extensions_values
Optimise Extensions.Values
2017-01-05 16:58:12 +13:00
James Newton-King 008a3c7655 Merge pull request #1126 from JonHanna/remove_list_array
Remove some unnecessary list and array allocations.
2017-01-05 11:32:37 +13:00
James Newton-King 306c3a812b Merge pull request #1125 from JonHanna/null_propogate
Use null-propogation where applicable and useful.
2017-01-05 11:15:49 +13:00
James Newton-King 60651dbd59 Merge pull request #1127 from stakx/issue-typos
Fix typos
2017-01-05 11:06:24 +13:00
James Newton-King 1a70298696 Merge pull request #1130 from JonHanna/linq_bridge_optimise
Linq bridge optimise
2017-01-05 11:01:06 +13:00
James Newton-King 3ae09a80f0 Merge branch 'master' of https://github.com/JamesNK/Newtonsoft.Json 2017-01-03 12:24:15 +13:00
James Newton-King 9feab13f7e -Build 2017-01-03 12:24:01 +13:00
James Newton-King ba23c14d57 Merge pull request #1124 from JonHanna/lazier_largeByteBuffer
Don't assign _largeByteBuffer until clear it will be used.
2017-01-01 15:06:06 +13:00
James Newton-King 0c24088279 Merge pull request #1121 from JonHanna/fix_1120
Don't write duplicate nulls to trace for object or Uri
2016-12-31 12:07:43 +13: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
James Newton-King f38ce92306 Merge pull request #1113 from stakx/issue-1112-jsonvalidatingreader-close
Make JsonValidatingReader close underlying JsonReader when CloseInput is true
2016-12-28 12:17:39 +13:00
James Newton-King ee5a229922 Merge branch 'master' of https://github.com/JamesNK/Newtonsoft.Json 2016-12-26 15:01:15 +13: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 bf88603c92 Merge pull request #1111 from stakx/issue-1097-clean-up-xml-documentation
Clean up XML documentation comments (continued)
2016-12-25 20:49:20 +13:00
James Newton-King cf6a917a46 Merge pull request #1109 from stakx/issue-1097-clean-up-xml-documentation
Clean up XML documentation comments (continued)
2016-12-24 10:19:05 +13:00
James Newton-King 780100b81f Merge pull request #1106 from stakx/issue-1097-clean-up-xml-documentation
Clean up XML documentation comments (continued)
2016-12-19 22:14:42 +13:00
James Newton-King d244812522 Merge pull request #1105 from stakx/issue-1097-clean-up-xml-documentation
Clean up XML documentation comments (continued)
2016-12-18 15:17:01 +13:00
James Newton-King 5456067b11 Merge pull request #1098 from stakx/issue-1097-clean-up-xml-documentation-comments
Fix minor issues in XML documentation comments
2016-12-11 13:47:59 +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
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
James Newton-King a8ab6b3436 Merge pull request #1073 from Rantanen/master
Fix null reference error when deserializing bytes
2016-11-06 09:03:54 +13: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
James Newton-King 989d980be6 Merge pull request #1064 from hughbe/implicit-conversion
Add a test for deserializing an IEnumerable with implicit conversion
2016-10-31 23:22:30 +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
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 0e0918b143 -Derp 2016-10-24 16:13:23 +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
James Newton-King 6890cfcc6c Merge pull request #1043 from pyitphyoaung/Move-classes-to-files-under-TestObjects
Move more classes to files under TestObjects
2016-10-13 16:08:01 +13:00
James Newton-King ae291d6b3b Merge pull request #1042 from pyitphyoaung/Issue774-Removal-of-netfx-core-directive-usage
Clean up NETFX_CORE directive usage
2016-10-13 13:07:09 +13:00
James Newton-King e74d6c5a4b -Test 2016-10-06 14:04:46 +13:00
James Newton-King 69ae589622 -Increment version to 9.0.2-beta1 2016-10-02 21:02:40 +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
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
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