LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,398 Commits 1 Branch 0 Tags
bfddda84f4233f55dc2220bbb33e94e625110a8b
Commit Graph
68 Commits
Author SHA1 Message Date
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 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 68d160f3c6 -Added netstandard1.1 with BigInteger support 2016-09-10 23:54:44 +12:00
Alexey Skalozub 95a4979ba4 Advanced constructor parameter binding on .NET Core & portable 2016-09-01 04:31:43 +03:00
James Newton-King ce2a08dba2 -Formatting 2015-12-27 14:31:36 +13:00
James Newton-King eb0cbd6a75 -Formatting 
-Build
 2015-12-04 23:54:38 +13:00
Dmitry Kalyanov f3706313ef Compare BaseDefinition for properties when adding private properties. 
Due to difference in mono vs .net (see https://bugzilla.xamarin.com/show_bug.cgi?id=36305),
MethodInfo.GetBaseDefinition() does not actually return base class (it returns partially-instantiated
generic class) in mono when overriding property from generic base class. Because of this, lookup
of matching property in ReflectionUtils.GetChildPrivateProperties() fails to find
already added property and adds the same property multiple times. Comparing GetBaseDefinition()'s
compensates for this: since the same function is applied to both PropertyInfo's, matching property
will be found.

This fixes issue #726.
 2015-11-27 15:58:15 +03:00
James Newton-King a2f9acf917 -Fixed potential error when writing escaped unicode character 2015-10-03 14:28:13 +13:00
James Newton-King b30e1a178b -Fixed JsonConvert.PopulateObject error with starting comment 2015-09-30 15:38:33 +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 0552affb83 -Renamed aspnetcore50 to dnxcore50 
-Documentation
 2015-04-04 16:13:37 +13:00
James Newton-King b9af7f227b -Replace tests console writes with asserts 2015-03-22 12:37:12 +13:00
James Newton-King 8b7b699e1d -Marked old JsonSchema implementation as obsolete 
-License headers
-Documentation
-Build
 2015-01-13 21:31:35 +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 b550aac6d6 -Updated version to 6.0.6 
-Fixed WinRT build
 2014-09-29 16:18:13 +13:00
James Newton-King 1337c4f7f7 -Performance 2014-09-28 16:19:18 +13:00
James Newton-King 6a22345e28 -Bug fix 2014-09-25 21:04:24 +12:00
James Newton-King 2faf5059bf Merge branch 'master' of https://github.com/JamesNK/Newtonsoft.Json 2014-09-25 20:29:01 +12: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
BrandonLWhite 12c33e70d2 Implemented support for passing arguments to parameterized JsonConverter constructors. 2014-09-13 17:48:50 -05: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
Redth aa6c474999 Changed tests to explicitly assert for strings with \r\n 
As opposed to leaving it up to the IDE to decide at compile time by having newlines in the actual document
 2014-09-09 09:35:01 -04:00
James Newton-King c987b0509a -Fixed JsonConvert.PopulateObject not setting JsonReader settings 2014-06-15 15:04:17 +12:00
James Newton-King 20eef9b608 -Test 2014-06-14 19:20:09 +12:00
Barry Dorrans 5d186e4ef3 Limited integer parsing to javascript integer size. 2014-05-22 17:17:09 -07:00
James Newton-King 6965fcfa46 -Fixed potential race condition serializing F# objects 
-Fixed schema divisible sometimes incorrectly validating to false
-Fixed not calling virtual ShouldSerialize methods
 2014-03-31 15:47:36 +13:00
James Newton-King b3369a45cd -Fixed compiler warnings 
-Changed PopulateObjectAsync to be obsolete
 2014-01-30 00:36:23 +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 32f326e46a -Fixed tests 2013-05-08 20:26:32 +12:00
James Newton-King f4d5ace26d -Increment version to 5.0.5 2013-05-08 20:10:13 +12:00
James Newton-King f3ec28a6b3 -Fixed build 2013-04-28 12:49:23 +12:00
James Newton-King a7d47558d8 -Added default serializer settings 2013-04-28 12:27:47 +12:00
James Newton-King b6d3168ed8 -Refactored parsing dates 
-Refactored writing integers
-Refactored JsonConvert
 2013-04-21 18:27:08 +12:00
James Newton-King 695bb8368f -Fixed build 
-Removed unused code
 2013-04-06 15:19:33 +13: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 689f1a763b -Cleanup unit test project compiler warnings 2012-08-04 13:23:41 +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 89ab4c0d1e -Improved deserialization performance by only tracking property presence when needed 2012-05-06 13:47:23 +12:00
James Newton-King e4491e5812 -Decreased deserializer stack usage 2012-05-06 01:43:20 +12:00
James Newton-King bdc5f95c15 -Unit tests 2012-04-24 18:07:38 +12:00
James Newton-King 7b776e9298 -Added JsonDictionaryAttribute 
-Added JsonContainerContract
-Added support for customizing the JsonConverter, type name handling, reference handling of collection items
 2012-04-22 23:17:58 +12:00
James Newton-King a7bddf989f -Added Path to JsonReaderException/JsonSerializationException messages 
-Added JsonException
-Fixed all Exceptions thrown to be more specific
 2012-04-21 17:25:44 +12:00
James Newton-King 10256fcf68 -Added Portable Class Library build 2012-04-18 21:02:34 +12:00