Make use of XBUILD_FRAMEWORK_FOLDERS_PATH in GetReferenceAssemblyPaths task and make...

diff --git a/mcs/class/Microsoft.Build/Makefile b/mcs/class/Microsoft.Build/Makefile
index 78f4a4438d6c176bed6e21cb020fb857e7efcbd4..f41641208cc7aa697cd516c7564673b8c11eec36 100644 (file)
--- a/mcs/class/Microsoft.Build/Makefile
+++ b/mcs/class/Microsoft.Build/Makefile
@@ -40,4 +40,5 @@ include ../../build/library.make
 
 export TESTING_MONO=a
 XBUILD_DIR=../../tools/xbuild
+XBUILD_FRAMEWORK_FOLDERS_PATH=xbuild-testing
 include $(XBUILD_DIR)/xbuild_targets.make

diff --git a/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v2.0/RedistList/FrameworkList.xml b/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v2.0/RedistList/FrameworkList.xml
new file mode 100644 (file)
index 0000000..879fdf4
--- /dev/null
+++ b/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v2.0/RedistList/FrameworkList.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FileList Name=".NET Framework 2.0" TargetFrameworkDirectory="..\..\..\..\..\lib\net_2_0">
+</FileList>

diff --git a/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v3.5/RedistList/FrameworkList.xml b/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v3.5/RedistList/FrameworkList.xml
new file mode 100644 (file)
index 0000000..6f4b7b9
--- /dev/null
+++ b/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v3.5/RedistList/FrameworkList.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FileList  Name=".NET Framework 3.5" TargetFrameworkDirectory="..\..\..\..\..\lib\net_2_0" IncludeFramework="v3.0">
+</FileList>

diff --git a/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v4.0/RedistList/FrameworkList.xml b/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v4.0/RedistList/FrameworkList.xml
new file mode 100644 (file)
index 0000000..9899af1
--- /dev/null
+++ b/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v4.0/RedistList/FrameworkList.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FileList  Name=".NET Framework 4" TargetFrameworkDirectory="..\..\..\..\..\lib\net_4_0">
+</FileList>

diff --git a/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v4.5/RedistList/FrameworkList.xml b/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v4.5/RedistList/FrameworkList.xml
new file mode 100644 (file)
index 0000000..9223cbb
--- /dev/null
+++ b/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v4.5/RedistList/FrameworkList.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FileList  Name=".NET Framework 4.5" TargetFrameworkDirectory="..\..\..\..\..\lib\net_4_5">
+</FileList>