* ObjectReader.cs: Field names can include the type name if the field belongs to...

[mono.git] / mcs / class / corlib / System.Runtime.Serialization.Formatters.Binary / ObjectWriter.cs

diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs
index 376b7fc1fce34e4c0cb88a99f68bb9817a02c465..5b9067ce1ca103225d366729308b50b52f3d4bba 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs
@@ -27,6 +27,7 @@ namespace System.Runtime.Serialization.Formatters.Binary
 \r
                ISurrogateSelector _surrogateSelector;\r
                StreamingContext _context;\r
+               FormatterAssemblyStyle _assemblyFormat;\r
 \r
                class TypeMetadata\r
                {\r
@@ -54,10 +55,11 @@ namespace System.Runtime.Serialization.Formatters.Binary
                        }\r
                }\r
 \r
-               public ObjectWriter(ISurrogateSelector surrogateSelector, StreamingContext context)\r
+               public ObjectWriter (ISurrogateSelector surrogateSelector, StreamingContext context, FormatterAssemblyStyle assemblyFormat)\r
                {\r
                        _surrogateSelector = surrogateSelector;\r
                        _context = context;\r
+                       _assemblyFormat = assemblyFormat;\r
                }\r
 \r
                public void WriteObjectGraph (BinaryWriter writer, object obj, Header[] headers)\r
@@ -537,7 +539,10 @@ namespace System.Runtime.Serialization.Formatters.Binary
                {\r
                        writer.Write ((byte) BinaryElement.Assembly);\r
                        writer.Write (id);\r
-                       writer.Write (assembly.GetName ().FullName);\r
+                       if (_assemblyFormat == FormatterAssemblyStyle.Full)\r
+                               writer.Write (assembly.GetName ().FullName);\r
+                       else\r
+                               writer.Write (assembly.GetName ().Name);\r
                }\r
 \r
                private int GetAssemblyId (Assembly assembly)\r