Use more common code in System.Json

mkorkalo · Mar 28, 2012 · 79f1922 · 79f1922
1 parent 4fbdf4a
commit 79f1922
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/mcs/class/System.Json/Assembly/AssemblyInfo.cs b/mcs/class/System.Json/Assembly/AssemblyInfo.cs
@@ -41,18 +41,10 @@
 //[assembly: AssemblyDescription ("System.Json.dll")]
 [assembly: AssemblyDefaultAlias ("System.Json.dll")]
 
-[assembly: AssemblyCompany (Consts.MonoCompany)]
-[assembly: AssemblyProduct (Consts.MonoProduct)]
-[assembly: AssemblyCopyright (Consts.MonoCopyright)]
-[assembly: AssemblyVersion (Consts.FxVersion)]
 [assembly: SatelliteContractVersion (Consts.FxVersion)]
 [assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
-[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 
-[assembly: NeutralResourcesLanguage ("en-US")]
 [assembly: AssemblyDelaySign (true)]
 [assembly: AssemblyKeyFile ("../winfx.pub")]
 
-[assembly: ComVisible (false)]
-
 [assembly: SecurityCritical]
diff --git a/mcs/class/System.Json/Makefile b/mcs/class/System.Json/Makefile
@@ -8,6 +8,7 @@ RESOURCES = $(RESX_DIST:.resx=.resources)
 
 LIBRARY = System.Json.dll
 LIB_MCS_FLAGS = \
+		/d:ASPNETMVC \
 	        /r:System.dll \
 	        /r:System.Xml.dll \
 	        /r:System.Core.dll \

diff --git a/mcs/class/System.Json/System.Json.dll.sources b/mcs/class/System.Json/System.Json.dll.sources
@@ -2,6 +2,11 @@
 ../../build/common/Locale.cs
 ../../build/common/MonoTODOAttribute.cs
 Assembly/AssemblyInfo.cs
+
+../../../external/aspnetwebstack/src/RS.cs
+../../../external/aspnetwebstack/src/CommonAssemblyInfo.cs
+../../../external/aspnetwebstack/src/TransparentCommonAssemblyInfo.cs
+
 ../../../external/aspnetwebstack/src/System.Json/Properties/AssemblyInfo.cs
 ../../../external/aspnetwebstack/src/System.Json/Extensions/JsonValueExtensions.cs
 ../../../external/aspnetwebstack/src/System.Json/GlobalSuppressions.cs
@@ -17,4 +22,4 @@ Assembly/AssemblyInfo.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
+