Jelajahi Sumber

2003-04-30 Gonzalo Paniagua Javier <[email protected]>

	* TemplateParser.cs: always reference all the assemblies in bin
	directory.

svn path=/trunk/mcs/; revision=14165
Gonzalo Paniagua Javier 23 tahun lalu
induk
melakukan
792f08f69e

+ 5 - 0
mcs/class/System.Web/System.Web.UI/ChangeLog

@@ -1,3 +1,8 @@
+2003-04-30  Gonzalo Paniagua Javier <[email protected]>
+
+	* TemplateParser.cs: always reference all the assemblies in bin
+	directory.
+
 2003-04-30  Gonzalo Paniagua Javier <[email protected]>
 
 	* ApplicationFileParser.cs: it works now. Prior to these changes, we

+ 16 - 0
mcs/class/System.Web/System.Web.UI/TemplateParser.cs

@@ -60,6 +60,7 @@ namespace System.Web.UI
 			assemblies.Add ("System.Data.dll");
 			assemblies.Add ("System.Web.dll");
 			assemblies.Add ("System.Xml.dll");
+			AddAssembliesInBin ();
 		}
 
 		protected abstract Type CompileIntoType ();
@@ -160,9 +161,24 @@ namespace System.Web.UI
 			return null;
 		}
 
+		void AddAssembliesInBin ()
+		{
+			if (!Directory.Exists (PrivateBinPath))
+				return;
+
+			string [] binDlls = Directory.GetFiles (PrivateBinPath, "*.dll");
+			foreach (string dll in binDlls) {
+				Assembly assembly = Assembly.LoadFrom (dll);
+				AddAssembly (assembly, true);
+			}
+		}
+
 		Assembly LoadAssemblyFromBin (string name)
 		{
 			Assembly assembly;
+			if (!Directory.Exists (PrivateBinPath))
+				return null;
+
 			string [] binDlls = Directory.GetFiles (PrivateBinPath, "*.dll");
 			foreach (string dll in binDlls) {
 				string fn = Path.GetFileName (dll);