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

@ -457,7 +457,7 @@ namespace System.ServiceModel.Dispatcher
this.matcher = matcher;
this.flags = QueryProcessingFlags.Match;
// PERF, [....], see if we can just let these to their default init
// PERF, Microsoft, see if we can just let these to their default init
this.messageAction = null;
//this.messageAddress = null;
//this.messageVia = null;
@ -510,7 +510,7 @@ namespace System.ServiceModel.Dispatcher
}
else
{
#pragma warning suppress 56503 // [....], property is more readable for this
#pragma warning suppress 56503 // Microsoft, property is more readable for this
throw DiagnosticUtility.ExceptionUtility.ThrowHelperCritical(new QueryProcessingException(QueryProcessingError.Unexpected));
}
this.counter = this.contextNode as INodeCounter;