Imported Upstream version 4.4.2.4

Former-commit-id: 92904c9c5915c37244316e42ba99e7b934ed7ee2
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-07-21 09:40:10 +00:00
parent 589d484eee
commit 0b4a830db1
343 changed files with 9849 additions and 688 deletions

View File

@ -33,7 +33,9 @@ using System.Net;
using System.ServiceModel.Channels;
using System.ServiceModel.Description;
using System.Xml;
#if !MOBILE && !XAMMAC_4_5
using WS = System.Web.Services.Description;
#endif
namespace System.ServiceModel.Channels
{
@ -119,6 +121,7 @@ namespace System.ServiceModel.Channels
return false;
}
#if !MOBILE && !XAMMAC_4_5
public override bool CanBuildChannelListener<TChannel> (
BindingContext context)
{
@ -132,6 +135,7 @@ namespace System.ServiceModel.Channels
}
return false;
}
#endif
public override T GetProperty<T> (BindingContext context)
{
@ -141,6 +145,7 @@ namespace System.ServiceModel.Channels
return base.GetProperty<T> (context);
}
#if !MOBILE && !XAMMAC_4_5
void IWsdlExportExtension.ExportContract (WsdlExporter exporter,
WsdlContractConversionContext context)
{
@ -192,5 +197,6 @@ namespace System.ServiceModel.Channels
transfer_mode == TransferMode.StreamedResponse)
assertions.Add (doc.CreateElement ("msf", "Streamed", "http://schemas.microsoft.com/ws/2006/05/framing/policy"));
}
#endif
}
}

View File

@ -43,16 +43,21 @@ namespace System.ServiceModel.Channels
{
public SslStreamSecurityBindingElement ()
{
#if !MOBILE && !XAMMAC_4_5
verifier = IdentityVerifier.CreateDefault ();
#endif
}
#if !MOBILE && !XAMMAC_4_5
IdentityVerifier verifier;
bool require_client_certificate;
public IdentityVerifier IdentityVerifier {
get { return verifier; }
set { verifier = value; }
}
#endif
bool require_client_certificate;
public bool RequireClientCertificate {
get { return require_client_certificate; }
@ -63,10 +68,13 @@ namespace System.ServiceModel.Channels
SslStreamSecurityBindingElement other)
: base (other)
{
#if !MOBILE && !XAMMAC_4_5
verifier = other.verifier;
#endif
require_client_certificate = other.require_client_certificate;
}
#if !MOBILE && !XAMMAC_4_5
[MonoTODO]
public StreamUpgradeProvider BuildClientStreamUpgradeProvider (BindingContext context)
{
@ -87,6 +95,7 @@ namespace System.ServiceModel.Channels
"msf", "SslTransportSecurity", PolicyImportHelper.FramingPolicyNS);
return element;
}
#endif
[MonoTODO]
public override IChannelFactory<TChannel>
@ -96,6 +105,7 @@ namespace System.ServiceModel.Channels
throw new NotImplementedException ();
}
#if !MOBILE && !XAMMAC_4_5
[MonoTODO]
public override IChannelListener<TChannel>
BuildChannelListener<TChannel> (
@ -103,6 +113,7 @@ namespace System.ServiceModel.Channels
{
throw new NotImplementedException ();
}
#endif
[MonoTODO]
public override bool CanBuildChannelFactory<TChannel> (
@ -111,12 +122,14 @@ namespace System.ServiceModel.Channels
throw new NotImplementedException ();
}
#if !MOBILE && !XAMMAC_4_5
[MonoTODO]
public override bool CanBuildChannelListener<TChannel> (
BindingContext context)
{
throw new NotImplementedException ();
}
#endif
public override BindingElement Clone ()
{
@ -129,6 +142,7 @@ namespace System.ServiceModel.Channels
throw new NotImplementedException ();
}
#if !MOBILE && !XAMMAC_4_5
#region explicit interface implementations
[MonoTODO]
void IPolicyExportExtension.ExportPolicy (
@ -140,5 +154,6 @@ namespace System.ServiceModel.Channels
context.GetBindingAssertions ().Add (transportBinding);
}
#endregion
#endif
}
}

View File

@ -31,7 +31,9 @@ using System;
using System.Collections.Generic;
using System.Net;
using System.ServiceModel.Channels;
#if !MOBILE && !XAMMAC_4_5
using System.ServiceModel.Channels.NetTcp;
#endif
using System.ServiceModel.Description;
namespace System.ServiceModel.Channels
@ -88,9 +90,15 @@ namespace System.ServiceModel.Channels
{
if (!CanBuildChannelFactory<TChannel> (context))
throw new InvalidOperationException (String.Format ("Not supported channel factory type '{0}'", typeof (TChannel)));
#if !MOBILE && !XAMMAC_4_5
return new TcpChannelFactory<TChannel> (this, context);
#else
throw new NotImplementedException ();
#endif
}
#if !MOBILE && !XAMMAC_4_5
public override IChannelListener<TChannel>
BuildChannelListener<TChannel> (
BindingContext context)
@ -99,6 +107,7 @@ namespace System.ServiceModel.Channels
throw new InvalidOperationException (String.Format ("Not supported channel listener type '{0}'", typeof (TChannel)));
return new TcpChannelListener<TChannel> (this, context);
}
#endif
public override BindingElement Clone ()
{

View File

@ -56,7 +56,7 @@ namespace System.ServiceModel.Channels
max_recv_message_size = other.max_recv_message_size;
}
public bool ManualAddressing {
public virtual bool ManualAddressing {
get { return manual_addressing; }
set { manual_addressing = value; }
}

View File

@ -61,12 +61,14 @@ namespace System.ServiceModel.Channels
return context.BuildInnerChannelFactory<TChannel> ();
}
#if !MOBILE && !XAMMAC_4_5
public override IChannelListener<TChannel>
BuildChannelListener<TChannel> (
BindingContext context)
{
return context.BuildInnerChannelListener<TChannel> ();
}
#endif
public override bool CanBuildChannelFactory<TChannel> (
BindingContext context)
@ -74,11 +76,13 @@ namespace System.ServiceModel.Channels
return context.CanBuildInnerChannelFactory<TChannel> ();
}
#if !MOBILE && !XAMMAC_4_5
public override bool CanBuildChannelListener<TChannel> (
BindingContext context)
{
return context.CanBuildInnerChannelListener<TChannel> ();
}
#endif
public override BindingElement Clone ()
{
@ -89,8 +93,10 @@ namespace System.ServiceModel.Channels
{
if (typeof (T) == typeof (ISecurityCapabilities))
return (T) (object) this;
#if !MOBILE && !XAMMAC_4_5
if (typeof (T) == typeof (IdentityVerifier))
return (T) (object) IdentityVerifier.CreateDefault ();
#endif
return null;
}
@ -120,6 +126,7 @@ namespace System.ServiceModel.Channels
get { throw new NotImplementedException (); }
}
#if !MOBILE && !XAMMAC_4_5
[MonoTODO]
void IPolicyExportExtension.ExportPolicy (
MetadataExporter exporter,
@ -141,6 +148,7 @@ namespace System.ServiceModel.Channels
element.AppendChild (protectionLevel);
return element;
}
#endif
#endregion
}
}