In System.Web.Configuration.Internal:

2006-02-28  Chris Toshok  <toshok@ximian.com>

	* IInternalConfigWebHost.cs: corcompare work.

In System.Web.Configuration_2.0:
2006-02-28  Chris Toshok  <toshok@ximian.com>

	* BuildProviderAppliesTo.cs, PagesToCountAction.cs: nuke.

In System.Web.Profile:
2006-02-28  Chris Toshok  <toshok@ximian.com>

	* ProfileBase.cs: corcompare work.

	* SqlProfileProvider.cs: add stubbed out file.

In System.Web.SessionState:
2006-02-28  Chris Toshok  <toshok@ximian.com>

	* SessionStateActions.cs: rename SessionStateActionFlags to this.

	* ISessionIDManager.cs: rename ISessionIDModule to this.

	* IStateRuntime.cs: corcompare work.

In System.Web.Security:
2006-02-28  Chris Toshok  <toshok@ximian.com>

	* FormsAuthentication.cs: corcompare work.

	* MembershipCreateUserException.cs: same.

	* MembershipPasswordException.cs: same.

	* AnonymousIdentificationModule.cs: same.

In System.Web.Configuration:
2006-02-28  Chris Toshok  <toshok@ximian.com>

	* FormsAuthPasswordFormat.cs: ifdef out the [Serializable] in the
	2.0 case.

In System.Web.Hosting:
2006-02-28  Chris Toshok  <toshok@ximian.com>

	* IAppDomainFactory.cs: corcompare work.

	* IAppManagerAppDomainFactory.cs: same

	* IISAPIRuntime.cs: same.

In System.Web.Management:
2006-02-28  Chris Toshok  <toshok@ximian.com>

	* SqlFeatures.cs: corcompare work

	* IRegiisUtility.cs: same.

	* WebEventFormatter.cs: same.

	* RuleFiringRecord.cs: same.

	* SessionStateType.cs: same.

	* WebApplicationInformtion.cs: same.

	* EventNotificationType.cs: same.

	* WebBaseEvent.cs: same.

	* IRegisterCreateITypeLib.cs: nuke


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

34 files changed, 274 insertions, 198 deletions

diff --git a/mcs/class/System.Web/System.Web.Configuration.Internal/ChangeLog b/mcs/class/System.Web/System.Web.Configuration.Internal/ChangeLog
index 13183ebc6b2..75c18b75883 100644
--- a/mcs/class/System.Web/System.Web.Configuration.Internal/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Configuration.Internal/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-28  Chris Toshok  <toshok@ximian.com>
+
+	* IInternalConfigWebHost.cs: corcompare work.
+
 2006-01-22  Chris Toshok  <toshok@ximian.com>
 
 	* IInternalConfigWebHost.cs: new 2.0 interface.
diff --git a/mcs/class/System.Web/System.Web.Configuration.Internal/IInternalConfigWebHost.cs b/mcs/class/System.Web/System.Web.Configuration.Internal/IInternalConfigWebHost.cs
index d84295cb245..6fb8b5b7f1d 100644
--- a/mcs/class/System.Web/System.Web.Configuration.Internal/IInternalConfigWebHost.cs
+++ b/mcs/class/System.Web/System.Web.Configuration.Internal/IInternalConfigWebHost.cs
@@ -41,7 +41,7 @@ namespace System.Web.Configuration.Internal {
 	public interface IInternalConfigWebHost {
 
 		string GetConfigPathFromSiteIDAndVPath (string siteID, string vpath);
-		void GetSideIDAndVPathFromConfigPath (string configPath, out string siteID, out string vpath);
+		void GetSiteIDAndVPathFromConfigPath (string configPath, out string siteID, out string vpath);
 
 	}
 }
diff --git a/mcs/class/System.Web/System.Web.Configuration/ChangeLog b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
index 66c8336dc39..9e1b54e5101 100644
--- a/mcs/class/System.Web/System.Web.Configuration/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-28  Chris Toshok  <toshok@ximian.com>
+
+	* FormsAuthPasswordFormat.cs: ifdef out the [Serializable] in the
+	2.0 case.
+
 2006-02-10 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* CompilationConfiguration.cs:
