Commit Graph
1111 Commits
Author SHA1 Message Date
James Newton-King cfafebe1e5 -Tests 2016-01-09 08:53:19 +13:00
James Newton-King 7b79ef5bf6 -Tests 2016-01-09 08:38:43 +13:00
James Newton-King 70120ce077 -Fixed ReadAsBytes with type name handling 2016-01-08 22:37:05 +13:00
James Newton-King 2c5322c302 -Increment version to 8.0.2
-Tests
2016-01-08 21:31:18 +13:00
James Newton-King 9021858293 -Added ReadAsBoolean
-Fixed reading booleans as strings
-Fixed reading large integers as booleans
2016-01-05 22:12:01 +13:00
James Newton-King 1ada613903 -Fixed serializing certain objects with events 2016-01-05 16:26:22 +13:00
James Newton-King 865c08d95d -Removed pre-release 2015-12-29 12:34:20 +13:00
James Newton-King 48f7e1d91e -Test 2015-12-29 10:05:22 +13:00
James Newton-King 0c5b72a521 -Formatting 2015-12-27 14:37:05 +13:00
James Newton-King ce2a08dba2 -Formatting 2015-12-27 14:31:36 +13:00
James Newton-King 00e75556a6 -Changed version to beta4 2015-12-26 21:32:11 +13:00
James Newton-King e625bcc5b4 -Build 2015-12-26 20:17:06 +13:00
James Newton-King 00305b1be5 -Build 2015-12-26 20:00:05 +13:00
James Newton-King dc07e59b0b -Tests 2015-12-26 18:01:24 +13:00
James Newton-King 3773eb5be7 -Added ReadAsDouble 2015-12-26 15:53:27 +13:00
James Newton-King 7f290b5a85 -JsonReader ReadAsBytes refactor 2015-12-26 13:14:31 +13:00
James Newton-King 027bfe46cb -JsonReader refactor fixes 2015-12-26 09:37:50 +13:00
James Newton-King f8d8b0941c -Derp 2015-12-26 02:09:34 +13:00
James Newton-King d1451bd4ae -JsonReader refactor 2015-12-26 01:55:36 +13:00
James Newton-King 68fa401d70 -Array pool perf test 2015-12-25 20:01:13 +13:00
James Newton-King 58fff8c2f8 -Updated to .NET Core RC1 2015-12-24 11:44:36 +13:00
James Newton-King e04f0eec48 -Documentation 2015-12-22 14:22:49 +13:00
James Newton-King f2f87880be -Tests 2015-12-22 14:19:13 +13:00
James Newton-King 9c1dbfe44d -Resolve conflict 2015-12-21 22:08:09 +13:00
James Newton-King 24f230c182 Merge pull request #754 from JonHanna/fix_752
Null Check on JsonWriter.WriteToken
2015-12-21 21:57:46 +13:00
James Newton-King f95a90893b -Refactor 2015-12-21 21:55:14 +13:00
Jon Hanna bf2e5a29aa Correct ParamName in exception for invalid JsonToken on ‎WriteToken
Fixes #755

Also consolidates WriteTokenInternal into matching WriteToken (slightly reduce
assembly size).

Also extend ExceptionAssert.Throws to return exception for further examination.
2015-12-20 21:34:21 +00:00
Jon Hanna d764cfae1a Null Check on JsonWriter.WriteToken
Fixes #752
2015-12-20 14:23:01 +00:00
James Newton-King aeaf3f1dc3 -Derp 2015-12-20 18:11:22 +13:00
James Newton-King a7046b0f6c -Refactor 2015-12-20 18:07:25 +13:00
James Newton-King 4304ea6431 Merge branch 'refactor_repeated_code' of https://github.com/JonHanna/Newtonsoft.Json into JonHanna-refactor_repeated_code 2015-12-20 14:09:23 +13:00
James Newton-King 04c0e318be -Don't call JsonWriter.Close when not disposing 2015-12-20 14:08:19 +13: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 dca5260334 -Fixed JsonWriter IDisposable implementation 2015-12-19 15:25:33 +13:00
James Newton-King 428a942203 Merge pull request #747 from JonHanna/gc_suppress_in_dispose
Suppress finaliser in Dispose if there's a protected Dispose(bool)
2015-12-19 08:55:40 +13:00
Jon Hanna 40bd051809 Suppress finaliser in Dispose if there's a protected Dispose(bool)
Fixes #746
2015-12-18 19:03:36 +00:00
James Newton-King 48786adc5b Merge pull request #743 from JonHanna/defer_reflection
Move reflection calls until after branches that may mean they're unused
2015-12-18 09:02:55 +13:00
Jon Hanna dbbe944b19 Move reflection calls until after branches that may mean they're unused
A handful of cases where reflection calls are made prior to branches that
might lead to the results not being used.
2015-12-17 18:27:12 +00:00
James Newton-King 9d8e59589b Merge pull request #741 from JonHanna/faster_nullable_value_access
Use GetValueOrDefault() over Value when Nullable<T> known non-null
2015-12-16 12:40:35 +13:00
Jon Hanna 7e6194b61b Use GetValueOrDefault() over Value when Nullable<T> known non-null
GetValueOrDefault() is an easily-inlined access to a field as this
will hold the correct value for both HasValue and !HasValue cases.
The Value property in comparison contains a branch on a check that the
Nullable<T> has its internal hasValue flag to decide whether to throw
InvalidOperationException or not.

Hence when a nullable type is known to have a value (not be null) and
one wants the value, rather than to possibly trigger the exception-throw
GetValueOrDefault() has a slight performance benefit over Value.

Accordingly, replace calls to the Value property with calls to
GetValueOrDefault() when previous checks or assignments guarantee the
value is not null.
2015-12-15 19:15:58 +00:00
James Newton-King 60cce16d43 -Documentation 2015-12-13 20:40:33 +13:00
James Newton-King 4c256e7afd -Fixed casting dynamic JValue to JToken 2015-12-13 18:56:10 +13:00
James Newton-King 815b283e58 -Refactored buffer pool 2015-12-13 15:40:37 +13:00
James Newton-King 4e2acac33a -Formatting 2015-12-12 18:22:06 +13:00
James Newton-King a5d1a41e14 -Removed generic SerializeObject methods 2015-12-12 18:14:57 +13:00
James Newton-King eec87d257d -Derp 2015-12-09 13:03:56 +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
James Newton-King a64616f9f9 -Fixed setting default values onto properties already set in constructor when deserializing 2015-12-06 20:26:55 +13:00