merge -r 60439:60440

[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 6d90b7e39caa1f2cb6bc922e3864f9eeae8a0557..8893836cd9ca5e7a0a90f0abd74d61bab103893b 100644 (file)
--- a/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceInstaller.cs
+++ b/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceInstaller.cs
@@ -39,12 +39,24 @@ namespace System.ServiceProcess
        public class ServiceInstaller : System.Configuration.Install.ComponentInstaller
        {
                public ServiceInstaller () {}
-
+               
                private string display_name;
                private string service_name;
                private string[] services_depended_on;
                private ServiceStartMode start_type;
 
+#if NET_2_0
+               private string description;
+               public string Description {
+                       get {
+                               return description;
+                       }
+                       set {
+                               description = value;
+                       }
+               }
+#endif
+
                public string DisplayName {
                        get {
                                return display_name;