[xbuild] Reorganize xbuild targets/frameworks/bin data

They had been squashed into one single source directory
despite being installed into very different locations.

Made it easier to follow what's what by separating them
into:

* data: targets and data files for xbuild bin directory
* targets: misc pcl/web targets for extension directory
* frameworks: framework definitions

26 files changed, 234 insertions, 230 deletions

diff --git a/mcs/tools/xbuild/Makefile b/mcs/tools/xbuild/Makefile
index 81a6bcd4ad6..57f054fe933 100644
--- a/mcs/tools/xbuild/Makefile
+++ b/mcs/tools/xbuild/Makefile
@@ -11,64 +11,71 @@ PROGRAM = xbuild.exe
 include ../../build/executable.make
 
 XBUILD_DIR=.
-XBUILD_FRAMEWORKS_DIR=$(mono_libdir)/mono/xbuild-frameworks/.NETFramework/
-REDISTLIST_DIR=$(XBUILD_FRAMEWORKS_DIR)/v$(FRAMEWORK_VERSION)/RedistList
 include $(XBUILD_DIR)/xbuild_test.make
 
 install-local:	install-extras
 
-WEBAPP_DIR = Microsoft/VisualStudio
-PORTABLE_DIR = $(mono_libdir)/mono/xbuild/Microsoft/Portable
+NETFRAMEWORK_DIR=$(mono_libdir)/mono/xbuild-frameworks/.NETFramework
+VS_TARGETS_DIR = $(mono_libdir)/mono/xbuild/Microsoft/VisualStudio
+PORTABLE_TARGETS_DIR = $(mono_libdir)/mono/xbuild/Microsoft/Portable
 
-install-extras: 
-	$(MKINSTALLDIRS) $(DESTDIR)$(XBUILD_BIN_DIR) $(DESTDIR)$(REDISTLIST_DIR) $(DESTDIR)$(XBUILD_FRAMEWORKS_DIR)/v3.0/RedistList $(DESTDIR)$(XBUILD_FRAMEWORKS_DIR)/v4.0/RedistList $(DESTDIR)$(mono_libdir)/mono/3.5 $(DESTDIR)$(mono_libdir)/mono/4.0
-	$(INSTALL_DATA) xbuild/xbuild.rsp $(DESTDIR)$(XBUILD_BIN_DIR)
-	sed -e 's/@XBUILD_ASSEMBLY_VERSION@/$(XBUILD_ASSEMBLY_VERSION)/g' xbuild.exe.config.in  > $(DESTDIR)$(XBUILD_BIN_DIR)/xbuild.exe.config
-	$(INSTALL_DATA) xbuild/$(XBUILD_VERSION)/Microsoft.Common.tasks $(DESTDIR)$(XBUILD_BIN_DIR)
-	$(INSTALL_DATA) xbuild/$(XBUILD_VERSION)/Microsoft.Common.targets $(DESTDIR)$(XBUILD_BIN_DIR)
-	$(INSTALL_DATA) xbuild/Microsoft.Build.xsd $(DESTDIR)$(XBUILD_BIN_DIR)
-	$(INSTALL_DATA) xbuild/Microsoft.CSharp.targets $(DESTDIR)$(XBUILD_BIN_DIR)
-	$(INSTALL_DATA) xbuild/Microsoft.VisualBasic.targets $(DESTDIR)$(XBUILD_BIN_DIR)
-	$(INSTALL_DATA) xbuild/$(FRAMEWORK_VERSION)/FrameworkList.xml $(DESTDIR)$(REDISTLIST_DIR)
-	$(INSTALL_DATA) xbuild/4.0/FrameworkList.xml $(DESTDIR)$(XBUILD_FRAMEWORKS_DIR)/v4.0/RedistList/FrameworkList.xml
-	$(INSTALL_DATA) xbuild/FrameworkList-3.0.xml $(DESTDIR)$(XBUILD_FRAMEWORKS_DIR)/v3.0/RedistList/FrameworkList.xml
+install-extras: install-bin-data install-frameworks install-pcl-targets install-web-targets
+
+install-bin-data:
 	$(MKINSTALLDIRS) $(DESTDIR)$(XBUILD_BIN_DIR)/MSBuild
