Merge pull request #1500 from criteo-forks/criteo

[mono.git] / mcs / class / System.ServiceModel / System.ServiceModel.Configuration / ServiceEndpointElement.cs

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceEndpointElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceEndpointElement.cs
index b44abe84190f00b6494e27aa7433fec0a882e18e..952ba7a0a9e558a209496752f1f22303a65c2311 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceEndpointElement.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceEndpointElement.cs
@@ -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,