Don't link against System.Design

svn path=/trunk/mcs/; revision=158361

diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile
index 446a99508cb252ee794decab21a30f957706d47f..156608ae199c6542990530c47fc4e85fd2f1417a 100644 (file)
--- a/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@ -253,7 +253,6 @@ LIB_MCS_FLAGS = \
        -r:System.Data.dll              \
        -r:System.Xml.dll               \
        -r:System.EnterpriseServices.dll \
-       -r:System.Design.dll \
        $(OTHER_LIB_MCS_FLAGS) \
        $(RESX_RES:%=/resource:%) \
        $(OTHER_RES:%=/resource:%)

diff --git a/mcs/class/System.Web/System.Web.UI/Page.cs b/mcs/class/System.Web/System.Web.UI/Page.cs
index ecfdebeda2da8022b62a0137e9026d227cd13963..3f98c3f647cd4b9901a7b719f8f2a4b0519a3a3f 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/Page.cs
+++ b/mcs/class/System.Web/System.Web.UI/Page.cs
@@ -63,7 +63,7 @@ namespace System.Web.UI
 [DefaultEvent ("Load"), DesignerCategory ("ASPXCodeBehind")]
 [ToolboxItem (false)]
 [Designer ("Microsoft.VisualStudio.Web.WebForms.WebFormDesigner, " + Consts.AssemblyMicrosoft_VisualStudio_Web, typeof (IRootDesigner))]
-[DesignerSerializer ("Microsoft.VisualStudio.Web.WebForms.WebFormCodeDomSerializer, " + Consts.AssemblyMicrosoft_VisualStudio_Web, typeof (TypeCodeDomSerializer))]
+//[DesignerSerializer ("Microsoft.VisualStudio.Web.WebForms.WebFormCodeDomSerializer, " + Consts.AssemblyMicrosoft_VisualStudio_Web, typeof (TypeCodeDomSerializer))]
 public partial class Page : TemplateControl, IHttpHandler
 {
        static string machineKeyConfigPath = "system.web/machineKey";