Merge pull request #900 from Blewzman/FixAggregateExceptionGetBaseException

[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 91441df066993862fa4100538be7fc25ce6c2e22..07795eb722d19c2cc2e412f33c1ef5957ed5ee61 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
@@ -121,11 +121,27 @@ namespace Microsoft.Build.Utilities
                        return mono_dir [(int)version];
                }
 
-               [MonoTODO]
                public static string GetPathToDotNetFrameworkFile (string fileName,
                                                                  TargetDotNetFrameworkVersion version)
                {
-                       throw new NotImplementedException ();
+                       string dir = GetPathToDotNetFramework (version);
+                       string file = Path.Combine (dir, fileName);
+                       if (File.Exists (file))
+                               return file;
+
+                       //Mono doesn't ship multiple versions of tools that are backwards/forwards compatible
+                       if (!runningOnDotNet) {
+#if NET_3_5
+                               //most of the 3.5 tools are in the 2.0 directory
+                               if (version == TargetDotNetFrameworkVersion.Version35)
+                                       return GetPathToDotNetFrameworkFile (fileName, TargetDotNetFrameworkVersion.Version20);
+#endif
+                               //unversioned tools are in the 4.5 directory
+                               if (version == TargetDotNetFrameworkVersion.Version20)
+                                       return GetPathToDotNetFrameworkFile (fileName, (TargetDotNetFrameworkVersion)5);
+                       }
+
+                       return null;
                }
 
                public static string GetPathToDotNetFrameworkSdk (TargetDotNetFrameworkVersion version)