Commit Graph
9 Commits
Author SHA1 Message Date
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 98cec10f57 Move System.Json sources from external before they are removed 2012-12-04 18:47:02 +01:00
Marek Safar ac706e0db8 Fix System.Json resources to be embedded 2012-03-30 15:14:11 +01: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
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
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
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 66ecab0058 initial checkin. New assembly in Silverlight 2.0 beta 2.
svn path=/trunk/mcs/; revision=105468
2008-06-10 16:49:49 +00:00