Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Safar <marek.safar@gmail.com>2015-10-06 14:16:43 +0300
committerMarek Safar <marek.safar@gmail.com>2015-10-06 14:17:50 +0300
commit4164d9fbe19a1e6acb3a5ea122891020ff2868d7 (patch)
treed0fa0c8badb10e735ea5a11e8207385b3134f54d /mcs/class/Microsoft.Build.Utilities
parent7cb8061fa3a65d1a556e19fcab4f521f227cb29c (diff)
[xbuild] Make ToolsVersion 14.0 targeting 4.5.* frameworks work
Diffstat (limited to 'mcs/class/Microsoft.Build.Utilities')
-rw-r--r--mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs7
1 files changed, 5 insertions, 2 deletions
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 8f040e404eb..64ed0757a90 100644
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
@@ -71,7 +71,8 @@ namespace Microsoft.Build.Utilities
// be a complete replacement for 4.0.
Path.Combine (lib_mono_dir, "net_4_x"),
Path.Combine (lib_mono_dir, "net_4_x"),
- Path.Combine (lib_mono_dir, "net_4_x")
+ Path.Combine (lib_mono_dir, "net_4_x"),
+ Path.Combine (lib_mono_dir, "net_4_x")
};
} else if (runningOnDotNet) {
mono_dir = new string [] {
@@ -81,7 +82,8 @@ namespace Microsoft.Build.Utilities
Path.Combine (lib_mono_dir, "v3.5"),
Path.Combine (lib_mono_dir, "v4.0.30319"),
Path.Combine (lib_mono_dir, "v4.0.30319"),
- Path.Combine (lib_mono_dir, "v4.0.30319")
+ Path.Combine (lib_mono_dir, "v4.0.30319"),
+ Path.Combine (lib_mono_dir, "v4.0.30319")
};
} else {
mono_dir = new string [] {
@@ -93,6 +95,7 @@ namespace Microsoft.Build.Utilities
Path.Combine (lib_mono_dir, "4.5"),
Path.Combine (lib_mono_dir, "4.5"),
Path.Combine (lib_mono_dir, "4.5"),
+ Path.Combine (lib_mono_dir, "4.5")
};
}