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

@@ -71,6 +71,13 @@ namespace System.Web.Services.Configuration
// Update paths
// If we're not running in the context of a web application then skip this setting.
#if MONO_BROKEN_CONFIGURATION_DLL
try {
var hack = this.EvaluationContext;
} catch (ConfigurationErrorsException) {
return;
}
#endif
ContextInformation context = this.EvaluationContext;
WebContext webContext = context.HostingContext as WebContext;
if (webContext == null)
@@ -115,6 +122,14 @@ namespace System.Web.Services.Configuration
PartialTrustHelpers.FailIfInPartialTrustOutsideAspNet();
WsdlHelpGeneratorElement parent = (WsdlHelpGeneratorElement)parentElement;
#if MONO_BROKEN_CONFIGURATION_DLL
try {
var hack = this.EvaluationContext;
} catch (ConfigurationErrorsException) {
base.Reset(parentElement);
return;
}
#endif
ContextInformation context = this.EvaluationContext;
WebContext webContext = context.HostingContext as WebContext;
if (webContext != null)