in NET_4_0, remove types that went into System.Xaml.dll. Change build order.

mcs/class/Makefile

@@ -102,7 +102,6 @@ net_2_0_dirs := \
 	Mono.Tasklets       		\
 	Mono.CSharp			\
 	Moonlight.Build.Tasks		\
-	WindowsBase			\
 	System.Data.Services	\
 	System.Data.Services.Client \
 	System.Net
@@ -110,7 +109,8 @@ net_2_0_dirs := \
 net_2_0_only_dirs := \
 	System.Web.Extensions_1.0	\
 	System.Web.Extensions.Design_1.0	\
-	Compat.ICSharpCode.SharpZipLib
+	Compat.ICSharpCode.SharpZipLib	\
+	WindowsBase
 
 moonlight_dirs := \
 	corlib			\
@@ -159,6 +159,7 @@ net_4_0_dirs := \
 	System.Windows.Forms.DataVisualization	\
 	System.ComponentModel.Composition \
 	System.Xaml \
+	WindowsBase \
 	System.ServiceModel.Routing \
 	System.ServiceModel.Discovery \
 	System.Runtime.Caching \

mcs/class/WindowsBase/Makefile

@@ -9,5 +9,8 @@ TEST_MCS_FLAGS = -unsafe -r:WindowsBase.dll
 ifeq (2.0, $(FRAMEWORK_VERSION))
 LIB_MCS_FLAGS += -d:NET_3_0
 endif
+ifeq (4.0, $(FRAMEWORK_VERSION))
+LIB_MCS_FLAGS += -d:NET_4_0 -r:System.Xaml.dll
+endif
 
 include ../../build/library.make

mcs/class/WindowsBase/System.Windows.Markup/AmbientAttribute.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -28,4 +29,5 @@ namespace System.Windows.Markup {
 	[AttributeUsage (AttributeTargets.Property)]
 	public class AmbientAttribute : Attribute {
 	}
-}
\ No newline at end of file
+}
+#endif

mcs/class/WindowsBase/System.Windows.Markup/ConstructorArgumentAttribute.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -42,4 +43,5 @@ namespace System.Windows.Markup {
 		string argumentName;
 	}
 
-}
\ No newline at end of file
+}
+#endif

mcs/class/WindowsBase/System.Windows.Markup/ContentPropertyAttribute.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -46,3 +47,4 @@ namespace System.Windows.Markup {
 		}
 	}
 }
+#endif

mcs/class/WindowsBase/System.Windows.Markup/ContentWrapperAttribute.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -62,3 +63,4 @@ namespace System.Windows.Markup {
 	}
 
 }
+#endif

mcs/class/WindowsBase/System.Windows.Markup/DateTimeValueSerializer.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -64,3 +65,4 @@ namespace System.Windows.Markup {
 	}
 
 }
+#endif

mcs/class/WindowsBase/System.Windows.Markup/DependsOnAttribute.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -47,3 +48,4 @@ namespace System.Windows.Markup {
 	}
 
 }
+#endif

mcs/class/WindowsBase/System.Windows.Markup/DictionaryKeyPropertyAttribute.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -38,4 +39,5 @@ namespace System.Windows.Markup {
 			get; private set;
 		}
 	}
-}
\ No newline at end of file
+}
+#endif

mcs/class/WindowsBase/System.Windows.Markup/IComponentConnector.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -32,4 +33,5 @@ namespace System.Windows.Markup {
 
 		void InitializeComponent ();
 	}
-}
\ No newline at end of file
+}
+#endif

mcs/class/WindowsBase/System.Windows.Markup/INameScope.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -33,4 +34,5 @@ namespace System.Windows.Markup {
 		void RegisterName (string name, object scopedElement);
 		void UnregisterName (string name);
 	}
-}
\ No newline at end of file
+}
+#endif

mcs/class/WindowsBase/System.Windows.Markup/IValueSerializerContext.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -32,4 +33,5 @@ namespace System.Windows.Markup {
 		ValueSerializer GetValueSerializerFor (PropertyDescriptor descriptor);
 		ValueSerializer GetValueSerializerFor (Type type);
 	}
-}
\ No newline at end of file
+}
+#endif

mcs/class/WindowsBase/System.Windows.Markup/IXamlTypeResolver.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -30,4 +31,5 @@ namespace System.Windows.Markup {
 	public interface IXamlTypeResolver {
 		Type Resolve (string qualifiedTypeName);
 	}
-}
\ No newline at end of file
+}
+#endif

