ContentProperty will just show up as an ordinal property, so no need to worry here.

diff --git a/mcs/class/System.Xaml/System.Xaml/XamlObjectWriter.cs b/mcs/class/System.Xaml/System.Xaml/XamlObjectWriter.cs
index eb3f3ad1d5a1eee72e845c84049f91dbaa340104..cdd6b45fadcc89077cf0356c481726ab525c08d9 100644 (file)
--- a/mcs/class/System.Xaml/System.Xaml/XamlObjectWriter.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlObjectWriter.cs
@@ -356,8 +356,7 @@ namespace System.Xaml
                        if (wpl != null && wpl.Contains (xm))
                                throw new XamlDuplicateMemberException (String.Format ("Property '{0}' is already set to this '{1}' object", xm, state.Type));
 
-                       if (xm == XamlLanguage.Initialization ||
-                           xm == state.Type.ContentProperty) {
+                       if (xm == XamlLanguage.Initialization) {
                                value = GetCorrectlyTypedValue (state.Type, value);
                                state.Value = value;
                                state.IsInstantiated = true;