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

@@ -102,8 +102,12 @@ namespace System.Xml.Serialization {
return (bool) AppSettings.UseLegacySerializerGeneration;
}
else {
#if CONFIGURATION_DEP
XmlSerializerSection configSection = ConfigurationManager.GetSection(ConfigurationStrings.XmlSerializerSectionPath) as XmlSerializerSection;
return configSection == null ? false : configSection.UseLegacySerializerGeneration;
#else
return false;
#endif
}
}
}
@@ -663,8 +667,10 @@ namespace System.Xml.Serialization {
parameters.GenerateInMemory = true;
if (string.IsNullOrEmpty(location)) {
#if CONFIGURATION_DEP
XmlSerializerSection configSection = ConfigurationManager.GetSection(ConfigurationStrings.XmlSerializerSectionPath) as XmlSerializerSection;
location = configSection == null ? location : configSection.TempFilesLocation;
#endif
// Trim leading and trailing white spaces (VSWhidbey 229873)
if (!string.IsNullOrEmpty(location)) {
location = location.Trim();