From: Michael Hutchinson <m.j.hutchinson@gmail.com>
Date: Thu, 9 Jan 2014 23:27:40 +0000 (-0500)
Subject: [xbuild] The 4.0 toolset is in the 4.5 directory
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=21a85cdd21b8106e8ace61b3e526b00fe0c7d087;p=mono.git

[xbuild] The 4.0 toolset is in the 4.5 directory
---

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 9a2ed2c6f96..91441df0669 100644
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
@@ -66,7 +66,10 @@ namespace Microsoft.Build.Utilities
 					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"),
+					// mono's 4.0 is not an actual framework directory with all tools etc
+					// it's simply reference assemblies. So like .NET we consider 4.5 to
+					// be a complete replacement for 4.0.
+					Path.Combine (lib_mono_dir, "net_4_5"),
 					Path.Combine (lib_mono_dir, "net_4_5"),
 					Path.Combine (lib_mono_dir, "net_4_5")
 				};	
@@ -86,7 +89,8 @@ namespace Microsoft.Build.Utilities
 					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"),
+					// see comment above regarding 4.0/4.5
+					Path.Combine (lib_mono_dir, "4.5"),
 					Path.Combine (lib_mono_dir, "4.5"),
 					Path.Combine (lib_mono_dir, "4.5"),
 				};