diff --git a/mcs/class/System.Web/System.Web.Configuration/FormsAuthPasswordFormat.cs b/mcs/class/System.Web/System.Web.Configuration/FormsAuthPasswordFormat.cs
index 5847c2e0bc3..91132fc35f0 100644
--- a/mcs/class/System.Web/System.Web.Configuration/FormsAuthPasswordFormat.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/FormsAuthPasswordFormat.cs
@@ -29,11 +29,13 @@ using System;
 
 namespace System.Web.Configuration {
 
+#if !NET_2_0
 	[Serializable]
+#endif
 	public enum FormsAuthPasswordFormat
 	{
 		Clear,
 		SHA1,
 		MD5
 	}
-}
\ No newline at end of file
+}
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/BuildProviderAppliesTo.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/BuildProviderAppliesTo.cs
deleted file mode 100644
index 5c655fdd5ec..00000000000
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/BuildProviderAppliesTo.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// System.Web.Configuration.BuildProviderAppliesTo.cs
-//
-// Authors:
-//	Duncan Mak (duncan@ximian.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-using System.Resources;
-
-#if NET_2_0
-namespace System.Web.Configuration
-{
-        [Serializable, Flags]
-        public enum BuildProviderAppliesTo
-        {
-                Web = 1,
-                Code = 2,
-                Resources = 4,
-                All = 7,
-        }
-}
-#endif
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog b/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
index 8682e5c8aad..a67bbb69d80 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-28  Chris Toshok  <toshok@ximian.com>
+
+	* BuildProviderAppliesTo.cs, PagesToCountAction.cs: nuke.
+
 2006-02-10 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* Compiler.cs:
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/PagesToCountAction.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/PagesToCountAction.cs
deleted file mode 100644
index eb42de35dd6..00000000000
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/PagesToCountAction.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.Configuration.PagesToCountAction.cs
-//
-// Authors:
-//	Duncan Mak (duncan@ximian.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-using System.Resources;
-
-#if NET_2_0
-namespace System.Web.Configuration
-{
-        public enum PagesToCountAction
-        {
-                Include = 1,
-                Exclude = 2,
-        }
-}
-#endif
diff --git a/mcs/class/System.Web/System.Web.Hosting/ChangeLog b/mcs/class/System.Web/System.Web.Hosting/ChangeLog
index de4e5e4438f..13df624e75d 100644
--- a/mcs/class/System.Web/System.Web.Hosting/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Hosting/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-28  Chris Toshok  <toshok@ximian.com>
+
+	* IAppDomainFactory.cs: corcompare work.
+
+	* IAppManagerAppDomainFactory.cs: same
+
+	* IISAPIRuntime.cs: same.
+
 2006-02-28 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* ApplicationManager.cs: implemented ShutdownAll().
