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

@ -39,9 +39,9 @@ namespace System.ServiceModel.Channels
{
ChannelManagerBase manager;
protected ChannelBase (ChannelManagerBase manager)
protected ChannelBase (ChannelManagerBase channelManager)
{
this.manager = manager;
this.manager = channelManager;
}
protected internal override TimeSpan DefaultCloseTimeout {