New tests.

[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 a1e05c787394ecb5735b70786f437558caf29e36..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
@@ -35,8 +35,7 @@ namespace Microsoft.Build.Utilities
        public static class ToolLocationHelper
        {
                static string lib_mono_dir;
-               static string mono_1_0_dir;
-               static string mono_2_0_dir;
+               static string [] mono_dir;
 
                static ToolLocationHelper ()
                {
@@ -51,8 +50,24 @@ namespace Microsoft.Build.Utilities
                        t2 = t1.Parent;
 
                        lib_mono_dir = t2.FullName;
-                       mono_1_0_dir = Path.Combine (lib_mono_dir, "1.0");
-                       mono_2_0_dir = Path.Combine (lib_mono_dir, "2.0");
+                       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")
+                               };
+                       }
+
                }
 
                [MonoTODO]
@@ -75,12 +90,7 @@ namespace Microsoft.Build.Utilities
 
                public static string GetPathToDotNetFramework (TargetDotNetFrameworkVersion version)
                {
-                       if (version == TargetDotNetFrameworkVersion.Version11)
-                               return mono_1_0_dir;
-                       else if (version == TargetDotNetFrameworkVersion.Version20)
-                               return mono_2_0_dir;
-                       else
-                               throw new ArgumentException ("version");
+                       return mono_dir [(int)version];
                }
 
                [MonoTODO]