[PCL]: System.Windows and System.Xml.Serialization are no Facade Assemblies.

12 files changed, 36 insertions, 38 deletions

diff --git a/mcs/class/Facades/Makefile b/mcs/class/Facades/Makefile
index d63f224a423..6d18c6c58a3 100644
--- a/mcs/class/Facades/Makefile
+++ b/mcs/class/Facades/Makefile
@@ -1,6 +1,6 @@
 thisdir = class/Facades
 
-net_4_5_SUBDIRS = System.Runtime System.Linq System.Xml.Serialization System.Xml.XmlSerializer \
+net_4_5_SUBDIRS = System.Runtime System.Linq System.Xml.XmlSerializer \
 	System.ServiceModel.Primitives System.Xml.ReaderWriter System.Diagnostics.Debug \
 	System.Runtime.Extensions System.Diagnostics.Tools System.Collections \
 	System.ComponentModel.EventBasedAsync System.ComponentModel System.ObjectModel \
@@ -10,7 +10,7 @@ net_4_5_SUBDIRS = System.Runtime System.Linq System.Xml.Serialization System.Xml
 	System.Text.Encoding.Extensions System.Linq.Queryable System.Linq.Expressions \
 	System.Net.Primitives System.Net.Requests System.Net.NetworkInformation \
 	System.Runtime.Serialization.Primitives System.Runtime.Serialization.Xml \
-	System.Runtime.Serialization.Json System.ServiceModel.Http System.Windows \
+	System.Runtime.Serialization.Json System.ServiceModel.Http \
 	System.Xml.XDocument System.Threading.Tasks System.Diagnostics.Contracts \
 	System.Dynamic.Runtime System.ComponentModel.Annotations System.Runtime.Numerics \
 	System.Linq.Parallel System.Collections.Concurrent System.Threading.Tasks.Parallel \
diff --git a/mcs/class/Facades/System.Windows/Makefile b/mcs/class/Facades/System.Windows/Makefile
deleted file mode 100644
index b1dec77374c..00000000000
--- a/mcs/class/Facades/System.Windows/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-thisdir = class/Facades/System.Windows
-SUBDIRS = 
-include ../../../build/rules.make
-
-LIBRARY_SUBDIR = Facades
-LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
-
-LIBRARY = System.Windows.dll
-LIB_MCS_FLAGS = /r:System
-
-NO_TEST = yes
-
-include ../../../build/library.make
diff --git a/mcs/class/Facades/System.Xml.Serialization/Makefile b/mcs/class/Facades/System.Xml.Serialization/Makefile
deleted file mode 100644
index eb5476b4bae..00000000000
--- a/mcs/class/Facades/System.Xml.Serialization/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-thisdir = class/Facades/System.Xml.Serialization
-SUBDIRS = 
-include ../../../build/rules.make
-
-LIBRARY_SUBDIR = Facades
-LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
-
-LIBRARY = System.Xml.Serialization.dll
-LIB_MCS_FLAGS = /r:System.Xml /r:System.ServiceModel
-
-NO_TEST = yes
-
-include ../../../build/library.make
diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 1e68fab29b2..25b3a835c71 100644
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -153,6 +153,8 @@ mobile_dirs := \
 	System.ComponentModel.DataAnnotations \
 	System.ComponentModel.Composition.4.5 \
 	System.Net \
+	System.Windows \
+	System.Xml.Serialization \
 	Facades
 
 monodroid_dirs := \
@@ -246,6 +248,8 @@ net_4_5_dirs := \
 	Mono.CodeContracts \
 	System.IO.Compression \
 	System.IO.Compression.FileSystem \
+	System.Windows \
+	System.Xml.Serialization \
 	Facades
 	
 net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) aot-compiler
diff --git a/mcs/class/Facades/System.Windows/AssemblyInfo.cs b/mcs/class/System.Windows/AssemblyInfo.cs
index 9f29e36845b..9c9952d5724 100644
--- a/mcs/class/Facades/System.Windows/AssemblyInfo.cs
+++ b/mcs/class/System.Windows/AssemblyInfo.cs
@@ -35,10 +35,10 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyCompany (Consts.MonoCompany)]
 [assembly: AssemblyProduct (Consts.MonoProduct)]
 [assembly: AssemblyCopyright (Consts.MonoCopyright)]
