diff options
Diffstat (limited to 'mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs')
| -rw-r--r-- | mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs b/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs index 5b09e23b4a1..368b25899fb 100644 --- a/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs +++ b/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs @@ -58,10 +58,8 @@ namespace System.Web.UI string privateBinPath; string baseDir; string baseVDir; -#if !NET_2_0 +#if !CONFIGURATION_2_0 CompilationConfiguration compilationConfig; -#else - TextReader reader; #endif int appAssemblyIndex = -1; Type cachedType; @@ -82,7 +80,7 @@ namespace System.Web.UI if (location != typeof (TemplateParser).Assembly.Location) appAssemblyIndex = assemblies.Add (location); -#if NET_2_0 +#if CONFIGURATION_2_0 bool addAssembliesInBin = false; foreach (AssemblyInfo info in CompilationConfig.Assemblies) { if (info.Assembly == "*") @@ -98,17 +96,13 @@ namespace System.Web.UI AddAssembliesInBin (); #endif +#if !CONFIGURATION_2_0 +#endif + language = CompilationConfig.DefaultLanguage; GetDirectivesAndContent (); } -#if NET_2_0 - internal SimpleWebHandlerParser (HttpContext context, string virtualPath, string physicalPath, TextReader reader) - : this (context, virtualPath, physicalPath) - { - this.reader = reader; - } -#endif protected Type GetCompiledTypeFromCache () { @@ -471,17 +465,12 @@ namespace System.Web.UI } } -#if NET_2_0 +#if CONFIGURATION_2_0 CompilationSection CompilationConfig { get { - return (CompilationSection)WebConfigurationManager.GetSection ("system.web/compilation"); + return (CompilationSection)WebConfigurationManager.GetWebApplicationSection ("system.web/compilation"); } } - - internal TextReader Reader { - get { return reader; } - set { reader = value; } - } #else internal CompilationConfiguration CompilationConfig { get { |