diff options
| author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2004-09-02 01:36:46 +0400 |
|---|---|---|
| committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2004-09-02 01:36:46 +0400 |
| commit | df642df602a20775799fa5345d1495b254b0e922 (patch) | |
| tree | 651a8017f774d9d5db60ad6b1c15b7e6e9e491aa /mcs/class | |
| parent | a1222cb8d01e2180a2ab250e140185482674bb23 (diff) | |
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
Diffstat (limited to 'mcs/class')
| -rw-r--r-- | mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs | 10 | ||||
| -rw-r--r-- | mcs/class/System.Web/System.Web.Compilation/ChangeLog | 5 |
2 files changed, 14 insertions, 1 deletions
diff --git a/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs index bda584c306b..0c14da135a5 100644 --- 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 abcbac5f808..74f469c1c96 100644 --- a/mcs/class/System.Web/System.Web.Compilation/ChangeLog +++ b/mcs/class/System.Web/System.Web.Compilation/ChangeLog @@ -1,5 +1,10 @@ 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 with tags. |