-[assembly: AssemblyVersion ("4.0.0.0")]
-[assembly: AssemblyInformationalVersion ("4.0.0.0")]
-[assembly: AssemblyFileVersion ("4.0.0.0")]
+[assembly: AssemblyVersion (Consts.FxVersion)]
+[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 [assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../../msfinal.pub")]
+[assembly: AssemblyKeyFile ("../msfinal.pub")]
 
 [assembly: ReferenceAssembly]
diff --git a/mcs/class/System.Windows/Makefile b/mcs/class/System.Windows/Makefile
new file mode 100644
index 00000000000..3ace126f2b3
--- /dev/null
+++ b/mcs/class/System.Windows/Makefile
@@ -0,0 +1,10 @@
+thisdir = class/System.Windows
+SUBDIRS = 
+include ../../build/rules.make
+
+LIBRARY = System.Windows.dll
+LIB_MCS_FLAGS = /r:System
+
+NO_TEST = yes
+
+include ../../build/library.make
diff --git a/mcs/class/Facades/System.Windows/System.Windows.dll.sources b/mcs/class/System.Windows/System.Windows.dll.sources
index 74532efb2ea..d75b28a0808 100644
--- a/mcs/class/Facades/System.Windows/System.Windows.dll.sources
+++ b/mcs/class/System.Windows/System.Windows.dll.sources
@@ -1,3 +1,3 @@
 AssemblyInfo.cs
 TypeForwarders.cs
-../../../build/common/Consts.cs
+../../build/common/Consts.cs
diff --git a/mcs/class/Facades/System.Windows/TypeForwarders.cs b/mcs/class/System.Windows/TypeForwarders.cs
index 18ab654c28e..18ab654c28e 100644
--- a/mcs/class/Facades/System.Windows/TypeForwarders.cs
+++ b/mcs/class/System.Windows/TypeForwarders.cs
diff --git a/mcs/class/Facades/System.Xml.Serialization/AssemblyInfo.cs b/mcs/class/System.Xml.Serialization/AssemblyInfo.cs
index 689aced4c42..fb3bd006eb5 100644
--- a/mcs/class/Facades/System.Xml.Serialization/AssemblyInfo.cs
+++ b/mcs/class/System.Xml.Serialization/AssemblyInfo.cs
@@ -35,10 +35,10 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyCompany (Consts.MonoCompany)]
 [assembly: AssemblyProduct (Consts.MonoProduct)]
 [assembly: AssemblyCopyright (Consts.MonoCopyright)]
-[assembly: AssemblyVersion ("4.0.0.0")]
-[assembly: AssemblyInformationalVersion ("4.0.0.0")]
-[assembly: AssemblyFileVersion ("4.0.0.0")]
+[assembly: AssemblyVersion (Consts.FxVersion)]
+[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 [assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../../msfinal.pub")]
+[assembly: AssemblyKeyFile ("../msfinal.pub")]
 
 [assembly: ReferenceAssembly]
diff --git a/mcs/class/System.Xml.Serialization/Makefile b/mcs/class/System.Xml.Serialization/Makefile
new file mode 100644
index 00000000000..3f8df6b664e
--- /dev/null
+++ b/mcs/class/System.Xml.Serialization/Makefile
@@ -0,0 +1,10 @@
+thisdir = class/System.Xml.Serialization
+SUBDIRS = 
+include ../../build/rules.make
+
+LIBRARY = System.Xml.Serialization.dll
+LIB_MCS_FLAGS = /r:System.Xml /r:System.ServiceModel
+
+NO_TEST = yes
+
+include ../../build/library.make
diff --git a/mcs/class/Facades/System.Xml.Serialization/System.Xml.Serialization.dll.sources b/mcs/class/System.Xml.Serialization/System.Xml.Serialization.dll.sources
index 74532efb2ea..d75b28a0808 100644
--- a/mcs/class/Facades/System.Xml.Serialization/System.Xml.Serialization.dll.sources
+++ b/mcs/class/System.Xml.Serialization/System.Xml.Serialization.dll.sources
@@ -1,3 +1,3 @@
 AssemblyInfo.cs
 TypeForwarders.cs
-../../../build/common/Consts.cs
+../../build/common/Consts.cs
diff --git a/mcs/class/Facades/System.Xml.Serialization/TypeForwarders.cs b/mcs/class/System.Xml.Serialization/TypeForwarders.cs
index 376e38dd929..376e38dd929 100644
--- a/mcs/class/Facades/System.Xml.Serialization/TypeForwarders.cs
+++ b/mcs/class/System.Xml.Serialization/TypeForwarders.cs