Imported Upstream version 4.0.0~alpha1

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

View File

@ -71,11 +71,9 @@ namespace System.ServiceModel.Configuration
static ConfigurationProperty listen_uri;
static ConfigurationProperty listen_uri_mode;
static ConfigurationProperty name;
#if NET_4_0
static ConfigurationProperty endpoint_configuration;
static ConfigurationProperty is_system_endpoint;
static ConfigurationProperty kind;
#endif
static ServiceEndpointElement ()
{
@ -128,11 +126,9 @@ namespace System.ServiceModel.Configuration
typeof (string), "", new StringConverter (), new StringValidator (0, int.MaxValue, null),
ConfigurationPropertyOptions.None);
#if NET_4_0
endpoint_configuration = new ConfigurationProperty ("endpointConfiguration", typeof (string), "", null, new StringValidator (0), ConfigurationPropertyOptions.IsKey);
is_system_endpoint = new ConfigurationProperty ("isSystemEndpoint", typeof (bool), false, null, null, ConfigurationPropertyOptions.None);
kind = new ConfigurationProperty ("kind", typeof (string), "", null, new StringValidator (0), ConfigurationPropertyOptions.IsKey);
#endif
properties.Add (address);
properties.Add (behavior_configuration);
@ -147,11 +143,9 @@ namespace System.ServiceModel.Configuration
properties.Add (listen_uri_mode);
properties.Add (name);
#if NET_4_0
properties.Add (endpoint_configuration);
properties.Add (is_system_endpoint);
properties.Add (kind);
#endif
}
public ServiceEndpointElement ()
@ -253,7 +247,6 @@ namespace System.ServiceModel.Configuration
get { return (IdentityElement) base [identity]; }
}
#if NET_4_0
[StringValidator (MinLength = 0)]
[ConfigurationProperty ("endpointConfiguration", DefaultValue = "", Options = ConfigurationPropertyOptions.IsKey)]
public string EndpointConfiguration {
@ -273,7 +266,6 @@ namespace System.ServiceModel.Configuration
get { return (string) base [kind]; }
set { base [kind] = value; }
}
#endif
[ConfigurationProperty ("listenUri",
Options = ConfigurationPropertyOptions.None,