Commit Graph
62 Commits
Author SHA1 Message Date
Steffen Kieß b005523cb1 Fix several issues in System.Json
- Fix detection of extra characters in JSON input
- Fix detection of invalid negative numeric literals
- Disallow leading zeros
- Use "round-trip" format for floating point numbers
- Serialize NaN and Infinity as strings
- Use NumberFormatInfo.InvariantInfo for Convert.To*()
- Use standard number parsing methods in ReadNumericLiteral()
- Add test cases
2014-07-07 19:22:29 +02:00
Oleg Stepanischev f7b81bda13 Added fix for Bug 20869 2014-06-26 22:24:34 +04:00
Miguel de Icaza 60fa2525fb [build] the csproj files can now do a full class libraries build 2014-05-25 00:47:09 -04:00
Miguel de Icaza 3599b97b57 [build] Fresh new csproj files based on the updated build system. 2014-05-23 17:15:53 -04:00
Joel Martinez e9068ebf5b [docs] documentation import for 'returns' elements. 2014-05-12 14:52:53 -04:00
Joel Martinez 891e93e1fe [docs] Import of additional member documentation that contain generic parameteres 2014-05-12 14:52:48 -04:00
Joel Martinez d4fcdb95b4 [docs] namespace documentation import. 2014-05-12 14:52:47 -04:00
Joel Martinez 6999270099 [docs] Import of Microsoft BCL Documentation.
The documentation is creative commons licensed.
2014-04-27 21:33:01 -04:00
Miguel de Icaza d79280674b Refreshed the CSProj files to use the new output build directory 2014-04-18 18:15:35 -04:00
Joel Martinez 2b564279c7 docupdate: System.Json documentation update 2014-03-10 15:14:01 -04:00
Marek Safar 8bd66dbbeb Add System.ServiceModel.Activation assembly. Fixes #14544 2013-09-10 10:14:50 +02:00
Marek Safar b888cf5f04 Update csproj files 2013-07-02 13:45:15 +02:00
Marek Safar cf650fb3fb Update 4.5 bcl solution files 2013-02-21 17:25:06 +01:00
Marek Safar 78318771d5 Update csproj files 2013-02-07 16:34:23 +01:00
Marek Safar f79fec62c5 Bring back 2.10 based System.Json and move aspnet stack version to System.Json.Microsoft 2012-12-05 12:11:16 +01:00
Marek Safar 4f03af7f1e Add resx to dist files 2012-12-05 10:18:06 +01:00
Marek Safar 98cec10f57 Move System.Json sources from external before they are removed 2012-12-04 18:47:02 +01:00
Marek Safar 2d2796f07b Fix System.Core reference in VS projects 2012-06-26 13:26:56 +01:00
Atsushi Eno b456ed5ec2 Remove/fix invalid Ststem.Json tests. 2012-04-16 19:51:16 +09:00
Marek Safar 8074a7d31e Update csproj files 2012-04-05 15:46:25 +01:00
Marek Safar ac706e0db8 Fix System.Json resources to be embedded 2012-03-30 15:14:11 +01:00
Marek Safar eedf18dd31 Remove unwanted assembly attributes 2012-03-29 15:15:00 +01:00
Marek Habersack 0b9c9ce27c Remove old System.Json sources 2012-03-29 14:46:09 +02:00
Marek Habersack 27c54b1fb0 Fix resource compilation for imported modules so that they don't put results in the submodule directory 2012-03-29 13:46:22 +02:00
Marek Habersack 79f1922e35 Use more common code in System.Json 2012-03-28 22:53:15 +02:00
Marek Habersack f28dc14452 Compile System.Json using the upstream sources 2012-03-28 21:10:19 +02:00
Gonzalo Paniagua Javier 1b9640df15 Fix the previous fix. 2012-03-21 23:15:12 -04:00
Gonzalo Paniagua Javier 2bd2130379 Fix possible nullref 2012-03-21 23:09:20 -04:00
Scott Blomquist a8628869f4 Add check for null JsonArray elements. 2012-03-21 18:20:16 -07:00
Marek Safar 97b0462e02 Add one more missing .csproj 2012-03-01 10:54:03 +00:00
Marek Safar 76dac96b4b Cleanup some assembly attributes 2012-02-17 12:37:25 +00:00
Marek Safar 88fde5a568 Add VS project files for test project 2012-02-10 14:56:23 +00:00
Marek Safar 91d40d754d Update class library csproj files 2012-02-09 11:25:18 +00:00
Miguel de Icaza 37b85d86ac Allow trailing commas on Json objects 2011-12-29 09:10:26 -05:00
Marek Safar dd9b92a100 Install 4.0 profile as developers package and make 4.5 profile default gac target for 4.x 2011-09-26 12:08:01 +01:00
Miguel de Icaza c236ec5ebc Ship System.Json for 2.0 and 4.0 as well.
Just because the .NET framework does not ship System.Json with their
core profiles does not mean we should not distribuet them.

Bring the joy of System.Json from Silverlight to the desktop

# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   ../Makefile
#	modified:   Makefile
#	modified:   System.Json.dll.sources
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	../../../eglib/src/gpath.c.orig
#	System.Json/.JsonValue.cs.swp
#	sources
#	../System/System.Net/#WebRequest.cs#
#	../../tools/monodoc/Resources/mono-ecma.css.orig
#	../../../mono.h
#	../../../mono/metadata/y
#	../../../mono/mini/.aot-compiler.c.swp
#	../../../mono/utils/mono-dtrace.h
#	../../../monotouch-enterprise.ashx
#	../../../web/
2011-08-12 18:34:53 -04:00
Miguel de Icaza 4a7c594eb1 [System.Json] Fix loader.
The current loader failed with some Json strings due to the implementation
of the BufferedStreamReader.   Removed that implementation completely,
and instead depend on the StreamReader to do the actual BOM detection.

