Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -4,11 +4,15 @@
namespace System.ServiceModel.Diagnostics
{
#if !NO_CONFIGURATION
using System.Configuration;
#endif
using System.Diagnostics;
using System.Runtime;
using System.Runtime.Diagnostics;
#if !NO_CONFIGURATION
using System.ServiceModel.Configuration;
#endif
class PiiTraceSource : TraceSource
{
@@ -59,7 +63,11 @@ namespace System.ServiceModel.Diagnostics
#pragma warning disable 618
System.Runtime.Diagnostics.EventLogger logger = new System.Runtime.Diagnostics.EventLogger(this.eventSourceName, null);
#pragma warning restore 618
#if !NO_CONFIGURATION
if (MachineSettingsSection.EnableLoggingKnownPii)
#else
if (false)
#endif
{
logger.LogEvent(TraceEventType.Information,
(ushort)System.Runtime.Diagnostics.EventLogCategory.MessageLogging,