Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@@ -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)]

View File

@@ -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
}
}

View File

@@ -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

View File

@@ -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,

View File

@@ -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
}
}
}

View File

@@ -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 ();

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

Some files were not shown because too many files have changed in this diff Show More