Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAtsushi Eno <atsushieno@gmail.com>2015-02-15 22:32:49 +0300
committerAtsushi Eno <atsushieno@gmail.com>2015-02-15 22:32:49 +0300
commite4b2bc75aac6cba83756c6aac2ac8b586a55d248 (patch)
treeb7b580fbefc05210e833fba9ae17b5c69ca59db3 /mcs/class/System.Xaml
parentbcd70a77a7da753708f8603cef08d6aac9c963c6 (diff)
[sys.xaml] serialize string value as string, do not try ValueConverter.
Fixed some xwt object serialization.
Diffstat (limited to 'mcs/class/System.Xaml')
-rw-r--r--mcs/class/System.Xaml/System.Xaml/XamlWriterInternalBase.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/mcs/class/System.Xaml/System.Xaml/XamlWriterInternalBase.cs b/mcs/class/System.Xaml/System.Xaml/XamlWriterInternalBase.cs
index 0dad3a2fc93..5a384918413 100644
--- a/mcs/class/System.Xaml/System.Xaml/XamlWriterInternalBase.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlWriterInternalBase.cs
@@ -241,6 +241,8 @@ namespace System.Xaml
// change XamlXmlReader too if we change here.
if ((value as string) == String.Empty) // FIXME: there could be some escape syntax.
return "\"\"";
+ if (value is string)
+ return (string) value;
var xt = value == null ? XamlLanguage.Null : sctx.GetXamlType (value.GetType ());
var vs = xm.ValueSerializer ?? xt.ValueSerializer;