Skip to content

[msbuild][tests] fix path to msbuild on Linux. #809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 5, 2017
Merged

[msbuild][tests] fix path to msbuild on Linux. #809

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down