Imported Upstream version 4.6.0.182

Former-commit-id: 439c182e520038bf50777ca2fe684f216ae28552
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-09-01 10:46:18 +00:00
parent c911219690
commit 804b15604f
118 changed files with 1007 additions and 891 deletions

View File

@ -42,9 +42,9 @@ namespace System.ServiceModel.Channels
[MonoTODO]
public
MessageEncodingBindingElement (MessageEncodingBindingElement source)
MessageEncodingBindingElement (MessageEncodingBindingElement elementToBeCloned)
{
MessageVersion = source.MessageVersion;
MessageVersion = elementToBeCloned.MessageVersion;
}
public abstract MessageEncoderFactory
@ -52,11 +52,11 @@ namespace System.ServiceModel.Channels
public abstract MessageVersion MessageVersion { get; set; }
public override T GetProperty<T> (BindingContext ctx)
public override T GetProperty<T> (BindingContext context)
{
if (typeof (T) == typeof (MessageVersion))
return (T) (object) MessageVersion;
return ctx.GetInnerProperty<T> ();
return context.GetInnerProperty<T> ();
}
#if !NET_2_1 && !XAMMAC_4_5