Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Toshok <toshok@novell.com>2006-02-28 21:56:23 +0300
committerChris Toshok <toshok@novell.com>2006-02-28 21:56:23 +0300
commitaf8994638308aa5e2b873ec1d415ee64ecedbf5e (patch)
treea2602d49021aed7a610998039e433c8aa69fee1c /mcs/class/System.Web/System.Web.Management
parent065f5bba6dac6745255aab143a5e5921e3fb94db (diff)
parenta1428ab74a05d191cc69d68c8571496a383d7d1d (diff)
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
Diffstat (limited to 'mcs/class/System.Web/System.Web.Management')
-rw-r--r--mcs/class/System.Web/System.Web.Management/ChangeLog20
-rw-r--r--mcs/class/System.Web/System.Web.Management/EventNotificationType.cs2
-rw-r--r--mcs/class/System.Web/System.Web.Management/IRegiisUtility.cs35
-rw-r--r--mcs/class/System.Web/System.Web.Management/IRegisterCreateITypeLib.cs58
-rw-r--r--mcs/class/System.Web/System.Web.Management/RuleFiringRecord.cs2
-rw-r--r--mcs/class/System.Web/System.Web.Management/SessionStateType.cs1
-rw-r--r--mcs/class/System.Web/System.Web.Management/SqlFeatures.cs9
-rw-r--r--mcs/class/System.Web/System.Web.Management/WebApplicationInformation.cs2
-rw-r--r--mcs/class/System.Web/System.Web.Management/WebBaseEvent.cs8
-rw-r--r--mcs/class/System.Web/System.Web.Management/WebEventFormatter.cs2
10 files changed, 49 insertions, 90 deletions
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 ();
}