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

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ChannelEndpointElement.cs
View File

@ -68,10 +68,8 @@ namespace System.ServiceModel.Configuration
static ConfigurationProperty headers;
static ConfigurationProperty identity;
static ConfigurationProperty name;
#if NET_4_0
static ConfigurationProperty endpoint_configuration;
static ConfigurationProperty kind;
#endif
static ChannelEndpointElement ()
{
@ -108,10 +106,8 @@ namespace System.ServiceModel.Configuration
typeof (string), "", new StringConverter (), null,
ConfigurationPropertyOptions.IsKey);
#if NET_4_0
endpoint_configuration = new ConfigurationProperty ("endpointConfiguration", typeof (string), "", null, new StringValidator (0), ConfigurationPropertyOptions.IsKey);
kind = new ConfigurationProperty ("kind", typeof (string), "", null, new StringValidator (0), ConfigurationPropertyOptions.IsKey);
#endif
properties.Add (address);
properties.Add (behavior_configuration);
@ -122,10 +118,8 @@ namespace System.ServiceModel.Configuration
properties.Add (identity);
properties.Add (name);
#if NET_4_0
properties.Add (endpoint_configuration);
properties.Add (kind);
#endif
}
public ChannelEndpointElement ()
@ -211,7 +205,6 @@ namespace System.ServiceModel.Configuration
set { base [name] = value; }
}
#if NET_4_0
[StringValidator (MinLength = 0)]
[ConfigurationProperty ("endpointConfiguration", DefaultValue = "", Options = ConfigurationPropertyOptions.IsKey)]
public string EndpointConfiguration {
@ -225,7 +218,6 @@ namespace System.ServiceModel.Configuration
get { return (string) base [kind]; }
set { base [kind] = value; }
}
#endif
protected override ConfigurationPropertyCollection Properties {
get { return properties; }