Compile System.Json using the upstream sources

diff --git a/mcs/class/System.Json/Assembly/AssemblyInfo.cs b/mcs/class/System.Json/Assembly/AssemblyInfo.cs
index b8c49cd952bd53eac4e7967132dddbb9b7d678c5..29a423993d8107d890d1223e15225cbdbbf0df0e 100755 (executable)
--- a/mcs/class/System.Json/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Json/Assembly/AssemblyInfo.cs
@@ -37,8 +37,8 @@ using System.Runtime.InteropServices;
 
 // General Information about the System.Json assembly
 
-[assembly: AssemblyTitle ("System.Json.dll")]
-[assembly: AssemblyDescription ("System.Json.dll")]
+//[assembly: AssemblyTitle ("System.Json.dll")]
+//[assembly: AssemblyDescription ("System.Json.dll")]
 [assembly: AssemblyDefaultAlias ("System.Json.dll")]
 
 [assembly: AssemblyCompany (Consts.MonoCompany)]

diff --git a/mcs/class/System.Json/Makefile b/mcs/class/System.Json/Makefile
index 906b0bf48f178ac8324ae1a357d887ee160d6007..f3845bcac0079876980ddbfaf615e4615b3565da 100644 (file)
--- a/mcs/class/System.Json/Makefile
+++ b/mcs/class/System.Json/Makefile
@@ -2,16 +2,26 @@ thisdir = class/System.Json
 SUBDIRS = 
 include ../../build/rules.make
 
+UPSTREAM_DIR = ../../../external/aspnetwebstack/src/System.Json/Properties
+RESX_RESOURCES = $(UPSTREAM_DIR)/Resources.resx
+RESOURCES = $(RESX_DIST:.resx=.resources)
+
 LIBRARY = System.Json.dll
 LIB_MCS_FLAGS = \
                /r:System.dll \
                /r:System.Xml.dll \
                /r:System.Core.dll \
-               /r:System.ServiceModel.Web.dll
+               /r:System.Runtime.Serialization.dll \
+               /r:System.ServiceModel.Web.dll \
+               $(RESX_RES:%=/resource:%)
+
+ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
+LIB_MCS_FLAGS += /r:Microsoft.CSharp.dll
+endif
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
-EXTRA_DISTFILES =
+EXTRA_DISTFILES = $(RESX_RESOURCES)
 
 VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR))
 
@@ -23,3 +33,8 @@ NO_TEST = yes
 endif
 
 include ../../build/library.make
+
+$(the_lib): $(RESOURCES)
+
+$(RESOURCES):  %.resources: %.resx
+       $(RESGEN) $< || cp $@.prebuilt $@

diff --git a/mcs/class/System.Json/System.Json.dll.sources b/mcs/class/System.Json/System.Json.dll.sources
index 47a9ceed63acc60eeff70671bb6a16c17d727b69..b64a4b612c34093494dfac1fa9a91d1f57b99eed 100644 (file)
--- a/mcs/class/System.Json/System.Json.dll.sources
+++ b/mcs/class/System.Json/System.Json.dll.sources
@@ -1,8 +1,20 @@
 ../../build/common/Consts.cs
+../../build/common/Locale.cs
+../../build/common/MonoTODOAttribute.cs
 Assembly/AssemblyInfo.cs
-System.Json/JsonArray.cs
-System.Json/JsonObject.cs
-System.Json/JsonPrimitive.cs
-System.Json/JsonType.cs
-System.Json/JsonValue.cs
-../System.ServiceModel.Web/System.Runtime.Serialization.Json/JavaScriptReader.cs
\ No newline at end of file
+../../../external/aspnetwebstack/src/System.Json/Properties/AssemblyInfo.cs
+../../../external/aspnetwebstack/src/System.Json/Extensions/JsonValueExtensions.cs
+../../../external/aspnetwebstack/src/System.Json/GlobalSuppressions.cs
+../../../external/aspnetwebstack/src/System.Json/JXmlToJsonValueConverter.cs
+../../../external/aspnetwebstack/src/System.Json/JsonArray.cs
+../../../external/aspnetwebstack/src/System.Json/JsonObject.cs
+../../../external/aspnetwebstack/src/System.Json/JsonPrimitive.cs
+../../../external/aspnetwebstack/src/System.Json/JsonType.cs
+../../../external/aspnetwebstack/src/System.Json/JsonValue.cs
+../../../external/aspnetwebstack/src/System.Json/JsonValueChange.cs
+../../../external/aspnetwebstack/src/System.Json/JsonValueChangeEventArgs.cs
+../../../external/aspnetwebstack/src/System.Json/JsonValueDynamicMetaObject.cs
+../../../external/aspnetwebstack/src/System.Json/JsonValueLinqExtensions.cs
+../../../external/aspnetwebstack/src/System.Json/NGenWrapper.cs
+../../../external/aspnetwebstack/src/System.Json/Properties/Resources.Designer.cs
+../../../external/aspnetwebstack/src/System.Json/RS.cs