2008-12-10 Gonzalo Paniagua Javier <gonzalo@novell.com>

	* XmlSerializer.cs: updated to work with shadowcopy fixes.

svn path=/trunk/mcs/; revision=121275

diff --git a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
index ad0da11ac71b2f08e9ccd7e83f3d5278cde1b27c..2f00d84c552e336129e3b69f3622986f3cb15ea6 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
+++ b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
@@ -1,3 +1,8 @@
+
+2008-12-10 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+       * XmlSerializer.cs: updated to work with shadowcopy fixes.
+
 2008-11-05  Atsushi Enomoto  <atsushi@ximian.com>
 
        * TypeData.cs : do not reject ICollection<T> for not implementing

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
index ba86f443a5b1c79c0c78a517b94ec3a1b9c0dd6f..78ea707b046552411baa134e7786effa3cbda774 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
@@ -743,8 +743,9 @@ namespace System.Xml.Serialization
                        
                        foreach (Type rtype in gen.ReferencedTypes)
                        {
-                               if (!cp.ReferencedAssemblies.Contains (rtype.Assembly.Location))
-                                       cp.ReferencedAssemblies.Add (rtype.Assembly.Location);
+                               string path = new Uri (rtype.Assembly.CodeBase).LocalPath;
+                               if (!cp.ReferencedAssemblies.Contains (path))
+                                       cp.ReferencedAssemblies.Add (path);
                        }
                                
                        if (!cp.ReferencedAssemblies.Contains ("System.dll"))