Remove unwanted assembly attributes

6 files changed, 3 insertions, 37 deletions

diff --git a/mcs/class/System.Json/Assembly/AssemblyInfo.cs b/mcs/class/System.Json/Assembly/AssemblyInfo.cs
index f4fd8d295a4..a550ea9caa1 100755
--- 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 fe4c4837f4a..20398a5fe6f 100644
--- 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 34e8ae5bc5c..bce0eb0998e 100644
--- 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 4af3edd9c5f..f2ea6ce90b4 100644
--- 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 125b7653994..c401565bfdc 100644
--- 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 6150b2df386..f280b4b75cf 100644
--- 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 \