Author: mhabersack
Date: 2006-11-27 13:02:05 -0500 (Mon, 27 Nov 2006)
New Revision: 68522
Modified:
trunk/mcs/class/System.Web/System.Web.Compilation/AppCodeCompiler.cs
trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog
Log:
App_Code fix
Modified: trunk/mcs/class/System.Web/System.Web.Compilation/AppCodeCompiler.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/AppCodeCompiler.cs
2006-11-27 16:58:31 UTC (rev 68521)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/AppCodeCompiler.cs
2006-11-27 18:02:05 UTC (rev 68522)
@@ -44,6 +44,7 @@
internal class AppCodeAssembly
{
private List<string> files;
+
private string name;
private string path;
private bool validAssembly;
@@ -92,7 +93,7 @@
// Build and add the assembly to the BuildManager's
// CodeAssemblies collection
- public void Build ()
+ public void Build (string[] binAssemblies)
{
Type compilerProvider = null;
CompilerInfo compilerInfo = null, cit;
@@ -160,6 +161,8 @@
BuildProvider bprovider;
CompilationSection compilationSection =
WebConfigurationManager.GetSection ("system.web/compilation") as
CompilationSection;
CompilerParameters parameters =
compilerInfo.CreateDefaultCompilerParameters ();
+ if (binAssemblies != null && binAssemblies.Length > 0)
+ parameters.ReferencedAssemblies.AddRange
(binAssemblies);
if (compilationSection != null) {
foreach (AssemblyInfo ai in
compilationSection.Assemblies)
@@ -290,8 +293,13 @@
if (!CollectFiles (appCode, defasm))
return;
+ AppDomainSetup setup =
AppDomain.CurrentDomain.SetupInformation;
+ string bindir = Path.Combine (setup.ApplicationBase,
setup.PrivateBinPath);
+ string[] binAssemblies = null;
+ if (Directory.Exists (bindir))
+ binAssemblies = Directory.GetFiles (bindir,
"*.dll");
foreach (AppCodeAssembly aca in assemblies)
- aca.Build ();
+ aca.Build (binAssemblies);
}
private bool CollectFiles (string dir, AppCodeAssembly aca)
Modified: trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog 2006-11-27
16:58:31 UTC (rev 68521)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog 2006-11-27
18:02:05 UTC (rev 68522)
@@ -1,3 +1,8 @@
+2006-11-27 Marek Habersack <[EMAIL PROTECTED]>
+
+ * AppCodeCompiler.cs: Add ~/bin/*.dll to the referenced assemblies
+ when compiling.
+
2006-11-25 Marek Habersack <[EMAIL PROTECTED]>
* AppResourcesCompiler.cs: small optimizations.
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
