Merge pull request #5668 from kumpera/wasm-work-p4

[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 8806c73e72d08ba7d1f1068ba3e2bbda0a34032d..42b7da6f23177cb6f4276d3d487fea0908339828 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
@@ -74,6 +74,7 @@ namespace Microsoft.Build.Utilities
                                        Path.Combine (lib_mono_dir, "net_4_x"),  // Version451
                                        Path.Combine (lib_mono_dir, "net_4_x"),  // Version46
                                        Path.Combine (lib_mono_dir, "net_4_x"),  // Version461
+                                       Path.Combine (lib_mono_dir, "net_4_x"),  // Version462
                                };      
                        } else if (runningOnDotNet) {
                                mono_dir = new string [] {
@@ -86,6 +87,7 @@ namespace Microsoft.Build.Utilities
                                        Path.Combine (lib_mono_dir, "v4.0.30319"),  // Version451
                                        Path.Combine (lib_mono_dir, "v4.0.30319"),  // Version46
                                        Path.Combine (lib_mono_dir, "v4.0.30319"),  // Version461
+                                       Path.Combine (lib_mono_dir, "v4.0.30319"),  // Version462
                                };
                        } else {
                                mono_dir = new string [] {
@@ -99,6 +101,7 @@ namespace Microsoft.Build.Utilities
                                        Path.Combine (lib_mono_dir, "4.5"),  // Version451
                                        Path.Combine (lib_mono_dir, "4.5"),  // Version46
                                        Path.Combine (lib_mono_dir, "4.5"),  // Version461
+                                       Path.Combine (lib_mono_dir, "4.5"),  // Version462
                                };
                        }
 
@@ -148,6 +151,16 @@ namespace Microsoft.Build.Utilities
                        return null;
                }
 
+               public static string GetPathToDotNetFrameworkBinFile (string fileName)
+               {
+                       string dir = Path.Combine(Directory.GetParent(Directory.GetParent(lib_mono_dir).FullName).FullName, "bin");
+                       string file = Path.Combine (dir, fileName);
+                       if (File.Exists (file))
+                               return file;
+
+                       return null;
+               }
+
                public static string GetPathToDotNetFrameworkSdk (TargetDotNetFrameworkVersion version)
                {
                        return GetPathToDotNetFramework (version);