merge -r 58784:58785

[mono.git] / mcs / class / System.Web / System.Web.UI / TemplateParser.cs

diff --git a/mcs/class/System.Web/System.Web.UI/TemplateParser.cs b/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
index b86efda451b4dfebbc0e08f2ee7b43123e01e86d..8a82aca3bbfad06f20414100410a2327c214b2dd 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
+++ b/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
@@ -69,8 +69,7 @@ namespace System.Web.UI {
                OutputCacheLocation oc_location;
                Assembly srcAssembly;
                int appAssemblyIndex = -1;
-
-               [MonoTODO ("deal with AddAssembliesInBin in the 2.0 case")]
+                
                internal TemplateParser ()
                {
                        imports = new ArrayList ();
@@ -89,15 +88,10 @@ namespace System.Web.UI {
                        imports.Add ("System.Web.UI.HtmlControls");
 
                        assemblies = new ArrayList ();
-#if CONFIGURATION_2_0
-                       foreach (AssemblyInfo info in CompilationConfig.Assemblies)
-                               AddAssemblyByName (info.Assembly);
-#else
                        foreach (string a in CompilationConfig.Assemblies)
                                AddAssemblyByName (a);
                        if (CompilationConfig.AssembliesInBin)
                                AddAssembliesInBin ();
-#endif
 
                        language = CompilationConfig.DefaultLanguage;
                }
@@ -641,17 +635,9 @@ namespace System.Web.UI {
                        get { return oc_param; }
                }
 
-#if CONFIGURATION_2_0
-               internal PagesSection PagesConfig {
-                       get {
-                               return WebConfigurationManager.GetSection ("system.web/pages") as PagesSection;
-                       }
-               }
-#else
                internal PagesConfiguration PagesConfig {
                        get { return PagesConfiguration.GetInstance (Context); }
                }
-#endif
        }
 }