diff options
Diffstat (limited to 'mcs/class')
28 files changed, 85 insertions, 0 deletions
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/AmbientAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/AmbientAttribute.cs index 3670d3b6610..003f0c789e3 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/AmbientAttribute.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/AmbientAttribute.cs @@ -31,6 +31,7 @@ using System.Xaml.Schema; namespace System.Windows.Markup { [AttributeUsage (AttributeTargets.Class | AttributeTargets.Method | AttributeTargets.Property, Inherited = true)] + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)] public sealed class AmbientAttribute : Attribute { } diff --git a/mcs/class/System.Xaml/System.Windows.Markup/ArrayExtension.cs b/mcs/class/System.Xaml/System.Windows.Markup/ArrayExtension.cs index 698583d182d..b409088cb5d 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/ArrayExtension.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/ArrayExtension.cs @@ -32,6 +32,7 @@ namespace System.Windows.Markup { [MarkupExtensionReturnType (typeof (Array))] [ContentProperty ("Items")] + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyPresentationFramework_3_5)] public class ArrayExtension : MarkupExtension { public ArrayExtension () @@ -58,6 +59,8 @@ namespace System.Windows.Markup } public IList Items { get; private set; } + + [ConstructorArgument ("arrayType")] public Type Type { get; set; } public void AddChild (Object value) diff --git a/mcs/class/System.Xaml/System.Windows.Markup/ChangeLog b/mcs/class/System.Xaml/System.Windows.Markup/ChangeLog index 45a1ac71304..726dec5a36e 100644 --- a/mcs/class/System.Xaml/System.Windows.Markup/ChangeLog +++ b/mcs/class/System.Xaml/System.Windows.Markup/ChangeLog @@ -1,3 +1,33 @@ +2010-04-15 Atsushi Enomoto <atsushi@ximian.com> + + * ArrayExtension.cs + TrimSurroundingWhitespaceAttribute.cs + RuntimeNamePropertyAttribute.cs + TypeExtension.cs + MarkupExtensionReturnTypeAttribute.cs + DateTimeValueSerializer.cs + IValueSerializerContext.cs + RootNamespaceAttribute.cs + MarkupExtension.cs + Reference.cs + AmbientAttribute.cs + NameScopePropertyAttribute.cs + ValueSerializer.cs + DictionaryKeyPropertyAttribute.cs + WhitespaceSignificantCollectionAttribute.cs + ConstructorArgumentAttribute.cs + IUriContext.cs + INameScope.cs + StaticExtension.cs + IProvideValueTarget.cs + ValueSerializerAttribute.cs + IXamlTypeResolver.cs + ContentWrapperAttribute.cs + ContentPropertyAttribute.cs + DependsOnAttribute.cs + NullExtension.cs + UidPropertyAttribute.cs : several corcompare fixes. + 2010-04-14 Atsushi Enomoto <atsushi@ximian.com> * TypeExtensionConverter.cs : implement. diff --git a/mcs/class/System.Xaml/System.Windows.Markup/ConstructorArgumentAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/ConstructorArgumentAttribute.cs index 7257495a163..7708fe7c078 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/ConstructorArgumentAttribute.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/ConstructorArgumentAttribute.cs @@ -25,6 +25,7 @@ using System; namespace System.Windows.Markup { [AttributeUsage (AttributeTargets.Property, AllowMultiple = false, Inherited = false)] + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)] public sealed class ConstructorArgumentAttribute : Attribute { public ConstructorArgumentAttribute (string argumentName) diff --git a/mcs/class/System.Xaml/System.Windows.Markup/ContentPropertyAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/ContentPropertyAttribute.cs index b8eb6160d74..e07000bd350 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/ContentPropertyAttribute.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/ContentPropertyAttribute.cs @@ -25,6 +25,7 @@ using System; namespace System.Windows.Markup { [AttributeUsage (AttributeTargets.Class, AllowMultiple = false, Inherited = true)] + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)] public sealed class ContentPropertyAttribute : Attribute { public ContentPropertyAttribute () diff --git a/mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs index f92f11ece2f..0407a18fe74 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs @@ -25,6 +25,7 @@ using System; namespace System.Windows.Markup { [AttributeUsage (AttributeTargets.Class, AllowMultiple = true, Inherited = true)] + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)] public sealed class ContentWrapperAttribute : Attribute { public ContentWrapperAttribute (Type contentWrapper) @@ -37,5 +38,17 @@ namespace System.Windows.Markup get { return ContentWrapper; } } + public override bool Equals (object other) + { + var cwa = other as ContentWrapperAttribute; + if (cwa == null) + return false; + return ContentWrapper != null ? ContentWrapper == cwa.ContentWrapper : cwa.ContentWrapper == null; + } + + public override int GetHashCode () + { + return ContentWrapper != null ? ContentWrapper.GetHashCode () : 0; + } } } diff --git a/mcs/class/System.Xaml/System.Windows.Markup/DateTimeValueSerializer.cs b/mcs/class/System.Xaml/System.Windows.Markup/DateTimeValueSerializer.cs index f5406382cbe..cc8fc2c2704 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/DateTimeValueSerializer.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/DateTimeValueSerializer.cs @@ -28,6 +28,7 @@ using System.Globalization; namespace System.Windows.Markup { + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)] public class DateTimeValueSerializer : ValueSerializer { public override bool CanConvertFromString (string value, IValueSerializerContext context) diff --git a/mcs/class/System.Xaml/System.Windows.Markup/DependsOnAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/DependsOnAttribute.cs index 1e6af7d1753..0ae0fa71528 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/DependsOnAttribute.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/DependsOnAttribute.cs @@ -25,6 +25,7 @@ using System; namespace System.Windows.Markup { [AttributeUsage (AttributeTargets.Method | AttributeTargets.Property, AllowMultiple = true)] + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)] public sealed class DependsOnAttribute : Attribute { public DependsOnAttribute (string name) diff --git a/mcs/class/System.Xaml/System.Windows.Markup/DictionaryKeyPropertyAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/DictionaryKeyPropertyAttribute.cs index e91a84681eb..1664fe23a8d 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/DictionaryKeyPropertyAttribute.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/DictionaryKeyPropertyAttribute.cs @@ -25,6 +25,7 @@ using System; namespace System.Windows.Markup { [AttributeUsageAttribute(AttributeTargets.Class, AllowMultiple = false, Inherited = true)] + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)] public sealed class DictionaryKeyPropertyAttribute : Attribute { public DictionaryKeyPropertyAttribute (string name) diff --git a/mcs/class/System.Xaml/System.Windows.Markup/INameScope.cs b/mcs/class/System.Xaml/System.Windows.Markup/INameScope.cs index 25c34690fc0..3035a7cbc17 100644 --- a/mcs/class/System.Xaml/System.Windows.Markup/INameScope.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/INameScope.cs @@ -25,6 +25,7 @@ using System.Collections.Generic; namespace System.Windows.Markup { + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)] public interface INameScope { object FindName (string name); diff --git a/mcs/class/System.Xaml/System.Windows.Markup/IProvideValueTarget.cs b/mcs/class/System.Xaml/System.Windows.Markup/IProvideValueTarget.cs index 3f623e389e0..6a44ce005d1 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/IProvideValueTarget.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/IProvideValueTarget.cs @@ -28,6 +28,7 @@ using System.Xaml.Schema; namespace System.Windows.Markup { + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyPresentationFramework_3_5)] public interface IProvideValueTarget { object TargetObject { get; } diff --git a/mcs/class/System.Xaml/System.Windows.Markup/IUriContext.cs b/mcs/class/System.Xaml/System.Windows.Markup/IUriContext.cs index 46483561e74..252ab6964cd 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/IUriContext.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/IUriContext.cs @@ -28,6 +28,7 @@ using System.Xaml.Schema; namespace System.Windows.Markup { + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyPresentationCore_3_5)] public interface IUriContext { Uri BaseUri { get; set; } diff --git a/mcs/class/System.Xaml/System.Windows.Markup/IValueSerializerContext.cs b/mcs/class/System.Xaml/System.Windows.Markup/IValueSerializerContext.cs index 223a226180f..bfc1e0a3720 100644 --- a/mcs/class/System.Xaml/System.Windows.Markup/IValueSerializerContext.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/IValueSerializerContext.cs @@ -29,6 +29,7 @@ using System.Xaml; namespace System.Windows.Markup { + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)] public interface IValueSerializerContext : ITypeDescriptorContext, IServiceProvider { ValueSerializer GetValueSerializerFor (PropertyDescriptor descriptor); diff --git a/mcs/class/System.Xaml/System.Windows.Markup/IXamlTypeResolver.cs b/mcs/class/System.Xaml/System.Windows.Markup/IXamlTypeResolver.cs index 4a957713829..563387c8421 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/IXamlTypeResolver.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/IXamlTypeResolver.cs @@ -28,6 +28,7 @@ using System.Xaml.Schema; namespace System.Windows.Markup { + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)] public interface IXamlTypeResolver { Type Resolve (string qualifiedTypeName); diff --git a/mcs/class/System.Xaml/System.Windows.Markup/MarkupExtension.cs b/mcs/class/System.Xaml/System.Windows.Markup/MarkupExtension.cs index a9cdcfe0165..f79cefd6e02 100644 --- a/mcs/class/System.Xaml/System.Windows.Markup/MarkupExtension.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/MarkupExtension.cs @@ -29,6 +29,7 @@ using System.Xaml.Schema; namespace System.Windows.Markup { + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)] public abstract class MarkupExtension { public abstract object ProvideValue (IServiceProvider serviceProvider); diff --git a/mcs/class/System.Xaml/System.Windows.Markup/MarkupExtensionReturnTypeAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/MarkupExtensionReturnTypeAttribute.cs index b42325a1b03..763a902c34f 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/MarkupExtensionReturnTypeAttribute.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/MarkupExtensionReturnTypeAttribute.cs @@ -36,6 +36,16 @@ namespace System.Windows.Markup ReturnType = returnType; } + [Obsolete ("Unused. Use MarkupExtensionReturnTypeAttribute(Type) or XamlSetMarkupExtensionAttribute.")] + public MarkupExtensionReturnTypeAttribute (Type returnType, Type expressionType) + : this (returnType) + { + ExpressionType = expressionType; + } + public Type ReturnType { get; private set; } + + [ObsoleteAttribute ("Unused. Use XamlSetMarkupExtensionAttribute functionality instead.")] + public Type ExpressionType { get; private set; } } } diff --git a/mcs/class/System.Xaml/System.Windows.Markup/NameScopePropertyAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/NameScopePropertyAttribute.cs index 07e75ba7225..8e33e017cfc 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/NameScopePropertyAttribute.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/NameScopePropertyAttribute.cs @@ -25,6 +25,7 @@ using System; namespace System.Windows.Markup { [AttributeUsage (AttributeTargets.Class, AllowMultiple = false, Inherited = true)] + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)] public sealed class NameScopePropertyAttribute : Attribute { public NameScopePropertyAttribute (string name) diff --git a/mcs/class/System.Xaml/System.Windows.Markup/NullExtension.cs b/mcs/class/System.Xaml/System.Windows.Markup/NullExtension.cs index 5d39c7cecf8..19cd2cbf598 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/NullExtension.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/NullExtension.cs @@ -29,6 +29,7 @@ using System.Xaml.Schema; namespace System.Windows.Markup { [MarkupExtensionReturnType (typeof (Object))] + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyPresentationFramework_3_5)] public class NullExtension : MarkupExtension { public override Object ProvideValue (IServiceProvider serviceProvider) diff --git a/mcs/class/System.Xaml/System.Windows.Markup/Reference.cs b/mcs/class/System.Xaml/System.Windows.Markup/Reference.cs index 7328914ac10..6d3429e8166 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/Reference.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/Reference.cs @@ -42,6 +42,7 @@ namespace System.Windows.Markup Name = name; } + [ConstructorArgument ("name")] public string Name { get; set; } public override object ProvideValue (IServiceProvider serviceProvider) diff --git a/mcs/class/System.Xaml/System.Windows.Markup/RootNamespaceAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/RootNamespaceAttribute.cs index dc7cb17faf4..040f1945a7a 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/RootNamespaceAttribute.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/RootNamespaceAttribute.cs @@ -25,6 +25,7 @@ using System; namespace System.Windows.Markup { [AttributeUsage (AttributeTargets.Assembly)] + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)] public sealed class RootNamespaceAttribute : Attribute { public RootNamespaceAttribute (string nameSpace) diff --git a/mcs/class/System.Xaml/System.Windows.Markup/RuntimeNamePropertyAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/RuntimeNamePropertyAttribute.cs index 7f667f25294..44c3706b502 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/RuntimeNamePropertyAttribute.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/RuntimeNamePropertyAttribute.cs @@ -25,6 +25,7 @@ using System; namespace System.Windows.Markup { [AttributeUsage (AttributeTargets.Class)] + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)] public sealed class RuntimeNamePropertyAttribute : Attribute { public RuntimeNamePropertyAttribute (string name) diff --git a/mcs/class/System.Xaml/System.Windows.Markup/StaticExtension.cs b/mcs/class/System.Xaml/System.Windows.Markup/StaticExtension.cs index c3478a61141..24df4f5a169 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/StaticExtension.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/StaticExtension.cs @@ -30,6 +30,7 @@ namespace System.Windows.Markup { [MarkupExtensionReturnType (typeof (object))] [TypeConverter (typeof (StaticExtensionConverter))] + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyPresentationFramework_3_5)] public class StaticExtension : MarkupExtension { public StaticExtension () @@ -41,7 +42,10 @@ namespace System.Windows.Markup Member = member; } + [ConstructorArgument ("member")] public string Member { get; set; } + + [DefaultValue (null)] public Type MemberType { get; set; } public override object ProvideValue (IServiceProvider serviceProvider) diff --git a/mcs/class/System.Xaml/System.Windows.Markup/TrimSurroundingWhitespaceAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/TrimSurroundingWhitespaceAttribute.cs index 40310d89d1f..371e3e06f8e 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/TrimSurroundingWhitespaceAttribute.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/TrimSurroundingWhitespaceAttribute.cs @@ -31,6 +31,7 @@ using System.Xaml.Schema; namespace System.Windows.Markup { [AttributeUsage (AttributeTargets.Class, AllowMultiple = false, Inherited = true)] + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)] public sealed class TrimSurroundingWhitespaceAttribute : Attribute { } diff --git a/mcs/class/System.Xaml/System.Windows.Markup/TypeExtension.cs b/mcs/class/System.Xaml/System.Windows.Markup/TypeExtension.cs index 6fbd4ff2ab4..83c13d3caa7 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/TypeExtension.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/TypeExtension.cs @@ -30,6 +30,7 @@ namespace System.Windows.Markup { [MarkupExtensionReturnType (typeof (Type))] [TypeConverter (typeof (TypeExtensionConverter))] + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyPresentationFramework_3_5)] public class TypeExtension : MarkupExtension { public TypeExtension () @@ -50,6 +51,8 @@ namespace System.Windows.Markup Type = type; } + [ConstructorArgument ("type")] + [DefaultValue (null)] public Type Type { get; set; } public string TypeName { get; set; } diff --git a/mcs/class/System.Xaml/System.Windows.Markup/UidPropertyAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/UidPropertyAttribute.cs index a0e9f04dc1d..1898e16a207 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/UidPropertyAttribute.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/UidPropertyAttribute.cs @@ -31,6 +31,7 @@ using System.Xaml.Schema; namespace System.Windows.Markup { [AttributeUsage (AttributeTargets.Class, AllowMultiple = false)] + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)] public sealed class UidPropertyAttribute : Attribute { public UidPropertyAttribute (string name) diff --git a/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializer.cs b/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializer.cs index c3bd3dc860b..157f0980673 100644 --- a/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializer.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializer.cs @@ -29,6 +29,7 @@ using System.Xaml; namespace System.Windows.Markup { + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)] public abstract class ValueSerializer { public static ValueSerializer GetSerializerFor (PropertyDescriptor descriptor) diff --git a/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializerAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializerAttribute.cs index ce2a67fcdc1..37dec5262a9 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializerAttribute.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializerAttribute.cs @@ -31,6 +31,7 @@ using System.Xaml.Schema; namespace System.Windows.Markup { [AttributeUsage (AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Interface, AllowMultiple = false, Inherited = true)] + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)] public sealed class ValueSerializerAttribute : Attribute { public ValueSerializerAttribute (string valueSerializerTypeName) diff --git a/mcs/class/System.Xaml/System.Windows.Markup/WhitespaceSignificantCollectionAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/WhitespaceSignificantCollectionAttribute.cs index 5156a73963d..36cdf56aa28 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/WhitespaceSignificantCollectionAttribute.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/WhitespaceSignificantCollectionAttribute.cs @@ -31,6 +31,7 @@ using System.Xaml.Schema; namespace System.Windows.Markup { [AttributeUsage (AttributeTargets.Class, AllowMultiple = false, Inherited = true)] + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)] public sealed class WhitespaceSignificantCollectionAttribute : Attribute { } |