Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -96,8 +96,9 @@ namespace System.ServiceModel.Description
MetadataSection.CreateFromServiceDescription (sd));
foreach (XmlSchema xs in GeneratedXmlSchemas.Schemas ())
metadata.MetadataSections.Add (
MetadataSection.CreateFromSchema (xs));
if (xs.TargetNamespace != XmlSchema.Namespace)
metadata.MetadataSections.Add (
MetadataSection.CreateFromSchema (xs));
return metadata;
}
@@ -459,7 +460,6 @@ namespace System.ServiceModel.Description
get {
if (xsd_exporter == null)
xsd_exporter = new XsdDataContractExporter ();
return xsd_exporter;
}
}
@@ -651,6 +651,9 @@ namespace System.ServiceModel.Description
return;
}
if (ns == string.Empty)
return;
XmlSchemaImport imp = new XmlSchemaImport ();
imp.Namespace = ns;
schema.Includes.Add (imp);