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 <atsushi@ximian.com>2010-11-17 09:50:18 +0300
committerAtsushi Eno <atsushi@ximian.com>2010-11-17 09:50:18 +0300
commit2e100c5e48b28bb08bd1f59581b87d62b776eab4 (patch)
tree17a88abdb9ad9ea0d498c54a54467e3a67221e0e /mcs/class/System.Xaml/System.Windows.Markup
parent2370aa1ac7ef8607b96dc693777bb34f34208c93 (diff)
Made a couple of PositionalParameter related fixes, disabling test, etc.
Diffstat (limited to 'mcs/class/System.Xaml/System.Windows.Markup')
-rw-r--r--mcs/class/System.Xaml/System.Windows.Markup/ValueSerializer.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializer.cs b/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializer.cs
index d3a001de3d2..b625bb98444 100644
--- a/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializer.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializer.cs
@@ -56,8 +56,8 @@ namespace System.Windows.Markup
if (context != null)
throw new NotImplementedException ();
- // MarkupExtension is serialized without ValueSerializer.
- if (typeof (MarkupExtension).IsAssignableFrom (type))
+ // Standard MarkupExtensions are serialized without ValueSerializer.
+ if (typeof (MarkupExtension).IsAssignableFrom (type) && XamlLanguage.AllTypes.Any (x => x.UnderlyingType == type))
return null;
var tc = TypeDescriptor.GetConverter (type);