From d865f236f51641ea91a0119f3a27ac14619141bb Mon Sep 17 00:00:00 2001 From: Gonzalo Paniagua Javier Date: Mon, 3 May 2004 21:54:08 +0000 Subject: 2004-05-04 Gonzalo Paniagua Javier * SimpleWebHandlerParser.cs: * TemplateParser.cs: for the assembly names given in the 'assembly' attribute, use LoadWithPartialName instead of Load. svn path=/trunk/mcs/; revision=26649 --- mcs/class/System.Web/System.Web.UI/ChangeLog | 5 +++++ mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs | 2 +- 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 + + * SimpleWebHandlerParser.cs: + * TemplateParser.cs: for the assembly names given in the 'assembly' + attribute, use LoadWithPartialName instead of Load. 2004-03-19 Gonzalo Paniagua Javier * 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) { -- cgit v1.2.3