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

@ -17,6 +17,7 @@ using XmlSerialization = System.Xml.Serialization;
#if WEB_EXTENSIONS_CODE
using System.Web.Resources;
using System.Diagnostics.CodeAnalysis;
#else
using Microsoft.VSDesigner.WCF.Resources;
#endif
@ -551,6 +552,7 @@ namespace Microsoft.VSDesigner.WCFModel
/// </summary>
/// <param name="contentReader"></param>
/// <remarks></remarks>
[SuppressMessage("Microsoft.Security.Xml", "CA3054:DoNotAllowDtdOnXmlTextReader", Justification = "Legacy code that trusts our developer-controlled input.")]
private void LoadContentFromTextReader(TextReader contentReader)
{
if (contentReader == null)
@ -597,6 +599,7 @@ namespace Microsoft.VSDesigner.WCFModel
/// </summary>
/// <return></return>
/// <remarks></remarks>
[SuppressMessage("Microsoft.Security.Xml", "CA3054:DoNotAllowDtdOnXmlTextReader", Justification = "Legacy code that trusts our developer-controlled input.")]
private MetadataContent LoadMetadataContent(MetadataType fileType)
{
if (ErrorInLoading != null)