From 79f1922e353e160b50558a67bfc44473b5e63317 Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Wed, 28 Mar 2012 22:48:22 +0200 Subject: [PATCH] Use more common code in System.Json --- mcs/class/System.Json/Assembly/AssemblyInfo.cs | 8 -------- mcs/class/System.Json/Makefile | 1 + mcs/class/System.Json/System.Json.dll.sources | 7 ++++++- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/mcs/class/System.Json/Assembly/AssemblyInfo.cs b/mcs/class/System.Json/Assembly/AssemblyInfo.cs index 29a423993d81..f4fd8d295a48 100755 --- 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 index f3845bcac007..78f19ed9c34d 100644 --- 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 index b64a4b612c34..7e0d4bdeb139 100644 --- 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 +