Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@ -47,7 +47,7 @@ namespace System.ServiceModel.Configuration
PropertyInformationCollection propertyInfo = this.ElementInformation.Properties;
if (propertyInfo[ConfigurationStrings.ChannelPoolSettings].ValueOrigin != PropertyValueOrigin.Default)
{
#pragma warning suppress 56506 // [....], base.ApplyConfiguration() validates the argument
#pragma warning suppress 56506 // Microsoft, base.ApplyConfiguration() validates the argument
this.ChannelPoolSettings.ApplyConfiguration(oneWayBindingElement.ChannelPoolSettings);
}
oneWayBindingElement.MaxAcceptedChannels = this.MaxAcceptedChannels;
@ -59,7 +59,7 @@ namespace System.ServiceModel.Configuration
base.CopyFrom(from);
OneWayElement source = (OneWayElement)from;
#pragma warning suppress 56506 // [....], base.CopyFrom() validates the argument
#pragma warning suppress 56506 // Microsoft, base.CopyFrom() validates the argument
PropertyInformationCollection propertyInfo = source.ElementInformation.Properties;
if (propertyInfo[ConfigurationStrings.ChannelPoolSettings].ValueOrigin != PropertyValueOrigin.Default)
{