2004-09-01 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* CachingCompiler.cs: don't try to watch for changes in system
	assemblies. Fixes bug #64871.

svn path=/trunk/mcs/; revision=33184

diff --git a/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs
index bda584c306be3b7418debf6a137fe39ad8baf481..0c14da135a5891112bd7bfccbd41ba695afb281e 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs
@@ -32,6 +32,7 @@ using System;
 using System.CodeDom.Compiler;
 using System.Collections;
 using System.Collections.Specialized;
+using System.IO;
 using System.Reflection;
 using System.Web.UI;
 using System.Web.Caching;
@@ -139,7 +140,14 @@ namespace System.Web.Compilation
                                ICodeCompiler compiler = provider.CreateCompiler ();
                                CompilerParameters options = GetOptions (assemblies);
                                results = compiler.CompileAssemblyFromFile (options, file);
-                               string [] deps = (string []) assemblies.ToArray (typeof (string));
+                               ArrayList realdeps = new ArrayList (assemblies.Count);
+                               for (int i = assemblies.Count - 1; i >= 0; i--) {
+                                       string current = (string) assemblies [i];
+                                       if (Path.IsPathRooted (current))
+                                               realdeps.Add (current);
+                               }
+
+                               string [] deps = (string []) realdeps.ToArray (typeof (string));
                                cache.Insert (cachePrefix + key, results, new CacheDependency (deps));
                        }
 

diff --git a/mcs/class/System.Web/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
index abcbac5f808312e88e58720baf8279bdeef492e0..74f469c1c9681b8465fc07886593751c7ef6a77c 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-01 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * CachingCompiler.cs: don't try to watch for changes in system
+       assemblies. Fixes bug #64871.
+
 2004-09-01 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * AspGenerator.cs: handle builders that need to process inner text