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

10
mcs/class/System.ServiceModel/System.ServiceModel.Description/ClientCredentials.cs
View File

@@ -31,7 +31,7 @@ using System.ServiceModel.Channels;
using System.ServiceModel.Description;
using System.ServiceModel.Dispatcher;
using System.ServiceModel.Security;
#if !NET_2_1
#if !MOBILE
using System.IdentityModel.Selectors;
using System.IdentityModel.Tokens;
using System.ServiceModel.Security.Tokens;
@@ -40,7 +40,7 @@ using System.ServiceModel.Security.Tokens;
namespace System.ServiceModel.Description
{
public class ClientCredentials
#if NET_2_1 || XAMMAC_4_5
#if MOBILE || XAMMAC_4_5
: IEndpointBehavior
#else
: SecurityCredentialsManager, IEndpointBehavior
@@ -58,7 +58,7 @@ namespace System.ServiceModel.Description
initiator = other.initiator.Clone ();
recipient = other.recipient.Clone ();
windows = other.windows.Clone ();
#if !NET_2_1
#if !MOBILE
issued_token = other.issued_token.Clone ();
peer = other.peer.Clone ();
support_interactive = other.support_interactive;
@@ -93,7 +93,7 @@ namespace System.ServiceModel.Description
get { return windows; }
}
#if !NET_2_1
#if !MOBILE
IssuedTokenClientCredential issued_token =
new IssuedTokenClientCredential ();
PeerCredential peer = new PeerCredential ();
@@ -130,7 +130,7 @@ namespace System.ServiceModel.Description
return new ClientCredentials (this);
}
#if !NET_2_1 && !XAMMAC_4_5
#if !MOBILE && !XAMMAC_4_5
public override SecurityTokenManager CreateSecurityTokenManager ()
{
return new ClientCredentialsSecurityTokenManager (this);

4
mcs/class/System.ServiceModel/System.ServiceModel.Description/ContractDescriptionGenerator.cs
View File

@@ -373,7 +373,7 @@ namespace System.ServiceModel.Description
var fname = a.Name ?? a.DetailType.Name + "Fault";
var fns = a.Namespace ?? cd.Namespace;
var fd = new FaultDescription (a.Action ?? cd.Namespace + cd.Name + "/" + od.Name + fname) { DetailType = a.DetailType, Name = fname, Namespace = fns };
#if !NET_2_1
#if !MOBILE
if (a.HasProtectionLevel)
fd.ProtectionLevel = a.ProtectionLevel;
#endif
@@ -400,7 +400,7 @@ namespace System.ServiceModel.Description
foreach (object obj in serviceMethod.GetCustomAttributes (typeof(IOperationBehavior),true))
od.Behaviors.Add ((IOperationBehavior) obj);
}
#if !NET_2_1
#if !MOBILE
if (od.Behaviors.Find<OperationBehaviorAttribute>() == null)
od.Behaviors.Add (new OperationBehaviorAttribute ());
#endif

8
mcs/class/System.ServiceModel/System.ServiceModel.Description/DataContractSerializerOperationBehavior.cs
View File

@@ -65,13 +65,13 @@ namespace System.ServiceModel.Description
public int MaxItemsInObjectGraph { get; set; }
#if !NET_2_1
#if !MOBILE
public IDataContractSurrogate DataContractSurrogate { get; set; }
#endif
public virtual XmlObjectSerializer CreateSerializer (Type type, string name, string ns, IList<Type> knownTypes)
{
#if NET_2_1
#if MOBILE
return new DataContractSerializer (type, name, ns, knownTypes);
#else
return new DataContractSerializer (type, name, ns, knownTypes, MaxItemsInObjectGraph, IgnoreExtensionDataObject, false, DataContractSurrogate);
@@ -80,7 +80,7 @@ namespace System.ServiceModel.Description
public virtual XmlObjectSerializer CreateSerializer (Type type, XmlDictionaryString name, XmlDictionaryString ns, IList<Type> knownTypes)
{
#if NET_2_1
#if MOBILE
return new DataContractSerializer (type, name, ns, knownTypes);
#else
return new DataContractSerializer (type, name, ns, knownTypes, MaxItemsInObjectGraph, IgnoreExtensionDataObject, false, DataContractSurrogate);
@@ -112,7 +112,7 @@ namespace System.ServiceModel.Description
{
}
#if !NET_2_1 && !XAMMAC_4_5
#if !MOBILE && !XAMMAC_4_5
//IWsdlExportExtension
void IWsdlExportExtension.ExportContract (WsdlExporter exporter,

2
mcs/class/System.ServiceModel/System.ServiceModel.Description/MessagePartDescription.cs
View File

@@ -100,7 +100,7 @@ namespace System.ServiceModel.Description
set { type = value; }
}
#if !NET_2_1 && !XAMMAC_4_5
#if !MOBILE && !XAMMAC_4_5
internal XsdDataContractImporter DataContractImporter { get; set; }
internal XmlSerializerMessageContractImporterInternal XmlSerializationImporter { get; set; }
internal System.CodeDom.CodeTypeReference CodeTypeReference { get; set; }

4
mcs/class/System.ServiceModel/System.ServiceModel.Description/XmlSerializerOperationBehavior.cs
View File

@@ -36,7 +36,7 @@ namespace System.ServiceModel.Description
{
public class XmlSerializerOperationBehavior
: IOperationBehavior
#if !NET_2_1
#if !MOBILE
, IWsdlExportExtension
#endif
{
@@ -104,7 +104,7 @@ namespace System.ServiceModel.Description
{
}
#if !NET_2_1 && !XAMMAC_4_5
#if !MOBILE && !XAMMAC_4_5
void IWsdlExportExtension.ExportContract (
WsdlExporter exporter,
WsdlContractConversionContext context)