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

@@ -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");