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

Imported Upstream version 4.8.0.309

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

12
mcs/class/System.ServiceModel/System.ServiceModel/EndpointAddress.cs
View File

@ -37,7 +37,7 @@ using System.Xml.Schema;
using System.Xml.Serialization;
using System.ServiceModel.Channels;
using System.ServiceModel.Description;
#if !NET_2_1
#if !MOBILE
using System.Security.Cryptography.Xml;
#endif
@ -116,7 +116,7 @@ namespace System.ServiceModel
get { return address; }
}
#if !NET_2_1
#if !MOBILE
internal static XmlSchema Schema {
get {
if (schema == null) {
@ -187,7 +187,7 @@ namespace System.ServiceModel
return ! (address1 == address2);
}
//#if !NET_2_1
//#if !MOBILE
public static EndpointAddress ReadFrom (
XmlDictionaryReader reader)
{
@ -296,7 +296,7 @@ namespace System.ServiceModel
addressingVersion.Namespace, reader.LocalName, reader.NamespaceURI));
reader.MoveToContent ();
#if !NET_2_1
#if !MOBILE
MetadataSet metadata = null;
if (reader.LocalName == "Metadata" &&
reader.NamespaceURI == addressingVersion.Namespace &&
@ -317,7 +317,7 @@ namespace System.ServiceModel
if (addressingVersion == AddressingVersion.WSAddressing10 && uri == w3c_anonymous)
uri = anonymous_role;
#if NET_2_1
#if MOBILE
return new EndpointAddress (uri, identity);
#else
if (metadata == null)
@ -338,7 +338,7 @@ namespace System.ServiceModel
{
if (writer == null)
throw new ArgumentNullException ("writer");
#if NET_2_1
#if MOBILE
if (addressingVersion == AddressingVersion.None) {
writer.WriteString (Uri.AbsoluteUri);
} else {