Commit Graph
300 Commits
Author SHA1 Message Date
James Newton-King cc6d99aa60 Migrate project.json to csproj (#1212) 2017-02-13 23:46:43 +13:00
James Newton-King 2e7b24e9b1 -Added support for TypeConverters to netstandard1.0+ 2017-01-19 17:43:07 +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
Jon Hanna 218c25c859 Call nullable WriteValue overloads in TraceJsonWriter (#1139)
Fixes #1138
2017-01-07 20:25:46 +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
Hugh Bellamy 123e8a54c5 Add a test for deserializing an IEnumerable with implicit conversion 2016-10-31 09:29:26 +00:00
James Newton-King 0721bd4dec -Fixed not erroring when deserializing incomplete JSON with a parameterized constructor 2016-10-24 14:20:59 +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 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 68d160f3c6 -Added netstandard1.1 with BigInteger support 2016-09-10 23:54:44 +12:00
James Newton-King d6277bf5d8 -Tests 2016-08-09 18:58:22 +12:00
TylerBrinkley 9603e3fe76 Made test not available in PORTABLE or PORTABLE40.
Fixed visual studio's auto update of Net35 Test project.
2016-08-08 10:15:42 -05:00
TylerBrinkley a771eab395 Fixed build on Net20 Tests.
Didn't realize HashSet wasn't available in Net20.
2016-08-08 09:36:15 -05:00
TylerBrinkley 4605894b6b Addresses #926 and #949 2016-08-08 09:18:34 -05:00
James Newton-King 172f2122d4 -Tests 2016-07-05 14:01:02 +12:00
Taylor Wood 07b72a5637 Fix spelling of "parameterized" 2016-05-24 11:41:40 -05:00
James Newton-King e8f4a3b651 -Updated build to use .NET CLI
-.NET Standard 1.0 included in package
2016-05-14 13:43:43 +12:00
timotei ce480a21f4 Properly handle ISet on Portable40 config
Up until now ISet members would not be
properly deserialized, getting an exception
that ISet cannot be instantiated.
2016-02-28 22:11:54 +02:00
James Newton-King 04f7bb5d65 -Test 2016-02-06 16:05:01 +13:00
James Newton-King 78f5587403 -Documentation 2016-02-06 10:28:57 +13:00
James Newton-King 70120ce077 -Fixed ReadAsBytes with type name handling 2016-01-08 22:37:05 +13:00
James Newton-King 9021858293 -Added ReadAsBoolean
-Fixed reading booleans as strings
-Fixed reading large integers as booleans
2016-01-05 22:12:01 +13:00
James Newton-King 1ada613903 -Fixed serializing certain objects with events 2016-01-05 16:26:22 +13:00
James Newton-King 3773eb5be7 -Added ReadAsDouble 2015-12-26 15:53:27 +13:00
James Newton-King 7f290b5a85 -JsonReader ReadAsBytes refactor 2015-12-26 13:14:31 +13:00
James Newton-King d1451bd4ae -JsonReader refactor 2015-12-26 01:55:36 +13:00
James Newton-King 815b283e58 -Refactored buffer pool 2015-12-13 15:40:37 +13:00
James Newton-King eb0cbd6a75 -Formatting
-Build
2015-12-04 23:54:38 +13:00
James Newton-King c96779dc10 -Fixed deserializing certain Microsoft formated dates 2015-11-28 21:48:10 +13:00
James Newton-King 226832ff5d -Fixed error when deserializing ignored property with mismatched type 2015-11-28 18:13:10 +13:00
James Newton-King 000407f610 -Added Required.DisallowNull 2015-11-15 21:25:47 +13:00
James Newton-King a3eb2d596c -Fixed DateTimeZoneHandling not being used when writing DateTime dictionary keys
-Buffer pooling fixes
-Improved date parsing performance
2015-11-14 15:22:59 +13:00
James Newton-King 8e1a59b8e6 -Fixed error when ReferenceResolver is set to null 2015-11-12 23:53:10 +13:00
James Newton-King d91e8f4425 -Fixed NZ culture tests on Windows 10 2015-11-02 10:12:19 -08:00
James Newton-King 57f4f98162 -Added support for deserializing Version from string 2015-10-10 23:20:20 +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 79c2a47057 Merge branch 'master' of github.com:JamesNK/Newtonsoft.Json 2015-09-03 11:00:08 +12:00
James Newton-King 8300fdfad2 -Test 2015-09-03 10:59:58 +12:00
James Newton-King c28feca66b -Build 2015-08-31 17:31:07 +12:00
James Newton-King 85e7968ed9 -Fixed documentation typo
-Fixed error when serializing some interfaces with hidden properties
-Fixed some large integers being incorrectly read from JSON
2015-08-30 22:24:57 +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