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

@@ -1727,6 +1727,7 @@ namespace System.Xml.Serialization {
internal static string TempFilesLocation {
get {
if (tempFilesLocation == null) {
#if CONFIGURATION_DEP
// Return different XmlSerializerSection from legacy assembly due to its register config handlers
object section = ConfigurationManager.GetSection(ConfigurationStrings.XmlSerializerSectionPath);
string location = null;
@@ -1736,6 +1737,9 @@ namespace System.Xml.Serialization {
location = configSection.TempFilesLocation;
}
}
#else
string location = null;
#endif
if (location != null) {
tempFilesLocation = location.Trim();
}