diff --git a/mcs/class/System.Web/System.Web.Hosting/IAppDomainFactory.cs b/mcs/class/System.Web/System.Web.Hosting/IAppDomainFactory.cs
index fa4a9621a96..accbb6ff3ba 100644
--- a/mcs/class/System.Web/System.Web.Hosting/IAppDomainFactory.cs
+++ b/mcs/class/System.Web/System.Web.Hosting/IAppDomainFactory.cs
@@ -35,6 +35,7 @@ namespace System.Web.Hosting
 {
 	[Guid ("e6e21054-a7dc-4378-877d-b7f4a2d7e8ba")]
 	[InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]
+	[ComImportAttribute]
 	public interface IAppDomainFactory
 	{
 		[return: MarshalAs (UnmanagedType.Interface)]
diff --git a/mcs/class/System.Web/System.Web.Hosting/IAppManagerAppDomainFactory.cs b/mcs/class/System.Web/System.Web.Hosting/IAppManagerAppDomainFactory.cs
index 198298ed6a3..911be941de4 100644
--- a/mcs/class/System.Web/System.Web.Hosting/IAppManagerAppDomainFactory.cs
+++ b/mcs/class/System.Web/System.Web.Hosting/IAppManagerAppDomainFactory.cs
@@ -32,9 +32,14 @@ using System.Runtime.InteropServices;
 
 namespace System.Web.Hosting
 {
+	[GuidAttribute ("02998279-7175-4D59-AA5A-FB8E44D4CA9D")]
+	[InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]
+	[ComImportAttribute]
         public interface IAppManagerAppDomainFactory
         {
-                object Create ([In] string s, [In] string app_id);
+		[return: MarshalAs (UnmanagedType.Interface)]
+                object Create ([In, MarshalAs(UnmanagedType.BStr)] string s,
+			       [In, MarshalAs(UnmanagedType.BStr)] string app_id);
                 void Stop ();
         }
 }
diff --git a/mcs/class/System.Web/System.Web.Hosting/IISAPIRuntime.cs b/mcs/class/System.Web/System.Web.Hosting/IISAPIRuntime.cs
index 8c1a0e62bed..646b2cb34c5 100644
--- a/mcs/class/System.Web/System.Web.Hosting/IISAPIRuntime.cs
+++ b/mcs/class/System.Web/System.Web.Hosting/IISAPIRuntime.cs
@@ -36,6 +36,7 @@ namespace System.Web.Hosting
 	//[Guid ("c4918956-485b-3503-bd10-9083e3f6b66c")] -> 1.1 pre service pack
 	[Guid ("08A2C56F-7C16-41C1-A8BE-432917A1A2D1")]
 	[InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]
+	[ComImportAttribute]
 	public interface IISAPIRuntime
 	{
 		void DoGCCollect ();
diff --git a/mcs/class/System.Web/System.Web.Management/ChangeLog b/mcs/class/System.Web/System.Web.Management/ChangeLog
index 3421810ee26..4a0e458798b 100644
--- a/mcs/class/System.Web/System.Web.Management/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Management/ChangeLog
@@ -1,3 +1,23 @@
+2006-02-28  Chris Toshok  <toshok@ximian.com>
+
+	* SqlFeatures.cs: corcompare work
+
+	* IRegiisUtility.cs: same.
+
+	* WebEventFormatter.cs: same.
+
+	* RuleFiringRecord.cs: same.
+
+	* SessionStateType.cs: same.
+
+	* WebApplicationInformtion.cs: same.
+
+	* EventNotificationType.cs: same.
+
+	* WebBaseEvent.cs: same.
+
+	* IRegisterCreateITypeLib.cs: nuke
+
 2004-08-02  Duncan Mak  <duncan@ximian.com>
 
 	* RuleFiringRecord.cs:
diff --git a/mcs/class/System.Web/System.Web.Management/EventNotificationType.cs b/mcs/class/System.Web/System.Web.Management/EventNotificationType.cs
index 0e248a12923..208d9ed0f3d 100644
--- a/mcs/class/System.Web/System.Web.Management/EventNotificationType.cs
+++ b/mcs/class/System.Web/System.Web.Management/EventNotificationType.cs
@@ -27,12 +27,10 @@
 //
 
 using System;
-using System.Runtime.InteropServices;
 
 #if NET_2_0
 namespace System.Web.Management
 {
-        [Serializable]
         public enum EventNotificationType
         {
                 Regular = 0,
diff --git a/mcs/class/System.Web/System.Web.Management/IRegiisUtility.cs b/mcs/class/System.Web/System.Web.Management/IRegiisUtility.cs
index 051f5b33d12..bb5c47937ec 100644
--- a/mcs/class/System.Web/System.Web.Management/IRegiisUtility.cs
+++ b/mcs/class/System.Web/System.Web.Management/IRegiisUtility.cs
@@ -32,31 +32,32 @@ using System.Runtime.InteropServices;
 #if NET_2_0
 namespace System.Web.Management
 {
+	[InterfaceTypeAttribute (ComInterfaceType.InterfaceIsIUnknown)]
+	[GuidAttribute ("C84F668A-CC3F-11D7-B79E-505054503030")]
+	[ComImportAttribute]
         public interface IRegiisUtility
         {
                 void ProtectedConfigAction (
                         long actionToPerform,
-                        [In] string first_argument,
-                        [In] string second_argument,
-                        [In] string provider_name,
-                        [In] string app_path,
-                        [In] string csp_or_location,
-                        int key_size,
-                        out string exception);
+                        [In,MarshalAs(UnmanagedType.LPWStr)] string firstArgument,
+                        [In,MarshalAs(UnmanagedType.LPWStr)] string secondArgument,
+                        [In,MarshalAs(UnmanagedType.LPWStr)] string providerName,
+                        [In,MarshalAs(UnmanagedType.LPWStr)] string appPath,
+                        [In,MarshalAs(UnmanagedType.LPWStr)] string site,
+                        [In,MarshalAs(UnmanagedType.LPWStr)] string cspOrLocation,
+                        int keySize,
+                        out IntPtr exception);
 
                 void RegisterAsnetMmcAssembly (
-                        int do_reg,
-                        [In] string assembly_name,
-                        [In] string binary_directory,
-                        out string exception);
+                        int doReg,
+                        [In,MarshalAs(UnmanagedType.LPWStr)] string assemblyName,
+                        [In,MarshalAs(UnmanagedType.LPWStr)] string binaryDirectory,
+                        out IntPtr exception);
 
-                void RegisterSystemWebAssembly (int do_reg, out string exception);
+                void RegisterSystemWebAssembly (int doReg,
+						out IntPtr exception);
 
-                void ToggleWebAdminToolConfigs (
-                        [In] string site,
-                        [In] int [] settings,
-                        int size,
-                        out string exception);
+		void RemoveBrowserCaps (out IntPtr exception);
         }
 }
 #endif
diff --git a/mcs/class/System.Web/System.Web.Management/IRegisterCreateITypeLib.cs b/mcs/class/System.Web/System.Web.Management/IRegisterCreateITypeLib.cs
deleted file mode 100644
index 4bb44b08a02..00000000000
--- a/mcs/class/System.Web/System.Web.Management/IRegisterCreateITypeLib.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// System.Web.Management.IRegisterCreateITypeLib.cs
-//
-// Authors:
-//	Duncan Mak (duncan@ximian.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-using System;
-using System.Runtime.InteropServices;
-
-#if NET_2_0
-namespace System.Web.Management
-{
-        public interface IRegisterCreateITypeLib
-        {
-                void CreateTypeInfo ();
-                
-                void SaveAllChanges ();
-                
-                void SetDocString ();
-
-                void SetGuid ();
-
-                void SetHelpContext ();
-
-                void SetHelpFileName ();
-
-                void SetLcid ();
-
-                void SetLibFlags ();
-
-                void SetName ();
-
-                void SetVersion ();
-        }
-}
-#endif
diff --git a/mcs/class/System.Web/System.Web.Management/RuleFiringRecord.cs b/mcs/class/System.Web/System.Web.Management/RuleFiringRecord.cs
index f8627fd8a8d..c92e8081717 100644
--- a/mcs/class/System.Web/System.Web.Management/RuleFiringRecord.cs
+++ b/mcs/class/System.Web/System.Web.Management/RuleFiringRecord.cs
@@ -32,7 +32,7 @@ using System.Web;
 
 namespace System.Web.Management
 {
-        public class RuleFiringRecord
+        public sealed class RuleFiringRecord
         {
                 internal RuleFiringRecord ()
                 {
diff --git a/mcs/class/System.Web/System.Web.Management/SessionStateType.cs b/mcs/class/System.Web/System.Web.Management/SessionStateType.cs
index d0cf520a44f..ae239bb9d36 100644
--- a/mcs/class/System.Web/System.Web.Management/SessionStateType.cs
+++ b/mcs/class/System.Web/System.Web.Management/SessionStateType.cs
@@ -29,7 +29,6 @@
 #if NET_2_0
 namespace System.Web.Management
 {
-        [Serializable]
         public enum SessionStateType
         {
                 Temporary = 0,
diff --git a/mcs/class/System.Web/System.Web.Management/SqlFeatures.cs b/mcs/class/System.Web/System.Web.Management/SqlFeatures.cs
index a1df23ffd56..32e2cd25815 100644
--- a/mcs/class/System.Web/System.Web.Management/SqlFeatures.cs
+++ b/mcs/class/System.Web/System.Web.Management/SqlFeatures.cs
@@ -29,17 +29,16 @@
 #if NET_2_0
 namespace System.Web.Management
 {
-        [Flags, Serializable]
+        [Flags]
         public enum SqlFeatures
         {
                 None = 0,
                 Membership = 1,
                 Profile = 2,
                 RoleManager = 4,
-                SiteCounters = 8,
-                Personalization = 16,
-                SqlWebEventProvider = 32,
-                All = 1073741887
+                Personalization = 8,
+                SqlWebEventProvider = 16,
+                All = 1073741855
         }
 }
 #endif
diff --git a/mcs/class/System.Web/System.Web.Management/WebApplicationInformation.cs b/mcs/class/System.Web/System.Web.Management/WebApplicationInformation.cs
index 7243b6bb683..4cf563bd632 100644
--- a/mcs/class/System.Web/System.Web.Management/WebApplicationInformation.cs
+++ b/mcs/class/System.Web/System.Web.Management/WebApplicationInformation.cs
@@ -32,7 +32,7 @@ using System.Web;
 
 namespace System.Web.Management
 {
-        public class WebApplicationInformation
+        public sealed class WebApplicationInformation
         {
                 string application_domain, application_path, application_virtual_path, machine_name, trust_level;
 
diff --git a/mcs/class/System.Web/System.Web.Management/WebBaseEvent.cs b/mcs/class/System.Web/System.Web.Management/WebBaseEvent.cs
index d27e9462904..2745a3b387d 100644
--- a/mcs/class/System.Web/System.Web.Management/WebBaseEvent.cs
+++ b/mcs/class/System.Web/System.Web.Management/WebBaseEvent.cs
@@ -37,14 +37,14 @@ namespace System.Web.Management
                 object event_source;
                 int event_code, event_detail_code;
 
-                public WebBaseEvent (string message, object event_source, int event_code)
+                protected WebBaseEvent (string message, object event_source, int event_code)
                 {
                         this.message = message;
                         this.event_source = event_source;
                         this.event_code = event_code;
                 }
 
-                public WebBaseEvent (string message, object event_source, int event_code, int event_detail_code)
+                protected WebBaseEvent (string message, object event_source, int event_code, int event_detail_code)
                 {
                         this.message = message;
                         this.event_source = event_source;
@@ -70,7 +70,7 @@ namespace System.Web.Management
                         }
                 }
 
-                public Guid EventId {
+                public Guid EventID {
                         get {
                                 throw new NotImplementedException ();
                         }
@@ -127,7 +127,7 @@ namespace System.Web.Management
                         throw new NotImplementedException ();
                 }
 
-                public string ToString (bool include_app_info, bool include_custom_event_details)
+                public virtual string ToString (bool include_app_info, bool include_custom_event_details)
                 {
                         throw new NotImplementedException ();
                 }
diff --git a/mcs/class/System.Web/System.Web.Management/WebEventFormatter.cs b/mcs/class/System.Web/System.Web.Management/WebEventFormatter.cs
index 30b4c1234ac..fbeef5ae02a 100644
--- a/mcs/class/System.Web/System.Web.Management/WebEventFormatter.cs
+++ b/mcs/class/System.Web/System.Web.Management/WebEventFormatter.cs
@@ -58,7 +58,7 @@ namespace System.Web.Management
                         throw new NotImplementedException ();
                 }
                 
-                public override string ToString ()
+                public new string ToString ()
                 {
                         throw new NotImplementedException ();
                 }
diff --git a/mcs/class/System.Web/System.Web.Profile/ChangeLog b/mcs/class/System.Web/System.Web.Profile/ChangeLog
index 352bcf8bc58..795d4ab8a05 100644
--- a/mcs/class/System.Web/System.Web.Profile/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Profile/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-28  Chris Toshok  <toshok@ximian.com>
+
+	* ProfileBase.cs: corcompare work.
+
+	* SqlProfileProvider.cs: add stubbed out file.
+
 2005-11-30  Chris Toshok  <toshok@ximian.com>
 
 	* ProfileBase.cs (Properties): mark as override, not static.
diff --git a/mcs/class/System.Web/System.Web.Profile/ProfileBase.cs b/mcs/class/System.Web/System.Web.Profile/ProfileBase.cs
index 2f902b08340..ba4f4beee9b 100644
--- a/mcs/class/System.Web/System.Web.Profile/ProfileBase.cs
+++ b/mcs/class/System.Web/System.Web.Profile/ProfileBase.cs
@@ -59,7 +59,7 @@ namespace System.Web.Profile
 		}
 
 		[MonoTODO]
-		public Object GetPropertyValue (string propertyName)
+		public object GetPropertyValue (string propertyName)
 		{
 			throw new NotImplementedException ();
 		}
@@ -79,7 +79,7 @@ namespace System.Web.Profile
 
 		[MonoTODO]
 		public void SetPropertyValue (string propertyName,
-					      Object propertyValue)
+					      object propertyValue)
 		{
 			throw new NotImplementedException ();
 		}
@@ -99,7 +99,7 @@ namespace System.Web.Profile
 		}
 
 		[MonoTODO]
-		public override Object this [ string propertyName ] {
+		public override object this [ string propertyName ] {
 			get {
 				throw new NotImplementedException ();
 			}
@@ -123,7 +123,7 @@ namespace System.Web.Profile
 		}
 
 		[MonoTODO]
-		public override SettingsPropertyCollection Properties {
+		public static SettingsPropertyCollection Properties {
 			get {
 				throw new NotImplementedException ();
 			}
diff --git a/mcs/class/System.Web/System.Web.Profile/SqlProfileProvider.cs b/mcs/class/System.Web/System.Web.Profile/SqlProfileProvider.cs
new file mode 100644
index 00000000000..06f811b37ef
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Profile/SqlProfileProvider.cs
@@ -0,0 +1,139 @@
+//
+// System.Web.UI.WebControls.SqlProfileProvider.cs
+//
+// Authors:
+//	Chris Toshok (toshok@ximian.com)
+//
+// (C) 2006 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+using System;
+using System.Configuration;
+using System.Collections.Specialized;
+
+namespace System.Web.Profile
+{
+	public class SqlProfileProvider : ProfileProvider
+	{
+		[MonoTODO]
+		public SqlProfileProvider ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override int DeleteInactiveProfiles (ProfileAuthenticationOption authenticationOption,
+							    DateTime userInactiveSinceDate)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override int DeleteProfiles (ProfileInfoCollection profiles)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override int DeleteProfiles (string[] usernames)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override ProfileInfoCollection FindInactiveProfilesByUserName (ProfileAuthenticationOption authenticationOption,
+										      string usernameToMatch,
+										      DateTime userInactiveSinceDate,
+										      int pageIndex,
+										      int pageSize,
+										      out int totalRecords)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override ProfileInfoCollection FindProfilesByUserName (ProfileAuthenticationOption authenticationOption,
+									      string usernameToMatch,
+									      int pageIndex,
+									      int pageSize,
+									      out int totalRecords)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override ProfileInfoCollection GetAllInactiveProfiles (ProfileAuthenticationOption authenticationOption,
+									      DateTime userInactiveSinceDate,
+									      int pageIndex,
+									      int pageSize,
+									      out int totalRecords)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override ProfileInfoCollection GetAllProfiles (ProfileAuthenticationOption authenticationOption,
+								      int pageIndex,
+								      int pageSize,
+								      out int totalRecords)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override int GetNumberOfInactiveProfiles (ProfileAuthenticationOption authenticationOption,
+								 DateTime userInactiveSinceDate)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override SettingsPropertyValueCollection GetPropertyValues (SettingsContext sc,
+										   SettingsPropertyCollection properties)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override void Initialize (string name,
+						 NameValueCollection config)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override void SetPropertyValues (SettingsContext sc,
+							SettingsPropertyValueCollection properties)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override string ApplicationName {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+	}
+}
+
+#endif
diff --git a/mcs/class/System.Web/System.Web.Security/AnonymousIdentificationModule.cs b/mcs/class/System.Web/System.Web.Security/AnonymousIdentificationModule.cs
index e3760370958..9072b7e72d5 100644
--- a/mcs/class/System.Web/System.Web.Security/AnonymousIdentificationModule.cs
+++ b/mcs/class/System.Web/System.Web.Security/AnonymousIdentificationModule.cs
@@ -37,11 +37,9 @@ namespace System.Web.Security {
 
 	public sealed class AnonymousIdentificationModule : IHttpModule {
 
-		bool use_cookie;
-
 		public event AnonymousIdentificationEventHandler Creating;
 		
-		public void ClearAnonymousIdentifier ()
+		public static void ClearAnonymousIdentifier ()
 		{
 			HttpContext c = HttpContext.Current;
 			SystemWebSectionGroup g = (SystemWebSectionGroup)WebConfigurationManager.GetSection ("system.web");
@@ -49,9 +47,6 @@ namespace System.Web.Security {
 			if (!g.AnonymousIdentification.Enabled
 			    || false /* XXX The user for the current request is anonymous */)
 				throw new NotSupportedException ();
-
-			if (use_cookie) {
-			}
 		}
 
 		public void Dispose ()
diff --git a/mcs/class/System.Web/System.Web.Security/ChangeLog b/mcs/class/System.Web/System.Web.Security/ChangeLog
index aae0f46b136..827caa46d97 100644
--- a/mcs/class/System.Web/System.Web.Security/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Security/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-28  Chris Toshok  <toshok@ximian.com>
+
+	* FormsAuthentication.cs: corcompare work.
+
+	* MembershipCreateUserException.cs: same.
+
+	* MembershipPasswordException.cs: same.
+
+	* AnonymousIdentificationModule.cs: same.
+
 2006-02-01  Chris Toshok  <toshok@ximian.com>
 
 	* FormsAuthentication.cs, Membership.cs,
diff --git a/mcs/class/System.Web/System.Web.Security/FormsAuthentication.cs b/mcs/class/System.Web/System.Web.Security/FormsAuthentication.cs
index 59a6bfd5a09..33a8b56ff3f 100644
--- a/mcs/class/System.Web/System.Web.Security/FormsAuthentication.cs
+++ b/mcs/class/System.Web/System.Web.Security/FormsAuthentication.cs
@@ -75,9 +75,6 @@ namespace System.Web.Security
 						"index.html",
 						"index.htm" };
 
-#if NET_2_0
-		[Obsolete]
-#endif
 		public FormsAuthentication ()
 		{
 		}
diff --git a/mcs/class/System.Web/System.Web.Security/MembershipCreateUserException.cs b/mcs/class/System.Web/System.Web.Security/MembershipCreateUserException.cs
index 6a1cf6aa57b..58b5e9c98b5 100644
--- a/mcs/class/System.Web/System.Web.Security/MembershipCreateUserException.cs
+++ b/mcs/class/System.Web/System.Web.Security/MembershipCreateUserException.cs
@@ -51,7 +51,7 @@ namespace System.Web.Security
 		{
 		}
 		
-		public MembershipCreateUserException (SerializationInfo info, StreamingContext context): base (info, context)
+		protected MembershipCreateUserException (SerializationInfo info, StreamingContext context): base (info, context)
 		{
 			info.AddValue ("statusCode", statusCode);
 		}
diff --git a/mcs/class/System.Web/System.Web.Security/MembershipPasswordException.cs b/mcs/class/System.Web/System.Web.Security/MembershipPasswordException.cs
index c9497cec476..6601304818d 100644
--- a/mcs/class/System.Web/System.Web.Security/MembershipPasswordException.cs
+++ b/mcs/class/System.Web/System.Web.Security/MembershipPasswordException.cs
@@ -42,7 +42,7 @@ namespace System.Web.Security
 		public MembershipPasswordException (string message) : base (message) {}
 		public MembershipPasswordException (string message, Exception innerException) : base (message, innerException) {}
 		
-		public MembershipPasswordException (SerializationInfo info, StreamingContext context): base (info, context)
+		protected MembershipPasswordException (SerializationInfo info, StreamingContext context): base (info, context)
 		{
 		}
 	}
diff --git a/mcs/class/System.Web/System.Web.SessionState/ChangeLog b/mcs/class/System.Web/System.Web.SessionState/ChangeLog
index 0e93b444552..05c42bdbff2 100644
--- a/mcs/class/System.Web/System.Web.SessionState/ChangeLog
+++ b/mcs/class/System.Web/System.Web.SessionState/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-28  Chris Toshok  <toshok@ximian.com>
+
+	* SessionStateActions.cs: rename SessionStateActionFlags to this.
+
+	* ISessionIDManager.cs: rename ISessionIDModule to this.
+
+	* IStateRuntime.cs: corcompare work.
+
 2006-02-01  Chris Toshok  <toshok@ximian.com>
 
 	* SessionStateServerHandler.cs: CONFIGURATION_2_0 => NET_2_0.
diff --git a/mcs/class/System.Web/System.Web.SessionState/ISessionIDModule.cs b/mcs/class/System.Web/System.Web.SessionState/ISessionIDManager.cs
index b178fa72cfe..d3742521a3e 100644
--- a/mcs/class/System.Web/System.Web.SessionState/ISessionIDModule.cs
+++ b/mcs/class/System.Web/System.Web.SessionState/ISessionIDManager.cs
@@ -1,5 +1,5 @@
 //
-// System.Web.SessionState.ISessionIDModule
+// System.Web.SessionState.ISessionIDManager
 //
 // Authors:
 //	Sanjay Gupta (gsanjay@novell.com)
@@ -34,11 +34,13 @@ using System;
 using System.Web;
 
 namespace System.Web.SessionState {
-	public interface ISessionIDModule
+	public interface ISessionIDManager
 	{
 		///methods
 		string CreateSessionID (HttpContext context);
 		string GetSessionID (HttpContext context);
+		void Initialize ();
+		bool InitializeRequest (HttpContext context, bool suppressAutoDetectRedirect, out bool supportSessionIDReissue);
 		void RemoveSessionID (HttpContext context);
 		void SaveSessionID (HttpContext context, string sessionID, out bool isRedirected, out bool isCookieAdded);
 		bool Validate (string id);
diff --git a/mcs/class/System.Web/System.Web.SessionState/IStateRuntime.cs b/mcs/class/System.Web/System.Web.SessionState/IStateRuntime.cs
index b1cd995f56e..fb33dfee513 100644
--- a/mcs/class/System.Web/System.Web.SessionState/IStateRuntime.cs
+++ b/mcs/class/System.Web/System.Web.SessionState/IStateRuntime.cs
@@ -35,6 +35,9 @@ namespace System.Web.SessionState
 {
 	[Guid ("7297744b-e188-40bf-b7e9-56698d25cf44")]
 	[InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]
+#if NET_2_0
+	[ComImportAttribute]
+#endif
 	public interface IStateRuntime
 	{
 		void ProcessRequest (
@@ -48,6 +51,18 @@ namespace System.Web.SessionState
 			[In, MarshalAs(UnmanagedType.I4)] int contentLength,
 			[In, MarshalAs(UnmanagedType.SysInt)] IntPtr content);
 
+		void ProcessRequest (
+			[In, MarshalAs(UnmanagedType.SysInt)] IntPtr tracker, 
+			[In, MarshalAs(UnmanagedType.I4)] int verb,
+			[In, MarshalAs(UnmanagedType.LPWStr)] string uri,
+			[In, MarshalAs(UnmanagedType.I4)] int exclusive, 
+			[In, MarshalAs(UnmanagedType.I4)] int extraFlags, 
+			[In, MarshalAs(UnmanagedType.I4)] int timeout,
+			[In, MarshalAs(UnmanagedType.I4)] int lockCookieExists,
+			[In, MarshalAs(UnmanagedType.I4)] int lockCookie,
+			[In, MarshalAs(UnmanagedType.I4)] int contentLength,
+			[In, MarshalAs(UnmanagedType.SysInt)] IntPtr content);
+
 		void StopProcessing ();
 	}
 }
diff --git a/mcs/class/System.Web/System.Web.SessionState/SessionStateActionFlags.cs b/mcs/class/System.Web/System.Web.SessionState/SessionStateActions.cs
index 52a10def8ee..52a10def8ee 100644
--- a/mcs/class/System.Web/System.Web.SessionState/SessionStateActionFlags.cs
+++ b/mcs/class/System.Web/System.Web.SessionState/SessionStateActions.cs
diff --git a/mcs/class/System.Web/System.Web.dll.sources b/mcs/class/System.Web/System.Web.dll.sources
index e051c594b94..6ce7f0bffd1 100644
--- a/mcs/class/System.Web/System.Web.dll.sources
+++ b/mcs/class/System.Web/System.Web.dll.sources
@@ -109,7 +109,6 @@ System.Web.Configuration_2.0/AuthorizationRuleCollection.cs
 System.Web.Configuration_2.0/AuthorizationSection.cs
 System.Web.Configuration_2.0/BufferModesCollection.cs
 System.Web.Configuration_2.0/BufferModeSettings.cs
-System.Web.Configuration_2.0/BuildProviderAppliesTo.cs
 System.Web.Configuration_2.0/BuildProviderCollection.cs
 System.Web.Configuration_2.0/BuildProvider.cs
 System.Web.Configuration_2.0/ClientTarget.cs
@@ -161,7 +160,6 @@ System.Web.Configuration_2.0/OutputCacheSection.cs
 System.Web.Configuration_2.0/OutputCacheSettingsSection.cs
 System.Web.Configuration_2.0/PagesEnableSessionState.cs
 System.Web.Configuration_2.0/PagesSection.cs
-System.Web.Configuration_2.0/PagesToCountAction.cs
 System.Web.Configuration_2.0/PassportAuthentication.cs
 System.Web.Configuration_2.0/ProcessModelSection.cs
 System.Web.Configuration_2.0/ProcessModelComAuthenticationLevel.cs
@@ -311,7 +309,6 @@ System.Web.Mail/ToUUEncodingTransform.cs
 System.Web.Mail/UUAttachmentEncoder.cs
 System.Web.Management/EventNotificationType.cs
 System.Web.Management/IRegiisUtility.cs
-System.Web.Management/IRegisterCreateITypeLib.cs
 System.Web.Management/IWebEventCustomEvaluator.cs
 System.Web.Management/RuleFiringRecord.cs
 System.Web.Management/SessionStateType.cs
@@ -346,6 +343,7 @@ System.Web.Profile/ProfileProviderAttribute.cs
 System.Web.Profile/ProfileProviderCollection.cs
 System.Web.Profile/ProfileProvider.cs
 System.Web.Profile/SettingsAllowAnonymousAttribute.cs
+System.Web.Profile/SqlProfileProvider.cs
 System.Web/QueueManager.cs
 System.Web.Security/ActiveDirectoryConnectionProtection.cs
 System.Web.Security/ActiveDirectoryMembershipProvider.cs
@@ -397,7 +395,7 @@ System.Web.SessionState/IHttpSessionState.cs
 System.Web.SessionState/IReadOnlySessionState.cs
 System.Web.SessionState/IRequiresSessionState.cs
 System.Web.SessionState/ISessionHandler.cs
-System.Web.SessionState/ISessionIDModule.cs
+System.Web.SessionState/ISessionIDManager.cs
 System.Web.SessionState/ISessionStateItemCollection.cs
 System.Web.SessionState/IStateRuntime.cs
 System.Web.SessionState/RemoteStateServer.cs
@@ -406,7 +404,7 @@ System.Web.SessionState/SessionDictionary.cs
 System.Web.SessionState/SessionId.cs
 System.Web.SessionState/SessionInProcHandler.cs
 System.Web.SessionState/SessionSQLServerHandler.cs
-System.Web.SessionState/SessionStateActionFlags.cs
+System.Web.SessionState/SessionStateActions.cs
 System.Web.SessionState/SessionStateItemExpireCallback.cs
 System.Web.SessionState/SessionStateMode.cs
 System.Web.SessionState/SessionStateModule.cs