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

@ -327,7 +327,7 @@ namespace System.ServiceModel.Channels
return;
if (MessageVersion.Addressing.Equals (AddressingVersion.WSAddressing10))
Add (MessageHeader.CreateHeader (name, ns, EndpointAddress10.FromEndpointAddress (address)));
#if !NET_2_1
#if !MOBILE
else if (MessageVersion.Addressing.Equals (AddressingVersion.WSAddressingAugust2004))
Add (MessageHeader.CreateHeader (name, ns, EndpointAddressAugust2004.FromEndpointAddress (address)));
#endif