diff options
author | Atsushi Eno <atsushieno@gmail.com> | 2014-06-10 16:49:05 +0400 |
---|---|---|
committer | Atsushi Eno <atsushieno@gmail.com> | 2014-06-10 16:49:05 +0400 |
commit | 93e5f42f801ec904d88a1151f126c84f581631ba (patch) | |
tree | 9e38c721b14a1fb026ce0b62663d45f71b2bdbf8 /mcs/class/System.Xaml | |
parent | 975bf0a37966e55e5544660f3f5089a8a90f4567 (diff) |
[sys.xaml] fix TypeId and get broken WindowsBase tests pass.
Diffstat (limited to 'mcs/class/System.Xaml')
-rwxr-xr-x | mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs | 6 | ||||
-rwxr-xr-x | mcs/class/System.Xaml/System.Windows.Markup/DependsOnAttribute.cs | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs index 0ee8ea4b2ab..d64a2a9645b 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs @@ -35,6 +35,12 @@ namespace System.Windows.Markup public Type ContentWrapper { get; private set; } +#if !__MOBILE__ + public override Object TypeId { + get { return this; } + } +#endif + public override bool Equals (object other) { var cwa = other as ContentWrapperAttribute; diff --git a/mcs/class/System.Xaml/System.Windows.Markup/DependsOnAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/DependsOnAttribute.cs index d087be19a05..361df14ed60 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/DependsOnAttribute.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/DependsOnAttribute.cs @@ -34,5 +34,12 @@ namespace System.Windows.Markup } public string Name { get; private set; } + +#if !__MOBILE__ + // really? I doubt it should be overriden. + public override Object TypeId { + get { return this; } + } +#endif } } |