Reduce !MOBILE scope in XmlReaderSettings. They are in use.
authorAtsushi Eno <atsushieno@gmail.com>
Tue, 3 Feb 2015 11:51:06 +0000 (19:51 +0800)
committerMarek Safar <marek.safar@gmail.com>
Mon, 2 May 2016 22:07:55 +0000 (00:07 +0200)
mcs/class/referencesource/System.Xml/System/Xml/Core/XmlReaderSettings.cs

index a8a04851d09b578a90f1b01b219d59a416bbdf3b..3b87f5a4c5e48873a7f9097bef0854c159b8d593 100644 (file)
@@ -138,7 +138,7 @@ namespace System.Xml {
             return xmlResolver;
         }
 
-#if !SILVERLIGHT && !MOBILE
+#if !SILVERLIGHT
         //This is used by get XmlResolver in Xsd.
         //Check if the config set to prohibit default resovler
         //notice we must keep GetXmlResolver() to avoid dead lock when init System.Config.ConfigurationManager
@@ -705,7 +705,7 @@ namespace System.Xml {
             }
         }
 
-#if !SILVERLIGHT && !MOBILE
+#if !SILVERLIGHT
         private static bool? s_enableLegacyXmlSettings = null;
 
         static internal bool EnableLegacyXmlSettings()
@@ -722,16 +722,19 @@ namespace System.Xml {
             }
 
             bool enableSettings = false; // default value
+#if !MOBILE
             if (!ReadSettingsFromRegistry(Registry.LocalMachine, ref enableSettings))
             {
                 // still ok if this call return false too as we'll use the default value which is false
                 ReadSettingsFromRegistry(Registry.CurrentUser, ref enableSettings);
             }
+#endif
 
             s_enableLegacyXmlSettings = enableSettings;
             return s_enableLegacyXmlSettings.Value;
         }
 
+#if !MOBILE
         [RegistryPermission(SecurityAction.Assert, Unrestricted = true)]
         [SecuritySafeCritical]
         private static bool ReadSettingsFromRegistry(RegistryKey hive, ref bool value)
@@ -757,6 +760,7 @@ namespace System.Xml {
 
             return false;
         }
+#endif // MOBILE
 
 #endif // SILVERLIGHT