Author: marek
Date: 2007-09-04 16:51:33 -0400 (Tue, 04 Sep 2007)
New Revision: 85324
Modified:
trunk/mcs/mcs/ChangeLog
trunk/mcs/mcs/namespace.cs
Log:
2007-09-04 Marek Safar <[EMAIL PROTECTED]>
* namespace.cs: We have 2 versions of System.Core assembly.
Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog 2007-09-04 20:36:46 UTC (rev 85323)
+++ trunk/mcs/mcs/ChangeLog 2007-09-04 20:51:33 UTC (rev 85324)
@@ -1,5 +1,9 @@
2007-09-04 Marek Safar <[EMAIL PROTECTED]>
+ * namespace.cs: We have 2 versions of System.Core assembly.
+
+2007-09-04 Marek Safar <[EMAIL PROTECTED]>
+
A fix for bug #82652
* class.cs (Class.GetClassBases): Compare types and not expressions.
Modified: trunk/mcs/mcs/namespace.cs
===================================================================
--- trunk/mcs/mcs/namespace.cs 2007-09-04 20:36:46 UTC (rev 85323)
+++ trunk/mcs/mcs/namespace.cs 2007-09-04 20:51:33 UTC (rev 85324)
@@ -102,8 +102,12 @@
protected void ComputeNamespaces (Assembly assembly)
{
- // How to test whether attribute exists without loading
the assembly :-(
- const string SystemCore = "System.Core,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
+ // How to test whether attribute exists without loading
the assembly :-(
+#if SMCS_SOURCE
+ const string SystemCore = "System.Core,
Version=2.1.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
+#else
+ const string SystemCore = "System.Core,
Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
+#endif
if (TypeManager.extension_attribute_type == null &&
assembly.FullName == SystemCore) {
TypeManager.extension_attribute_type =
assembly.GetType("System.Runtime.CompilerServices.ExtensionAttribute");
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
