diff options
| author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2008-12-11 07:19:05 +0300 |
|---|---|---|
| committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2008-12-11 07:19:05 +0300 |
| commit | 070f6cbea39676a27de3459897d7b9b85e594b81 (patch) | |
| tree | 78d992cc3b8523c4c213851512982b8333c9a93b /mcs/class/System.XML/System.Xml.Serialization | |
| parent | 240ed61c5973a3238d003d681314a4b736efd53c (diff) | |
2008-12-10 Gonzalo Paniagua Javier <gonzalo@novell.com>
* XmlSerializer.cs: updated to work with shadowcopy fixes.
svn path=/trunk/mcs/; revision=121275
Diffstat (limited to 'mcs/class/System.XML/System.Xml.Serialization')
| -rw-r--r-- | mcs/class/System.XML/System.Xml.Serialization/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog index ad0da11ac71..2f00d84c552 100644 --- 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 ba86f443a5b..78ea707b046 100644 --- 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")) |