Author: gert
Date: 2006-09-22 13:52:55 -0400 (Fri, 22 Sep 2006)
New Revision: 65823
Added:
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess.Design/
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess.Design/ChangeLog
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess.Design/ServiceNameConverter.cs
Modified:
trunk/mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs
trunk/mcs/class/System.ServiceProcess/Assembly/ChangeLog
trunk/mcs/class/System.ServiceProcess/ChangeLog
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess.dll.sources
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ChangeLog
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceAccount.cs
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceBase.cs
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceController.cs
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceInstaller.cs
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceProcessInstaller.cs
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/TimeoutException.cs
Log:
* AssemblyInfo.cs: AssemblyConfiguration and AssemblyTrademark
attributes are 1.1 only. Added AssemblyFileVersion, Debuggable and
CompilationRelaxtations attribute for 2.0 profile.
* ServiceProcessInstaller.cs: Added missing ServiceProcessDescription
attribute.
* ServiceAccount.cs: Removed extra Serializable attribute.
* ServiceInstaller.cs: Added ServiceProcessDescriptions.
* ServiceBase.cs: Added descriptions for ServiceProcessDescription
as reported by class status. Modified return type of OnPowerEvent
from void to bool.
* ServiceController.cs: Added description for class-level
ServiceProcessDescription. Added TypeConverter for ServiceName.
* TimeoutException.cs: Added ctor introduced in 2.0 profile.
* System.ServiceProcess.dll.sources: Added ServiceNameConverter.cs.
* ServiceNameConverter.cs: Dummy implementation to fix class status.
Modified: trunk/mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs
===================================================================
--- trunk/mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs
2006-09-22 17:48:58 UTC (rev 65822)
+++ trunk/mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs
2006-09-22 17:52:55 UTC (rev 65823)
@@ -29,6 +29,7 @@
//
using System;
+using System.Diagnostics;
using System.Reflection;
using System.Resources;
using System.Security;
@@ -39,14 +40,12 @@
[assembly: AssemblyVersion (Consts.FxVersion)]
[assembly: SatelliteContractVersion (Consts.FxVersion)]
-
+
[assembly: AssemblyTitle ("System.ServiceProcess.dll")]
[assembly: AssemblyDescription ("System.ServiceProcess.dll")]
-[assembly: AssemblyConfiguration ("Development version")]
[assembly: AssemblyCompany ("MONO development team")]
[assembly: AssemblyProduct ("MONO CLI")]
[assembly: AssemblyCopyright ("(c) 2003 Various Authors")]
-[assembly: AssemblyTrademark ("")]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDefaultAlias ("System.ServiceProcess.dll")]
@@ -57,3 +56,12 @@
[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyKeyFile("../msfinal.pub")]
+
+#if NET_2_0
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: Debuggable
(DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
+#else
+[assembly: AssemblyConfiguration ("Development version")]
+[assembly: AssemblyTrademark ("")]
+#endif
Modified: trunk/mcs/class/System.ServiceProcess/Assembly/ChangeLog
===================================================================
--- trunk/mcs/class/System.ServiceProcess/Assembly/ChangeLog 2006-09-22
17:48:58 UTC (rev 65822)
+++ trunk/mcs/class/System.ServiceProcess/Assembly/ChangeLog 2006-09-22
17:52:55 UTC (rev 65823)
@@ -1,5 +1,11 @@
-2004-04-06 Andreas Nahr <[EMAIL PROTECTED]>
+2006-09-22 Gert Driesen <[EMAIL PROTECTED]>
+ * AssemblyInfo.cs: AssemblyConfiguration and AssemblyTrademark
+ attributes are 1.1 only. Added AssemblyFileVersion, Debuggable and
+ CompilationRelaxtations attribute for 2.0 profile.
+
+2004-04-06 Andreas Nahr <[EMAIL PROTECTED]>
+
* AssemblyInfo.cs: Added
* ChangeLog: Added
- * Locale.cs: Added
\ No newline at end of file
+ * Locale.cs: Added
Modified: trunk/mcs/class/System.ServiceProcess/ChangeLog
===================================================================
--- trunk/mcs/class/System.ServiceProcess/ChangeLog 2006-09-22 17:48:58 UTC
(rev 65822)
+++ trunk/mcs/class/System.ServiceProcess/ChangeLog 2006-09-22 17:52:55 UTC
(rev 65823)
@@ -1,3 +1,7 @@
+2006-09-22 Gert Driesen <[EMAIL PROTECTED]>
+
+ * System.ServiceProcess.dll.sources: Added ServiceNameConverter.cs.
+
2006-09-14 Gert Driesen <[EMAIL PROTECTED]>
* Makefile: Treat warnings as error. Ignore no warnings.
Modified: trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ChangeLog
===================================================================
--- trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ChangeLog
2006-09-22 17:48:58 UTC (rev 65822)
+++ trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ChangeLog
2006-09-22 17:52:55 UTC (rev 65823)
@@ -1,3 +1,16 @@
+2006-09-22 Gert Driesen <[EMAIL PROTECTED]>
+
+ * ServiceProcessInstaller.cs: Added missing ServiceProcessDescription
+ attribute.
+ * ServiceAccount.cs: Removed extra Serializable attribute.
+ * ServiceInstaller.cs: Added ServiceProcessDescriptions.
+ * ServiceBase.cs: Added descriptions for ServiceProcessDescription
+ as reported by class status. Modified return type of OnPowerEvent
+ from void to bool.
+ * ServiceController.cs: Added description for class-level
+ ServiceProcessDescription. Added TypeConverter for ServiceName.
+ * TimeoutException.cs: Added ctor introduced in 2.0 profile.
+
2006-09-16 Gert Driesen <[EMAIL PROTECTED]>
* ServiceProcessInstaller.cs: Added some missing attributes. Fixes
Modified:
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceAccount.cs
===================================================================
---
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceAccount.cs
2006-09-22 17:48:58 UTC (rev 65822)
+++
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceAccount.cs
2006-09-22 17:52:55 UTC (rev 65823)
@@ -28,10 +28,9 @@
namespace System.ServiceProcess
{
- [Serializable]
public enum ServiceAccount {
LocalService = 0,
- NetworkService = 1,
+ NetworkService = 1,
LocalSystem = 2,
User = 3
}
Modified:
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceBase.cs
===================================================================
--- trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceBase.cs
2006-09-22 17:48:58 UTC (rev 65822)
+++ trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceBase.cs
2006-09-22 17:52:55 UTC (rev 65823)
@@ -64,7 +64,7 @@
}
[DefaultValue (true)]
- [ServiceProcessDescription ("")]
+ [ServiceProcessDescription ("Whether the service should
automatically write to the event log on common events such as Install and
Start.")]
public bool AutoLog {
get { return auto_log; }
set { auto_log = value; }
@@ -132,7 +132,7 @@
}
}
- [ServiceProcessDescription ("")]
+ [ServiceProcessDescription ("The name by which the service is
identified to the system.")]
[TypeConverter
("System.Diagnostics.Design.StringValueConverter, " +
Consts.AssemblySystem_Design)]
public string ServiceName {
get { return service_name; }
@@ -170,8 +170,9 @@
{
}
- protected virtual void OnPowerEvent (PowerBroadcastStatus
powerStatus)
+ protected virtual bool OnPowerEvent (PowerBroadcastStatus
powerStatus)
{
+ return true;
}
protected virtual void OnShutdown ()
Modified:
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceController.cs
===================================================================
---
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceController.cs
2006-09-22 17:48:58 UTC (rev 65822)
+++
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceController.cs
2006-09-22 17:52:55 UTC (rev 65823)
@@ -36,13 +36,16 @@
#if NET_2_0
using System.Runtime.InteropServices;
#endif
+using System.ServiceProcess.Design;
using System.Threading;
namespace System.ServiceProcess
{
[Designer("System.ServiceProcess.Design.ServiceControllerDesigner, " +
Consts.AssemblySystem_Design)]
[MonoTODO ("No unix implementation")]
- [ServiceProcessDescription ("")]
+#if NET_2_0
+ [ServiceProcessDescription ("Provides the ability to connect to, query,
and manipulate running or stopped Windows services.")]
+#endif
public class ServiceController : Component
{
private string _name;
@@ -190,6 +193,7 @@
[ReadOnly (true)]
[RecommendedAsConfigurable (true)]
[ServiceProcessDescription ("The short name of the service.")]
+ [TypeConverter (typeof (ServiceNameConverter))]
public string ServiceName {
get {
if (_serviceName.Length == 0 &&
(_displayName.Length > 0 || _name.Length > 0))
Modified:
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceInstaller.cs
===================================================================
---
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceInstaller.cs
2006-09-22 17:48:58 UTC (rev 65822)
+++
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceInstaller.cs
2006-09-22 17:52:55 UTC (rev 65823)
@@ -55,7 +55,7 @@
[ComVisible (false)]
[DefaultValue ("")]
- [ServiceProcessDescription ("")]
+ [ServiceProcessDescription ("Indicates the service's
description (a brief comment that explains the purpose of the service). ")]
public string Description {
get {
return description;
@@ -67,6 +67,9 @@
#endif
[DefaultValue("")]
+#if NET_2_0
+ [ServiceProcessDescription ("Indicates the friendly name that
identifies the service to the user.")]
+#endif
public string DisplayName {
get {
return display_name;
@@ -77,6 +80,9 @@
}
[DefaultValue("")]
+#if NET_2_0
+ [ServiceProcessDescription ("Indicates the name used by the
system to identify this service.")]
+#endif
[TypeConverter("System.Diagnostics.Design.StringValueConverter,
" + Consts.AssemblySystem_Design)]
public string ServiceName {
get {
@@ -89,6 +95,9 @@
}
}
+#if NET_2_0
+ [ServiceProcessDescription ("Indicates the services that must
be running in order for this service to run.")]
+#endif
public string[] ServicesDependedOn {
get {
return services_depended_on;
@@ -99,6 +108,9 @@
}
[DefaultValue (ServiceStartMode.Manual)]
+#if NET_2_0
+ [ServiceProcessDescription ("Indicates how and when this
service is started.")]
+#endif
public ServiceStartMode StartType {
get {
return start_type;
Modified:
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceProcessInstaller.cs
===================================================================
---
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceProcessInstaller.cs
2006-09-22 17:48:58 UTC (rev 65822)
+++
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceProcessInstaller.cs
2006-09-22 17:52:55 UTC (rev 65823)
@@ -45,6 +45,9 @@
private string username;
[DefaultValue (ServiceAccount.User)]
+#if NET_2_0
+ [ServiceProcessDescription ("Indicates the account type under
which the service will run.")]
+#endif
public ServiceAccount Account {
get {
return account;
Modified:
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/TimeoutException.cs
===================================================================
---
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/TimeoutException.cs
2006-09-22 17:48:58 UTC (rev 65822)
+++
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess/TimeoutException.cs
2006-09-22 17:52:55 UTC (rev 65823)
@@ -43,6 +43,13 @@
{
}
+#if NET_2_0
+ public TimeoutException (string message, Exception
innerException)
+ : base (message, innerException)
+ {
+ }
+#endif
+
protected TimeoutException (SerializationInfo info,
StreamingContext context) : base (info, context)
{
}
Added:
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess.Design/ChangeLog
===================================================================
---
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess.Design/ChangeLog
2006-09-22 17:48:58 UTC (rev 65822)
+++
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess.Design/ChangeLog
2006-09-22 17:52:55 UTC (rev 65823)
@@ -0,0 +1,3 @@
+2006-09-22 Gert Driesen <[EMAIL PROTECTED]>
+
+ * ServiceNameConverter.cs: Dummy implementation to fix class status.
Property changes on:
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess.Design/ChangeLog
___________________________________________________________________
Name: svn:eol-style
+ native
Added:
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess.Design/ServiceNameConverter.cs
===================================================================
---
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess.Design/ServiceNameConverter.cs
2006-09-22 17:48:58 UTC (rev 65822)
+++
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess.Design/ServiceNameConverter.cs
2006-09-22 17:52:55 UTC (rev 65823)
@@ -0,0 +1,51 @@
+//
+// System.ServiceProcess.Design.ServiceNameConverter
+//
+// Authors:
+// Gert Driesen ([EMAIL PROTECTED])
+//
+// (C) 2006 Novell Inc.
+//
+//
+// 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.
+//
+
+using System.ComponentModel;
+using System.Globalization;
+
+namespace System.ServiceProcess.Design
+{
+ internal class ServiceNameConverter : TypeConverter
+ {
+ public override bool CanConvertFrom (ITypeDescriptorContext
context, Type sourceType)
+ {
+ if (sourceType == typeof (string))
+ return true;
+ return base.CanConvertFrom (sourceType);
+ }
+
+ public override object ConvertFrom (ITypeDescriptorContext
context, CultureInfo culture, object value)
+ {
+ if (value is string)
+ return ((string) value);
+ return base.ConvertFrom (context, culture, value);
+ }
+ }
+}
Property changes on:
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess.Design/ServiceNameConverter.cs
___________________________________________________________________
Name: svn:eol-style
+ native
Modified:
trunk/mcs/class/System.ServiceProcess/System.ServiceProcess.dll.sources
===================================================================
--- trunk/mcs/class/System.ServiceProcess/System.ServiceProcess.dll.sources
2006-09-22 17:48:58 UTC (rev 65822)
+++ trunk/mcs/class/System.ServiceProcess/System.ServiceProcess.dll.sources
2006-09-22 17:52:55 UTC (rev 65823)
@@ -21,3 +21,4 @@
System.ServiceProcess/ServiceControllerPermissionEntryCollection.cs
System.ServiceProcess/UnixServiceController.cs
System.ServiceProcess/Win32ServiceController.cs
+System.ServiceProcess.Design/ServiceNameConverter.cs
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
