Commit Graph
100 Commits
Author SHA1 Message Date
James Newton-King e99d9d42e4 -Fixed tests 2015-04-12 17:58:04 +12:00
James Newton-King 765bfbf1b4 -Tests 2015-04-07 17:36:41 +12:00
James Newton-King d2d097172e -NuGet package icon 2015-04-06 16:39:24 +12:00
James Newton-King fbe255bfbf -Returned to aspnetcore50 target
-Set prerelease to beta2
2015-04-06 15:05:04 +12:00
James Newton-King 629c32062e -Fixed deserializing classes derived from ConcurrentDictionary
-Updated to latest immutable collections
-Tests
2015-04-05 01:46:58 +13:00
James Newton-King 0552affb83 -Renamed aspnetcore50 to dnxcore50
-Documentation
2015-04-04 16:13:37 +13:00
James Newton-King a5865a9fb5 Merge branch 'ravensorb-master' 2015-04-03 12:10:49 +13:00
James Newton-King daf32bf571 -Fixed PR test 2015-04-03 12:10:23 +13:00
James Newton-King 5b392b54b8 -Clean up PR 2015-04-02 20:28:01 +13:00
James Newton-King 415b2cf7fe Merge branch 'master' of https://github.com/ravensorb/Newtonsoft.Json into ravensorb-master 2015-04-02 20:18:34 +13:00
James Newton-King 9eca136e79 -Documentation 2015-04-02 20:16:33 +13:00
James Newton-King f809e30a51 -Tests 2015-04-01 21:44:41 +13:00
James Newton-King 0a5162521a Merge branch 'pischke-master' 2015-03-29 21:23:02 +13:00
James Newton-King bc7350d12c -PR fixes 2015-03-29 21:22:42 +13:00
James Newton-King c565d56fdf -Build 2015-03-22 20:43:39 +13:00
James Newton-King c38c87cf5b -Build
-Tests
2015-03-22 19:48:02 +13:00
James Newton-King 41590f5a58 -Build 2015-03-22 17:44:38 +13:00
James Newton-King ff7e9f3f2a -Build 2015-03-22 14:30:38 +13:00
James Newton-King 965296d15a -Tests 2015-03-22 13:47:10 +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 a3df7ecd98 -Build 2015-03-21 23:09:27 +13:00
James Newton-King d503779c18 -Build 2015-03-21 22:38:06 +13:00
James Newton-King 8e68f23492 -Set project's intermediate output path 2015-03-21 21:33:18 +13:00
James Newton-King a3278ccd6a -Fixed serializing discriminated unions with type name or reference tracking enabled
-Fixed build
2015-03-21 20:35:57 +13:00
James Newton-King cdac4d8d38 -Fixed error when deserializing large JSON integers to XML
-Fixed serializing extension data properties with no setter
2015-03-15 18:45:29 +13:00
James Newton-King 502c01bb27 -Tests 2015-03-08 16:48:17 +13:00
James Newton-King 87a5e67c07 -Tests 2015-03-08 16:30:17 +13:00
James Newton-King 8c545b0bc0 -Fixed IsoDateTimeConverter on DateTime properties with DateTimeFormatHandling.DateTimeOffset
-Fixed preserving object references with read only properties
2015-03-08 16:20:54 +13:00
James Newton-King 0effb85a31 -Fix converting unmatched namespace prefixes in JSON to XML 2015-03-08 11:11:16 +13:00
James Newton-King 95e04ba96e -DiscriminatedUnionConverter performance improvements 2015-03-08 10:15:34 +13:00
James Newton-King b1184ef6b5 -Obsolete DefaultContractResolver(bool) 2015-03-04 20:34:21 +13:00
James Newton-King 376ab4dbb5 -Fixed deserializing large nullable UInt64 values 2015-02-25 20:44:07 +13:00
James Newton-King dd611a9ca5 -Fixed medium trust error 2015-02-17 21:11:51 +13:00
James Newton-King d287206dd9 -Build 2015-02-17 19:56:31 +13:00
James Newton-King 215a5a8aea -Change NuGet version to beta 2015-02-17 19:48:26 +13:00
James Newton-King f146cf7f29 -Tests 2015-02-17 19:16:25 +13:00
James Newton-King f132b87eaa -Documentation 2015-02-16 23:31:52 +13:00
James Newton-King 7c57b1663c -Merge documentation proof read 2015-02-15 13:57:37 +13:00
James Newton-King 20f66cdac9 -Fixed incorrect JTokenReader.Path in certain situations 2015-02-15 13:54:08 +13:00
James Newton-King 432a6e8945 -Build
-Documentation
2015-02-01 03:24:00 +13:00
James Newton-King 2fe55480f2 Merge branch '7.0.1-new' 2015-01-29 23:35:25 +13:00
James Newton-King ca76003256 -Updated Json.NET Schema URL 2015-01-29 21:11:06 +13:00
James Newton-King e8ca53e788 -Fixed deserializing empty strings in Hashtables 2015-01-27 00:00:53 +13:00
James Newton-King 0657fd9b44 -Updated urls 2015-01-25 16:28:25 +13:00
James Newton-King a94c2d5192 -Documentation 2015-01-19 23:45:26 +13:00
James Newton-King e96f1f036b -Derp 2015-01-13 22:06:43 +13:00
James Newton-King 4bc6e27e72 -Increment version to 7.0.1 2015-01-13 21:52:29 +13:00
James Newton-King 2dd8799b06 -Merge 7.0.1 changes 2015-01-13 21:38:10 +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 1497343173 -Protect against multiple attributes error 2015-01-11 19:46:39 +13:00
James Newton-King 569ca0b5f9 Merge branch 'master' into 6.0.8 2015-01-11 19:10:14 +13:00
James Newton-King 3936094b66 -WinRT build 2015-01-11 18:17:45 +13:00
James Newton-King ec6c64c8b6 -WinRT build 2015-01-11 17:37:20 +13:00
James Newton-King 773610fbdf -Changed version to 6.0.8 2015-01-11 17:03:08 +13:00
James Newton-King 6c1e1bfcba -Added support for serializing const fields
-Fixed tests
2015-01-11 16:54:10 +13:00
James Newton-King 9a4f96aa8f -Fixed using MetadataTypeAttribute with proxies
-Fixed error when deserializing undeserializable collections
2015-01-11 14:32:52 +13:00
James Newton-King 88b1e5c49a -Build 2015-01-10 22:54:36 +13:00
James Newton-King 5399c074a3 -Build 2014-12-31 15:31:16 +13:00
James Newton-King 20e9351c15 -Documentation 2014-12-30 22:21:55 +13:00
James Newton-King bc1a58e717 -Documentation 2014-12-29 15:47:26 +13:00
James Newton-King 78bc6c8bc3 -License headers 2014-12-29 12:46:13 +13:00
James Newton-King c714bae747 -Marked old JsonSchema implementation as obsolete 2014-12-29 12:15:18 +13:00
James Newton-King a2e15adf80 -Added AttributeProvider
-Increament version to 7.0.1
2014-12-23 10:57:17 +00:00
James Newton-King d22b5fd534 -Fixed WinRT 2014-12-23 11:58:22 +13:00
James Newton-King 25814e5a6c -Upgrade System.Collections.Immutable 2014-12-22 22:11:22 +00:00
James Newton-King 5d34cedcb3 -Build 2014-12-23 00:49:27 +13:00
James Newton-King a09f240f51 -Fixed CI 2014-12-22 17:16:10 +13:00
James Newton-King f760b78fbe -Added JToken.AncestorsAndSelf
-Added Extensions.AncestorsAndSelf and Extensions.DescendantsAndSelf
-Tests
2014-12-22 17:05:13 +13:00
James Newton-King 33ae4624bd -Fixed WinRT 2014-12-22 15:09:35 +13:00
James Newton-King 6155894321 Merge remote-tracking branch 'origin/json-schema' 2014-12-22 14:36:41 +13:00
James Newton-King e9dc993fc3 -Explicit culture for tests
-Tests
2014-12-22 00:11:57 +13:00
James Newton-King 55ccac4d92 -Added CurrentToken to JTokenWriter
-Added WriteToken(JsonToken, object) to JsonWriter
2014-12-17 19:38:39 +13:00
James Newton-King 9c2a1d853d -Fixed build 2014-12-07 16:31:52 +13:00
James Newton-King 82025bc5b7 -Added JContainer.DescendantsAndSelf
-Added CurrentToken to JTokenReader
2014-12-07 16:08:27 +13:00
James Newton-King fbaf3659d0 -Build 2014-12-02 14:17:09 +13:00
James Newton-King 2821b141d7 -Updated psake
-Build
2014-12-02 13:52:49 +13:00
James Newton-King 970a07ec5a -Build 2014-12-02 13:04:22 +13:00
James Newton-King 0dfe5024f0 -Build 2014-12-02 12:43:21 +13:00
James Newton-King 7399216c6f -Changed JsonContractType to always have all options 2014-12-02 11:08:16 +13:00
James Newton-King a764d4b0e1 Merge branch 'json-schema' of github.com:JamesNK/Newtonsoft.Json into json-schema 2014-12-02 00:43:29 +13:00
James Newton-King 209c10ddde -Explicit enum values 2014-12-02 00:43:01 +13:00
James Newton-King 0e6887da49 -Updated README.md with new logo location 2014-12-01 00:16:25 +13:00
James Newton-King 1c09507d9f -Fixed WinRT 2014-11-30 23:00:15 +13:00
James Newton-King 4a19ecd940 -Incremented version to 6.07 2014-11-30 21:41:56 +13:00
James Newton-King d5af34c790 -Schema InternalsVisibleTo 2014-11-30 21:27:44 +13:00
James Newton-King 449f4dd841 -Tests
-Documentation
2014-11-30 21:10:54 +13:00
James Newton-King b3b5a60bdb -Upgraded documentation to use latest Sandcastle
-Changed documentation conceptual references to links
2014-11-29 16:29:33 +13:00
James Newton-King fea3ffddeb -Fixed array XML documentation references 2014-11-29 16:25:16 +13:00
James Newton-King 68ebba03fb -Fixed casting a nullable negative SByte value 2014-11-29 00:28:33 +13:00
James Newton-King ed80d49e6e -Cleanup solution files 2014-11-24 22:16:39 +13:00
James Newton-King cfa51f5f58 Merge pull request #429 from yeroo/master
Bug: Unexpected token: Comment
2014-11-24 22:03:11 +13:00
James Newton-King 04e9048d10 -Refactor 2014-11-24 22:01:53 +13:00
James Newton-King b5ef767774 Merge branch 'Inverness-feature-iserializable-references' 2014-11-11 19:01:47 +13:00
James Newton-King 93e1113fa2 -Refactor 2014-11-11 19:01:27 +13:00
James Newton-King 7d38287972 Merge branch 'feature-iserializable-references' of https://github.com/Inverness/Newtonsoft.Json into Inverness-feature-iserializable-references 2014-11-11 12:08:47 +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 7b4995523b -Fixed (hopefully) MetadataTypeAttribute not being found on some platforms 2014-11-05 16:33:53 -08:00
James Newton-King d316425746 -Fixed settings not being used when deserializing F# unions 2014-11-05 16:25:57 -08:00