Commit Graph
58 Commits
Author SHA1 Message Date
Florian Greinacher b8e60c773b Change ifdefs to be by feature, not by platform (#1146)
* First pass

* Second pass

* Third pass

* Temporarily change build script to build only portable

* Add portable features for release build

* Add feature constants to build script

* Add more feature constants to build script

* Fix build issues

* Fix build issues

* Get rid of constants in build.ps1

* HAVE_NUMERICS -> HAVE_BIG_INTEGER

* Remove HAVE_NULLABLE

* Remove HAVE_NUMERICS from csprojs

* Add missing ifdef

* Add feature defines to pj

* Re-enable netstd builds

* Fix defines in pj

* Trying to get better build outputs

* Trying to get the build error

* Use newer cli

* Address review feedback; make netstd build work

* Introduce HAVE_DB_NULL_TYPE

* Adapt to upstream changes; address remaining review feedback

* Adapt to upstream changes; address remaining review feedback

* Rename some constants for constistency

* Address review feedback

* -Fixed build with signed assembly

* Fix merge erorr

* Address review feedback

* Introduce HAVE_NON_SERIALIZED_ATTRIBUTE

* HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE
2017-01-12 11:07:02 +13:00
timotei ce480a21f4 Properly handle ISet on Portable40 config
Up until now ISet members would not be
properly deserialized, getting an exception
that ISet cannot be instantiated.
2016-02-28 22:11:54 +02:00
James Newton-King eb0cbd6a75 -Formatting
-Build
2015-12-04 23:54:38 +13:00
James Newton-King ad68ea8780 -Added JsonConstructorAttribute support for lists and dictionaries 2015-10-03 14:10:39 +13:00
James Newton-King 239cde86f0 -Added support for immutable collections to Portable .NET 4.0 build 2015-09-30 18:04:18 +13:00
James Newton-King 52d9c0fca3 -Fixed build warnings in VS2015 2015-08-12 21:33:31 +12: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 6cf71b805e -Fixed tests 2014-09-03 22:27:42 +12:00
James Newton-King 1a36b4a996 -Changed collection parameterized creators to be created only when needed 2014-09-03 21:06:16 +12:00
James Newton-King 695742563b -Fixed Win8 build
-Fixed serializing ObservableCollection<T> on Win8
2014-08-30 14:34:16 +12:00
James Newton-King c545dc3f43 -Refactoring 2014-06-21 16:38:52 +12:00
James Newton-King 6b08fbc2fa -Code cleanup 2014-06-15 21:02:35 +12:00
James Newton-King 017a38c65b -Fixed deserializing non-generic IReadOnlyCollection<T> implementations 2014-05-12 13:40:48 +12:00
James Newton-King 1a6f7cdada -More object creation refactoring 2014-05-08 11:21:19 +12:00
James Newton-King a9884b7518 -Rename 2014-05-05 17:46:16 +12:00
James Newton-King c299fee560 -Refactor parameterized collection creation to use delegates 2014-05-02 17:49:13 +12:00
James Newton-King d5b71afc88 -Fixed bug when converting certain XML with namespaces
-Add support for serializing F# lists, sets and maps
2014-03-09 17:46:36 +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 5512e2623c -Added missing casts to JToken
-Upgraded to Immutable Collections RC
-Tests
2013-09-13 20:15:30 +12:00
James Newton-King 423d065c8f -Added support for immutable collections
-Updated NUnit assembly source to NuGet
2013-07-09 00:12:09 +12:00
James Newton-King 1ed1e84496 Merged conflict 2013-04-12 12:23:13 +12:00
James Newton-King f527d0bd4c -Fixed error serializing some non-generic collections 2013-04-12 12:14:50 +12:00
James Newton-King 1abcfb1ace -Fixed error when populating onto read only collections
-Fixed serializing hidden properties
-Readded DataContractAttribute inheritance
2013-04-07 03:55:35 +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 cb7ac1dfb4 -Performance 2013-04-01 23:51:40 +13:00
James Newton-King 77bce8f5de -Changed portable assembly to be .NET 4.5, WP8, Win8 2013-03-31 16:12:52 +13:00
James Newton-King 0007006850 -Added support for deserializing IList
-Fixed bugs
2013-03-30 20:46:11 +13:00
James Newton-King 2bf88ebba0 -Added support for falling back to IEnumerable<T> constructor on lists
-Added support for falling back to IEnumerable<KeyValuePair<TKey, TValue>> constructor on dictionaries
2013-03-30 13:57:13 +13:00
James Newton-King 57d9cb898d -Fixed build 2013-03-29 17:03:29 +13:00
James Newton-King efd31db09e -Refactored serializing and deserializing lists and dictionary 2013-03-29 15:52:57 +13:00
James Newton-King b81dfd352a -Added .NET 4.5 version
-Added IReadOnlyCollection<T> and IReadOnlyDictionary<TKey, TValue> support
-Incremented version to 5.0
2013-03-13 20:44:45 +13:00
James Newton-King 4d291cfc3d -Upgraded Windows Phone project to WP8 2013-03-11 20:14:24 +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 e3be3e43db -Added StringEscapeHandling with options to escape HTML and non-ASCII characters
-Added feature to deserialize ISet<T> properties as HashSet<T>
-Fixed ReferenceLoopHandling not being used when serializing ISerializable and dynamic values
2012-11-18 14:36:00 +13:00
James Newton-King 689f1a763b -Cleanup unit test project compiler warnings 2012-08-04 13:23:41 +12:00
James Newton-King 32dc957880 -Properties on dynamic objects with JsonProperty/DataMember will now be included in serialized JSON
-Serialize and deserialize multidimensional arrays
2012-07-31 20:53:26 +12:00
James Newton-King 0e22f39e12 -Added ItemRequired to JsonObjectAttribute 2012-05-02 23:57:52 +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 83618b1ea0 -Line endings 2012-04-08 18:10:07 +12: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
James Newton-King 5800e97ff3 -Added Newtonsoft.Json.Metro build (whew, what a pain!)
-Added .gitignore file
2012-03-15 18:34:51 +13:00
James Newton-King 0d6ad0b76e -Added Path to JsonReader/JsonWriter/ErrorContext with the JSON path of the current position
-Changed collection type on JsonArrayContract to public
-Changed dictionary key type and dictionary value type on JsonDictionaryContract to public
-Fixed error handling when failing to parse array content
-Fixed error handling when there are missing required properties
2012-02-23 23:07:41 +13:00
JamesNK 58d51cda5c -Added ReadAsInt32 to JsonReader
-Improved performance by using an enum rather than a type check to test contract type
2012-01-22 01:51:01 +00:00
JamesNK 45cbd34daa -Fixed potential multi-threading serializing issue 2012-01-16 07:22:26 +00:00
JamesNK faf6426527 -Rewrote JsonTextReader to use internal buffer to improve performance
-Improved JsonSerializer to cache contract/converters where possible to improve performance
-Improved JsonTextReader error message when additional JSON content found
-Fixed internal exception thrown when deserializing Decimal/DateTimeOffset/Byte lists
-Fixed various JsonTextReader bugs
2012-01-16 06:53:41 +00:00
JamesNK 628e7977e8 -Fixed deserializing to IEnumerable<T> properties 2011-08-02 01:15:21 +00:00
JamesNK 5c0431464b -Fix to preserve collection type information in certain situations when serializing
-Add missing Newtonsoft.Json.WindowsPhone.sln file
2010-11-17 07:31:20 +00:00
JamesNK 12a91cce9e -Updated source code to VS2010
-Updated main project to .NET 4.0
-Updated to psake 4.0
-Changed assembly version to 4.0.0.0
-Added ICustomTypeDescriptor implementation to JObject, removed JTypeDescriptionProvider and JTypeDescriptor
-Changed serialization of collections to use iterator rather than indexer
-Removed Compact Framework project
-Fixed XML documentation warnings
2010-08-31 02:19:41 +00:00