Imported Upstream version 3.8.0

Former-commit-id: 6a76a29bd07d86e57c6c8da45c65ed5447d38a61
This commit is contained in:
Jo Shields
2014-09-04 09:07:35 +01:00
parent a575963da9
commit fe777c5c82
1062 changed files with 12460 additions and 5983 deletions

View File

@@ -31,9 +31,7 @@ using System.Xaml.Schema;
namespace System.Windows.Markup
{
[AttributeUsage (AttributeTargets.Class | AttributeTargets.Method | AttributeTargets.Property, Inherited = true)]
#if !NET_2_1
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
#endif
public sealed class AmbientAttribute : Attribute
{
}

View File

@@ -32,9 +32,7 @@ namespace System.Windows.Markup
{
[MarkupExtensionReturnType (typeof (Array))]
[ContentProperty ("Items")]
#if !NET_2_1
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyPresentationFramework_3_5)]
#endif
public class ArrayExtension : MarkupExtension
{
public ArrayExtension ()
@@ -62,9 +60,7 @@ namespace System.Windows.Markup
public Type Type { get; set; }
IList items;
#if !NET_2_1
[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
#endif
public IList Items {
get { return items; }
}

View File

@@ -25,9 +25,7 @@ using System;
namespace System.Windows.Markup
{
[AttributeUsage (AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
#if !NET_2_1
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
#endif
public sealed class ConstructorArgumentAttribute : Attribute
{
public ConstructorArgumentAttribute (string argumentName)

View File

@@ -29,9 +29,7 @@ namespace System.Windows.Markup
// member regardless of this attribute.
[AttributeUsage (AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
#if !NET_2_1
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
#endif
public sealed class ContentPropertyAttribute : Attribute
{
public ContentPropertyAttribute ()

View File

@@ -25,9 +25,7 @@ using System;
namespace System.Windows.Markup
{
[AttributeUsage (AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
#if !NET_2_1
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
#endif
public sealed class ContentWrapperAttribute : Attribute
{
public ContentWrapperAttribute (Type contentWrapper)
@@ -36,7 +34,8 @@ namespace System.Windows.Markup
}
public Type ContentWrapper { get; private set; }
#if !NET_2_1
#if !__MOBILE__
public override Object TypeId {
get { return this; }
}

View File

@@ -28,9 +28,7 @@ using System.Globalization;
namespace System.Windows.Markup
{
#if !NET_2_1
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
#endif
public class DateTimeValueSerializer : ValueSerializer
{
const DateTimeStyles styles = DateTimeStyles.RoundtripKind | DateTimeStyles.NoCurrentDateDefault | DateTimeStyles.AllowLeadingWhite | DateTimeStyles.AllowTrailingWhite;

View File

@@ -25,9 +25,7 @@ using System;
namespace System.Windows.Markup
{
[AttributeUsage (AttributeTargets.Method | AttributeTargets.Property, AllowMultiple = true)]
#if !NET_2_1
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
#endif
public sealed class DependsOnAttribute : Attribute
{
public DependsOnAttribute (string name)
@@ -37,7 +35,7 @@ namespace System.Windows.Markup
public string Name { get; private set; }
#if !NET_2_1
#if !__MOBILE__
// really? I doubt it should be overriden.
public override Object TypeId {
get { return this; }

View File

@@ -25,9 +25,7 @@ using System;
namespace System.Windows.Markup
{
[AttributeUsageAttribute(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
#if !NET_2_1
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
#endif
public sealed class DictionaryKeyPropertyAttribute : Attribute
{
public DictionaryKeyPropertyAttribute (string name)

View File

@@ -28,9 +28,7 @@ using System.Xaml.Schema;
namespace System.Windows.Markup
{
#if !NET_2_1
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
#endif
public interface IComponentConnector
{
void Connect (int connectionId, object target);

View File

@@ -25,9 +25,7 @@ using System.Collections.Generic;
namespace System.Windows.Markup
{
#if !NET_2_1
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
#endif
public interface INameScope
{
object FindName (string name);

View File

@@ -28,9 +28,7 @@ using System.Xaml.Schema;
namespace System.Windows.Markup
{
#if !NET_2_1
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyPresentationFramework_3_5)]
#endif
public interface IProvideValueTarget
{
object TargetObject { get; }

View File

@@ -28,9 +28,7 @@ using System.Xaml.Schema;
namespace System.Windows.Markup
{
#if !NET_2_1
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyPresentationCore_3_5)]
#endif
public interface IUriContext
{
Uri BaseUri { get; set; }

View File

@@ -29,9 +29,7 @@ using System.Xaml;
namespace System.Windows.Markup
{
#if !NET_2_1
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
#endif
public interface IValueSerializerContext : ITypeDescriptorContext, IServiceProvider
{
ValueSerializer GetValueSerializerFor (PropertyDescriptor descriptor);

View File

@@ -28,9 +28,7 @@ using System.Xaml.Schema;
namespace System.Windows.Markup
{
#if !NET_2_1
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
#endif
public interface IXamlTypeResolver
{
Type Resolve (string qualifiedTypeName);

View File

@@ -29,9 +29,7 @@ using System.Xaml.Schema;
namespace System.Windows.Markup
{
#if !NET_2_1
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
#endif
public abstract class MarkupExtension
{
public abstract object ProvideValue (IServiceProvider serviceProvider);

View File

@@ -25,9 +25,7 @@ using System;
namespace System.Windows.Markup
{
[AttributeUsage (AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
#if !NET_2_1
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
#endif
public sealed class NameScopePropertyAttribute : Attribute
{
public NameScopePropertyAttribute (string name)

View File

@@ -29,9 +29,7 @@ using System.Xaml.Schema;
namespace System.Windows.Markup
{
[MarkupExtensionReturnType (typeof (Object))]
#if !NET_2_1
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyPresentationFramework_3_5)]
#endif
public class NullExtension : MarkupExtension
{
public override Object ProvideValue (IServiceProvider serviceProvider)

View File

@@ -25,9 +25,7 @@ using System;
namespace System.Windows.Markup
{
[AttributeUsage (AttributeTargets.Assembly)]
#if !NET_2_1
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
#endif
public sealed class RootNamespaceAttribute : Attribute
{
public RootNamespaceAttribute (string nameSpace)

View File

@@ -25,9 +25,7 @@ using System;
namespace System.Windows.Markup
{
[AttributeUsage (AttributeTargets.Class)]
#if !NET_2_1
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
#endif
public sealed class RuntimeNamePropertyAttribute : Attribute
{
public RuntimeNamePropertyAttribute (string name)

View File

@@ -30,9 +30,7 @@ namespace System.Windows.Markup
{
[MarkupExtensionReturnType (typeof (object))]
[TypeConverter (typeof (StaticExtensionConverter))]
#if !NET_2_1
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyPresentationFramework_3_5)]
#endif
public class StaticExtension : MarkupExtension
{
public StaticExtension ()

Some files were not shown because too many files have changed in this diff Show More