Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@ -81,7 +81,7 @@ namespace System.ServiceModel.Channels
q.MaxStringContentLength = (int) MaxReceivedMessageSize;
return (T) (object) q;
}
#if !NET_2_1
#if !MOBILE
if (typeof (T) == typeof (ChannelProtectionRequirements))
// blank one, basically it should not be used
// for any secure channels (
@ -92,7 +92,7 @@ namespace System.ServiceModel.Channels
return context.GetInnerProperty<T> ();
}
#if !NET_2_1 && !XAMMAC_4_5
#if !MOBILE && !XAMMAC_4_5
internal static XmlElement CreateTransportBinding (XmlElement transportToken)
{
var doc = new XmlDocument ();