mcs/class/WindowsBase/System.Windows.Markup/MarkupExtension.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -36,3 +37,4 @@ namespace System.Windows.Markup {
 		public abstract object ProvideValue (IServiceProvider serviceProvider);
 	}
 }
+#endif

mcs/class/WindowsBase/System.Windows.Markup/MarkupExtensionReturnTypeAttribute.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -57,3 +58,4 @@ namespace System.Windows.Markup {
 	}
 
 }
+#endif

mcs/class/WindowsBase/System.Windows.Markup/NameScopePropertyAttribute.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -51,4 +52,5 @@ namespace System.Windows.Markup {
 		}
 	}
 
-}
\ No newline at end of file
+}
+#endif

mcs/class/WindowsBase/System.Windows.Markup/RootNamespaceAttribute.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -41,4 +42,5 @@ namespace System.Windows.Markup {
 
 		string nameSpace;
 	}
-}
\ No newline at end of file
+}
+#endif

mcs/class/WindowsBase/System.Windows.Markup/RuntimeNamePropertyAttribute.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -41,4 +42,5 @@ namespace System.Windows.Markup {
 
 		string name;
 	}
-}
\ No newline at end of file
+}
+#endif

mcs/class/WindowsBase/System.Windows.Markup/TrimSurroundingWhitespaceAttribute.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -31,4 +32,5 @@ namespace System.Windows.Markup {
 	public sealed class TrimSurroundingWhitespaceAttribute : Attribute
 	{
 	}
-}
\ No newline at end of file
+}
+#endif

mcs/class/WindowsBase/System.Windows.Markup/UidDuringInitializationAttribute.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -38,4 +39,5 @@ namespace System.Windows.Markup {
 			private set;
 		}
 	}
-}
\ No newline at end of file
+}
+#endif

mcs/class/WindowsBase/System.Windows.Markup/UidPropertyAttribute.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -38,4 +39,5 @@ namespace System.Windows.Markup {
 			private set;
 		}
 	}
-}
\ No newline at end of file
+}
+#endif

mcs/class/WindowsBase/System.Windows.Markup/UsableDuringInitializationAttribute.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -38,4 +39,5 @@ namespace System.Windows.Markup {
 			private set;
 		}
 	}
-}
\ No newline at end of file
+}
+#endif

mcs/class/WindowsBase/System.Windows.Markup/ValueSerializer.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -167,3 +168,4 @@ namespace System.Windows.Markup {
 	}
 
 }
+#endif

mcs/class/WindowsBase/System.Windows.Markup/ValueSerializerAttribute.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -55,4 +56,5 @@ namespace System.Windows.Markup {
 
 		Type valueSerializerType;
 	}
-}
\ No newline at end of file
+}
+#endif

mcs/class/WindowsBase/System.Windows.Markup/WhitespaceSignificantCollectionAttribute.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -31,4 +32,5 @@ namespace System.Windows.Markup {
 	public sealed class WhitespaceSignificantCollectionAttribute : Attribute
 	{
 	}
-}
\ No newline at end of file
+}
+#endif

mcs/class/WindowsBase/System.Windows.Markup/XmlLangPropertyAttribute.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -41,4 +42,5 @@ namespace System.Windows.Markup {
 
 		string name;
 	}
-}
\ No newline at end of file
+}
+#endif

mcs/class/WindowsBase/System.Windows.Markup/XmlnsCompatibleWithAttribute.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -47,4 +48,5 @@ namespace System.Windows.Markup {
 		string newNamespace;
 		string oldNamespace;
 	}
-}
\ No newline at end of file
+}
+#endif

mcs/class/WindowsBase/System.Windows.Markup/XmlnsDefinitionAttribute.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -53,4 +54,5 @@ namespace System.Windows.Markup {
 		string clrNamespace;
 		string assemblyName;
 	}
-}
\ No newline at end of file
+}
+#endif

mcs/class/WindowsBase/System.Windows.Markup/XmlnsPrefixAttribute.cs

+#if !NET_4_0
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -47,4 +48,5 @@ namespace System.Windows.Markup {
 		string prefix;
 		string xmlNamespace;
 	}
-}
\ No newline at end of file
+}
+#endif