Remove unwanted assembly attributes

diff --git a/mcs/class/System.Json/Assembly/AssemblyInfo.cs b/mcs/class/System.Json/Assembly/AssemblyInfo.cs
index f4fd8d295a48f53223fb510887a7b2299b147c6e..a550ea9caa15684f460fbd452d9e502c8f3ab66e 100755 (executable)
--- a/mcs/class/System.Json/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Json/Assembly/AssemblyInfo.cs
@@ -37,14 +37,6 @@ using System.Runtime.InteropServices;
 
 // General Information about the System.Json assembly
 
-//[assembly: AssemblyTitle ("System.Json.dll")]
-//[assembly: AssemblyDescription ("System.Json.dll")]
 [assembly: AssemblyDefaultAlias ("System.Json.dll")]
 
-[assembly: SatelliteContractVersion (Consts.FxVersion)]
 [assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
-
-[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../winfx.pub")]
-
-[assembly: SecurityCritical]

diff --git a/mcs/class/System.Json/Makefile b/mcs/class/System.Json/Makefile
index fe4c4837f4ab3c76a10b04e07a1cc1c573de939b..20398a5fe6f99d89848469fcb9921a17225c9df0 100644 (file)
--- a/mcs/class/System.Json/Makefile
+++ b/mcs/class/System.Json/Makefile
@@ -8,7 +8,7 @@ RESOURCES = $(subst $(UPSTREAM_DIR),$(build_libdir),$(RESX_RESOURCES:.resx=.reso
 
 LIBRARY = System.Json.dll
 LIB_MCS_FLAGS = \
-               /d:ASPNETMVC \
+               /d:ASPNETMVC -keyfile:../winfx.pub -delaysign \
                /r:System.dll \
                /r:System.Xml.dll \
                /r:System.Core.dll \
@@ -24,15 +24,6 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES = $(RESX_RESOURCES)
 
-VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR))
-
-ifndef VALID_PROFILE
-LIBRARY_NAME = dummy-System.Json.dll
-NO_INSTALL = yes
-NO_SIGN_ASSEMBLY = yes
-NO_TEST = yes
-endif
-
 include ../../build/library.make
 
 $(the_lib): $(RESOURCES)

diff --git a/mcs/class/System.Web.Razor/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.Razor/Assembly/AssemblyInfo.cs
index 34e8ae5bc5c642ddfd5e4e07144da067c9ab62dd..bce0eb0998e483164c403efc360560020e9391e5 100644 (file)
--- a/mcs/class/System.Web.Razor/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web.Razor/Assembly/AssemblyInfo.cs
@@ -35,15 +35,7 @@ using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about the System.Json assembly
-
-//[assembly: AssemblyTitle ("System.Json.dll")]
-//[assembly: AssemblyDescription ("System.Json.dll")]
 [assembly: AssemblyDefaultAlias ("System.Web.Razor.dll")]
 
-[assembly: SatelliteContractVersion (Consts.FxVersion)]
 [assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
 
-[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../winfx.pub")]
-

diff --git a/mcs/class/System.Web.Razor/Makefile b/mcs/class/System.Web.Razor/Makefile
index 4af3edd9c5fa20b7c9c71d89328cd00493cf7370..f2ea6ce90b463bf88ba55b389eef899f5ae4f51e 100644 (file)
--- a/mcs/class/System.Web.Razor/Makefile
+++ b/mcs/class/System.Web.Razor/Makefile
@@ -15,7 +15,7 @@ RESOURCES = $(subst $(UPSTREAM_DIR),$(build_libdir),$(RESX_DIST:.resx=.resources
 LIB_MCS_FLAGS = \
                /warn:1 \
                /noconfig \
-               /keyfile:../winfx.pub \
+               /keyfile:../winfx.pub -delaysign \
                /r:System.dll \
                /r:System.Core.dll \
                /d:ASPNETWEBPAGES \

diff --git a/mcs/class/System.Web.WebPages.Deployment/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.WebPages.Deployment/Assembly/AssemblyInfo.cs
index 125b765399450b43ceaac09d261ee291e5566985..c401565bfdc075cc86aa0487ba343547bb3aa79f 100644 (file)
--- a/mcs/class/System.Web.WebPages.Deployment/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web.WebPages.Deployment/Assembly/AssemblyInfo.cs
@@ -35,15 +35,6 @@ using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about the System.Json assembly
-
-//[assembly: AssemblyTitle ("System.Json.dll")]
-//[assembly: AssemblyDescription ("System.Json.dll")]
 [assembly: AssemblyDefaultAlias ("System.Web.WebPages.Deployment.dll")]
 
-[assembly: SatelliteContractVersion (Consts.FxVersion)]
 [assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
-
-[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../winfx.pub")]
-

diff --git a/mcs/class/System.Web.WebPages.Deployment/Makefile b/mcs/class/System.Web.WebPages.Deployment/Makefile
index 6150b2df38638f5166f898e13333182ae73431cd..f280b4b75cf5256eed504f3f5745acb14eb8a4c2 100644 (file)
--- a/mcs/class/System.Web.WebPages.Deployment/Makefile
+++ b/mcs/class/System.Web.WebPages.Deployment/Makefile
@@ -15,7 +15,7 @@ RESOURCES = $(subst $(UPSTREAM_DIR),$(build_libdir),$(RESX_DIST:.resx=.resources
 LIB_MCS_FLAGS = \
                /warn:1 \
                /noconfig \
-               /keyfile:../winfx.pub \
+               /keyfile:../winfx.pub -delaysign \
                /r:System.dll \
                /r:System.Core.dll \
                /r:System.Configuration.dll \