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

@ -197,7 +197,7 @@ namespace System.ServiceModel.Channels
lock (ThisLock)
{
if (closed)
#pragma warning suppress 56503 // [....], Invalid State after dispose
#pragma warning suppress 56503 // Microsoft, Invalid State after dispose
throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(CreateBufferDisposedException());
return messageData.Buffer.Count;
}
@ -224,7 +224,7 @@ namespace System.ServiceModel.Channels
lock (ThisLock)
{
if (closed)
#pragma warning suppress 56503 // [....], Invalid State after dispose
#pragma warning suppress 56503 // Microsoft, Invalid State after dispose
throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(CreateBufferDisposedException());
return messageData.MessageEncoder.ContentType;
}