LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
817 Commits 1 Branch 0 Tags
21eb43e3b37bc22285eef6dab7c88cbd9bab6efb
Commit Graph
817 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Newton-King 21eb43e3b3 -Added xamarinios10 to .NET 4.0 portable build 
-Added aspnetcore50 to .NET 4.5 portable build
 2014-09-25 22:33:53 +12:00
James Newton-King 83bede562f Merge pull request #383 from spadfield/fix/bson-guid-deserialization 
Fix InvalidCastException when deserializing a GUID from BSON.
 2014-09-25 21:28:44 +12:00
James Newton-King fc5134fbcc Merge pull request #380 from tamizhvendan/master 
Removing the redundant requirement of having "fields property with empty array"
 2014-09-25 21:09:00 +12:00
James Newton-King 6a22345e28 -Bug fix 2014-09-25 21:04:24 +12:00
James Newton-King 2faf5059bf Merge branch 'master' of https://github.com/JamesNK/Newtonsoft.Json 2014-09-25 20:29:01 +12:00
James Newton-King 64ffa098b9 -Fixed null reference error when using JEnumerable created with default constructor 
-Tests
 2014-09-25 20:28:47 +12:00
Steven Padfield bfc2771ce8 Fix InvalidCastException when deserializing a GUID from BSON. 2014-09-24 10:51:21 -07:00
James Newton-King 060c7e9cbd Merge pull request #377 from BrandonLWhite/bw-JsonConverterArgs 
Implemented support for passing arguments to parameterized JsonConverter constructors
 2014-09-23 12:46:38 +12:00
James Newton-King 77a3a2c65c Merge pull request #379 from dogwatch/patch-1 
Added JsonConvert.ToString(string, StringEscapeHandling)
 2014-09-23 12:43:15 +12:00
Tamizhvendan S 8eea549b0a Removing the redundant requirement of having "fields property with empty array" for union types with no values. 
Note : Values are optionals in the Discriminated Union
Reference : http://msdn.microsoft.com/en-us/library/vstudio/dd233226(v=vs.100).aspx
 2014-09-19 22:31:29 +05:30
dogwatch b7c92fdeb9 Update JsonConvert.cs 2014-09-16 21:58:37 +04:00
dogwatch 040701ed68 Update JsonConvert.cs 2014-09-16 21:37:39 +04:00
dogwatch a32c34c78f Update JavaScriptUtils.cs 2014-09-16 21:30:21 +04:00
BrandonLWhite 977bc30368 Changed naming of JsonConverterAttribute.ConverterArgs to "ConverterParameters" for consistency. 2014-09-13 18:14:06 -05:00
BrandonLWhite 12c33e70d2 Implemented support for passing arguments to parameterized JsonConverter constructors. 2014-09-13 17:48:50 -05:00
James Newton-King b3e667fa78 -Fixed tests 2014-09-12 23:56:17 +12:00
James Newton-King 99df43eb4d -Tests line endings 2014-09-12 23:34:20 +12:00
James Newton-King a09c2110e8 -Fixed WinRT build 2014-09-12 21:43:17 +12:00
James Newton-King dfb2ac17a5 -Refactor ExceptionAssert 2014-09-12 21:33:53 +12:00
James Newton-King 4b9ce67ab7 -Fixed WinRT build 2014-09-12 20:55:20 +12:00
James Newton-King 6bb1b77fa4 -Fixed tests 2014-09-12 20:14:53 +12:00
James Newton-King 2fc8638d59 -Fixed test 2014-09-11 15:34:20 +12:00
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