Add support for ToolsVersion and correctly build msbuild+xbuild assemblies

[mono.git] / mcs / class / Microsoft.Build.Utilities / Microsoft.Build.Utilities / ToolLocationHelper.cs

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
index 3c132076022b5d981f03fdafb44dd9441fb95e4f..a6c807cfbdfac942da27b1ad8821f38879c14f32 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
@@ -50,13 +50,24 @@ namespace Microsoft.Build.Utilities
                        t2 = t1.Parent;
 
                        lib_mono_dir = t2.FullName;
+                       if (Environment.GetEnvironmentVariable ("TESTING_MONO") != null) {
+                               mono_dir = new string [] {
+                                       Path.Combine (lib_mono_dir, "net_1_0"),
+                                       Path.Combine (lib_mono_dir, "net_2_0"),
+                                       Path.Combine (lib_mono_dir, "net_2_0"),
+                                       Path.Combine (lib_mono_dir, "net_3_5"),
+                                       Path.Combine (lib_mono_dir, "net_4_0")
+                               };      
+                       } else {
+                               mono_dir = new string [] {
+                                       Path.Combine (lib_mono_dir, "1.0"),
+                                       Path.Combine (lib_mono_dir, "2.0"),
+                                       Path.Combine (lib_mono_dir, "2.0"),
+                                       Path.Combine (lib_mono_dir, "3.5"),
+                                       Path.Combine (lib_mono_dir, "4.0")
+                               };
+                       }
 
-                       mono_dir = new string [] {
-                               Path.Combine (lib_mono_dir, "1.0"),
-                               Path.Combine (lib_mono_dir, "2.0"),
-                               Path.Combine (lib_mono_dir, "2.0"),
-                               Path.Combine (lib_mono_dir, "3.5")
-                       };
                }
 
                [MonoTODO]