diff options
| author | Alex Earl <slide.o.mix@gmail.com> | 2016-09-24 18:43:20 +0300 |
|---|---|---|
| committer | Alex Earl <slide.o.mix@gmail.com> | 2016-09-24 18:44:33 +0300 |
| commit | d6bb1449801fbde9329c65778d2788aedf7ecafe (patch) | |
| tree | 253d271680b53cd287d34febad8eb4950265f3af /mcs/class/Microsoft.Build.Tasks | |
| parent | 972b78f8bf2e9a536cd8de29d9a4a06dcc8ad6f8 (diff) | |
Fix issue with VB projects
Fixed GenerateFullPathToTool for Vbc task to match behavior of the Csc
task. This allows VB.NET projects to build successfully.
See https://bugzilla.xamarin.com/show_bug.cgi?id=44714
Diffstat (limited to 'mcs/class/Microsoft.Build.Tasks')
| -rw-r--r-- | mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Vbc.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Vbc.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Vbc.cs index cf56b148f11..ae6d75bf406 100644 --- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Vbc.cs +++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Vbc.cs @@ -153,7 +153,10 @@ namespace Microsoft.Build.Tasks { { if (!string.IsNullOrEmpty (ToolPath)) return Path.Combine (ToolPath, ToolExe); - return ToolLocationHelper.GetPathToDotNetFrameworkFile (ToolExe, TargetDotNetFrameworkVersion.VersionLatest); + var possibleToolPath = ToolLocationHelper.GetPathToDotNetFrameworkFile (ToolExe, TargetDotNetFrameworkVersion.VersionLatest); + if (!string.IsNullOrEmpty(possibleToolPath)) + return possibleToolPath; + return ToolLocationHelper.GetPathToDotNetFrameworkBinFile(ToolExe); } [MonoTODO] |