James Newton-King
7fcd12e2cf
-Fixed build
2014-09-10 20:25:35 +12:00
James Newton-King
a0f9df8a14
Merge branch 'master' of github.com:JamesNK/Newtonsoft.Json
2014-09-10 20:04:48 +12:00
James Newton-King
352e52dda0
-Tests
...
-Documentation
2014-09-10 20:04:39 +12:00
James Newton-King
beedc932c3
Merge pull request #371 from Redth/master
...
Portable Tests working on Mono / OSX
2014-09-10 20:03:11 +12:00
Redth
69ce5fe690
Fixed whitespace
2014-09-09 09:56:22 -04:00
Redth
bc341c6764
Tests.Portable.csproj fixes for Xamarin Studio
...
global alias caused compilation errors, as well as the Entity Data model that doesn't seem to be actually used in the project.
2014-09-09 09:42:16 -04:00
Redth
59a3ff8b2a
Added check for multiple exception messages to match for mono
...
Some tests check explicitly for a given exception message which differs on Mono, so added possible options to check for so both platforms will pass
2014-09-09 09:40:07 -04:00
Redth
831e32809e
Added Exception.Throws overload to take multiple possible messages to match
...
This way tests can pass in multiple possible string matches which the runtime may use as a message depending on the given platform (e.g.: MS-Runtime vs Mono)
2014-09-09 09:39:05 -04:00
Redth
aa6c474999
Changed tests to explicitly assert for strings with \r\n
...
As opposed to leaving it up to the IDE to decide at compile time by having newlines in the actual document
2014-09-09 09:35:01 -04:00
Redth
fc9c3ad720
Added gitattribute for explicit crlf line endings
2014-09-09 08:22:56 -04:00
Redth
e93122e03d
Ignore .userprefs from Xamarin Studio
2014-09-09 08:22:09 -04:00
James Newton-King
d463fce5a1
-Documentation
2014-09-07 10:34:07 +12:00
James Newton-King
289359f191
-Fixed camelcase culture bug
2014-09-07 10:14:34 +12:00
James Newton-King
7e29a7e489
-Fixed build
2014-09-06 15:53:38 +12:00
James Newton-King
eb1c683de3
-Updated version to 6.0.5
2014-09-06 15:14:34 +12:00
James Newton-King
a4ba1cf195
Merge pull request #347 from kenkendk/master
...
Fixed codeplex issue 24176
2014-09-06 14:31:56 +12:00
James Newton-King
ffd9cf9209
-Fixed deserializing F# unions with out of order properties
...
-Tests
2014-09-05 20:36:45 +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
0c865efd96
-Fixed not matching some parameters when deserializing via a cosntructor
2014-09-02 23:29:20 +12:00
James Newton-King
4a375721ac
-Added support for constructors with out and ref parameters
2014-08-31 15:33:19 +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
57ccaf00bf
-Improved Portable40 assembly performance by using compiled expression reflection
...
-Fixed converting string JValues to enums with JToken.ToObject
2014-08-24 23:33:08 +12:00
James Newton-King
dce6228b8f
-Fixed error in JTokenWriter when disposing after adding a duplicate property
...
-Fixed not validating JSON when deserializing with DataTableConverter
2014-08-17 19:42:11 +12:00
Kenneth Skovhede
ad71c61745
Fixed codeplex issue 24176
2014-08-13 12:25:40 +02:00
James Newton-King
73a266217b
-Build
2014-08-03 20:28:50 +12:00
James Newton-King
dd07fdff93
-Fixed WinRT build
2014-08-03 19:06:51 +12:00
James Newton-King
3327a6954c
-Merge demo
2014-08-03 18:56:41 +12:00
James Newton-King
8e727a27b2
-JProperty performance
...
-Improved property name escape skipping
2014-08-03 00:08:31 +12:00
James Newton-King
750771e890
-Code cleanup
2014-08-02 10:30:23 +12:00
James Newton-King
5a4875dcbd
Merge pull request #341 from bbowyersmyth/perf
...
ToCamelCase performance and memory tuning
2014-08-02 10:06:37 +12:00
Bruce Bowyer-Smyth
f585324de9
ToCamelCase performance and memory tuning
2014-08-02 06:58:09 +10:00
James Newton-King
1801014f00
Merge pull request #338 from bbowyersmyth/chars
...
Symbol chars used instead of single length strings
2014-08-01 21:28:46 +12:00
James Newton-King
5fc738247f
-Added Merge to LINQ to JSON
2014-08-01 21:27:38 +12:00
Bruce Bowyer-Smyth
432d262dcd
Symbol chars used instead of single length strings
2014-07-28 16:30:10 +10:00
James Newton-King
490895716c
-Documentation
2014-07-24 23:34:33 +12:00
James Newton-King
ee170dc551
-Incremented version to 6.0.4
...
-Removed unused file
2014-07-21 14:33:23 +12:00
James Newton-King
e32b4671c8
-Added MetadataPropertyHandling.Ignore
2014-07-20 18:29:31 +12:00
James Newton-King
07baae515a
-Fixed MetadataHandling.ReadAhead bugs
2014-07-20 12:26:00 +12:00
James Newton-King
6b5356ed51
-Fixed build
2014-07-19 23:36:19 +12:00
James Newton-King
70b0813551
-Fixed incorrect NuGet targets on portable assembly
...
-Fixed using JTokenEqualityComparer with JProperties that have no value
2014-07-19 12:48:20 +12:00
James Newton-King
51212d92b1
-Fixed directly serializing XmlElements
2014-07-04 17:28:36 +12:00
James Newton-King
30445090f2
-DI tests
2014-07-04 11:28:23 +12:00
James Newton-King
f0f79695a4
-Updated CONTRIBUTING.md
2014-07-01 09:16:28 +12:00
James Newton-King
8cfa35f6f1
-Updated CONTRIBUTING.md
2014-06-30 21:38:09 +12:00
James Newton-King
a38a8646fa
-Updated CONTRIBUTING.md
2014-06-30 19:22:08 +12:00
James Newton-King
a43e8f460d
-Updated README.md
2014-06-30 16:53:24 +12:00
James Newton-King
a2df01f5e4
-Updated LICENSE.md
2014-06-30 16:40:36 +12:00
James Newton-King
95b8917865
-Updated README.md
2014-06-30 16:37:41 +12:00
James Newton-King
d4bfbfe8a9
-Updated README.md
2014-06-30 16:23:27 +12:00