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
baulig · May 3, 2004 · d865f23 · d865f23
1 parent 466b4c0
commit d865f23
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -224,7 +224,7 @@ internal virtual Assembly AddAssemblyByName (string name, ILocation location)
 			}
 
 			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
@@ -349,7 +349,7 @@ internal virtual Assembly AddAssemblyByName (string name)
 			}
 
 			try {
-				assembly = Assembly.Load (name);
+				assembly = Assembly.LoadWithPartialName (name);
 				string loc = assembly.Location;
 				fullpath = (Path.GetDirectoryName (loc) == PrivateBinPath);
 			} catch (Exception e) {