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

Imported Upstream version 4.0.3.13

Browse Source 
Former-commit-id: 4f1f69b42e04def9a697c2550b23b9cae645ef29
This commit is contained in:
Xamarin Public Jenkins
2015-07-20 03:39:00 -04:00
parent 4cee7df5e0
commit 2c051c3d51
138 changed files with 3829 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ using System.ServiceModel.Security.Tokens;
namespace System.ServiceModel.Description
{
public class ClientCredentials
#if NET_2_1
#if NET_2_1 || XAMMAC_4_5
: IEndpointBehavior
#else
: SecurityCredentialsManager, IEndpointBehavior
@@ -128,7 +128,7 @@ namespace System.ServiceModel.Description
return new ClientCredentials (this);
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
public override SecurityTokenManager CreateSecurityTokenManager ()
{
return new ClientCredentialsSecurityTokenManager (this);

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

@@ -112,7 +112,7 @@ namespace System.ServiceModel.Description
{
}
#if !NET_2_1
#if !NET_2_1 && !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
#if !NET_2_1 && !XAMMAC_4_5
internal XsdDataContractImporter DataContractImporter { get; set; }
internal XmlSerializerMessageContractImporterInternal XmlSerializationImporter { get; set; }
internal System.CodeDom.CodeTypeReference CodeTypeReference { get; set; }

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

@@ -104,7 +104,7 @@ namespace System.ServiceModel.Description
{
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
void IWsdlExportExtension.ExportContract (
WsdlExporter exporter,
WsdlContractConversionContext context)