[sys.xaml] remove extraneous NET_2_1 and use __MOBILE__ to make it build for XA/XiOS.

43 files changed, 5 insertions, 131 deletions

diff --git a/mcs/class/System.Xaml/Makefile b/mcs/class/System.Xaml/Makefile
index 04ad2dda799..17d16132910 100644
--- a/mcs/class/System.Xaml/Makefile
+++ b/mcs/class/System.Xaml/Makefile
@@ -18,7 +18,7 @@ TEST_EXTRA_DISTFILES = \
 	Test/XmlFiles/*.xml \
 	Test/XmlFiles/*.xaml
 
-VALID_PROFILE := $(filter 4, $(FRAMEWORK_VERSION_MAJOR))
+VALID_PROFILE := $(filter 4 monodroid monotouch, $(FRAMEWORK_VERSION_MAJOR))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Xaml.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/AmbientAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/AmbientAttribute.cs
index ff55aefc7cf..003f0c789e3 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/AmbientAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/AmbientAttribute.cs
@@ -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
 	{
 	}
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/ArrayExtension.cs b/mcs/class/System.Xaml/System.Windows.Markup/ArrayExtension.cs
index 7a99b796010..e3da18695d9 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/ArrayExtension.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/ArrayExtension.cs
@@ -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; }
 		}
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/ConstructorArgumentAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/ConstructorArgumentAttribute.cs
index 69a8b3f0ba6..7708fe7c078 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/ConstructorArgumentAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/ConstructorArgumentAttribute.cs
@@ -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)
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/ContentPropertyAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/ContentPropertyAttribute.cs
index f772a2bd82e..5b3c078b70d 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/ContentPropertyAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/ContentPropertyAttribute.cs
@@ -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 ()
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs
index 12e10c5e151..0ee8ea4b2ab 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs
@@ -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,11 +34,6 @@ namespace System.Windows.Markup
 		}
 		
 		public Type ContentWrapper { get; private set; }
-#if !NET_2_1
-		public override Object TypeId {
-			get { return this; }
-		}
-#endif
 
 		public override bool Equals (object other)
 		{
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/DateTimeValueSerializer.cs b/mcs/class/System.Xaml/System.Windows.Markup/DateTimeValueSerializer.cs
index 5556e7f43c1..720a3517dcc 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/DateTimeValueSerializer.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/DateTimeValueSerializer.cs
@@ -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;
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/DependsOnAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/DependsOnAttribute.cs
index f49ce4fb5be..d087be19a05 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/DependsOnAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/DependsOnAttribute.cs
@@ -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)
@@ -36,12 +34,5 @@ namespace System.Windows.Markup
 		}
 		
 		public string Name { get; private set; }
-
-#if !NET_2_1
-		// really? I doubt it should be overriden.
-		public override Object TypeId {
-			get { return this; }
-		}
-#endif
 	}
 }
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/DictionaryKeyPropertyAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/DictionaryKeyPropertyAttribute.cs
index df7f4482bdc..1664fe23a8d 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/DictionaryKeyPropertyAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/DictionaryKeyPropertyAttribute.cs
@@ -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)
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/IComponentConnector.cs b/mcs/class/System.Xaml/System.Windows.Markup/IComponentConnector.cs
index 8b143b92791..5e6081628fd 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/IComponentConnector.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/IComponentConnector.cs
@@ -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);
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/INameScope.cs b/mcs/class/System.Xaml/System.Windows.Markup/INameScope.cs
index 5c142ec0afa..3035a7cbc17 100644
--- a/mcs/class/System.Xaml/System.Windows.Markup/INameScope.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/INameScope.cs
@@ -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);
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/IProvideValueTarget.cs b/mcs/class/System.Xaml/System.Windows.Markup/IProvideValueTarget.cs
index 65c124bfc36..6a44ce005d1 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/IProvideValueTarget.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/IProvideValueTarget.cs
@@ -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; }
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/IUriContext.cs b/mcs/class/System.Xaml/System.Windows.Markup/IUriContext.cs
index 7ace4b70cd7..252ab6964cd 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/IUriContext.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/IUriContext.cs
@@ -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; }
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/IValueSerializerContext.cs b/mcs/class/System.Xaml/System.Windows.Markup/IValueSerializerContext.cs
index 011c32e983a..bfc1e0a3720 100644
--- a/mcs/class/System.Xaml/System.Windows.Markup/IValueSerializerContext.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/IValueSerializerContext.cs
@@ -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);
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/IXamlTypeResolver.cs b/mcs/class/System.Xaml/System.Windows.Markup/IXamlTypeResolver.cs
index c78be097471..563387c8421 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/IXamlTypeResolver.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/IXamlTypeResolver.cs
@@ -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);
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/MarkupExtension.cs b/mcs/class/System.Xaml/System.Windows.Markup/MarkupExtension.cs
index 9277a3ca7ac..f79cefd6e02 100644
--- a/mcs/class/System.Xaml/System.Windows.Markup/MarkupExtension.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/MarkupExtension.cs
@@ -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);
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/NameScopePropertyAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/NameScopePropertyAttribute.cs
index 3ecd55b2001..8e33e017cfc 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/NameScopePropertyAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/NameScopePropertyAttribute.cs
@@ -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)
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/NullExtension.cs b/mcs/class/System.Xaml/System.Windows.Markup/NullExtension.cs
index 9aef4b4d78f..19cd2cbf598 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/NullExtension.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/NullExtension.cs
@@ -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)
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/RootNamespaceAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/RootNamespaceAttribute.cs
index 392968b4328..040f1945a7a 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/RootNamespaceAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/RootNamespaceAttribute.cs
@@ -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)
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/RuntimeNamePropertyAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/RuntimeNamePropertyAttribute.cs
index ccd2cbc95bf..44c3706b502 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/RuntimeNamePropertyAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/RuntimeNamePropertyAttribute.cs
@@ -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)
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/StaticExtension.cs b/mcs/class/System.Xaml/System.Windows.Markup/StaticExtension.cs
index 465ba56521d..24df4f5a169 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/StaticExtension.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/StaticExtension.cs
@@ -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 ()
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/TrimSurroundingWhitespaceAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/TrimSurroundingWhitespaceAttribute.cs
index bf4309d6e33..371e3e06f8e 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/TrimSurroundingWhitespaceAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/TrimSurroundingWhitespaceAttribute.cs
@@ -31,9 +31,7 @@ using System.Xaml.Schema;
 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 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 00af705581e..42da7a13783 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/TypeExtension.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/TypeExtension.cs
@@ -30,9 +30,7 @@ namespace System.Windows.Markup
 {
 	[MarkupExtensionReturnType (typeof (Type))]
 	[TypeConverter (typeof (TypeExtensionConverter))]
-#if !NET_2_1
 	[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyPresentationFramework_3_5)]
-#endif
 	public class TypeExtension : MarkupExtension
 	{
 		public TypeExtension ()
@@ -56,9 +54,7 @@ namespace System.Windows.Markup
 		[ConstructorArgument ("type")]
 		[DefaultValue (null)]
 		public Type Type { get; set; }
-#if !NET_2_1
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-#endif
 		public string TypeName { get; set; }
 
 		public override object ProvideValue (IServiceProvider serviceProvider)
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/UidPropertyAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/UidPropertyAttribute.cs
index bd66ca26145..1898e16a207 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/UidPropertyAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/UidPropertyAttribute.cs
@@ -31,9 +31,7 @@ using System.Xaml.Schema;
 namespace System.Windows.Markup
 {
 	[AttributeUsage (AttributeTargets.Class, AllowMultiple = false)]
-#if !NET_2_1
 	[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
-#endif
 	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 bee7ad65908..45adefabec7 100644
--- a/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializer.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializer.cs
@@ -32,24 +32,19 @@ using System.Xaml.Schema;
 
 namespace System.Windows.Markup
 {
-#if !NET_2_1
 	[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
-#endif
 	public abstract class ValueSerializer
 	{
-#if !NET_2_1
 		public static ValueSerializer GetSerializerFor (PropertyDescriptor descriptor)
 		{
 			return GetSerializerFor (descriptor, null);
 		}
-#endif
 
 		public static ValueSerializer GetSerializerFor (Type type)
 		{
 			return GetSerializerFor (type, null);
 		}
 
-#if !NET_2_1
 		// untested
 		public static ValueSerializer GetSerializerFor (PropertyDescriptor descriptor, IValueSerializerContext context)
 		{
@@ -63,7 +58,6 @@ namespace System.Windows.Markup
 				return new TypeConverterValueSerializer (tc);
 			return null;
 		}
-#endif
 
 		public static ValueSerializer GetSerializerFor (Type type, IValueSerializerContext context)
 		{
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializerAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializerAttribute.cs
index fdb4e951e2f..37dec5262a9 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializerAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializerAttribute.cs
@@ -31,9 +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)]
-#if !NET_2_1
 	[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
-#endif
 	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 893d79c1aa3..36cdf56aa28 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/WhitespaceSignificantCollectionAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/WhitespaceSignificantCollectionAttribute.cs
@@ -31,9 +31,7 @@ using System.Xaml.Schema;
 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 WhitespaceSignificantCollectionAttribute : Attribute
 	{
 	}
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/XmlLangPropertyAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/XmlLangPropertyAttribute.cs
index 18978a84645..4789120383b 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/XmlLangPropertyAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/XmlLangPropertyAttribute.cs
@@ -31,9 +31,7 @@ using System.Xaml.Schema;
 namespace System.Windows.Markup
 {
 	[AttributeUsage (AttributeTargets.Class, AllowMultiple = false)]
-#if !NET_2_1
 	[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
-#endif
 	public sealed class XmlLangPropertyAttribute : Attribute
 	{
 		public XmlLangPropertyAttribute (string name)
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/XmlnsCompatibleWithAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/XmlnsCompatibleWithAttribute.cs
index e77ae359726..0e16db2f15d 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/XmlnsCompatibleWithAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/XmlnsCompatibleWithAttribute.cs
@@ -31,9 +31,7 @@ using System.Xaml.Schema;
 namespace System.Windows.Markup
 {
 	[AttributeUsage (AttributeTargets.Assembly, AllowMultiple = true)]
-#if !NET_2_1
 	[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
-#endif
 	public sealed class XmlnsCompatibleWithAttribute : Attribute
 	{
 		public XmlnsCompatibleWithAttribute (string oldNamespace, string newNamespace)
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/XmlnsDefinitionAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/XmlnsDefinitionAttribute.cs
index 078623fb082..81be2dae73d 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/XmlnsDefinitionAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/XmlnsDefinitionAttribute.cs
@@ -31,9 +31,7 @@ using System.Xaml.Schema;
 namespace System.Windows.Markup
 {
 	[AttributeUsage (AttributeTargets.Assembly, AllowMultiple = true)]
-#if !NET_2_1
 	[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
-#endif
 	public sealed class XmlnsDefinitionAttribute : Attribute
 	{
 		public XmlnsDefinitionAttribute (string xmlNamespace, string clrNamespace)
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/XmlnsPrefixAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/XmlnsPrefixAttribute.cs
index 4bdf0d97aff..c907c8eb427 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/XmlnsPrefixAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/XmlnsPrefixAttribute.cs
@@ -31,9 +31,7 @@ using System.Xaml.Schema;
 namespace System.Windows.Markup
 {
 	[AttributeUsage (AttributeTargets.Assembly, AllowMultiple = true)]
-#if !NET_2_1
 	[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
-#endif
 	public sealed class XmlnsPrefixAttribute : Attribute
 	{
 		public XmlnsPrefixAttribute (string xmlNamespace, string prefix)
diff --git a/mcs/class/System.Xaml/System.Xaml/XamlDuplicateMemberException.cs b/mcs/class/System.Xaml/System.Xaml/XamlDuplicateMemberException.cs
index e65e23faf1f..10e18587261 100644
--- a/mcs/class/System.Xaml/System.Xaml/XamlDuplicateMemberException.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlDuplicateMemberException.cs
@@ -27,9 +27,7 @@ using System.Runtime.Serialization;
 
 namespace System.Xaml
 {
-#if !NET_2_1
 	[Serializable]
-#endif
 	public class XamlDuplicateMemberException : XamlException
 	{
 		public XamlDuplicateMemberException ()
@@ -54,25 +52,21 @@ namespace System.Xaml
 		{
 		}
 
-#if !NET_2_1
 		protected XamlDuplicateMemberException (SerializationInfo info, StreamingContext context)
 			: base (info, context)
 		{
 			DuplicateMember = (XamlMember) info.GetValue ("member", typeof (XamlMember));
 			ParentType = (XamlType) info.GetValue ("type", typeof (XamlType));
 		}
-#endif
 
 		public XamlMember DuplicateMember { get; set; }
 		public XamlType ParentType { get; set; }
 
-#if !NET_2_1
 		public override void GetObjectData (SerializationInfo info, StreamingContext context)
 		{
 			base.GetObjectData (info, context);
 			info.AddValue ("member", DuplicateMember);
 			info.AddValue ("type", ParentType);
 		}
-#endif
 	}
 }
diff --git a/mcs/class/System.Xaml/System.Xaml/XamlException.cs b/mcs/class/System.Xaml/System.Xaml/XamlException.cs
index ecccbb4ced5..669b2245ece 100644
--- a/mcs/class/System.Xaml/System.Xaml/XamlException.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlException.cs
@@ -27,9 +27,7 @@ using System.Runtime.Serialization;
 
 namespace System.Xaml
 {
-#if !NET_2_1
 	[Serializable]
-#endif
 	public class XamlException : Exception
 	{
 		public XamlException ()
@@ -63,14 +61,12 @@ namespace System.Xaml
 			LinePosition = linePosition;
 		}
 
-#if !NET_2_1
 		protected XamlException (SerializationInfo info, StreamingContext context)
 			: base (info, context)
 		{
 			LineNumber = info.GetInt32 ("lineNumber");
 			LinePosition = info.GetInt32 ("linePosition");
 		}
-#endif
 
 		public int LineNumber { get; protected internal set; }
 		public int LinePosition { get; protected internal set; }
@@ -78,12 +74,10 @@ namespace System.Xaml
 			get { return FormatLine (base.Message, LineNumber, LinePosition); }
 		}
 
-#if !NET_2_1
 		public override void GetObjectData (SerializationInfo info, StreamingContext context)
 		{
 			info.AddValue ("lineNumber", LineNumber);
 			info.AddValue ("linePosition", LinePosition);
 		}
-#endif
 	}
 }
diff --git a/mcs/class/System.Xaml/System.Xaml/XamlInternalException.cs b/mcs/class/System.Xaml/System.Xaml/XamlInternalException.cs
index a24cffe420a..d98aa4c4df2 100644
--- a/mcs/class/System.Xaml/System.Xaml/XamlInternalException.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlInternalException.cs
@@ -27,9 +27,7 @@ using System.Runtime.Serialization;
 
 namespace System.Xaml
 {
-#if !NET_2_1
 	[Serializable]
-#endif
 	public class XamlInternalException : XamlException
 	{
 		public XamlInternalException ()
@@ -47,11 +45,9 @@ namespace System.Xaml
 		{
 		}
 
-#if !NET_2_1
 		protected XamlInternalException (SerializationInfo info, StreamingContext context)
 			: base (info, context)
 		{
 		}
-#endif
 	}
 }
diff --git a/mcs/class/System.Xaml/System.Xaml/XamlMember.cs b/mcs/class/System.Xaml/System.Xaml/XamlMember.cs
index 7b85eb322d5..ad03cbf6283 100644
--- a/mcs/class/System.Xaml/System.Xaml/XamlMember.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlMember.cs
@@ -166,7 +166,6 @@ namespace System.Xaml
 			get { return directive_ns ?? (DeclaringType == null ? null : DeclaringType.PreferredXamlNamespace); }
 		}
 		
-#if !NET_2_1
 		public DesignerSerializationVisibility SerializationVisibility {
 			get {
 				var c= GetCustomAttributeProvider ();
@@ -174,7 +173,6 @@ namespace System.Xaml
 				return a != null ? a.Visibility : DesignerSerializationVisibility.Visible;
 			}
 		}
-#endif
 
 		public bool IsAttachable {
 			get { return is_attachable; }
diff --git a/mcs/class/System.Xaml/System.Xaml/XamlObjectReaderException.cs b/mcs/class/System.Xaml/System.Xaml/XamlObjectReaderException.cs
index 89c64fe1adc..0bad880d68d 100644
--- a/mcs/class/System.Xaml/System.Xaml/XamlObjectReaderException.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlObjectReaderException.cs
@@ -27,9 +27,7 @@ using System.Runtime.Serialization;
 
 namespace System.Xaml
 {
-#if !NET_2_1
 	[Serializable]
-#endif
 	public class XamlObjectReaderException : XamlException
 	{
 		public XamlObjectReaderException ()
@@ -47,11 +45,9 @@ namespace System.Xaml
 		{
 		}
 
-#if !NET_2_1
 		protected XamlObjectReaderException (SerializationInfo info, StreamingContext context)
 			: base (info, context)
 		{
 		}
-#endif
 	}
 }
diff --git a/mcs/class/System.Xaml/System.Xaml/XamlObjectWriterException.cs b/mcs/class/System.Xaml/System.Xaml/XamlObjectWriterException.cs
index b5ce0b3b803..17708cc0344 100644
--- a/mcs/class/System.Xaml/System.Xaml/XamlObjectWriterException.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlObjectWriterException.cs
@@ -27,9 +27,7 @@ using System.Runtime.Serialization;
 
 namespace System.Xaml
 {
-#if !NET_2_1
 	[Serializable]
-#endif
 	public class XamlObjectWriterException : XamlException
 	{
 		public XamlObjectWriterException ()
@@ -47,11 +45,9 @@ namespace System.Xaml
 		{
 		}
 
-#if !NET_2_1
 		protected XamlObjectWriterException (SerializationInfo info, StreamingContext context)
 			: base (info, context)
 		{
 		}
-#endif
 	}
 }
diff --git a/mcs/class/System.Xaml/System.Xaml/XamlObjectWriterSettings.cs b/mcs/class/System.Xaml/System.Xaml/XamlObjectWriterSettings.cs
index 4ecbe75e6f7..a46dded4edf 100644
--- a/mcs/class/System.Xaml/System.Xaml/XamlObjectWriterSettings.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlObjectWriterSettings.cs
@@ -25,7 +25,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Reflection;
 using System.Windows.Markup;
-#if !NET_2_1
+#if !__MOBILE__
 using System.Xaml.Permissions;
 #endif
 using System.Xaml.Schema;
@@ -42,7 +42,7 @@ namespace System.Xaml
 			: base (settings)
 		{
 			var s = settings;
-#if !NET_2_1
+#if !__MOBILE__
 			AccessLevel = s.AccessLevel;
 #endif
 			AfterBeginInitHandler = s.AfterBeginInitHandler;
@@ -65,7 +65,7 @@ namespace System.Xaml
 		public EventHandler<XamlObjectEventArgs> BeforePropertiesHandler { get; set; }
 		public EventHandler<XamlSetValueEventArgs> XamlSetValueHandler { get; set; }
 
-#if !NET_2_1
+#if !__MOBILE__
 		[MonoTODO ("Ignored")]
 		public XamlAccessLevel AccessLevel { get; set; }
 #endif
diff --git a/mcs/class/System.Xaml/System.Xaml/XamlParseException.cs b/mcs/class/System.Xaml/System.Xaml/XamlParseException.cs
index 1ae1667b53a..4bb8340a48a 100644
--- a/mcs/class/System.Xaml/System.Xaml/XamlParseException.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlParseException.cs
@@ -27,9 +27,7 @@ using System.Runtime.Serialization;
 
 namespace System.Xaml
 {
-#if !NET_2_1
 	[Serializable]
-#endif
 	public class XamlParseException : XamlException
 	{
 		public XamlParseException ()
@@ -47,11 +45,9 @@ namespace System.Xaml
 		{
 		}
 
-#if !NET_2_1
 		protected XamlParseException (SerializationInfo info, StreamingContext context)
 			: base (info, context)
 		{
 		}
-#endif
 	}
 }
diff --git a/mcs/class/System.Xaml/System.Xaml/XamlSchemaContext.cs b/mcs/class/System.Xaml/System.Xaml/XamlSchemaContext.cs
index de31e46de24..64cf91ea71c 100644
--- a/mcs/class/System.Xaml/System.Xaml/XamlSchemaContext.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlSchemaContext.cs
@@ -57,10 +57,8 @@ namespace System.Xaml
 		{
 			if (referenceAssemblies != null)
 				reference_assemblies = new List<Assembly> (referenceAssemblies);
-#if !NET_2_1
 			else
 				AppDomain.CurrentDomain.AssemblyLoad += OnAssemblyLoaded;
-#endif
 
 			if (settings == null)
 				return;
@@ -69,13 +67,11 @@ namespace System.Xaml
 			SupportMarkupExtensionsWithDuplicateArity = settings.SupportMarkupExtensionsWithDuplicateArity;
 		}
 
-#if !NET_2_1
 		~XamlSchemaContext ()
 		{
 			if (reference_assemblies == null)
 				AppDomain.CurrentDomain.AssemblyLoad -= OnAssemblyLoaded;
 		}
-#endif
 
 		IList<Assembly> reference_assemblies;
 
@@ -255,7 +251,6 @@ namespace System.Xaml
 			return compat_nss.TryGetValue (xamlNamespace, out compatibleNamespace);
 		}
 
-#if !NET_2_1
 		void OnAssemblyLoaded (object o, AssemblyLoadEventArgs e)
 		{
 			if (reference_assemblies != null)
@@ -270,8 +265,7 @@ namespace System.Xaml
 			if (all_xaml_types != null)
 				FillAllXamlTypes (e.LoadedAssembly);
 		}
-#endif
-		
+
 		// cache updater methods
 		void FillXamlNamespaces (Assembly ass)
 		{
diff --git a/mcs/class/System.Xaml/System.Xaml/XamlSchemaException.cs b/mcs/class/System.Xaml/System.Xaml/XamlSchemaException.cs
index 9681927b39b..78de4f8e482 100644
--- a/mcs/class/System.Xaml/System.Xaml/XamlSchemaException.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlSchemaException.cs
@@ -27,9 +27,7 @@ using System.Runtime.Serialization;
 
 namespace System.Xaml
 {
-#if !NET_2_1
 	[Serializable]
-#endif
 	public class XamlSchemaException : XamlException
 	{
 		public XamlSchemaException ()
@@ -47,11 +45,9 @@ namespace System.Xaml
 		{
 		}
 
-#if !NET_2_1
 		protected XamlSchemaException (SerializationInfo info, StreamingContext context)
 			: base (info, context)
 		{
 		}
-#endif
 	}
 }
diff --git a/mcs/class/System.Xaml/System.Xaml/XamlServices.cs b/mcs/class/System.Xaml/System.Xaml/XamlServices.cs
index cf686d8506f..c8026d195a4 100755
--- a/mcs/class/System.Xaml/System.Xaml/XamlServices.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlServices.cs
@@ -71,13 +71,11 @@ namespace System.Xaml
 			return sw.ToString ();
 		}
 
-#if !NET_2_1
 		public static void Save (string fileName, object instance)
 		{
 			using (var xw = XmlWriter.Create (fileName, new XmlWriterSettings () { OmitXmlDeclaration = true, Indent = true }))
 				Save (xw, instance);
 		}
-#endif
 
 		public static void Save (Stream stream, object instance)
 		{
diff --git a/mcs/class/System.Xaml/System.Xaml/XamlXmlWriterException.cs b/mcs/class/System.Xaml/System.Xaml/XamlXmlWriterException.cs
index d784b9df2d0..ffa402cc7df 100644
--- a/mcs/class/System.Xaml/System.Xaml/XamlXmlWriterException.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlXmlWriterException.cs
@@ -27,9 +27,7 @@ using System.Runtime.Serialization;
 
 namespace System.Xaml
 {
-#if !NET_2_1
 	[Serializable]
-#endif
 	public class XamlXmlWriterException : XamlException
 	{
 		public XamlXmlWriterException ()
@@ -47,11 +45,9 @@ namespace System.Xaml
 		{
 		}
 
-#if !NET_2_1
 		protected XamlXmlWriterException (SerializationInfo info, StreamingContext context)
 			: base (info, context)
 		{
 		}
-#endif
 	}
 }