Commit Graph
67 Commits
Author SHA1 Message Date
James Newton-King aa5f28c097 -Added Portable40 back 2017-04-02 10:24:09 +12:00
James Newton-King ba514c4610 -Cleaned up preprocessor symbols 2017-03-05 15:12: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 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 86c2f80311 -Fixed JTokenWriter sometimes losing types when writing JToken 2016-04-29 16:21:41 +12:00
James Newton-King d1451bd4ae -JsonReader refactor 2015-12-26 01:55:36 +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 a9c7d60d22 -Improved JArray bad indexer message 2015-11-23 20:31:28 +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 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 b270104bfb -Fixed writing ULong.MaxValue JValues as JSON 2015-06-12 09:59:20 +12:00
James Newton-King 1ba98761c7 -Fix build 2015-06-11 15:22:51 +12:00
James Newton-King 9e29489e5a -Added support for reading GUID strings as bytes in JsonTextReader
-Changed reading GUIDs as bytes to only support 00000000-0000-0000-0000-000000000000 format
2015-06-10 17:10:16 +12:00
James Newton-King 0552affb83 -Renamed aspnetcore50 to dnxcore50
-Documentation
2015-04-04 16:13:37 +13:00
James Newton-King f09cfcded0 -Build 2015-03-22 13:34:52 +13:00
James Newton-King 345c6f3512 -Tests 2015-03-22 13:00:41 +13:00
James Newton-King b9af7f227b -Replace tests console writes with asserts 2015-03-22 12:37:12 +13:00
James Newton-King 449f4dd841 -Tests
-Documentation
2014-11-30 21:10:54 +13:00
James Newton-King 1816f555ea -Fixed tests
-Fixed exception message line breaks to use Environment.NewLine
2014-11-11 12:06:30 +13:00
James Newton-King d316425746 -Fixed settings not being used when deserializing F# unions 2014-11-05 16:25:57 -08: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 88eeb8ba92 -Fixed MetadataTypeAttribute reflection bug by using CustomAttributeData
-Fixed immutable collections bug by getting type from known assembly
-Added support from running tests on aspnetcore50
2014-10-18 00:00:26 +13:00
James Newton-King 64ffa098b9 -Fixed null reference error when using JEnumerable created with default constructor
-Tests
2014-09-25 20:28:47 +12:00
James Newton-King 99df43eb4d -Tests line endings 2014-09-12 23:34:20 +12:00
James Newton-King dfb2ac17a5 -Refactor ExceptionAssert 2014-09-12 21:33:53 +12:00
James Newton-King 7a8f5e43bc -Tests 2014-05-11 21:58:36 +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 0f77cd1b03 -Added SpecialPropertiesHandling 2014-02-12 01:43:46 +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 13aa07f63e -Fixed potential inifinite loop when parsing unquoted value
-Added NuGet install.ps1
-Incremented version to 5.0.6
2013-06-01 14:18:20 +12:00
James Newton-King 032bf82e0a -Readded .NET 4, SL4, WP7, Win8 portable library
-Disable SL library build
2013-04-06 11:38:01 +13:00
James Newton-King 92de187a74 -Changed portable assembly to .NET 4.5, Silverlight 5, Win8, WP8
-Fixed incorrect namespace when converting XML to JSON
2013-03-06 23:04:26 +13:00
James Newton-King c6eff351a4 -Removed old PocketPC ifdefs 2013-02-10 17:49:36 +13:00
James Newton-King f98c6a0d8d -Documentation 2013-01-29 21:02:28 +13:00
James Newton-King e3a720504e -Lots and lots of JSON Schema work
-JSON Schema spec tests added
-Added Path to JToken
-Fixed JTokenWriter returning null reference
-Build script logging
-Documentation
-Updated to NUnit 2.6
2012-12-31 00:53:08 +13:00
James Newton-King 689f1a763b -Cleanup unit test project compiler warnings 2012-08-04 13:23:41 +12:00
James Newton-King 5d83daa804 -Changed LINQ to JSON load methods to support reading past preceding comments 2012-07-16 00:01:40 +12:00
James Newton-King 55854f1682 -Fixed time zone unit test failure
-Removed Metro IDictionary copy
-Fixed Metro build
2012-06-08 05:21:58 -07:00
James Newton-King 10256fcf68 -Added Portable Class Library build 2012-04-18 21:02:34 +12:00
James Newton-King 83618b1ea0 -Line endings 2012-04-08 18:10:07 +12:00
James Newton-King 60004065fd -Fixed Metro build 2012-03-19 00:03:20 +13:00
James Newton-King 8471c4ffe1 -Added IgnoreSerializableInterface to DefaultContractResolver
-Changed serializing ISerializable types under partial trust to error to fix security issue
-Fixed LinqBridge collision error in .NET 2.0 by moving types to a different namespace
-Fixed JObject.Keys error when object has no items
2012-03-18 16:24:30 +13:00