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

@@ -374,7 +374,7 @@ namespace System.Web.Services.Description {
foreach (XmlMembersMapping member in soapMembers)
soapExporter.ExportMembersMapping(member);
// NOTE, [....], we are sharing the SoapInclude and XmlInclude attributes of the
// NOTE, Microsoft, we are sharing the SoapInclude and XmlInclude attributes of the
// class among ALL classes generated, This is probably OK, since doing to per
// class would probably result in the same set of includes if the user
// has object as a return value (meaning 'all' types are OK).
@@ -1076,7 +1076,7 @@ namespace System.Web.Services.Description {
return true;
}
else if (soapBindingStyle == SoapBindingStyle.Document) {
// NOTE, [....]. WSDL doesn't really let us figure out whether a document is
// NOTE, Microsoft. WSDL doesn't really let us figure out whether a document is
// in fact a struct containing parameters, so we apply a little heuristic here
// in order to produce the appropriate programming model.
hasWrapper = (parts.Length == 1 && string.Compare(parts[0].Name, "parameters", StringComparison.Ordinal) == 0);

View File

@@ -36,7 +36,7 @@ namespace System.Web.Services.Discovery {
public DiscoveryDocument() {
}
// NOTE, [....]: This property is not really ignored by the xml serializer. Instead,
// NOTE, Microsoft: This property is not really ignored by the xml serializer. Instead,
// the attributes that would go here are configured in WebServicesConfiguration's
// DiscoveryDocumentSerializer property.
/// <include file='doc\DiscoveryDocument.uex' path='docs/doc[@for="DiscoveryDocument.References"]/*' />

View File

@@ -66,7 +66,7 @@ namespace System.Web.Services.Discovery {
public override string DefaultFilename {
get {
string filename = FilenameFromUrl(Url);
return Path.ChangeExtension(filename, ".disco"); // [[....]] change default extension
return Path.ChangeExtension(filename, ".disco"); // [Microsoft] change default extension
}
}

View File

@@ -140,7 +140,7 @@ namespace System.Web.Services.Discovery {
// -------------------------------------------------------------------------------
// Calculate root ADSI virtual directory name (func by '[....]').
// Calculate root ADSI virtual directory name (func by 'Microsoft').
private string GetWebServerForUrl(string url) {
Uri uri = new Uri(url);
DirectoryEntry w3Service = new DirectoryEntry("IIS://" + uri.Host + "/W3SVC");

View File

@@ -90,7 +90,7 @@ namespace System.Web.Services.Protocols {
/// <para>[To be supplied.]</para>
/// </devdoc>
protected WebClientProtocol() {
this.timeout = 100000; // should be kept in [....] with HttpWebRequest.Timeout default (see private WebRequest.DefaultTimeout)
this.timeout = 100000; // should be kept in sync with HttpWebRequest.Timeout default (see private WebRequest.DefaultTimeout)
}
internal WebClientProtocol(WebClientProtocol protocol) {

View File

@@ -20,7 +20,7 @@ namespace System.Web.Services.Protocols {
/// <para>[To be supplied.]</para>
/// </devdoc>
public enum LogicalMethodTypes {
/// <include file='doc\LogicalMethodInfo.uex' path='docs/doc[@for="LogicalMethodTypes.[....]"]/*' />
/// <include file='doc\LogicalMethodInfo.uex' path='docs/doc[@for="LogicalMethodTypes.Sync"]/*' />
/// <devdoc>
/// <para>[To be supplied.]</para>
/// </devdoc>
@@ -362,7 +362,7 @@ namespace System.Web.Services.Protocols {
/// <para>[To be supplied.]</para>
/// </devdoc>
public ICustomAttributeProvider CustomAttributeProvider {
// Custom attributes are always on the XXX ([....]) or BeginXXX (async) method.
// Custom attributes are always on the XXX (sync) or BeginXXX (async) method.
get { return methodInfo; }
}

View File

@@ -107,7 +107,7 @@ namespace System.Web.Services.Protocols {
}
/*
// [....]: adapted from UrlEscapeStringUnicode below
// Microsoft: adapted from UrlEscapeStringUnicode below
internal static string EscapeStringUnicode(string s) {
int l = s.Length;
StringBuilder sb = new StringBuilder(l);
@@ -126,7 +126,7 @@ namespace System.Web.Services.Protocols {
}
*/
// [....]: copied from System.Web.HttpUtility
// Microsoft: copied from System.Web.HttpUtility
internal static string UrlEscapeStringUnicode(string s) {
int l = s.Length;
StringBuilder sb = new StringBuilder(l);

View File

@@ -59,7 +59,7 @@ namespace System.Web.Services.Protocols {
/// <devdoc>
/// <para>[To be supplied.]</para>
/// </devdoc>
// NOTE, [....]: The SOAP 1.1 is unclear on whether the detail element can or should be qualified.
// NOTE, Microsoft: The SOAP 1.1 is unclear on whether the detail element can or should be qualified.
// Based on consensus about the intent, we will not qualify it.
public static readonly XmlQualifiedName DetailElementName = new XmlQualifiedName(Soap.Element.FaultDetail, "");