[Monodevelop-patches-list] r1925 - in trunk/MonoDevelop/Core/src/Main/Base: . Services

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-08-08 23:13:26 -0400 (Sun, 08 Aug 2004)
New Revision: 1925

Modified:
   trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
   trunk/MonoDevelop/Core/src/Main/Base/Services/SystemAssemblyService.cs
Log:
fix issue w/ new mscorlib location.


Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-08-07 06:43:58 UTC (rev 1924)
+++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-08-09 03:13:26 UTC (rev 1925)
@@ -1,3 +1,7 @@
+2004-08-09  Todd Berman  <tberman at off.net>
+
+	* Services/SystemAssemblyService.cs: Work w/ cvs HEAD and 1.0.x
+
 2004-08-07  Todd Berman  <tberman at off.net>
 
 	* AssemblyInfo.cs.in: Use new ASSEMBLY_VERSION variable.

Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/SystemAssemblyService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Services/SystemAssemblyService.cs	2004-08-07 06:43:58 UTC (rev 1924)
+++ trunk/MonoDevelop/Core/src/Main/Base/Services/SystemAssemblyService.cs	2004-08-09 03:13:26 UTC (rev 1925)
@@ -35,7 +35,10 @@
 			base.InitializeService ();
 			//Pull up assemblies from the installed mono system.
 			string prefix = Path.GetDirectoryName (typeof (int).Assembly.Location);
-			foreach (string assembly in Directory.GetFiles (Path.Combine (Path.Combine (prefix, "mono"), "1.0"), "*.dll")) {
+			if (prefix.IndexOf ("mono/1.0") == -1) {
+				prefix = Path.Combine (Path.Combine (prefix, "mono"), "1.0");
+			}
+			foreach (string assembly in Directory.GetFiles (prefix, "*.dll")) {
 				AddAssembly (assembly, "MONO-SYSTEM");
 			}