Commit Graph
175 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 56e3d7575b -Fixed deserializing non-string values in some XML nodes 2017-01-19 11:49:09 +13:00
James Newton-King 473baa639b -Optimized IXmlNode memory usage when no child nodes or attributes 2017-01-15 18:37:06 +13:00
stakx 8639ac94ae Typos
Running a spell checker on the whole solution revealed a couple more
typos. This fixes all of those (although internal // line comments are
mostly left alone).

Additionally, convert a very few string.Format occurrences to the pre-
dominant .FormatWith pattern and fix some incorrect message strings.
2017-01-04 03:01:26 +01:00
James Newton-King b2afa9d674 -Fixed StringEnumConverter when EnumMember defines members that differ only by case 2016-11-06 20:58:32 -08:00
James Newton-King 29c84fd7c2 -Improved error when attempting to convert root JSON object property to an XML attribute 2016-10-25 14:43:27 +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 6c272eac6e -Fixed StringEnumConverter.AllowIntegerValues to reject integer strings 2016-09-12 17:25:19 +12:00
James Newton-King 39ecc359eb -Fixed date XML precision on portable builds 2016-09-12 09:45:37 +12:00
James Newton-King 68d160f3c6 -Added netstandard1.1 with BigInteger support 2016-09-10 23:54:44 +12:00
James Newton-King 216ff4ab8b -Tests 2016-09-10 18:41:30 +12:00
James Newton-King dada8ea0e3 -Fixed deserializing DataTable with error handling 2016-07-19 18:46:33 +12:00
James Newton-King b83e1fab4c -Fixed deserializing null Regex 2016-07-18 21:46:07 +12:00
James Newton-King 7f6a01001d -Fixed StringEnumConverter reading specified enum names that contain a comma 2016-07-15 16:52:59 +10:00
James Newton-King b71ca75905 -Fixed converting dollar JSON properties to XML 2016-04-29 23:19:42 +12:00
James Newton-King b24be98fcc -Tests 2016-04-10 15:17:55 +12:00
James Newton-King 55c87a0e73 -Fixed converting XElements without namespace attribute to JSON 2016-04-10 11:36:21 +12:00
James Newton-King 0311bc0f24 -Added constructor to StringEnumConverter for setting camelcase from attribute 2016-02-06 16:27:33 +13:00
Taylor Wood 38ebf96655 Fix DU converter exception typo. 2016-01-28 22:02:39 -06:00
Jon Hanna a06716c6a6 Refactor some cases of repeated code into separate methods.
Make the MoveToContent() and ReadToContent() produced from this public.
2015-12-20 00:28:40 +00:00
James Newton-King a5d1a41e14 -Removed generic SerializeObject methods 2015-12-12 18:14:57 +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 45936d58a2 -Fixed converting JSON to XML with invalid XML name characters 2015-12-06 22:10:58 +13:00
James Newton-King 709dd8cea6 -Merge 2015-12-06 21:08:04 +13:00
Oleg Deribas 7ce78833f4 When converting JSON to XML encode characters in JSON property names which are not compatible with XML and decode when converting back. 2015-12-05 20:09:03 +00:00
James Newton-King eb0cbd6a75 -Formatting
-Build
2015-12-04 23:54:38 +13:00
James Newton-King b2827d3ddb -Tests 2015-11-28 19:46:00 +13:00
James Newton-King 425c1d8402 -Fixed converting null string JValues to XML 2015-11-25 01:18:59 +13:00
James Newton-King d91e8f4425 -Fixed NZ culture tests on Windows 10 2015-11-02 10:12:19 -08: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 eccdf4bf95 -Fixed converting JSON to XML
-Fixed not including line data with many XmlNodeConverter exceptions
2015-09-30 17:35:53 +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 3613a89a56 -Fixed error when deserializing null DataSet or DataTable properties 2015-06-30 15:04:43 +12:00
James Newton-King 67c20905ee -Build 2015-06-21 09:16:51 +00:00
James Newton-King 08296c5eca -Documentation 2015-06-10 01:16:12 +12:00
James Newton-King e8f4589e53 -Increment prerelease to beta3
-Remove internals from ResolvePropertyName
2015-05-03 19:46:59 +12:00
James Newton-King 0f584a6d52 -Added JsonRequiredProperty
-Added JsonSerializerSettings.ReferenceResolverProvider property
-Marked JsonSerializerSettings.ReferenceResolver as obsolete
2015-05-02 19:40:44 +12:00
James Newton-King 0552affb83 -Renamed aspnetcore50 to dnxcore50
-Documentation
2015-04-04 16:13:37 +13:00
James Newton-King f809e30a51 -Tests 2015-04-01 21:44:41 +13:00
James Newton-King bc7350d12c -PR fixes 2015-03-29 21:22:42 +13:00
pischke 00bbd96718 DataTableConverter is using Serializer for cell data. 2015-03-26 23:17:27 +01: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 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 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