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

@ -79,13 +79,11 @@ namespace System.ServiceModel.Configuration
get { return (ExtensionElementCollection) base ["bindingExtensions"]; }
}
#if NET_4_0
[ConfigurationProperty ("endpointExtensions",
Options = ConfigurationPropertyOptions.None)]
public ExtensionElementCollection EndpointExtensions {
get { return (ExtensionElementCollection) base ["endpointExtensions"]; }
}
#endif
protected override ConfigurationPropertyCollection Properties {
get {
@ -94,9 +92,7 @@ namespace System.ServiceModel.Configuration
_properties.Add (new ConfigurationProperty ("behaviorExtensions", typeof (ExtensionElementCollection), null, null, null, ConfigurationPropertyOptions.None));
_properties.Add (new ConfigurationProperty ("bindingElementExtensions", typeof (ExtensionElementCollection), null, null, null, ConfigurationPropertyOptions.None));
_properties.Add (new ConfigurationProperty ("bindingExtensions", typeof (ExtensionElementCollection), null, null, null, ConfigurationPropertyOptions.None));
#if NET_4_0
_properties.Add (new ConfigurationProperty ("endpointExtensions", typeof (ExtensionElementCollection), null, null, null, ConfigurationPropertyOptions.None));
#endif
}
return _properties;
}
@ -106,9 +102,7 @@ namespace System.ServiceModel.Configuration
InitializeBehaviorExtensionsDefault ();
InitializeBindingElementExtensionsDefault ();
InitializeBindingExtensionsDefault ();
#if NET_4_0
InitializeEndpointExtensionsDefault ();
#endif
}
void InitializeBindingExtensionsDefault () {
@ -171,11 +165,9 @@ namespace System.ServiceModel.Configuration
BehaviorExtensions.Add (new ExtensionElement ("transactedBatching", typeof (TransactedBatchingElement).AssemblyQualifiedName));
}
#if NET_4_0
void InitializeEndpointExtensionsDefault () {
EndpointExtensions.Add (new ExtensionElement ("mexEndpoint", typeof (ServiceMetadataEndpointCollectionElement).AssemblyQualifiedName));
}
#endif
}
}