Browse Source

2006-02-01 Chris Toshok <[email protected]>

	* WebServiceCompiler.cs: CONFIGURATION_2_0 => NET_2_0, and use
	GetSection instead of GetWebApplicationSection.

	* CachingCompiler.cs: same.

	* AspGenerator.cs: same.

	* BaseCompiler.cs: same.


svn path=/trunk/mcs/; revision=56410
Chris Toshok 20 years ago
parent
commit
34e0a74a38

+ 2 - 2
mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs

@@ -659,8 +659,8 @@ namespace System.Web.Compilation
 			if (String.Compare (lang, tparser.Language, true) == 0)
 				return;
 
-#if CONFIGURATION_2_0
-			CompilationSection section = (CompilationSection) WebConfigurationManager.GetWebApplicationSection ("system.web/compilation");
+#if NET_2_0
+			CompilationSection section = (CompilationSection) WebConfigurationManager.GetSection ("system.web/compilation");
 			if (section.Compilers[tparser.Language] != section.Compilers[lang])
 #else
 			CompilationConfiguration cfg = CompilationConfiguration.GetInstance (HttpContext.Current); 

+ 1 - 1
mcs/class/System.Web/System.Web.Compilation/BaseCompiler.cs

@@ -324,7 +324,7 @@ namespace System.Web.Compilation
 
 			Init ();
 			string lang = parser.Language;
-#if CONFIGURATION_2_0
+#if NET_2_0
 			CompilationSection config = (CompilationSection) WebConfigurationManager.GetSection ("system.web/compilation");
 			Compiler comp = config.Compilers[lang];
 			provider = comp.Provider;

+ 1 - 1
mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs

@@ -146,7 +146,7 @@ namespace System.Web.Compilation
 				if (results != null)
 					return results;
  
-#if CONFIGURATION_2_0
+#if NET_2_0
 				CompilationSection config = (CompilationSection) WebConfigurationManager.GetSection ("system.web/compilation");
 				Compiler c = config.Compilers[language];
 				CodeDomProvider provider = c.Provider;

+ 11 - 0
mcs/class/System.Web/System.Web.Compilation/ChangeLog

@@ -1,3 +1,14 @@
+2006-02-01  Chris Toshok  <[email protected]>
+
+	* WebServiceCompiler.cs: CONFIGURATION_2_0 => NET_2_0, and use
+	GetSection instead of GetWebApplicationSection.
+
+	* CachingCompiler.cs: same.
+
+	* AspGenerator.cs: same.
+
+	* BaseCompiler.cs: same.
+	
 2006-01-23 Gonzalo Paniagua Javier <[email protected]>
 
 	* AspGenerator.cs: ignore 'thead'. Fixes bug #77326.

+ 3 - 3
mcs/class/System.Web/System.Web.Compilation/WebServiceCompiler.cs

@@ -70,8 +70,8 @@ namespace System.Web.Compilation
 			}
 
 			string lang = parser.Language;
-#if CONFIGURATION_2_0
-			CompilationSection config = (CompilationSection)WebConfigurationManager.GetWebApplicationSection ("system.web/compilation");
+#if NET_2_0
+			CompilationSection config = (CompilationSection)WebConfigurationManager.GetSection ("system.web/compilation");
 			Compiler c = config.Compilers[lang];
 			provider = (c == null) ? null : c.Provider;
 #else
@@ -87,7 +87,7 @@ namespace System.Web.Compilation
 
 			compilerParameters = CachingCompiler.GetOptions (parser.Assemblies);
 			compilerParameters.IncludeDebugInformation = parser.Debug;
-#if CONFIGURATION_2_0
+#if NET_2_0
 			compilerParameters.CompilerOptions = c.CompilerOptions;
 			compilerParameters.WarningLevel = c.WarningLevel;
 #else