LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,427 Commits 1 Branch 0 Tags
febdb8188b226ee7810bbf7e053ada171818fbeb
Commit Graph
1427 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Newton-King febdb8188b -Changed netstandard1.1 to netstandard1.3 
-Added support for ISerializable interface to netstandard1.3+
-Added support for SerializableAttribute and NonSerializedAttribute to netstandard1.3+
 2017-03-05 14:29:24 +13:00
James Newton-King b9ef3adbc2 -Build 2017-02-26 20:54:21 +13:00
James Newton-King b5f1b83191 -Added improved support for deserializing immutable structs 2017-02-26 19:11:45 +13:00
James Newton-King a49773e2b2 -Build 2017-02-26 13:00:46 +13:00
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 980cab1a22 -Build 2017-02-19 18:05:50 +13:00
James Newton-King b285f3fc2d -Build 2017-02-18 21:54:33 +13:00
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
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 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
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
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
Florian Greinacher 7819b3c5ef Handle F# lists that implement IReadOnlyCollection<T> (F# 4.1 and above) (#1181) 
Fixes #1180
 2017-01-17 09:45:43 +13:00
James Newton-King 285b4c9a85 -Marked SerializationBinder as obsolete 2017-01-16 19:55:21 +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 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
Jon Hanna b3e2d61708 Optimise XmlNodeConverter (#1176) 
* Short-circuit SerializeGroupedNodes on no child nodes.

Avoids creating unused Dictionary.

* Don't create Dictionary in ReadAttributeElements if it'll be empty.

* Reduce calls to JsonReader.TokenType virtual property.

* Remove duplicate finished boolean.

Different reasons for finishing the ReadAttributeElements loop are
noted, but the difference isn't acted on, so merge them.

* Check correct XML is from correct TokenType immediately.

(This changes the exception message in the case of it also being an
invalid objectType, but not the exception type).
 2017-01-15 18:14:00 +13:00
Jon Hanna 0ef9ec292b Don't explicitly check for Failed or Cancelled Statuses (#1179) 
Between discussion at #1137 and a few rounds of revision at #1159 we
arrived at an optimisation where tasks that are both heavily hit and
very likely to return in a completed state are checked for a status of
either RanToCompletion, Canceled or Faulted and a path is taken where
no await is needed for any of those.

The Canceled and Faulted tasks are returned immediately, allowing that
state to be passed to the caller.

However, these are exceptional cases, and if we just continued the
subsequent await would raise the appropriate exception. Checking for
all three cases instead of just RanToCompletion is optimising for those
execptional conditions at cost (in the form of a larger comparison
segment of code) to the more common cases of the task either being
completed or still running.

Simplify this back to a check just for RanToCompletion.
 2017-01-15 14:34:37 +13:00