Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/mcs/class/System.Runtime.Remoting
diff options
context:
space:
mode:
authorZoltan Varga <vargaz@gmail.com>2015-01-13 23:29:38 +0300
committerZoltan Varga <vargaz@gmail.com>2015-01-13 23:29:38 +0300
commit0985d4aa4be4a9286db4e36cf75e3b18a31e5ff9 (patch)
tree46b65e83cd552237e592e85486afcca719d8a9c3 /mcs/class/System.Runtime.Remoting
parentf54652de26710952d4f80e25d87a87b346a86992 (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.Runtime.Remoting')
-rw-r--r--mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpChannel.cs4
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpClientChannel.cs4
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpClientTransportSink.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpServerChannel.cs8
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/RemotingHttpListener.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Unix/IpcChannel.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Unix/IpcClientChannel.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Unix/IpcServerChannel.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Unix/UnixChannelLoader.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcChannel.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcChannelHelper.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcClientChannel.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcServerChannel.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcTransport.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeClient.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeException.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeHelper.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeListener.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeSocket.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeStream.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc/IpcChannel.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc/IpcClientChannel.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc/IpcServerChannel.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpConnectionPool.cs5
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/IAuthorizeRemotingConnection.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SocketCachePolicy.cs2
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/SUDSGeneratorException.cs6
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/SUDSParserException.cs6
-rw-r--r--mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Services/RemotingClientProxy.cs4
30 files changed, 0 insertions, 83 deletions
diff --git a/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs b/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs
index fd9d08db646..e87df264496 100644
--- a/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs
@@ -38,7 +38,6 @@ using System.Runtime.InteropServices;
// General Information about the System.Runtime.Remoting assembly
-#if NET_2_0
[assembly: AssemblyTitle ("System.Runtime.Remoting.dll")]
[assembly: AssemblyDescription ("System.Runtime.Remoting.dll")]
[assembly: AssemblyDefaultAlias ("System.Runtime.Remoting.dll")]
@@ -48,7 +47,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright (Consts.MonoCopyright)]
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
-#endif
[assembly: AssemblyVersion (Consts.FxVersion)]
[assembly: SatelliteContractVersion (Consts.FxVersion)]
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpChannel.cs
index facd522f99a..83936faee9e 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpChannel.cs
@@ -34,9 +34,7 @@ namespace System.Runtime.Remoting.Channels.Http
public class HttpChannel : BaseChannelWithProperties,
IChannel, IChannelReceiver, IChannelReceiverHook, IChannelSender
-#if NET_2_0
, ISecurableChannel
-#endif
{
HttpClientChannel client;
HttpServerChannel server;
@@ -223,7 +221,6 @@ namespace System.Runtime.Remoting.Channels.Http
#endregion
-#if NET_2_0
#region ISecurableChannel
public bool IsSecured
@@ -233,6 +230,5 @@ namespace System.Runtime.Remoting.Channels.Http
}
#endregion
-#endif
}
}
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpClientChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpClientChannel.cs
index b8eea16af24..965442fc95e 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpClientChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpClientChannel.cs
@@ -37,9 +37,7 @@ namespace System.Runtime.Remoting.Channels.Http
public class HttpClientChannel : BaseChannelWithProperties,
IChannel, IChannelSender
-#if NET_2_0
, ISecurableChannel
-#endif
{
string name = "http client";
int priority = 1;
@@ -270,7 +268,6 @@ namespace System.Runtime.Remoting.Channels.Http
#endregion
-#if NET_2_0
#region ISecurableChannel
public bool IsSecured
@@ -282,7 +279,6 @@ namespace System.Runtime.Remoting.Channels.Http
}
#endregion
-#endif
#region Internal properties
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpClientTransportSink.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpClientTransportSink.cs
index 3679aa13e3d..e7fbdc81418 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpClientTransportSink.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpClientTransportSink.cs
@@ -137,10 +137,8 @@ namespace System.Runtime.Remoting.Channels.Http
request.AllowAutoRedirect = false;
if (channel.Credentials != null)
request.Credentials = channel.Credentials;
-#if NET_2_0
else if (channel.UseDefaultCredentials == true)
request.UseDefaultCredentials = true;
-#endif
else if (channel.Username != null && channel.Username.Length > 0) {
if (channel.Domain != null && channel.Domain.Length > 0) {
request.Credentials = new NetworkCredential (channel.Username, channel.Password,
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpServerChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpServerChannel.cs
index e5ecf3b381c..e4815da1997 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpServerChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpServerChannel.cs
@@ -47,9 +47,6 @@ namespace System.Runtime.Remoting.Channels.Http
int port = -1; // querying GetChannelUri () on .NET indicates this is the default value
bool suppressChannelData = false;
bool useIPAddress = true;
-#if !NET_2_0
- bool exclusiveAddressUse = true;
-#endif
bool wantsToListen = true;
HttpServerTransportSink sink;
@@ -102,11 +99,6 @@ namespace System.Runtime.Remoting.Channels.Http
case "listen":
this.wantsToListen = Convert.ToBoolean (property.Value);
break;
-#if !NET_2_0
- case "exclusiveAddressUse":
- this.exclusiveAddressUse = Convert.ToBoolean (property.Value);
- break;
-#endif
}
}
}
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/RemotingHttpListener.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/RemotingHttpListener.cs
index 1936a281ec2..b62be0214f1 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/RemotingHttpListener.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/RemotingHttpListener.cs
@@ -52,10 +52,8 @@ namespace System.Runtime.Remoting.Channels.Http
string address = null;
if (addr == IPAddress.Any)
address = "*";
-#if NET_2_0
else if (addr == IPAddress.IPv6Any)
address = "*";
-#endif
else
address = addr.ToString ();
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Unix/IpcChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Unix/IpcChannel.cs
index 943de8e603c..f4f21cc0e01 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Unix/IpcChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Unix/IpcChannel.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.Collections;
@@ -143,4 +142,3 @@ namespace System.Runtime.Remoting.Channels.Ipc.Unix
}
}
-#endif
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Unix/IpcClientChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Unix/IpcClientChannel.cs
index b207217f452..3b3bc718df5 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Unix/IpcClientChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Unix/IpcClientChannel.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.Collections;
@@ -147,4 +146,3 @@ namespace System.Runtime.Remoting.Channels.Ipc.Unix
}
}
-#endif
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Unix/IpcServerChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Unix/IpcServerChannel.cs
index 34bbcf7e49d..5090b577b61 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Unix/IpcServerChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Unix/IpcServerChannel.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.Collections;
@@ -152,4 +151,3 @@ namespace System.Runtime.Remoting.Channels.Ipc.Unix
}
}
-#endif
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Unix/UnixChannelLoader.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Unix/UnixChannelLoader.cs
index c6c84bb0dd9..c3ee90eeab1 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Unix/UnixChannelLoader.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Unix/UnixChannelLoader.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.Reflection;
@@ -75,4 +74,3 @@ namespace System.Runtime.Remoting.Channels.Ipc.Unix
}
}
-#endif
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcChannel.cs
index 5cb721944f4..883ea72ebe2 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcChannel.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.Collections;
@@ -141,4 +140,3 @@ namespace System.Runtime.Remoting.Channels.Ipc.Win32
}
}
-#endif
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcChannelHelper.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcChannelHelper.cs
index 6b018b035f4..b48da2f9fd5 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcChannelHelper.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcChannelHelper.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.IO;
@@ -142,4 +141,3 @@ namespace System.Runtime.Remoting.Channels.Ipc.Win32
}
}
-#endif
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcClientChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcClientChannel.cs
index 2be59efb57b..68f3ec90563 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcClientChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcClientChannel.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.Collections;
@@ -280,4 +279,3 @@ namespace System.Runtime.Remoting.Channels.Ipc.Win32
}
-#endif
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcServerChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcServerChannel.cs
index cb3b42b83d6..bc2fe4be464 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcServerChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcServerChannel.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.Collections;
@@ -387,4 +386,3 @@ namespace System.Runtime.Remoting.Channels.Ipc.Win32
}
-#endif
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcTransport.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcTransport.cs
index 7225c757d52..fb94830f185 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcTransport.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcTransport.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.IO;
@@ -136,4 +135,3 @@ namespace System.Runtime.Remoting.Channels.Ipc.Win32
}
}
-#endif
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeClient.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeClient.cs
index 3cb468b36a1..915dc7cd0dc 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeClient.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeClient.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.Runtime.InteropServices;
@@ -112,4 +111,3 @@ namespace System.Runtime.Remoting.Channels.Ipc.Win32
}
}
-#endif
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeException.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeException.cs
index 2ffc0127e38..ed135af6fd6 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeException.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeException.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.ComponentModel;
@@ -63,4 +62,3 @@ namespace System.Runtime.Remoting.Channels.Ipc.Win32
}
}
-#endif
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeHelper.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeHelper.cs
index 5730fe5680d..089cd330b62 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeHelper.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeHelper.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.Runtime.InteropServices;
@@ -226,4 +225,3 @@ namespace System.Runtime.Remoting.Channels.Ipc.Win32
}
-#endif
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeListener.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeListener.cs
index a1146abb283..8270e3d157f 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeListener.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeListener.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.Runtime.InteropServices;
@@ -110,4 +109,3 @@ namespace System.Runtime.Remoting.Channels.Ipc.Win32
}
}
-#endif
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeSocket.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeSocket.cs
index d7793ada45e..8c213a76f53 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeSocket.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeSocket.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.IO;
@@ -366,4 +365,3 @@ namespace System.Runtime.Remoting.Channels.Ipc.Win32
}
}
-#endif
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeStream.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeStream.cs
index 11ef3140389..620863cb074 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeStream.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeStream.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.IO;
@@ -140,4 +139,3 @@ namespace System.Runtime.Remoting.Channels.Ipc.Win32
}
}
-#endif
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc/IpcChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc/IpcChannel.cs
index 503db92f726..0b53f638b35 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc/IpcChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc/IpcChannel.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.Collections;
@@ -121,4 +120,3 @@ namespace System.Runtime.Remoting.Channels.Ipc
}
}
-#endif
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc/IpcClientChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc/IpcClientChannel.cs
index 9a98e17b88c..68fd4dcb36d 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc/IpcClientChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc/IpcClientChannel.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.Collections;
@@ -92,4 +91,3 @@ namespace System.Runtime.Remoting.Channels.Ipc
}
}
-#endif
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc/IpcServerChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc/IpcServerChannel.cs
index 061fc09be00..43a39ec5903 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc/IpcServerChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc/IpcServerChannel.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.Collections;
@@ -129,4 +128,3 @@ namespace System.Runtime.Remoting.Channels.Ipc
}
}
-#endif
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpConnectionPool.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpConnectionPool.cs
index f5a8ce25922..f19ef808c5c 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpConnectionPool.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpConnectionPool.cs
@@ -125,12 +125,7 @@ namespace System.Runtime.Remoting.Channels.Tcp
// Avoid excessive waiting for data by the tcp stack in linux.
// We can't safely use SetSocketOption for both runtimes because
// it would break 2.0 TcpClient's property cache.
-#if NET_2_0
Client.NoDelay = true;
-#else
- Client.SetSocketOption (SocketOptionLevel.Tcp,
- SocketOptionName.NoDelay, 1);
-#endif
}
public bool IsAlive
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/IAuthorizeRemotingConnection.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/IAuthorizeRemotingConnection.cs
index 692be2a57c9..e746611358a 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/IAuthorizeRemotingConnection.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/IAuthorizeRemotingConnection.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.Net;
@@ -42,4 +41,3 @@ namespace System.Runtime.Remoting.Channels
}
-#endif
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SocketCachePolicy.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SocketCachePolicy.cs
index bc519901f9b..a36bbb6f170 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SocketCachePolicy.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SocketCachePolicy.cs
@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
namespace System.Runtime.Remoting.Channels
{
@@ -38,4 +37,3 @@ namespace System.Runtime.Remoting.Channels
}
}
-#endif
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/SUDSGeneratorException.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/SUDSGeneratorException.cs
index 1e1d47db1e6..c6518da1366 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/SUDSGeneratorException.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/SUDSGeneratorException.cs
@@ -28,27 +28,21 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.Runtime.Serialization;
-#endif
namespace System.Runtime.Remoting.MetadataServices
{
-#if NET_2_0
[Serializable]
-#endif
public class SUDSGeneratorException : Exception
{
internal SUDSGeneratorException ()
{
}
-#if NET_2_0
protected SUDSGeneratorException (SerializationInfo info, StreamingContext context)
: base (info, context)
{
}
-#endif
}
}
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/SUDSParserException.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/SUDSParserException.cs
index a680289444f..57c93798e1b 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/SUDSParserException.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/SUDSParserException.cs
@@ -28,27 +28,21 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.Runtime.Serialization;
-#endif
namespace System.Runtime.Remoting.MetadataServices
{
-#if NET_2_0
[Serializable]
-#endif
public class SUDSParserException : Exception
{
internal SUDSParserException ()
{
}
-#if NET_2_0
protected SUDSParserException (SerializationInfo info, StreamingContext context)
: base (info, context)
{
}
-#endif
}
}
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Services/RemotingClientProxy.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Services/RemotingClientProxy.cs
index 9b734d7281f..f20eddf3552 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Services/RemotingClientProxy.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Services/RemotingClientProxy.cs
@@ -29,15 +29,11 @@
using System;
using System.ComponentModel;
-#if NET_2_0
using System.Runtime.InteropServices;
-#endif
namespace System.Runtime.Remoting.Services
{
-#if NET_2_0
[ComVisible (true)]
-#endif
public abstract class RemotingClientProxy: Component
{
protected object _tp;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 13:14:44 +0300