[Mono-dev] Remove partial(ness) from HttpCapabilitiesBase & HttpBrowserCapabilities

[Eyal Alaluf]

Hi, all.

This fix is a part of building System.Web using MS .Net 1.1 C# compiler. I hope that there
are no more plans to expand the use of new C# features in System.Web (or elsewhere) for stuff
that is .Net 1.1 compatible.
Any further use of partial or yield in 1.1 parts of System.Web will break the Grasshopper build.

Eyal.
-------------- next part --------------
Index: System.Web/HttpBrowserCapabilities.cs

===================================================================

--- System.Web/HttpBrowserCapabilities.cs	(revision 49680)

+++ System.Web/HttpBrowserCapabilities.cs	(working copy)

@@ -36,13 +36,8 @@

 namespace System.Web
 {
 	//
-	// The real implementation lives in System.Web/BrowserCapabilities.cs
+	// The implementation lives in System.Web/BrowserCapabilities.cs
 	//
-	public partial class HttpBrowserCapabilities : HttpCapabilitiesBase
-	{
-		public HttpBrowserCapabilities ()
-		{
-		}
-	}
+	// public class HttpBrowserCapabilities : HttpCapabilitiesBase
 }
 
Index: System.Web/BrowserCapabilities.cs

===================================================================

--- System.Web/BrowserCapabilities.cs	(revision 49680)

+++ System.Web/BrowserCapabilities.cs	(working copy)

@@ -35,11 +35,11 @@

 
 #if NET_2_0
 namespace System.Web.Configuration {
-	public partial class HttpCapabilitiesBase
+	public class HttpCapabilitiesBase
 #else
 
 namespace System.Web {
-	public partial class HttpBrowserCapabilities : HttpCapabilitiesBase
+	public class HttpBrowserCapabilities : HttpCapabilitiesBase
 #endif
 	{
 		const int HaveActiveXControls = 1;
@@ -95,6 +95,10 @@

 		Version [] clrVersions;
 		internal string useragent;
 
+		public HttpBrowserCapabilities ()
+		{
+		}
+
 		public bool ActiveXControls {
 			get {
 				if (!Get (HaveActiveXControls)) {
Index: System.Web.Configuration/HttpCapabilitiesBase.cs

===================================================================

--- System.Web.Configuration/HttpCapabilitiesBase.cs	(revision 49680)

+++ System.Web.Configuration/HttpCapabilitiesBase.cs	(working copy)

@@ -35,7 +35,7 @@

 	// CAS
 	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public partial class HttpCapabilitiesBase
+	public class HttpCapabilitiesBase
 	{
 		Hashtable capabilities;