diff options
| author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2004-05-04 01:54:08 +0400 |
|---|---|---|
| committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2004-05-04 01:54:08 +0400 |
| commit | d865f236f51641ea91a0119f3a27ac14619141bb (patch) | |
| tree | 51561ddecac886c70695d051af82cf30a15893f3 /mcs/class/System.Web/System.Web.UI | |
| parent | 466b4c0feced6f2a2a8a4ddaebe11500919a2710 (diff) | |
2004-05-04 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* SimpleWebHandlerParser.cs:
* TemplateParser.cs: for the assembly names given in the 'assembly'
attribute, use LoadWithPartialName instead of Load.
svn path=/trunk/mcs/; revision=26649
Diffstat (limited to 'mcs/class/System.Web/System.Web.UI')
| -rw-r--r-- | mcs/class/System.Web/System.Web.UI/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs | 2 | ||||
| -rwxr-xr-x | mcs/class/System.Web/System.Web.UI/TemplateParser.cs | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog index 6ee71b4127c..bfa20efa3d9 100644 --- a/mcs/class/System.Web/System.Web.UI/ChangeLog +++ b/mcs/class/System.Web/System.Web.UI/ChangeLog @@ -1,3 +1,8 @@ +2004-05-04 Gonzalo Paniagua Javier <gonzalo@ximian.com> + + * SimpleWebHandlerParser.cs: + * TemplateParser.cs: for the assembly names given in the 'assembly' + attribute, use LoadWithPartialName instead of Load. 2004-03-19 Gonzalo Paniagua Javier <gonzalo@ximian.com> * Page.cs: return HttpContext.Current if _context has not yet been diff --git a/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs b/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs index d0ca97b39c3..6c212e1a24b 100644 --- a/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs +++ b/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs @@ -224,7 +224,7 @@ namespace System.Web.UI } try { - assembly = Assembly.Load (name); + assembly = Assembly.LoadWithPartialName (name); string loc = assembly.Location; fullpath = (Path.GetDirectoryName (loc) == PrivateBinPath); } catch (Exception e) { diff --git a/mcs/class/System.Web/System.Web.UI/TemplateParser.cs b/mcs/class/System.Web/System.Web.UI/TemplateParser.cs index 6cdeadba8dd..c47e8f4ec0f 100755 --- a/mcs/class/System.Web/System.Web.UI/TemplateParser.cs +++ b/mcs/class/System.Web/System.Web.UI/TemplateParser.cs @@ -349,7 +349,7 @@ namespace System.Web.UI } try { - assembly = Assembly.Load (name); + assembly = Assembly.LoadWithPartialName (name); string loc = assembly.Location; fullpath = (Path.GetDirectoryName (loc) == PrivateBinPath); } catch (Exception e) { |