-	$(INSTALL_DATA) xbuild/MSBuild/Microsoft.Build.CommonTypes.xsd $(DESTDIR)$(XBUILD_BIN_DIR)/MSBuild
-	$(INSTALL_DATA) xbuild/MSBuild/Microsoft.Build.Core.xsd $(DESTDIR)$(XBUILD_BIN_DIR)/MSBuild
-	$(MKINSTALLDIRS) $(DESTDIR)$(mono_libdir)/mono/xbuild
-	$(MKINSTALLDIRS) $(DESTDIR)$(mono_libdir)/mono/xbuild/$(WEBAPP_DIR)/v9.0/WebApplications
-	$(INSTALL_DATA) xbuild/Microsoft.WebApplication.targets $(DESTDIR)$(mono_libdir)/mono/xbuild/$(WEBAPP_DIR)/v9.0/WebApplications
-	$(MKINSTALLDIRS) $(DESTDIR)$(mono_libdir)/mono/xbuild/$(WEBAPP_DIR)/v10.0/WebApplications
-	$(INSTALL_DATA) xbuild/Microsoft.WebApplication.targets $(DESTDIR)$(mono_libdir)/mono/xbuild/$(WEBAPP_DIR)/v10.0/WebApplications
-	$(MKINSTALLDIRS) $(DESTDIR)$(mono_libdir)/mono/xbuild/$(WEBAPP_DIR)/v11.0/WebApplications
-	$(INSTALL_DATA) xbuild/Microsoft.WebApplication.targets $(DESTDIR)$(mono_libdir)/mono/xbuild/$(WEBAPP_DIR)/v11.0/WebApplications
-	$(MKINSTALLDIRS) $(DESTDIR)$(PORTABLE_DIR)/v4.0
-	$(MKINSTALLDIRS) $(DESTDIR)$(PORTABLE_DIR)/v4.5
-	$(INSTALL_DATA) xbuild/4.0/Microsoft.Portable.CSharp.targets $(DESTDIR)$(PORTABLE_DIR)/v4.0
-	$(INSTALL_DATA) xbuild/4.5/Microsoft.Portable.CSharp.targets $(DESTDIR)$(PORTABLE_DIR)/v4.5
-	$(INSTALL_DATA) xbuild/Microsoft.Portable.CSharp.targets $(DESTDIR)$(mono_libdir)/mono/4.0
+	$(INSTALL_DATA) data/xbuild.rsp $(DESTDIR)$(XBUILD_BIN_DIR)
+	$(INSTALL_DATA) data/$(XBUILD_VERSION)/Microsoft.Common.tasks $(DESTDIR)$(XBUILD_BIN_DIR)
+	$(INSTALL_DATA) data/$(XBUILD_VERSION)/Microsoft.Common.targets $(DESTDIR)$(XBUILD_BIN_DIR)
+	$(INSTALL_DATA) data/Microsoft.Build.xsd $(DESTDIR)$(XBUILD_BIN_DIR)
+	$(INSTALL_DATA) data/Microsoft.CSharp.targets $(DESTDIR)$(XBUILD_BIN_DIR)
+	$(INSTALL_DATA) data/Microsoft.VisualBasic.targets $(DESTDIR)$(XBUILD_BIN_DIR)
+	$(INSTALL_DATA) data/MSBuild/Microsoft.Build.CommonTypes.xsd $(DESTDIR)$(XBUILD_BIN_DIR)/MSBuild
+	$(INSTALL_DATA) data/MSBuild/Microsoft.Build.Core.xsd $(DESTDIR)$(XBUILD_BIN_DIR)/MSBuild
+	sed -e 's/@ASM_VERSION@/$(XBUILD_ASSEMBLY_VERSION)/g' data/xbuild.exe.config.in > $(DESTDIR)$(XBUILD_BIN_DIR)/xbuild.exe.config
+
+install-frameworks:
+	$(MKINSTALLDIRS) $(DESTDIR)$(NETFRAMEWORK_DIR)/v$(FRAMEWORK_VERSION)/RedistList
+	$(INSTALL_DATA) frameworks/net_$(FRAMEWORK_VERSION).xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v$(FRAMEWORK_VERSION)/RedistList/FrameworkList.xml
+	$(MKINSTALLDIRS) $(DESTDIR)$(NETFRAMEWORK_DIR)/v3.0/RedistList
+	$(INSTALL_DATA) frameworks/net_3.0.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v3.0/RedistList/FrameworkList.xml
+	$(MKINSTALLDIRS) $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.0/RedistList
+	$(INSTALL_DATA) frameworks/net_4.0.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.0/RedistList/FrameworkList.xml
+
+install-pcl-targets:
+	$(MKINSTALLDIRS) $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.0
+	$(INSTALL_DATA) targets/Microsoft.Portable.CSharp_4.0.targets $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.0/Microsoft.Portable.CSharp.targets
+	$(MKINSTALLDIRS) $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.5
+	$(INSTALL_DATA) targets/Microsoft.Portable.CSharp_4.5.targets $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.5/Microsoft.Portable.CSharp.targets
+
+install-web-targets:
+	$(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/v9.0/WebApplications
+	$(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/v9.0/WebApplications
+	$(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/v10.0/WebApplications
+	$(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/v10.0/WebApplications
+	$(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/v11.0/WebApplications
+	$(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/v11.0/WebApplications
 
 EXTRA_DISTFILES = \
-	xbuild/xbuild.rsp \
-	xbuild/2.0/Microsoft.Common.tasks \
-	xbuild/3.5/Microsoft.Common.tasks \
-	xbuild/4.0/Microsoft.Common.tasks \
-	xbuild/2.0/Microsoft.Common.targets \
-	xbuild/3.5/Microsoft.Common.targets \
-	xbuild/4.0/Microsoft.Common.targets \
-	xbuild/4.0/Microsoft.Portable.CSharp.targets \
-	xbuild/4.5/Microsoft.Portable.CSharp.targets \
-	xbuild/2.0/FrameworkList.xml \
-	xbuild/3.5/FrameworkList.xml \
-	xbuild/4.0/FrameworkList.xml \
-	xbuild/4.5/FrameworkList.xml \
-	xbuild/FrameworkList-3.0.xml \
-	xbuild/Microsoft.Build.xsd \
-	xbuild/Microsoft.CSharp.targets \
-	xbuild/MSBuild/Microsoft.Build.CommonTypes.xsd \
-	xbuild/MSBuild/Microsoft.Build.Core.xsd		\
-	xbuild/Microsoft.VisualBasic.targets \
-	xbuild/Microsoft.WebApplication.targets \
-	xbuild/Microsoft.Portable.CSharp.targets \
-	xbuild_targets.make \
-	xbuild.exe.config.in
+	data/xbuild.rsp \
+	data/xbuild.exe.config.in \
+	data/Microsoft.Build.xsd \
+	data/2.0/Microsoft.Common.tasks \
+	data/3.5/Microsoft.Common.tasks \
+	data/4.0/Microsoft.Common.tasks \
+	data/2.0/Microsoft.Common.targets \
+	data/3.5/Microsoft.Common.targets \
+	data/4.0/Microsoft.Common.targets \
+	data/Microsoft.CSharp.targets \
+	data/MSBuild/Microsoft.Build.CommonTypes.xsd \
+	data/MSBuild/Microsoft.Build.Core.xsd \
+	frameworks/net_2.0.xml \
+	frameworks/net_3.0.xml \
+	frameworks/net_3.5.xml \
+	frameworks/net_4.0.xml \
+	frameworks/net_4.5.xml \
+	targets/Microsoft.Portable.CSharp_4.0.targets \
+	targets/Microsoft.Portable.CSharp_4.5.targets \
+	targets/Microsoft.VisualBasic.targets \
+	targets/Microsoft.WebApplication.targets \
+	targets/Microsoft.Portable.CSharp.targets \
+	xbuild_tests.make
diff --git a/mcs/tools/xbuild/xbuild/12.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets
index a0385734994..a0385734994 100644
--- a/mcs/tools/xbuild/xbuild/12.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets
diff --git a/mcs/tools/xbuild/xbuild/12.0/Microsoft.Common.tasks b/mcs/tools/xbuild/data/12.0/Microsoft.Common.tasks
index 550f6d04934..550f6d04934 100644
--- a/mcs/tools/xbuild/xbuild/12.0/Microsoft.Common.tasks
+++ b/mcs/tools/xbuild/data/12.0/Microsoft.Common.tasks
diff --git a/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets
index 9ba7f3a92ec..fef699031c6 100644
--- a/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" InitialTargets="_ValidateEssentialProperties" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
 	<Import Project="$(MSBuildProjectFullPath).user" Condition="Exists('$(MSBuildProjectFullPath).user')"/>
-	
+
 	<PropertyGroup>
 		<OutputType Condition="'$(OutputType)' == ''">Exe</OutputType>
 		<TargetExt Condition="'$(OutputType)' == 'Winexe'">.exe</TargetExt>
@@ -16,7 +16,7 @@
 
 	<PropertyGroup>
 		<AssemblyName Condition="'$(AssemblyName)' == ''">$(MSBuildProjectName)</AssemblyName>
-		<OutputPath Condition="'$(OutputPath)' != '' and !HasTrailingSlash('$(OutputPath)')">$(OutputPath)\</OutputPath> 
+		<OutputPath Condition="'$(OutputPath)' != '' and !HasTrailingSlash('$(OutputPath)')">$(OutputPath)\</OutputPath>
 		<OutputPath Condition=" '$(Platform)'=='' and '$(Configuration)'=='' and '$(OutputPath)'=='' ">bin\Debug\</OutputPath>
 		<WarningLevel Condition="'$(WarningLevel)' == ''" >2</WarningLevel>
 		<TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v2.0</TargetFrameworkVersion>
@@ -100,7 +100,7 @@
 			<Output TaskParameter="AppConfigFile" ItemName="AppConfigWithTargetPath"/>
 		</FindAppConfigFile>
 
-		<MakeDir 
+		<MakeDir
 			Directories="$(OutDir);$(IntermediateOutputPath);@(DocFileItem->'%(RelativeDir)')"
 		/>
 	</Target>
@@ -113,10 +113,10 @@
 			<Output Condition="'$(TargetFrameworkVersion)' == 'v3.5'"
 				TaskParameter="FrameworkVersion35Path"
 				ItemName="_CombinedTargetFrameworkDirectoriesItem"/>
-			<Output Condition="'$(TargetFrameworkVersion)' == 'v3.0' or '$(TargetFrameworkVersion)' == 'v3.5'" 
+			<Output Condition="'$(TargetFrameworkVersion)' == 'v3.0' or '$(TargetFrameworkVersion)' == 'v3.5'"
 				TaskParameter="FrameworkVersion30Path"
 				ItemName="_CombinedTargetFrameworkDirectoriesItem"/>
-			<Output Condition="'$(TargetFrameworkVersion)' == 'v2.0' or '$(TargetFrameworkVersion)' == 'v3.0' or '$(TargetFrameworkVersion)' == 'v3.5'" 
+			<Output Condition="'$(TargetFrameworkVersion)' == 'v2.0' or '$(TargetFrameworkVersion)' == 'v3.0' or '$(TargetFrameworkVersion)' == 'v3.5'"
 				TaskParameter="FrameworkVersion20Path"
 				ItemName="_CombinedTargetFrameworkDirectoriesItem"/>
 		</GetFrameworkPath>
@@ -488,7 +488,7 @@
 	<Target Name="DeployOutputFiles"
 		DependsOnTargets="PrepareResources;CoreCompile;_CopyDeployFilesToOutputDirectory;_CopyAppConfigFile">
 
-		<Copy 
+		<Copy
 			SourceFiles="$(IntermediateOutputPath)$(AssemblyName)$(TargetExt).mdb"
 			Condition="'$(OutDir)' != '' and Exists('$(IntermediateOutputPath)$(AssemblyName)$(TargetExt).mdb')"
 			DestinationFolder="$(OutDir)"
diff --git a/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.tasks b/mcs/tools/xbuild/data/2.0/Microsoft.Common.tasks
index d1677c9d843..d1677c9d843 100644
--- a/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.tasks
+++ b/mcs/tools/xbuild/data/2.0/Microsoft.Common.tasks
diff --git a/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets b/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets
index 6d91c776739..03935bdba31 100644
--- a/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" InitialTargets="_ValidateEssentialProperties" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
 	<Import Project="$(MSBuildProjectFullPath).user" Condition="Exists('$(MSBuildProjectFullPath).user')"/>
-	
+
 	<PropertyGroup>
 		<OutputType Condition="'$(OutputType)' == ''">Exe</OutputType>
 		<TargetExt Condition="'$(OutputType)' == 'Winexe'">.exe</TargetExt>
@@ -16,7 +16,7 @@
 
 	<PropertyGroup>
 		<AssemblyName Condition="'$(AssemblyName)' == ''">$(MSBuildProjectName)</AssemblyName>
-		<OutputPath Condition="'$(OutputPath)' != '' and !HasTrailingSlash('$(OutputPath)')">$(OutputPath)\</OutputPath> 
+		<OutputPath Condition="'$(OutputPath)' != '' and !HasTrailingSlash('$(OutputPath)')">$(OutputPath)\</OutputPath>
 		<OutputPath Condition=" '$(Platform)'=='' and '$(Configuration)'=='' and '$(OutputPath)'=='' ">bin\Debug\</OutputPath>
 		<WarningLevel Condition="'$(WarningLevel)' == ''" >2</WarningLevel>
 		<TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v2.0</TargetFrameworkVersion>
@@ -100,7 +100,7 @@
 			<Output TaskParameter="AppConfigFile" ItemName="AppConfigWithTargetPath"/>
 		</FindAppConfigFile>
 
-		<MakeDir 
+		<MakeDir
 			Directories="$(OutDir);$(IntermediateOutputPath);@(DocFileItem->'%(RelativeDir)')"
 		/>
 	</Target>
@@ -113,10 +113,10 @@
 			<Output Condition="'$(TargetFrameworkVersion)' == 'v3.5'"
 				TaskParameter="FrameworkVersion35Path"
 				ItemName="_CombinedTargetFrameworkDirectoriesItem"/>
-			<Output Condition="'$(TargetFrameworkVersion)' == 'v3.0' or '$(TargetFrameworkVersion)' == 'v3.5'" 
+			<Output Condition="'$(TargetFrameworkVersion)' == 'v3.0' or '$(TargetFrameworkVersion)' == 'v3.5'"
 				TaskParameter="FrameworkVersion30Path"
 				ItemName="_CombinedTargetFrameworkDirectoriesItem"/>
-			<Output Condition="'$(TargetFrameworkVersion)' == 'v2.0' or '$(TargetFrameworkVersion)' == 'v3.0' or '$(TargetFrameworkVersion)' == 'v3.5'" 
+			<Output Condition="'$(TargetFrameworkVersion)' == 'v2.0' or '$(TargetFrameworkVersion)' == 'v3.0' or '$(TargetFrameworkVersion)' == 'v3.5'"
 				TaskParameter="FrameworkVersion20Path"
 				ItemName="_CombinedTargetFrameworkDirectoriesItem"/>
 		</GetFrameworkPath>
@@ -495,7 +495,7 @@
 	<Target Name="DeployOutputFiles"
 		DependsOnTargets="PrepareResources;CoreCompile;_CopyDeployFilesToOutputDirectory;_CopyAppConfigFile">
 
-		<Copy 
+		<Copy
 			SourceFiles="$(IntermediateOutputPath)$(AssemblyName)$(TargetExt).mdb"
 			Condition="'$(OutDir)' != '' and Exists('$(IntermediateOutputPath)$(AssemblyName)$(TargetExt).mdb')"
 			DestinationFolder="$(OutDir)"
diff --git a/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.tasks b/mcs/tools/xbuild/data/3.5/Microsoft.Common.tasks
index 397d68c73ea..397d68c73ea 100644
--- a/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.tasks
+++ b/mcs/tools/xbuild/data/3.5/Microsoft.Common.tasks
diff --git a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets
index 6e4b73e89db..a0385734994 100644
--- a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets
@@ -7,8 +7,8 @@
 	<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\$(MSBuildThisFile)\ImportBefore\*"
 		Condition="'$(ImportByWildcardBeforeMicrosoftCommonTargets)' == 'true' and Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\$(MSBuildThisFile)\ImportBefore')"/>
 
-	<Import Project="$(MSBuildProjectFullPath).user" Condition="Exists('$(MSBuildProjectFullPath).user')"/>	
-	
+	<Import Project="$(MSBuildProjectFullPath).user" Condition="Exists('$(MSBuildProjectFullPath).user')"/>
+
 	<PropertyGroup>
 		<OutputType Condition="'$(OutputType)' == ''">Exe</OutputType>
 		<TargetExt Condition="'$(OutputType)' == 'Winexe'">.exe</TargetExt>
@@ -23,7 +23,7 @@
 
 	<PropertyGroup>
 		<AssemblyName Condition="'$(AssemblyName)' == ''">$(MSBuildProjectName)</AssemblyName>
-		<OutputPath Condition="'$(OutputPath)' != '' and !HasTrailingSlash('$(OutputPath)')">$(OutputPath)\</OutputPath> 
+		<OutputPath Condition="'$(OutputPath)' != '' and !HasTrailingSlash('$(OutputPath)')">$(OutputPath)\</OutputPath>
 		<OutputPath Condition=" '$(Platform)'=='' and '$(Configuration)'=='' and '$(OutputPath)'=='' ">bin\Debug\</OutputPath>
 		<WarningLevel Condition="'$(WarningLevel)' == ''" >2</WarningLevel>
 
@@ -115,7 +115,7 @@
 			<Output TaskParameter="AppConfigFile" ItemName="AppConfigWithTargetPath"/>
 		</FindAppConfigFile>
 
-		<MakeDir 
+		<MakeDir
 			Directories="$(OutDir);$(IntermediateOutputPath);@(DocFileItem->'%(RelativeDir)')"
 		/>
 	</Target>
@@ -136,10 +136,10 @@
 			<Output Condition="'$(TargetFrameworkVersion)' == 'v3.5'"
 				TaskParameter="FrameworkVersion35Path"
 				ItemName="_CombinedTargetFrameworkDirectoriesItem"/>
-			<Output Condition="'$(TargetFrameworkVersion)' == 'v3.0' or '$(TargetFrameworkVersion)' == 'v3.5'" 
+			<Output Condition="'$(TargetFrameworkVersion)' == 'v3.0' or '$(TargetFrameworkVersion)' == 'v3.5'"
 				TaskParameter="FrameworkVersion30Path"
 				ItemName="_CombinedTargetFrameworkDirectoriesItem"/>
-			<Output Condition="'$(TargetFrameworkVersion)' == 'v2.0' or '$(TargetFrameworkVersion)' == 'v3.0' or '$(TargetFrameworkVersion)' == 'v3.5'" 
+			<Output Condition="'$(TargetFrameworkVersion)' == 'v2.0' or '$(TargetFrameworkVersion)' == 'v3.0' or '$(TargetFrameworkVersion)' == 'v3.5'"
 				TaskParameter="FrameworkVersion20Path"
 				ItemName="_CombinedTargetFrameworkDirectoriesItem"/>
 		</GetFrameworkPath>
@@ -171,7 +171,7 @@
 			<Output TaskParameter="TargetFrameworkMonikerDisplayName" PropertyName="TargetFrameworkMonikerDisplayName"/>
 		</GetReferenceAssemblyPaths>
 
-		
+
 		<!-- Remove duplicates. -->
 		<ItemGroup>
 			<_TargetFrameworkDirectories Include="$(_TargetFrameworkDirectories);$(TargetFrameworkDirectory)" KeepDuplicates="false" />
@@ -179,17 +179,17 @@
 		<PropertyGroup>
 			<TargetFrameworkDirectory>@(_TargetFrameworkDirectories)</TargetFrameworkDirectory>
 		</PropertyGroup>
-		
+
 		<ItemGroup Condition="'$(ImplicitlyExpandDesignTimeFacades)' == 'true'">
 			<DesignTimeFacadeDirectoryRoots Include="$(TargetFrameworkDirectory)" />
 			<DesignTimeFacadeDirectories Include="%(DesignTimeFacadeDirectoryRoots.Identity)\Facades\" Condition="Exists('%(DesignTimeFacadeDirectoryRoots.Identity)\Facades\')" />
 			<_DesignTimeFacadeAssemblies Include="%(DesignTimeFacadeDirectories.Identity)\*.dll"/>
 		</ItemGroup>
-		
+
 		<PropertyGroup Condition="'@(DesignTimeFacadeDirectories)' != ''">
 			<TargetFrameworkDirectory>$(TargetFrameworkDirectory);@(DesignTimeFacadeDirectories)</TargetFrameworkDirectory>
 		</PropertyGroup>
-		
+
 	</Target>
 
 	<PropertyGroup>
@@ -229,23 +229,23 @@
 			PrepareForBuild
 		</ResolveAssemblyReferencesDependsOn>
 	</PropertyGroup>
-	
+
 	<PropertyGroup Condition="'$(TargetFrameworkMoniker)' != ''">
 		<TargetFrameworkMonikerAssemblyAttributesPath Condition="'$(TargetFrameworkMonikerAssemblyAttributesPath)' == ''">$(IntermediateOutputPath)$(TargetFrameworkMoniker).AssemblyAttribute$(DefaultLanguageSourceExtension)</TargetFrameworkMonikerAssemblyAttributesPath>
-		<GenerateTargetFrameworkAttribute Condition="'$(GenerateTargetFrameworkAttribute)' == '' and '$(TargetFrameworkMoniker)' 
+		<GenerateTargetFrameworkAttribute Condition="'$(GenerateTargetFrameworkAttribute)' == '' and '$(TargetFrameworkMoniker)'
 	!= '' and '$(TargetingClr2Framework)' != 'true'">true</GenerateTargetFrameworkAttribute>
 	</PropertyGroup>
-	
+
 	<ItemGroup Condition="'$(GenerateTargetFrameworkAttribute)' == 'true'">
 		<FileWrites Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" />
 	</ItemGroup>
-	
+
 	<Target Name="GenerateTargetFrameworkMonikerAttribute"
 		DependsOnTargets="PrepareForBuild;GetReferenceAssemblyPaths"
 		Inputs="$(MSBuildToolsPath)\Microsoft.Common.targets"
 		Outputs="$(TargetFrameworkMonikerAssemblyAttributesPath)"
 		Condition="'$(GenerateTargetFrameworkAttribute)' == 'true'">
-		
+
 		<WriteLinesToFile
 			File="$(TargetFrameworkMonikerAssemblyAttributesPath)"
 			Lines="$(TargetFrameworkMonikerAssemblyAttributeText)"
@@ -253,7 +253,7 @@
 			ContinueOnError="true"
 			Condition="'@(Compile)' != '' and '$(TargetFrameworkMonikerAssemblyAttributeText)' != ''"
 		/>
-		
+
 		<ItemGroup Condition="'@(Compile)' != '' and '$(TargetFrameworkMonikerAssemblyAttributeText)' != ''">
 			<Compile Include="$(TargetFrameworkMonikerAssemblyAttributesPath)"/>
 		</ItemGroup>
@@ -294,7 +294,7 @@
 			<Output TaskParameter="RelatedFiles" ItemName="_ReferenceRelatedPaths"/>
 			<Output TaskParameter="SatelliteFiles" ItemName="ReferenceSatellitePaths"/>
 			<Output TaskParameter="CopyLocalFiles" ItemName="ReferenceCopyLocalPaths"/>
-			
+
 			<!-- FIXME: backwards compatibility -->
 			<Output TaskParameter="ResolvedDependencyFiles" ItemName="_ResolvedDependencyFiles"/>
 		</ResolveAssemblyReference>
@@ -387,7 +387,7 @@
 			AfterBuild
 		</BuildDependsOn>
 	</PropertyGroup>
-	
+
 	<Target Name="BuildOnlySettings"/>
 	<Target Name="BeforeBuild"/>
 	<Target Name="AfterBuild"/>
@@ -597,7 +597,7 @@
 	<Target Name="DeployOutputFiles"
 		DependsOnTargets="PrepareResources;CoreCompile;_CopyDeployFilesToOutputDirectory;_CopyAppConfigFile">
 
-		<Copy 
+		<Copy
 			SourceFiles="$(IntermediateOutputPath)$(AssemblyName)$(TargetExt).mdb"
 			Condition="'$(OutDir)' != '' and Exists('$(IntermediateOutputPath)$(AssemblyName)$(TargetExt).mdb')"
 			DestinationFolder="$(OutDir)"
@@ -630,7 +630,7 @@
 
 		<Copy SourceFiles="@(ItemsToCopyToOutputDirectoryPreserveNewest)"
 			DestinationFiles="@(ItemsToCopyToOutputDirectoryPreserveNewest->'$(OutDir)%(TargetPath)')"
-			SkipUnchangedFiles="$(SkipCopyUnchangedFiles)"> 
+			SkipUnchangedFiles="$(SkipCopyUnchangedFiles)">
 			<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
 		</Copy>
 	</Target>
@@ -876,7 +876,7 @@
 		     we can safely remove the file list now -->
 		<Delete Files="$(IntermediateOutputPath)$(CleanFile)" TreatErrorsAsWarnings="true" />
 	</Target>
-	
+
 	<PropertyGroup>
 		<ImplicitlyExpandDesignTimeFacades>true</ImplicitlyExpandDesignTimeFacades>
 
@@ -890,9 +890,9 @@
 			GetReferenceAssemblyPaths
 		</ImplicitlyExpandDesignTimeFacadesDependsOn>
 	</PropertyGroup>
-	
+
 	<Target Name="ImplicitlyExpandDesignTimeFacades" Condition="'$(ImplicitlyExpandDesignTimeFacades)' == 'true'" DependsOnTargets="$(ImplicitlyExpandDesignTimeFacadesDependsOn)">
-	
+
 		<PropertyGroup>
 			<_HasReferenceToSystemRuntime Condition="'%(_ResolvedDependencyFiles.Filename)' == 'System.Runtime'">true</_HasReferenceToSystemRuntime>
 		</PropertyGroup>
@@ -907,11 +907,11 @@
 			</ReferencePath>
 			<_ResolveAssemblyReferenceResolvedFiles Include="@(ReferencePath)" Condition="'%(ReferencePath.ResolvedFrom)' == 'ImplicitlyExpandDesignTimeFacades'" />
 		</ItemGroup>
-    
+
 		<Message Importance="Low" Text="Including @(ReferencePath)" Condition="'%(ReferencePath.ResolvedFrom)' == 'ImplicitlyExpandDesignTimeFacades'" />
 
 	</Target>
-	
+
 	<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\$(MSBuildThisFile)\ImportAfter\*"
 		Condition="'$(ImportByWildcardAfterMicrosoftCommonTargets)' == 'true' and Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\$(MSBuildThisFile)\ImportAfter')"/>
 </Project>
diff --git a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.tasks b/mcs/tools/xbuild/data/4.0/Microsoft.Common.tasks
index d326aad0145..d326aad0145 100644
--- a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.tasks
+++ b/mcs/tools/xbuild/data/4.0/Microsoft.Common.tasks
diff --git a/mcs/tools/xbuild/xbuild/MSBuild/Microsoft.Build.CommonTypes.xsd b/mcs/tools/xbuild/data/MSBuild/Microsoft.Build.CommonTypes.xsd
index 390189b3ed2..148f6bf4f35 100644
--- a/mcs/tools/xbuild/xbuild/MSBuild/Microsoft.Build.CommonTypes.xsd
+++ b/mcs/tools/xbuild/data/MSBuild/Microsoft.Build.CommonTypes.xsd
@@ -4,7 +4,7 @@ elementFormDefault="qualified">
 
     <!-- =================== INCLUDE COMMON SCHEMA =========================== -->
     <xs:include schemaLocation="Microsoft.Build.Core.xsd"/>
-    
+
     <!-- ======================== ITEMS =====================================-->
     <!-- Possible Types include SimpleItemType (no meta-data subelements), GenericItemType (any meta-data), or something more specific.-->
     <xs:element name="Reference" substitutionGroup="msb:Item">
@@ -30,7 +30,7 @@ elementFormDefault="qualified">
                                 <xs:annotation>
                                     <xs:documentation>Fusion name of the assembly (optional)</xs:documentation>
                                 </xs:annotation>
-                            </xs:element>                            
+                            </xs:element>
                             <xs:element name="SpecificVersion">
                                 <xs:annotation>
                                     <xs:documentation>Whether only the version in the fusion name should be referenced (optional, boolean)</xs:documentation>
@@ -45,7 +45,7 @@ elementFormDefault="qualified">
                                 <xs:annotation>
                                     <xs:documentation>Whether the reference should be copied to the output folder (optional, boolean)</xs:documentation>
                                 </xs:annotation>
-                            </xs:element>                                
+                            </xs:element>
                         </xs:choice>
                     </xs:sequence>
                     <!-- redefine Include just to give a specific description -->
@@ -142,7 +142,7 @@ elementFormDefault="qualified">
                         <xs:annotation>
                             <xs:documentation>Path to native reference</xs:documentation>
                         </xs:annotation>
-                    </xs:attribute>                    
+                    </xs:attribute>
                 </xs:extension>
             </xs:complexContent>
         </xs:complexType>
@@ -165,7 +165,7 @@ elementFormDefault="qualified">
                                 <xs:annotation>
                                     <xs:documentation>Project GUID, in the form {00000000-0000-0000-0000-000000000000}</xs:documentation>
                                 </xs:annotation>
-                            </xs:element>                                
+                            </xs:element>
                             <xs:element name="Package"/>
                         </xs:choice>
                     </xs:sequence>
@@ -178,15 +178,15 @@ elementFormDefault="qualified">
                 </xs:extension>
             </xs:complexContent>
         </xs:complexType>
-    </xs:element>    
+    </xs:element>
     <xs:element name="Compile" substitutionGroup="msb:Item">
         <xs:annotation>
             <xs:documentation>Source files for compiler</xs:documentation>
-        </xs:annotation>        
-        <xs:complexType>           
+        </xs:annotation>
+        <xs:complexType>
             <xs:complexContent>
                 <xs:extension base="msb:SimpleItemType">
-                    <xs:sequence minOccurs="0" maxOccurs="unbounded">                       
+                    <xs:sequence minOccurs="0" maxOccurs="unbounded">
                         <xs:choice>
                             <xs:element name="SubType"/>
                             <xs:element name="DependentUpon"/>
@@ -194,7 +194,7 @@ elementFormDefault="qualified">
                                 <xs:annotation>
                                     <xs:documentation>Whether file was generated from another file (boolean)</xs:documentation>
                                 </xs:annotation>
-                            </xs:element>                                 
+                            </xs:element>
                             <xs:element name="DesignTime"/>
                             <xs:element name="Link">
                                 <xs:annotation>
@@ -206,7 +206,7 @@ elementFormDefault="qualified">
                                 <xs:annotation>
                                     <xs:documentation>Display in user interface (optional, boolean)</xs:documentation>
                                 </xs:annotation>
-                            </xs:element>                                
+                            </xs:element>
                         </xs:choice>
                     </xs:sequence>
                     <!-- redefine Include just to give a specific description -->
@@ -214,7 +214,7 @@ elementFormDefault="qualified">
                         <xs:annotation>
                             <xs:documentation>Semi-colon separated list of source files (wildcards are allowed)</xs:documentation>
                         </xs:annotation>
-                    </xs:attribute>                    
+                    </xs:attribute>
                 </xs:extension>
             </xs:complexContent>
         </xs:complexType>
@@ -222,7 +222,7 @@ elementFormDefault="qualified">
     <xs:element name="EmbeddedResource" substitutionGroup="msb:Item">
         <xs:annotation>
             <xs:documentation>Resources to be embedded in the generated assembly</xs:documentation>
-        </xs:annotation>        
+        </xs:annotation>
         <xs:complexType>
             <xs:complexContent>
                 <xs:extension base="msb:SimpleItemType">
@@ -233,27 +233,27 @@ elementFormDefault="qualified">
                                 <xs:annotation>
                                     <xs:documentation>Name of any file generator that is run on this item</xs:documentation>
                                 </xs:annotation>
-                            </xs:element>                               
+                            </xs:element>
                             <xs:element name="LastGenOutput">
                                 <xs:annotation>
                                     <xs:documentation>File that was created by any file generator that was run on this item</xs:documentation>
                                 </xs:annotation>
-                            </xs:element>                                 
+                            </xs:element>
                             <xs:element name="CustomToolNamespace">
                                 <xs:annotation>
                                     <xs:documentation>Namespace into which any file generator that is run on this item should create code</xs:documentation>
                                 </xs:annotation>
-                            </xs:element>                                
+                            </xs:element>
                             <xs:element name="Link">
                                 <xs:annotation>
                                     <xs:documentation>Notional path within project to display if the file is physically located outside of the project file's cone (optional)</xs:documentation>
                                 </xs:annotation>
-                            </xs:element>                                
+                            </xs:element>
                             <xs:element name="InProject">
                                 <xs:annotation>
                                     <xs:documentation>Display in user interface (optional, boolean)</xs:documentation>
                                 </xs:annotation>
-                            </xs:element>                                
+                            </xs:element>
                             <xs:element name="SubType"/>
                         </xs:choice>
                     </xs:sequence>
@@ -262,7 +262,7 @@ elementFormDefault="qualified">
                         <xs:annotation>
                             <xs:documentation>Semi-colon separated list of resource files (wildcards are allowed)</xs:documentation>
                         </xs:annotation>
-                    </xs:attribute>                    
+                    </xs:attribute>
                 </xs:extension>
             </xs:complexContent>
         </xs:complexType>
@@ -281,14 +281,14 @@ elementFormDefault="qualified">
                                 <xs:annotation>
                                     <xs:documentation>Name of any file generator that is run on this item</xs:documentation>
                                 </xs:annotation>
-                            </xs:element>                                  
+                            </xs:element>
                             <xs:element name="LastGenOutput"/>
                             <xs:element name="CustomToolNamespace"/>
                             <xs:element name="Link">
                                 <xs:annotation>
                                     <xs:documentation>Notional path within project to display if the file is physically located outside of the project file's cone (optional)</xs:documentation>
                                 </xs:annotation>
-                            </xs:element>                                
+                            </xs:element>
                             <xs:element name="Group"/>
                             <xs:element name="PublishState">
                             <xs:annotation>
@@ -306,7 +306,7 @@ elementFormDefault="qualified">
                                 <xs:annotation>
                                     <xs:documentation>Copy file to output directory (optional, boolean, default false)</xs:documentation>
                                 </xs:annotation>
-                            </xs:element>                                    
+                            </xs:element>
                         </xs:choice>
                     </xs:sequence>
                     <!-- redefine Include just to give a specific description -->
@@ -318,7 +318,7 @@ elementFormDefault="qualified">
                 </xs:extension>
             </xs:complexContent>
         </xs:complexType>
-    </xs:element>    
+    </xs:element>
     <xs:element name="None" substitutionGroup="msb:Item">
         <xs:annotation>
             <xs:documentation>Files that should have no role in the build process</xs:documentation>
@@ -334,19 +334,19 @@ elementFormDefault="qualified">
                                 <xs:annotation>
                                     <xs:documentation>Name of any file generator that is run on this item</xs:documentation>
                                 </xs:annotation>
-                            </xs:element>                                  
+                            </xs:element>
                             <xs:element name="LastGenOutput"/>
                             <xs:element name="CustomToolNamespace"/>
                             <xs:element name="Link">
                                 <xs:annotation>
                                     <xs:documentation>Notional path within project to display if the file is physically located outside of the project file's cone (optional)</xs:documentation>
                                 </xs:annotation>
-                            </xs:element>                                
+                            </xs:element>
                             <xs:element name="InProject">
                                 <xs:annotation>
                                     <xs:documentation>Display in user interface (optional, boolean)</xs:documentation>
                                 </xs:annotation>
-                            </xs:element>                                
+                            </xs:element>
                         </xs:choice>
                     </xs:sequence>
                 </xs:extension>
@@ -362,17 +362,17 @@ elementFormDefault="qualified">
         <xs:annotation>
             <xs:documentation>Assemblies whose namespaces should be imported by the Visual Basic compiler</xs:documentation>
         </xs:annotation>
-    </xs:element>        
+    </xs:element>
     <xs:element name="Service" type="msb:SimpleItemType" substitutionGroup="msb:Item"/>
     <xs:element name="WebReferences" type="msb:SimpleItemType" substitutionGroup="msb:Item">
         <xs:annotation>
             <xs:documentation>Name of Web References folder to display in user interface</xs:documentation>
         </xs:annotation>
-    </xs:element>        
+    </xs:element>
     <xs:element name="WebReferenceUrl" substitutionGroup="msb:Item">
         <xs:annotation>
             <xs:documentation>Represents a reference to a web service</xs:documentation>
-        </xs:annotation>        
+        </xs:annotation>
             <xs:complexType>
                 <xs:complexContent>
                     <xs:extension base="msb:SimpleItemType">
@@ -392,7 +392,7 @@ elementFormDefault="qualified">
                             <xs:annotation>
                                 <xs:documentation>URL to web service</xs:documentation>
                             </xs:annotation>
-                        </xs:attribute>                        
+                        </xs:attribute>
                     </xs:extension>
                 </xs:complexContent>
             </xs:complexType>
@@ -407,7 +407,7 @@ elementFormDefault="qualified">
                                 <xs:annotation>
                                     <xs:documentation>Display in user interface (optional, boolean)</xs:documentation>
                                 </xs:annotation>
-                            </xs:element>                                
+                            </xs:element>
                             <xs:element name="ProductName"/>
                             <xs:element name="Install"/>
                         </xs:choice>
@@ -426,7 +426,7 @@ elementFormDefault="qualified">
                                 <xs:annotation>
                                     <xs:documentation>Display in user interface (optional, boolean)</xs:documentation>
                                 </xs:annotation>
-                            </xs:element>                                
+                            </xs:element>
                             <xs:element name="Group"/>
                             <xs:element name="IsAssembly">
                                 <xs:annotation>
@@ -437,7 +437,7 @@ elementFormDefault="qualified">
                                 <xs:annotation>
                                     <xs:documentation>Default, Included, Excluded, DataFile, or Prerequisite</xs:documentation>
                                 </xs:annotation>
-                            </xs:element>                            
+                            </xs:element>
                         </xs:choice>
                     </xs:sequence>
                 </xs:extension>
@@ -469,7 +469,7 @@ elementFormDefault="qualified">
         <xs:annotation>
             <xs:documentation>Name of output assembly</xs:documentation>
         </xs:annotation>
-    </xs:element>           
+    </xs:element>
     <xs:element name="AssemblyOriginatorKeyFile" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="AssemblyOriginatorKeyFileType" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="AssemblyOriginatorKeyMode" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
@@ -478,13 +478,13 @@ elementFormDefault="qualified">
         <xs:annotation>
             <xs:documentation>boolean</xs:documentation>
         </xs:annotation>
-    </xs:element>         
+    </xs:element>
     <xs:element name="BaseAddress" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="BootstrapperComponentsLocation" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
             <xs:documentation>HomeSite, Relative, or Absolute</xs:documentation>
         </xs:annotation>
-    </xs:element>        
+    </xs:element>
     <xs:element name="BootstrapperComponentsUrl" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="BootstrapperEnabled" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
@@ -505,26 +505,26 @@ elementFormDefault="qualified">
         <xs:annotation>
             <xs:documentation>Whether to emit symbols (boolean)</xs:documentation>
         </xs:annotation>
-    </xs:element>        
-    <xs:element name="DebugType" type="msb:StringPropertyType" substitutionGroup="msb:Property">   
+    </xs:element>
+    <xs:element name="DebugType" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
             <xs:documentation>none, pdbonly, or full</xs:documentation>
         </xs:annotation>
-    </xs:element>         
+    </xs:element>
     <xs:element name="DefaultClientScript" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="DefaultHTMLPageLayout" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="DefaultTargetSchema" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="DefineConstants" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
-    <xs:element name="DefineDebug" type="msb:StringPropertyType" substitutionGroup="msb:Property">   
+    <xs:element name="DefineDebug" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
             <xs:documentation>Whether DEBUG is defined (boolean)</xs:documentation>
         </xs:annotation>
-    </xs:element>          
+    </xs:element>
     <xs:element name="DefineTrace" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
             <xs:documentation>Whether TRACE is defined (boolean)</xs:documentation>
         </xs:annotation>
-    </xs:element>          
+    </xs:element>
     <xs:element name="DelaySign" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="DisableLangXtns" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="DisallowUrlActiviation" type="msb:StringPropertyType" substitutionGroup="msb:Property">
@@ -566,75 +566,75 @@ elementFormDefault="qualified">
         <xs:annotation>
             <xs:documentation>boolean</xs:documentation>
         </xs:annotation>
-    </xs:element>                
+    </xs:element>
     <xs:element name="MinimumRequiredVersion" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
             <xs:documentation>Matches the expression "\d\.\d\.\d\.\d"</xs:documentation>
         </xs:annotation>
-    </xs:element>                
+    </xs:element>
     <xs:element name="MyType" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
-    <xs:element name="NoConfig" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>    
+    <xs:element name="NoConfig" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="NoStandardLibraries" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="NoStdLib" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
             <xs:documentation>Whether standard libraries (such as mscorlib) should be referenced automatically (boolean)</xs:documentation>
         </xs:annotation>
-    </xs:element>          
+    </xs:element>
     <xs:element name="NoWarn" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
             <xs:documentation>Comma separated list of disabled warnings</xs:documentation>
         </xs:annotation>
-    </xs:element>        
+    </xs:element>
     <xs:element name="OpenBrowserOnPublish" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
             <xs:documentation>boolean</xs:documentation>
         </xs:annotation>
-    </xs:element>                
+    </xs:element>
     <xs:element name="Optimize" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
             <xs:documentation>Should compiler optimize output (boolean)</xs:documentation>
         </xs:annotation>
-    </xs:element>     
+    </xs:element>
     <xs:element name="OptionCompare" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
             <xs:documentation>Option Compare setting (Text or Binary)</xs:documentation>
         </xs:annotation>
-    </xs:element>         
+    </xs:element>
     <xs:element name="OptionExplicit" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
             <xs:documentation>Should Option Explicit be set (On or Off)</xs:documentation>
         </xs:annotation>
-    </xs:element>         
+    </xs:element>
     <xs:element name="OptionStrict" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
             <xs:documentation>Should Option Strict be set (On or Off)</xs:documentation>
         </xs:annotation>
-    </xs:element>            
+    </xs:element>
     <xs:element name="OSVersion" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="OutputPath" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
             <xs:documentation>Path to output folder, with trailing slash</xs:documentation>
         </xs:annotation>
-    </xs:element>        
+    </xs:element>
     <xs:element name="OutputType" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
             <xs:documentation>Type of output to generate (WinExe, Exe, or Library)</xs:documentation>
         </xs:annotation>
     </xs:element>
     <xs:element name="Platform" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
-    <xs:element name="PlatformFamilyName" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>    
-    <xs:element name="PlatformID" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>    
+    <xs:element name="PlatformFamilyName" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
+    <xs:element name="PlatformID" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="PlatformTarget" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="PostBuildEvent" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
             <xs:documentation>Command line to be run at the end of build</xs:documentation>
         </xs:annotation>
-    </xs:element>          
+    </xs:element>
     <xs:element name="PreBuildEvent" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
             <xs:documentation>Command line to be run at the start of build</xs:documentation>
         </xs:annotation>
-    </xs:element>        
+    </xs:element>
     <xs:element name="ProductName" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="ProductVersion" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="ProjectGuid" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
@@ -647,7 +647,7 @@ elementFormDefault="qualified">
         <xs:annotation>
             <xs:documentation>Semi-colon separated list of folders to search during reference resolution</xs:documentation>
         </xs:annotation>
-    </xs:element>        
+    </xs:element>
     <xs:element name="RegisterForComInterop" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="RemoteDebugEnabled" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="RemoteDebugMachine" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
@@ -671,7 +671,7 @@ elementFormDefault="qualified">
         <xs:annotation>
             <xs:documentation>Type that contains the main entry point</xs:documentation>
         </xs:annotation>
-    </xs:element>        
+    </xs:element>
     <xs:element name="SupportUrl" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="TargetCulture" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="TargetZone" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
@@ -680,13 +680,13 @@ elementFormDefault="qualified">
         <xs:annotation>
             <xs:documentation>boolean</xs:documentation>
         </xs:annotation>
-    </xs:element>                
+    </xs:element>
     <xs:element name="TypeComplianceDiagnostics" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="UpdateEnabled" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
             <xs:documentation>boolean</xs:documentation>
         </xs:annotation>
-    </xs:element>                
+    </xs:element>
     <xs:element name="UpdateInterval" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="UpdateIntervalUnits" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
@@ -702,13 +702,13 @@ elementFormDefault="qualified">
         <xs:annotation>
             <xs:documentation>boolean</xs:documentation>
         </xs:annotation>
-    </xs:element>        
+    </xs:element>
     <xs:element name="UpdateRequired" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
             <xs:documentation>boolean</xs:documentation>
         </xs:annotation>
-    </xs:element>                
-    <xs:element name="UpdateUrl" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>    
+    </xs:element>
+    <xs:element name="UpdateUrl" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="UTF8OutPut" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="UseVSHostingProcess" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="VSTO_TrustAssembliesLocation" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
@@ -716,12 +716,12 @@ elementFormDefault="qualified">
         <xs:annotation>
             <xs:documentation>integer between 0 and 4 inclusive</xs:documentation>
         </xs:annotation>
-    </xs:element>        
+    </xs:element>
     <xs:element name="WarningsAsErrors" type="msb:StringPropertyType" substitutionGroup="msb:Property">
         <xs:annotation>
             <xs:documentation>Comma separated list of warning numbers to treat as errors</xs:documentation>
         </xs:annotation>
-    </xs:element>          
+    </xs:element>
     <xs:element name="WebPage" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <xs:element name="Win32ResourceFile" type="msb:StringPropertyType" substitutionGroup="msb:Property"/>
     <!-- ======================== TASKS =====================================-->
diff --git a/mcs/tools/xbuild/xbuild/MSBuild/Microsoft.Build.Core.xsd b/mcs/tools/xbuild/data/MSBuild/Microsoft.Build.Core.xsd
index 9ab9bda4412..c8f2aacb1be 100644
--- a/mcs/tools/xbuild/xbuild/MSBuild/Microsoft.Build.Core.xsd
+++ b/mcs/tools/xbuild/data/MSBuild/Microsoft.Build.Core.xsd
@@ -37,7 +37,7 @@
             <xs:element name="ProjectExtensions" type="msb:ProjectExtensionsType"/>
         </xs:choice>
     </xs:group>
-    <!-- ======================================================================================= -->    
+    <!-- ======================================================================================= -->
     <xs:group name="ProjectLevelTagType">
         <xs:choice>
             <xs:element name="PropertyGroup" type="msb:PropertyGroupType"/>
@@ -47,12 +47,12 @@
                 <xs:annotation>
                     <xs:documentation>Logs an Error event</xs:documentation>
                 </xs:annotation>
-            </xs:element>                
+            </xs:element>
             <xs:element name="Warning" type="msb:WarningErrorOutsideTargetType">
                 <xs:annotation>
                     <xs:documentation>Logs a Warning event</xs:documentation>
                 </xs:annotation>
-            </xs:element>                
+            </xs:element>
             <xs:element name="Message" type="msb:MessageOutsideTargetType"/>
             <xs:element name="UsingTask" type="msb:UsingTaskType"/>
             <xs:element name="Target" type="msb:TargetType"/>
@@ -66,8 +66,8 @@
             <xs:element name="Target" type="msb:TargetType"/>
             <xs:element name="Import" type="msb:ImportType"/>
         </xs:choice>
-    </xs:group>    
-    <!-- ======================================================================================= -->        
+    </xs:group>
+    <!-- ======================================================================================= -->
     <xs:complexType name="TargetType">
         <xs:annotation>
             <xs:documentation>Groups tasks into a section of the build process</xs:documentation>
@@ -88,12 +88,12 @@
             <xs:annotation>
                 <xs:documentation>Optional semi-colon separated list of targets that should be run before this target</xs:documentation>
             </xs:annotation>
-        </xs:attribute>            
+        </xs:attribute>
         <xs:attribute name="Inputs" type="xs:string" use="optional">
             <xs:annotation>
                 <xs:documentation>Optional semi-colon separated list of files that form inputs into this target. Their timestamps will be compared with the timestamps of files in Outputs to determine whether the Target is up to date</xs:documentation>
             </xs:annotation>
-        </xs:attribute>                
+        </xs:attribute>
         <xs:attribute name="Outputs" type="xs:string" use="optional">
             <xs:annotation>
                 <xs:documentation>Optional semi-colon separated list of files that form outputs into this target. Their timestamps will be compared with the timestamps of files in Inputs to determine whether the Target is up to date</xs:documentation>
@@ -103,9 +103,9 @@
             <xs:annotation>
                 <xs:documentation>Optional expression evaluated to determine whether the Target and the targets it depends on should be run</xs:documentation>
             </xs:annotation>
-        </xs:attribute>            
+        </xs:attribute>
     </xs:complexType>
-    <!-- ======================================================================================= -->        
+    <!-- ======================================================================================= -->
     <xs:complexType name="PropertyGroupType">
         <xs:annotation>
             <xs:documentation>Groups property definitions</xs:documentation>
@@ -117,13 +117,13 @@
             <xs:annotation>
                 <xs:documentation>Optional expression evaluated to determine whether the PropertyGroup should be used</xs:documentation>
             </xs:annotation>
-        </xs:attribute>                
+        </xs:attribute>
     </xs:complexType>
-    <!-- ======================================================================================= -->        
+    <!-- ======================================================================================= -->
     <xs:complexType name="ItemGroupType">
         <xs:annotation>
             <xs:documentation>Groups item list definitions</xs:documentation>
-        </xs:annotation>        
+        </xs:annotation>
         <xs:sequence minOccurs="0" maxOccurs="unbounded">
             <xs:element ref="msb:Item"/>
         </xs:sequence>
@@ -131,7 +131,7 @@
             <xs:annotation>
                 <xs:documentation>Optional expression evaluated to determine whether the ItemGroup should be used</xs:documentation>
             </xs:annotation>
-        </xs:attribute>                
+        </xs:attribute>
     </xs:complexType>
     <!-- ======================================================================================= -->
     <xs:complexType name="ChooseType">
@@ -165,7 +165,7 @@
     <xs:complexType name="OtherwiseType">
         <xs:annotation>
             <xs:documentation>Groups PropertyGroup and/or ItemGroup elements that are used if no Conditions on sibling When elements evaluate to true</xs:documentation>
-        </xs:annotation>        
+        </xs:annotation>
         <xs:sequence minOccurs="0" maxOccurs="unbounded">
             <xs:choice>
                 <xs:element name="PropertyGroup" type="msb:PropertyGroupType"/>
@@ -174,7 +174,7 @@
             </xs:choice>
         </xs:sequence>
     </xs:complexType>
-    <!-- ======================================================================================= -->        
+    <!-- ======================================================================================= -->
     <xs:complexType name="OnErrorType">
         <xs:annotation>
             <xs:documentation>Specifies targets to execute in the event of a recoverable error</xs:documentation>
@@ -188,9 +188,9 @@
             <xs:annotation>
                 <xs:documentation>Semi-colon separated list of targets to execute</xs:documentation>
             </xs:annotation>
-        </xs:attribute>            
+        </xs:attribute>
     </xs:complexType>
-    <!-- ======================================================================================= -->        
+    <!-- ======================================================================================= -->
     <xs:complexType name="MessageOutsideTargetType">
         <xs:annotation>
             <xs:documentation>Logs an informational Message event, with an optional Importance</xs:documentation>
@@ -199,41 +199,41 @@
             <xs:annotation>
                 <xs:documentation>Optional expression evaluated to determine whether the Message should be logged</xs:documentation>
             </xs:annotation>
-        </xs:attribute>            
+        </xs:attribute>
         <xs:attribute name="Importance" type="xs:string" use="optional">
             <xs:annotation>
                 <xs:documentation>Optional priority level. Allowed values are Low, Normal (default), and High</xs:documentation>
             </xs:annotation>
-        </xs:attribute>             
+        </xs:attribute>
         <xs:attribute name="Text" type="xs:string" use="optional">
             <xs:annotation>
                 <xs:documentation>Text to log</xs:documentation>
             </xs:annotation>
-        </xs:attribute>             
+        </xs:attribute>
     </xs:complexType>
-    <!-- ======================================================================================= -->        
+    <!-- ======================================================================================= -->
     <xs:complexType name="WarningErrorOutsideTargetType">
         <xs:attribute name="Condition" type="xs:string" use="optional">
             <xs:annotation>
                 <xs:documentation>Optional expression evaluated to determine whether the text should be logged</xs:documentation>
             </xs:annotation>
-        </xs:attribute>             
+        </xs:attribute>
         <xs:attribute name="Text" type="xs:string" use="optional">
             <xs:annotation>
                 <xs:documentation>Text to log</xs:documentation>
             </xs:annotation>
-        </xs:attribute>             
-    </xs:complexType>    
-    <!-- ======================================================================================= -->    
+        </xs:attribute>
+    </xs:complexType>
+    <!-- ======================================================================================= -->
     <xs:complexType name="UsingTaskType">
         <xs:annotation>
             <xs:documentation>Declares where to load a task that will be used in the project</xs:documentation>
-        </xs:annotation>        
+        </xs:annotation>
         <xs:attribute name="Condition" type="xs:string" use="optional">
             <xs:annotation>
                 <xs:documentation>Optional expression evaluated to determine whether the declaration should be evaluated</xs:documentation>
             </xs:annotation>
-        </xs:attribute>                
+        </xs:attribute>
         <xs:attribute name="AssemblyName" type="msb:non_empty_string" use="optional">
             <xs:annotation>
                 <xs:documentation>Optional name of assembly containing the task. Either AssemblyName or AssemblyFile must be used</xs:documentation>
@@ -243,30 +243,30 @@
             <xs:annotation>
                 <xs:documentation>Optional path to assembly containing the task. Either AssemblyName or AssemblyFile must be used</xs:documentation>
             </xs:annotation>
-        </xs:attribute>            
+        </xs:attribute>
         <xs:attribute name="TaskName" type="msb:non_empty_string" use="required">
             <xs:annotation>
                 <xs:documentation>Name of task class in the assembly</xs:documentation>
             </xs:annotation>
-        </xs:attribute>             
+        </xs:attribute>
     </xs:complexType>
-    <!-- ======================================================================================= -->  
+    <!-- ======================================================================================= -->
     <xs:complexType name="ImportType">
         <xs:annotation>
             <xs:documentation>Declares that the contents of another project file should be inserted at this location</xs:documentation>
-        </xs:annotation>        
+        </xs:annotation>
         <xs:attribute name="Condition" type="xs:string" use="optional">
             <xs:annotation>
                 <xs:documentation>Optional expression evaluated to determine whether the import should occur</xs:documentation>
             </xs:annotation>
-        </xs:attribute>              
+        </xs:attribute>
         <xs:attribute name="Project" type="msb:non_empty_string" use="required">
             <xs:annotation>
                 <xs:documentation>Project file to import</xs:documentation>
             </xs:annotation>
-        </xs:attribute>            
+        </xs:attribute>
     </xs:complexType>
-    <!-- ======================================================================================= -->  
+    <!-- ======================================================================================= -->
     <xs:complexType name="ProjectExtensionsType" mixed="true">
         <xs:annotation>
             <xs:documentation>Optional section used by MSBuild hosts, that may contain arbitrary XML content that is ignored by MSBuild itself</xs:documentation>
@@ -274,43 +274,43 @@
         <xs:sequence minOccurs="0" maxOccurs="unbounded">
             <xs:any processContents="skip"/>
         </xs:sequence>
-    </xs:complexType>    
+    </xs:complexType>
     <!-- ======================================================================================= -->
     <xs:element name="Item" type="msb:SimpleItemType" abstract="true"/>
-    <!-- ======================================================================================= -->   
+    <!-- ======================================================================================= -->
     <!-- convenience type for items that have no meta-data-->
     <xs:complexType name="SimpleItemType">
         <xs:attribute name="Condition" type="xs:string" use="optional">
             <xs:annotation>
                 <xs:documentation>Optional expression evaluated to determine whether the items should be evaluated</xs:documentation>
             </xs:annotation>
-        </xs:attribute>             
+        </xs:attribute>
         <xs:attribute name="Include" type="xs:string" use="required">
             <xs:annotation>
                 <xs:documentation>Semi-colon separated list of files (wildcards are allowed) or other item names to include in this item list</xs:documentation>
             </xs:annotation>
-        </xs:attribute>             
+        </xs:attribute>
         <xs:attribute name="Exclude" type="xs:string" use="optional">
             <xs:annotation>
                 <xs:documentation>Semi-colon separated list of files (wildcards are allowed) or other item names to exclude from the Include list</xs:documentation>
             </xs:annotation>
-        </xs:attribute>             
+        </xs:attribute>
     </xs:complexType>
-    <!-- ======================================================================================= -->      
+    <!-- ======================================================================================= -->
     <!-- general utility type allowing an item type to be defined but not its child meta-data-->
     <xs:complexType name="GenericItemType">
         <xs:complexContent>
             <xs:extension base="msb:SimpleItemType">
                 <xs:sequence minOccurs="0" maxOccurs="unbounded">
-                    <xs:any namespace="##any" processContents="skip"/>  
-                </xs:sequence>      
+                    <xs:any namespace="##any" processContents="skip"/>
+                </xs:sequence>
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
-    <!-- ======================================================================================= -->  
+    <!-- ======================================================================================= -->
     <!-- no type declared on this abstract element, so either a simple or complex type can be substituted for it.-->
     <xs:element name="Property" abstract="true"/>
-    <!-- ======================================================================================= -->      
+    <!-- ======================================================================================= -->
     <!-- convenience type for properties that just want to allow text and no elements in them-->
     <xs:complexType name="StringPropertyType">
         <xs:simpleContent>
@@ -323,7 +323,7 @@
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>
-    <!-- ======================================================================================= -->      
+    <!-- ======================================================================================= -->
     <!-- general utility type allowing text and/or elements inside-->
     <xs:complexType name="GenericPropertyType" mixed="true">
         <xs:sequence minOccurs="0" maxOccurs="unbounded">
@@ -377,10 +377,10 @@
             <xs:annotation>
                 <xs:documentation>Optional boolean indicating whether a recoverable task error should be ignored. Default false</xs:documentation>
             </xs:annotation>
-        </xs:attribute>            
+        </xs:attribute>
         <!-- We don't need the anyAttribute here because other types deriving from this type will add the right attributes.-->
     </xs:complexType>
-    <!-- ======================================================================================= -->  
+    <!-- ======================================================================================= -->
     <!-- XSD considers an empty-valued attribute to satisfy use="required", but we want it to have a non-empty value in most cases, hence this utility type. -->
     <xs:simpleType name="non_empty_string">
         <xs:restriction base="xs:string">
diff --git a/mcs/tools/xbuild/xbuild/Microsoft.Build.xsd b/mcs/tools/xbuild/data/Microsoft.Build.xsd
index 1cd971c61ec..e88f00f0f5d 100644
--- a/mcs/tools/xbuild/xbuild/Microsoft.Build.xsd
+++ b/mcs/tools/xbuild/data/Microsoft.Build.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://schemas.microsoft.com/developer/msbuild/2003" 
+<xs:schema targetNamespace="http://schemas.microsoft.com/developer/msbuild/2003"
 xmlns:xs="http://www.w3.org/2001/XMLSchema"
 xmlns:msb="http://schemas.microsoft.com/developer/msbuild/2003"
 elementFormDefault="qualified">
@@ -9,9 +9,9 @@ elementFormDefault="qualified">
 
     <!-- ========= ADD CUSTOM ITEMS, PROPERTIES, AND TASKS BELOW ======= -->
     <!-- Note that these will be in the msbuild namespace. A future version of
-        msbuild may require that custom itemtypes, properties, and tasks be in a 
+        msbuild may require that custom itemtypes, properties, and tasks be in a
         custom namespace, but currently msbuild only supports the msbuild namespace. -->
-    
+
     <!-- example custom itemtype with particular meta-data required-->
     <!--<xs:element name="MyItem" substitutionGroup="msb:Item">
         <xs:complexType>
@@ -26,10 +26,10 @@ elementFormDefault="qualified">
             </xs:complexContent>
         </xs:complexType>
     </xs:element>-->
-    
+
     <!-- Example custom itemtype with NO meta-data -->
     <!--<xs:element name="MySimpleItem" type="msb:SimpleItemType" substitutionGroup="msb:Item"/>-->
-    
+
     <!-- Example custom itemtype with ANY meta-data -->
     <!--<xs:element name="MyFlexibleItem" type="msb:GenericItemType" substitutionGroup="msb:Item"/>-->
 
@@ -46,5 +46,5 @@ elementFormDefault="qualified">
             </xs:complexContent>
         </xs:complexType>
     </xs:element>-->
-    
+
 </xs:schema>
diff --git a/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets b/mcs/tools/xbuild/data/Microsoft.CSharp.targets
index 3c378252a46..c23b8ae26d9 100644
--- a/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets
+++ b/mcs/tools/xbuild/data/Microsoft.CSharp.targets
@@ -53,7 +53,7 @@
 			NoStandardLib="$(NoStdLib)"
 			Optimize="$(Optimize)"
 			OutputAssembly="@(IntermediateAssembly)"
-			PdbFile="$(PdbFile)" 
+			PdbFile="$(PdbFile)"
 			Platform="$(PlatformTarget)"
 			References="@(ReferencePath)"
 			ResponseFiles="$(CompilerResponseFile)"
@@ -103,11 +103,11 @@
 
 		<CscToolExe Condition="'$(CscToolExe)' == '' and '$(TargetFrameworkVersion)' == 'v4.5' and '$(OS)' != 'Windows_NT'">mcs</CscToolExe>
 		<CscToolExe Condition="'$(CscToolExe)' == '' and '$(TargetFrameworkVersion)' == 'v4.5' and '$(OS)' == 'Windows_NT'">mcs.bat</CscToolExe>
-		
+
 		<CscToolExe Condition="'$(CscToolExe)' == '' and '$(TargetFrameworkVersion)' == 'v4.0' and '$(OS)' != 'Windows_NT'">dmcs</CscToolExe>
 		<CscToolExe Condition="'$(CscToolExe)' == '' and '$(TargetFrameworkVersion)' == 'v4.0' and '$(OS)' == 'Windows_NT'">dmcs.bat</CscToolExe>
 	</PropertyGroup>
-	
+
 	<PropertyGroup>
 		<TargetFrameworkMonikerAssemblyAttributeText Condition="'$(TargetFrameworkMoniker)' != '' and '$(TargetingClr2Framework)' != 'true'">
 // &lt;autogenerated /&gt;
diff --git a/mcs/tools/xbuild/xbuild/Microsoft.VisualBasic.targets b/mcs/tools/xbuild/data/Microsoft.VisualBasic.targets
index 4b89dfafb93..aba4cfa286e 100644
--- a/mcs/tools/xbuild/xbuild/Microsoft.VisualBasic.targets
+++ b/mcs/tools/xbuild/data/Microsoft.VisualBasic.targets
@@ -64,7 +64,7 @@
 			OptionCompare="$(OptionCompare)"
 			OptionExplicit="$(OptionExplicit)"
 			OptionStrict="$(OptionStrict)"
-			OptionStrictType="$(OptionStrictType)" 
+			OptionStrictType="$(OptionStrictType)"
 			OutputAssembly="@(IntermediateAssembly)"
 			Platform="$(PlatformTarget)"
 			References="@(ResolvedFiles)"
diff --git a/mcs/tools/xbuild/xbuild.exe.config.in b/mcs/tools/xbuild/data/xbuild.exe.config.in
index 5b69fbe3f56..8127938d390 100644
--- a/mcs/tools/xbuild/xbuild.exe.config.in
+++ b/mcs/tools/xbuild/data/xbuild.exe.config.in
@@ -5,11 +5,11 @@
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.Build.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-100.0.0.0" newVersion="@XBUILD_ASSEMBLY_VERSION@" />
+				<bindingRedirect oldVersion="0.0.0.0-100.0.0.0" newVersion="@ASM_VERSION@" />
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.Build.Engine" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-100.0.0.0" newVersion="@XBUILD_ASSEMBLY_VERSION@" />
+				<bindingRedirect oldVersion="0.0.0.0-100.0.0.0" newVersion="@ASM_VERSION@" />
 			</dependentAssembly>
 		</assemblyBinding>
 	</runtime>
diff --git a/mcs/tools/xbuild/xbuild/xbuild.rsp b/mcs/tools/xbuild/data/xbuild.rsp
index 9b9ce708701..9b9ce708701 100644
--- a/mcs/tools/xbuild/xbuild/xbuild.rsp
+++ b/mcs/tools/xbuild/data/xbuild.rsp
diff --git a/mcs/tools/xbuild/xbuild/2.0/FrameworkList.xml b/mcs/tools/xbuild/frameworks/net_2.0.xml
index 2b8bd9b1dff..2b8bd9b1dff 100644
--- a/mcs/tools/xbuild/xbuild/2.0/FrameworkList.xml
+++ b/mcs/tools/xbuild/frameworks/net_2.0.xml
diff --git a/mcs/tools/xbuild/xbuild/FrameworkList-3.0.xml b/mcs/tools/xbuild/frameworks/net_3.0.xml
index ae06c8818c1..ae06c8818c1 100644
--- a/mcs/tools/xbuild/xbuild/FrameworkList-3.0.xml
+++ b/mcs/tools/xbuild/frameworks/net_3.0.xml
diff --git a/mcs/tools/xbuild/xbuild/3.5/FrameworkList.xml b/mcs/tools/xbuild/frameworks/net_3.5.xml
index 122584299a1..122584299a1 100644
--- a/mcs/tools/xbuild/xbuild/3.5/FrameworkList.xml
+++ b/mcs/tools/xbuild/frameworks/net_3.5.xml
diff --git a/mcs/tools/xbuild/xbuild/4.0/FrameworkList.xml b/mcs/tools/xbuild/frameworks/net_4.0.xml
index 701279497fd..701279497fd 100644
--- a/mcs/tools/xbuild/xbuild/4.0/FrameworkList.xml
+++ b/mcs/tools/xbuild/frameworks/net_4.0.xml
diff --git a/mcs/tools/xbuild/xbuild/4.5/FrameworkList.xml b/mcs/tools/xbuild/frameworks/net_4.5.xml
index 2fa28c496ff..2fa28c496ff 100644
--- a/mcs/tools/xbuild/xbuild/4.5/FrameworkList.xml
+++ b/mcs/tools/xbuild/frameworks/net_4.5.xml
diff --git a/mcs/tools/xbuild/xbuild/Microsoft.Portable.CSharp.targets b/mcs/tools/xbuild/targets/Microsoft.Portable.CSharp_4.0.targets
index 72c20ef5c24..d90ae2c3c4b 100644
--- a/mcs/tools/xbuild/xbuild/Microsoft.Portable.CSharp.targets
+++ b/mcs/tools/xbuild/targets/Microsoft.Portable.CSharp_4.0.targets
@@ -10,23 +10,23 @@
 		<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
 		<NoStdLib>true</NoStdLib>
 
-		<ImplicitlyExpandTargetFramework Condition="'$(ImplicitlyExpandTargetFramework)' == '' ">true</ImplicitlyExpandTargetFramework>	
+		<ImplicitlyExpandTargetFramework Condition="'$(ImplicitlyExpandTargetFramework)' == '' ">true</ImplicitlyExpandTargetFramework>
 	</PropertyGroup>
 
 	<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.Targets" />
-	
+
 	<PropertyGroup>
 		<ResolveReferencesDependsOn>
 			$(ResolveReferencesDependsOn);
 			ImplicitlyExpandTargetFramework;
 		</ResolveReferencesDependsOn>
-		
+
 		<ImplicitlyExpandTargetFrameworkDependsOn>
 			$(ImplicitlyExpandTargetFrameworkDependsOn);
 			GetReferenceAssemblyPaths
 		</ImplicitlyExpandTargetFrameworkDependsOn>
 	</PropertyGroup>
-	
+
 	<Target Name="ImplicitlyExpandTargetFramework"
 		DependsOnTargets="$(ImplicitlyExpandTargetFrameworkDependsOn)">
 
diff --git a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Portable.CSharp.targets b/mcs/tools/xbuild/targets/Microsoft.Portable.CSharp_4.5.targets
index d80a9f5dfce..e2116bf7f80 100644
--- a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Portable.CSharp.targets
+++ b/mcs/tools/xbuild/targets/Microsoft.Portable.CSharp_4.5.targets
@@ -1,3 +1,3 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="$(MSBuildToolsPath)\Microsoft.Portable.CSharp.Targets" />    
+	<Import Project="$(MSBuildToolsPath)\Microsoft.Portable.CSharp.Targets" />
 </Project>
diff --git a/mcs/tools/xbuild/xbuild/Microsoft.WebApplication.targets b/mcs/tools/xbuild/targets/Microsoft.WebApplication.targets
index 0f619042502..0f619042502 100644
--- a/mcs/tools/xbuild/xbuild/Microsoft.WebApplication.targets
+++ b/mcs/tools/xbuild/targets/Microsoft.WebApplication.targets
diff --git a/mcs/tools/xbuild/xbuild/4.5/Microsoft.Portable.CSharp.targets b/mcs/tools/xbuild/xbuild/4.5/Microsoft.Portable.CSharp.targets
deleted file mode 100644
index d80a9f5dfce..00000000000
--- a/mcs/tools/xbuild/xbuild/4.5/Microsoft.Portable.CSharp.targets
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="$(MSBuildToolsPath)\Microsoft.Portable.CSharp.Targets" />    
-</Project>
diff --git a/mcs/tools/xbuild/xbuild_test.make b/mcs/tools/xbuild/xbuild_test.make
index 1917f88bd89..b4709c71be3 100644
--- a/mcs/tools/xbuild/xbuild_test.make
+++ b/mcs/tools/xbuild/xbuild_test.make
@@ -1,4 +1,4 @@
-XBUILD_TARGETS_DIR=$(topdir)/tools/xbuild/xbuild
+XBUILD_DATA_DIR=$(topdir)/tools/xbuild/data
 XBUILD_PROFILE_DIR=$(topdir)/class/lib/$(PROFILE)
 
 # makes xbuild look in the class/lib/$PROFILE build directories for targets etc
@@ -7,10 +7,10 @@ export TESTING_MONO=a
 test-local: copy-targets $(test_lib).config
 
 copy-targets:
-	cp $(XBUILD_TARGETS_DIR)/$(XBUILD_VERSION)/Microsoft.Common.targets $(XBUILD_PROFILE_DIR)
-	cp $(XBUILD_TARGETS_DIR)/$(XBUILD_VERSION)/Microsoft.Common.tasks $(XBUILD_PROFILE_DIR)
-	cp $(XBUILD_TARGETS_DIR)/Microsoft.CSharp.targets $(XBUILD_PROFILE_DIR)
-	cp $(XBUILD_TARGETS_DIR)/Microsoft.VisualBasic.targets $(XBUILD_PROFILE_DIR)
+	cp $(XBUILD_DATA_DIR)/$(XBUILD_VERSION)/Microsoft.Common.targets $(XBUILD_PROFILE_DIR)
+	cp $(XBUILD_DATA_DIR)/$(XBUILD_VERSION)/Microsoft.Common.tasks $(XBUILD_PROFILE_DIR)
+	cp $(XBUILD_DATA_DIR)/Microsoft.CSharp.targets $(XBUILD_PROFILE_DIR)
+	cp $(XBUILD_DATA_DIR)/Microsoft.VisualBasic.targets $(XBUILD_PROFILE_DIR)
 
 clean-local: clean-target-files clean-test-config
 
@@ -20,8 +20,8 @@ clean-target-files:
 	rm -f $(XBUILD_PROFILE_DIR)/Microsoft.CSharp.targets
 	rm -f $(XBUILD_PROFILE_DIR)/Microsoft.VisualBasic.targets
 
-$(test_lib).config: $(XBUILD_DIR)/xbuild.exe.config.in
-	sed -e 's/@XBUILD_ASSEMBLY_VERSION@/$(XBUILD_ASSEMBLY_VERSION)/g' $(XBUILD_DIR)/xbuild.exe.config.in > $(test_lib).config
+$(test_lib).config: $(XBUILD_DATA_DIR)/xbuild.exe.config.in
+	sed -e 's/@ASM_VERSION@/$(XBUILD_ASSEMBLY_VERSION)/g' $(XBUILD_DATA_DIR)/xbuild.exe.config.in > $(test_lib).config
 
 clean-test-config:
 	rm -f $(test_lib).config