diff options
author | Zoltan Varga <vargaz@gmail.com> | 2015-01-13 23:29:38 +0300 |
---|---|---|
committer | Zoltan Varga <vargaz@gmail.com> | 2015-01-13 23:29:38 +0300 |
commit | 0985d4aa4be4a9286db4e36cf75e3b18a31e5ff9 (patch) | |
tree | 46b65e83cd552237e592e85486afcca719d8a9c3 /mcs/class/System.ServiceProcess | |
parent | f54652de26710952d4f80e25d87a87b346a86992 (diff) |
[bcl] Remove NET_2_0 defines from the class libs. This has been done using: unifdef -t -DNET_2_0 -o <filename> <filename>.
Diffstat (limited to 'mcs/class/System.ServiceProcess')
7 files changed, 0 insertions, 36 deletions
diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceControllerPermission.cs b/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceControllerPermission.cs index d515e53cb08..6f86f51114d 100644 --- 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 } } diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceInstaller.cs b/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceInstaller.cs index 06b1070671f..ad82f287178 100644 --- a/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceInstaller.cs +++ b/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceInstaller.cs @@ -32,9 +32,7 @@ using System; using System.Collections; using System.ComponentModel; using System.Configuration.Install; -#if NET_2_0 using System.Runtime.InteropServices; -#endif namespace System.ServiceProcess { @@ -49,9 +47,7 @@ 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 @@ -69,7 +65,6 @@ namespace System.ServiceProcess } #endif -#if NET_2_0 [ComVisible (false)] [DefaultValue ("")] [ServiceProcessDescription ("Indicates the service's description (a brief comment that explains the purpose of the service). ")] @@ -81,12 +76,9 @@ namespace System.ServiceProcess description = value; } } -#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; @@ -97,9 +89,7 @@ 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 { @@ -112,9 +102,7 @@ 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; @@ -125,9 +113,7 @@ 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; diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceProcessInstaller.cs b/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceProcessInstaller.cs index f4f33cfc078..4b97721e0f7 100644 --- a/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceProcessInstaller.cs +++ b/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceProcessInstaller.cs @@ -47,9 +47,7 @@ namespace System.ServiceProcess 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; diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess/SessionChangeDescription.cs b/mcs/class/System.ServiceProcess/System.ServiceProcess/SessionChangeDescription.cs index e9a6aff04ed..e38e21198bd 100644 --- a/mcs/class/System.ServiceProcess/System.ServiceProcess/SessionChangeDescription.cs +++ b/mcs/class/System.ServiceProcess/System.ServiceProcess/SessionChangeDescription.cs @@ -28,7 +28,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 namespace System.ServiceProcess { @@ -78,4 +77,3 @@ namespace System.ServiceProcess } } -#endif diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess/SessionChangeReason.cs b/mcs/class/System.ServiceProcess/System.ServiceProcess/SessionChangeReason.cs index 484b0db93d6..05c3d02d2c8 100644 --- a/mcs/class/System.ServiceProcess/System.ServiceProcess/SessionChangeReason.cs +++ b/mcs/class/System.ServiceProcess/System.ServiceProcess/SessionChangeReason.cs @@ -28,7 +28,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 namespace System.ServiceProcess { @@ -46,4 +45,3 @@ namespace System.ServiceProcess } } -#endif diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess/TimeoutException.cs b/mcs/class/System.ServiceProcess/System.ServiceProcess/TimeoutException.cs index dcec3ee2d5c..fd022702c66 100644 --- a/mcs/class/System.ServiceProcess/System.ServiceProcess/TimeoutException.cs +++ b/mcs/class/System.ServiceProcess/System.ServiceProcess/TimeoutException.cs @@ -43,12 +43,10 @@ namespace System.ServiceProcess { } -#if NET_2_0 public TimeoutException (string message, Exception innerException) : base (message, innerException) { } -#endif protected TimeoutException (SerializationInfo info, StreamingContext context) : base (info, context) { diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess/Win32ServiceController.cs b/mcs/class/System.ServiceProcess/System.ServiceProcess/Win32ServiceController.cs index f15d4a59b25..fee6147202e 100644 --- a/mcs/class/System.ServiceProcess/System.ServiceProcess/Win32ServiceController.cs +++ b/mcs/class/System.ServiceProcess/System.ServiceProcess/Win32ServiceController.cs @@ -591,13 +591,8 @@ namespace System.ServiceProcess IntPtr buffer = IntPtr.Zero; try { -#if NET_2_0 scHandle = OpenServiceControlManager (machineName, SERVICE_MANAGER_RIGHTS.SC_MANAGER_ENUMERATE_SERVICE); -#else - scHandle = OpenServiceControlManager (machineName, - SERVICE_MANAGER_RIGHTS.SC_MANAGER_ENUMERATE_SERVICE, true); -#endif uint bufferSize = 0; uint bytesNeeded = 0; |