Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
2015-08-26 07:17:56 -04:00
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions
--- a/external/referencesource/System.Xml/System/Xml/Serialization/AppSettings.cs
+++ b/external/referencesource/System.Xml/System/Xml/Serialization/AppSettings.cs
@@ -25,6 +25,7 @@ namespace System.Xml.Serialization {
        }

        static void EnsureSettingsLoaded() {
+#if CONFIGURATION_DEP
            if (!settingsInitalized) {
                lock (appSettingsLock) {
                    if (!settingsInitalized) {
@@ -48,6 +49,7 @@ namespace System.Xml.Serialization {
                    }
                }
            }
+#endif
        }
    }
 }