From 1db5ab30f5246437c07b19d50075cac849203a86 Mon Sep 17 00:00:00 2001 From: Atsushi Eno Date: Sat, 2 Sep 2017 03:12:23 +0900 Subject: [PATCH] [msbuild][tests] fix path to msbuild on Linux. Keep in mind that there is no /Library/Frameworks/Mono.framework outside OSX. --- .../Tests/Xamarin.ProjectTools/Common/Builder.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs index 851ae7d271d..81add458978 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs @@ -11,6 +11,7 @@ namespace Xamarin.ProjectTools public class Builder : IDisposable { const string fixed_osx_xbuild_path = "/Library/Frameworks/Mono.framework/Commands"; + const string fixed_linux_xbuild_path = "/usr/bin"; const string xbuildapp = "xbuild"; const string msbuildapp = "msbuild"; string msbuildExe; @@ -26,9 +27,10 @@ public class Builder : IDisposable string GetUnixBuildExe () { RunningMSBuild = false; - string path = Path.Combine (fixed_osx_xbuild_path, xbuildapp); + var tooldir = Directory.Exists (fixed_osx_xbuild_path) ? fixed_osx_xbuild_path : fixed_linux_xbuild_path; + string path = Path.Combine (tooldir, xbuildapp); if (!string.IsNullOrEmpty (Environment.GetEnvironmentVariable ("USE_MSBUILD"))) { - path = Path.Combine (fixed_osx_xbuild_path, msbuildapp); + path = Path.Combine (tooldir, msbuildapp); RunningMSBuild = true; } return File.Exists (path) ? path : msbuildapp;