Merge pull request #2424 from alexrp/task-unobserved-exceptions

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

diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceControllerPermission.cs b/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceControllerPermission.cs
index d515e53cb0831de8bf1843fd24df5fddf21caf46..6f86f51114df2db8f9a2d80f77a9df1061cea57f 100644 (file)
--- a/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceControllerPermission.cs
+++ b/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceControllerPermission.cs
@@ -125,7 +125,6 @@ namespace System.ServiceProcess {
                        }
                }
 
-#if NET_2_0
                private static char[] invalidServiceNameChars = new char[] { '/', '\\' };
 
                internal static void ValidateServiceName (string name)
@@ -138,13 +137,5 @@ namespace System.ServiceProcess {
                                throw new ArgumentException (msg, "ServiceName");
                        }
                }
-#else
-               internal static void ValidateServiceName (string name)
-               {
-                       if (name == null)
-                               throw new ArgumentNullException ("ServiceName");
-                       // FIXME: maybe other checks are required (but not documented)
-               }
-#endif
        }
 }