Merge remote-tracking branch 'mfoliveira/ppc64el-v2'

[mono.git] / mcs / class / System.ServiceProcess / System.ServiceProcess / ServiceInstaller.cs

diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceInstaller.cs b/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceInstaller.cs
index b730061765265a4caedc6cb52baf110dc4eac44d..06b1070671f51aa80f88fd5fbec0bc84870f6ebb 100644 (file)
--- a/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceInstaller.cs
+++ b/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceInstaller.cs
@@ -49,13 +49,30 @@ namespace System.ServiceProcess
                private string service_name;
                private string[] services_depended_on;
                private ServiceStartMode start_type;
-
 #if NET_2_0
                private string description;
+#endif
+#if NET_4_0
+               private bool delayedAutoStart;
+#endif
+
+#if NET_4_0
+               [DefaultValue(false)]
+               [ServiceProcessDescription("Indicates that the service's start should be delayed after other automatically started services have started.")]
+               public bool DelayedAutoStart {
+                       get {
+                               return delayedAutoStart;
+                       }
+                       set {
+                               delayedAutoStart = value;
+                       }
+               }
+#endif
 
+#if NET_2_0
                [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 +84,9 @@ namespace System.ServiceProcess
 #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 +97,9 @@ namespace System.ServiceProcess
                }
 
                [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 +112,9 @@ namespace System.ServiceProcess
                        }
                }
 
+#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 +125,9 @@ namespace System.ServiceProcess
                }
 
                [DefaultValue (ServiceStartMode.Manual)]
+#if NET_2_0
+               [ServiceProcessDescription ("Indicates how and when this service is started.")]
+#endif
                public ServiceStartMode StartType {
                        get {
                                return start_type;