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/DiagnosticSection.cs
View File

@ -59,10 +59,8 @@ namespace System.ServiceModel.Configuration
{
// Static Fields
static ConfigurationPropertyCollection properties;
#if NET_4_0
static ConfigurationProperty end_to_end_tracing;
static ConfigurationProperty etw_provider_id;
#endif
static ConfigurationProperty message_logging;
static ConfigurationProperty performance_counters;
static ConfigurationProperty performance_counter_enabled;
@ -71,11 +69,9 @@ namespace System.ServiceModel.Configuration
static DiagnosticSection ()
{
properties = new ConfigurationPropertyCollection ();
#if NET_4_0
end_to_end_tracing = new ConfigurationProperty ("endToEndTracing", typeof (EndToEndTracingElement), null, null, null, ConfigurationPropertyOptions.None);
etw_provider_id = new ConfigurationProperty ("etwProviderId", typeof (string), null, null, null, ConfigurationPropertyOptions.None);
#endif
message_logging = new ConfigurationProperty ("messageLogging", typeof (MessageLoggingElement), null, null, null, ConfigurationPropertyOptions.None);
performance_counters = new ConfigurationProperty ("performanceCounters", typeof (PerformanceCounterScope), "Off", null, null, ConfigurationPropertyOptions.None);
@ -85,10 +81,8 @@ namespace System.ServiceModel.Configuration
wmi_provider_enabled = new ConfigurationProperty ("wmiProviderEnabled",
typeof (bool), "false", new BooleanConverter (), null, ConfigurationPropertyOptions.None);
#if NET_4_0
properties.Add (end_to_end_tracing);
properties.Add (etw_provider_id);
#endif
properties.Add (message_logging);
properties.Add (performance_counters);
properties.Add (performance_counter_enabled);
@ -102,7 +96,6 @@ namespace System.ServiceModel.Configuration
// Properties
#if NET_4_0
[ConfigurationProperty ("endToEndTracing", Options = ConfigurationPropertyOptions.None)]
public EndToEndTracingElement EndToEndTracing {
get { return (EndToEndTracingElement) base [end_to_end_tracing]; }
@ -114,7 +107,6 @@ namespace System.ServiceModel.Configuration
get { return (string) base [etw_provider_id]; }
set { base [etw_provider_id] = value; }
}
#endif
[ConfigurationProperty ("messageLogging",
Options = ConfigurationPropertyOptions.None)]