This removes the JavaScriptObjectDeserializer.cs file
2011-03-08 17:54:28 -05:00
Jb Evain 444243c522 Add pretty print support for null values in JsonObjects 2010-10-14 14:00:41 +02:00
Jb Evain 9112013354 Allow null values in JsonObjects 2010-10-14 13:58:03 +02:00
Jb Evain 23b15a3d27 Fix the NET_2_1 build of System.Json 2010-09-01 15:58:39 +02:00
Jb Evain 040f24a7df [hygiene] simplify the code dealing with internal collections
Initialize the objets with the provided source at construction time
like SL does, and thus avoid dealing with two different sources.
2010-08-11 11:23:35 +02:00
Jb Evain fbe3813fb2 fix the System.Json build 2010-08-11 10:43:49 +02:00
Miguel de Icaza 9a1847e7e6 2010-04-01 Miguel de Icaza <[email protected]>
* JsonValue.cs: We need to use Convert.ToXXXX for numbers as we
	always end up reporting the value JsonType.Number regardless of
	the underlying storage (int, long or decimal).   The parser
	picks the best storage suitable for the data, and can end up using
	"ints" for values that sometimes use longs. 

	This causes problems when derefercing the data for example, if you
	have an int and try to get it out as a long you end up with an
	invalid cast exception.

svn path=/trunk/mcs/; revision=154613
2010-04-01 06:39:52 +00:00
Atsushi Eno 6f0cd4a650 2010-03-10 Atsushi Enomoto <[email protected]>
in System.ServiceModel.Web:
	* JavaScriptReader.cs : moved from Sys.Json/JsonReader.cs.

	* net_2_0_System.ServiceModel.Web.dll.sources,
	  net_2_1_raw_System.ServiceModel.Web.dll.sources :
	  move JsonReader.cs as Sys.R.S.Json/JavaScriptReader.cs

in System.Json:
	* JsonReader.cs : moved to Sys.SM.Web/Sys.R.S.Json.

	* System.Json.dll.sources : remove JsonReader.cs.


svn path=/trunk/mcs/; revision=153393
2010-03-10 10:22:36 +00:00
Atsushi Eno 286c255027 2010-03-10 Atsushi Enomoto <[email protected]>
in System.ServiceModel.Web:
	* JavaScriptObjectDeserializer.cs : new internal file, which is
	  used by System.Json (for moonlight compatibility).

	* net_2_0_System.ServiceModel.Web.dll.sources,
	  net_2_1_raw_System.ServiceModel.Web.dll.sources :
	  add JavaScriptObjectDeserializer.cs and JsonReader in Sys.Json
	  (which is to be moved later).

	* AssemblyInfo.cs: added InternalVisibleTo(System.Json). Also added
	  dummy 2.0 for easy testing.

in System.Json:

	* JsonValue.cs : use Sys.SM.Web.dll's JavaScriptObjectDeserializer
	  for silverlight sdk / moonlight compatibility.
	* JsonReader.cs : renamed to JavaScriptReader (for disambiguation in
	  Sys.SM.Web.dll). Now it is native-type based and used by the above
	  deserializer.

	* Makefile : reference System.Xml and System.ServiceModel.Web (for
	  moonlight compatibility).

	* AssemblyInfo.cs : use the same pub key in 2.0 (dummy), to ease
	  testing locally.



svn path=/trunk/mcs/; revision=153392
2010-03-10 10:17:24 +00:00
Atsushi Eno c2d585a1ea 2010-02-18 Atsushi Enomoto <[email protected]>
* JsonValue.cs : fix string escaping, it was giving wrong output
	  after \" and \\.


svn path=/trunk/mcs/; revision=151954
2010-02-18 07:07:16 +00:00
Atsushi Eno 20ede70ef0 2010-02-18 Atsushi Enomoto <[email protected]>
* JsonReader.cs : line endings after a value should not result in
	  a parse error.
	* JsonObject.cs : duplicate object key "SHOULD" not be used, but
	  they are not rejected. So, make it a bit sloppy.


svn path=/trunk/mcs/; revision=151953
2010-02-18 04:43:03 +00:00
Atsushi Eno ae319ebc63 2010-01-27 Atsushi Enomoto <[email protected]>
* JsonReader.cs : oops, added previous change to wrong position.


svn path=/trunk/mcs/; revision=150287
2010-01-27 10:39:14 +00:00
Atsushi Eno 1bacfd9f5e 2010-01-27 Atsushi Enomoto <[email protected]>
* JsonReader.cs : It seems it can either return int, long or decimal
	  depending on the value. Users cannot really predict what type of
	  the primitive value can be returned and casts to specific types
	  very likely fail. doh.


svn path=/trunk/mcs/; revision=150285
2010-01-27 10:28:56 +00:00
Atsushi Eno a49c5de1bf 2010-01-27 Atsushi Enomoto <[email protected]>
* JsonReader.cs : use decimal instead of int to parse decimal part
	  of numeric value. It can parse bigger value than int now (like
	  tweet id).


svn path=/trunk/mcs/; revision=150268
2010-01-27 01:37:27 +00:00