mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.2.0.179

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

11
mcs/class/System.ServiceModel/System.ServiceModel.Description/MessageDescription.cs
View File

@ -99,17 +99,6 @@ namespace System.ServiceModel.Description
#region internals required for moonlight compatibility
#if NET_2_1 // it uses S.R.Serialization internals which is InternalVisible to this assembly only in 2.1. So, DON'T use this member in full 2.0 profile.
XmlName msg_name;
internal XmlName MessageName {
get {
if (msg_name == null)
msg_name = new XmlName (KnownTypeCollection.GetStaticQName (MessageType).Name);
return msg_name;
}
}
#endif
internal bool IsTypedMessage {
get { return MessageType == null; }
}

13
mcs/class/System.ServiceModel/System.ServiceModel.Description/MetadataExchangeClient.cs
View File

@ -53,6 +53,7 @@ namespace System.ServiceModel.Description
EndpointAddress address;
SMBinding binding;
MetadataExchangeClientMode mode = MetadataExchangeClientMode.MetadataExchange;
TimeSpan? operation_timeout = null;
// constructors
@ -88,7 +89,17 @@ namespace System.ServiceModel.Description
[MonoTODO]
public int MaximumResolvedReferences { get; set; }
public TimeSpan OperationTimeout { get; set; }
public TimeSpan OperationTimeout {
get {
if (!this.operation_timeout.HasValue) {
this.operation_timeout = DefaultCommunicationTimeouts.Instance.ReceiveTimeout;
}
return this.operation_timeout.Value;
}
set {
this.operation_timeout = value;
}
}
[MonoTODO]
public bool ResolveMetadataReferences { get; set; }

9
mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlExporter.cs
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);