LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
834 Commits 1 Branch 0 Tags
70d3e9327d5dcd9a1770b3aed5437d6aa0b15802
Commit Graph
834 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Newton-King 70d3e9327d -Documentation 2014-10-20 20:18:22 +13:00
James Newton-King ac98329006 Merge branch 'master' of https://github.com/JamesNK/Newtonsoft.Json 2014-10-20 19:54:30 +13:00
James Newton-King f88d2a42d8 -Documentation 2014-10-20 19:53:56 +13:00
James Newton-King 04d9d3181a -Tests 2014-10-20 18:52:21 +13:00
James Newton-King 703b30f9d1 -Build 2014-10-19 23:39:19 +13:00
James Newton-King 697e31444c -Changed MetadataTypeAttribute to use GetCustomeAttributes to support .NET 4.0 PCL 2014-10-19 23:11:58 +13:00
James Newton-King bc40ef0a4c -Reverted iOS NuGet target 
-Readme.txt
 2014-10-19 19:53:49 +13:00
James Newton-King 7011940383 -Fixed build 2014-10-19 18:53:19 +13:00
James Newton-King c7f8d85cc4 -Fixed tests 
-Changed JTokenReader to provide line numbers for end tokens
 2014-10-19 18:29:34 +13:00
James Newton-King 15906f1f36 -Automated aspnetcore50 tests in build script 
-Documentation
 2014-10-19 15:51:56 +13:00
James Newton-King 103395618b -Added WinRT tests to build script 2014-10-18 18:37:19 +13:00
James Newton-King 88a29704da -Fixed jsonpath error when parsing a property that follows an escaped property 
-Changed reader/writer/token path to escape property names containing special characters
 2014-10-18 15:36:42 +13:00
James Newton-King 01f1c5e261 -Fixed test error caused by StringDictionary now implementing IDictionary<string, string> 2014-10-18 08:36:05 +13:00
James Newton-King 88eeb8ba92 -Fixed MetadataTypeAttribute reflection bug by using CustomAttributeData 
-Fixed immutable collections bug by getting type from known assembly
-Added support from running tests on aspnetcore50
 2014-10-18 00:00:26 +13:00
James Newton-King 4d09aca2c1 -Fixed WinRT build 2014-10-17 10:41:36 +13:00
James Newton-King b550aac6d6 -Updated version to 6.0.6 
-Fixed WinRT build
 2014-09-29 16:18:13 +13:00
James Newton-King 1337c4f7f7 -Performance 2014-09-28 16:19:18 +13:00
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