Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479

external/referencesource/SMDiagnostics/System/ServiceModel/Diagnostics/LegacyDiagnosticTrace.cs

@@ -66,10 +66,12 @@ namespace System.ServiceModel.Diagnostics
                 this.CreateTraceSource();
                 this.AddDomainEventHandlersForCleanup();
             }
+#if !NO_CONFIGURATION
             catch (ConfigurationErrorsException)
             {
                 throw;
             }
+#endif
             catch (Exception e)
             {
                 if (Fx.IsFatal(e))

external/referencesource/SMDiagnostics/System/ServiceModel/Diagnostics/MachineSettingsSection.cs

@@ -2,6 +2,7 @@
 // Copyright (c) Microsoft Corporation.  All rights reserved.
 //------------------------------------------------------------------------------
 
+#if !NO_CONFIGURATION
 namespace System.ServiceModel.Configuration
 {
     using System.Configuration;
@@ -51,5 +52,7 @@ namespace System.ServiceModel.Configuration
         }
     }
 }
+#endif
+
 
 

external/referencesource/SMDiagnostics/System/ServiceModel/Diagnostics/PiiTraceSource.cs

@@ -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,