2008-11-12 Atsushi Enomoto <atsushi@ximian.com>

	* updated to DbLinq r946 (quick fix for vendor loading).

svn path=/branches/atsushi-200810/mcs/; revision=118675

diff --git a/mcs/class/System.Data.Linq/ChangeLog b/mcs/class/System.Data.Linq/ChangeLog
index dd64ebe0ace053dc936e121813f33031cd0b58f5..947673e412287d620449c9528416e8a2740525b0 100755 (executable)
--- a/mcs/class/System.Data.Linq/ChangeLog
+++ b/mcs/class/System.Data.Linq/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-12  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * updated to DbLinq r946 (quick fix for vendor loading).
+
 2008-11-12  Atsushi Enomoto  <atsushi@ximian.com>
 
        * updated to DbLinq r945.

diff --git a/mcs/class/System.Data.Linq/src/DbLinq/Data/Linq/DataContext.cs b/mcs/class/System.Data.Linq/src/DbLinq/Data/Linq/DataContext.cs
index a89a3eaa0c8020c3e80e8a27da25908655ef7484..7d276b81277c201c594f0dfc44d00e2d5e77f350 100644 (file)
--- a/mcs/class/System.Data.Linq/src/DbLinq/Data/Linq/DataContext.cs
+++ b/mcs/class/System.Data.Linq/src/DbLinq/Data/Linq/DataContext.cs
@@ -173,8 +173,12 @@ namespace DbLinq.Data.Linq
             Assembly assy;\r
             try\r
             {\r
+#if MONO_STRICT\r
+               assy = typeof (DataContext).Assembly; // System.Data.Linq.dll\r
+#else\r
                 //TODO: check if DLL is already loaded?\r
                 assy = Assembly.LoadFrom(assemblyToLoad);\r
+#endif\r
             }\r
             catch (Exception ex)\r
             {\r