Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -18,8 +18,10 @@ namespace System.Diagnostics {
[ThreadStatic]
static int indentLevel;
static volatile int indentSize;
#if CONFIGURATION_DEP
static volatile bool settingsInitialized;
static volatile bool defaultInitialized;
#endif
// this is internal so TraceSource can use it. We want to lock on the same object because both TraceInternal and
@@ -62,7 +64,7 @@ namespace System.Diagnostics {
internal static string AppName {
get {
if (appName == null) {
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
new EnvironmentPermission(EnvironmentPermissionAccess.Read, "Path").Assert();
#endif
appName = Path.GetFileName(Environment.GetCommandLineArgs()[0]);
@@ -303,7 +305,9 @@ namespace System.Diagnostics {
// in the System.Diagnostics.Trace class
static internal void Refresh() {
lock (critSec) {
#if CONFIGURATION_DEP
settingsInitialized = false;
#endif
listeners = null;
}
InitializeSettings();