Skip to content

Commit d871bf8

Browse files
dellis1972jonpryor
authored andcommitted
[Xamarin.ProjectTools] Fix path to xabuild for monodroi. (#948)
The Builder was not checking for the xabuild script in the `out` directory for the monodroid tree.
1 parent 2dc5689 commit d871bf8

File tree

1 file changed

+3
-0
lines changed
  • src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common

1 file changed

+3
-0
lines changed

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ public string XABuildExe {
5050
#else
5151
var xabuild = Path.GetFullPath (Path.Combine (Root, "..", "Release", "bin", "xabuild"));
5252
#endif
53+
if (File.Exists (xabuild))
54+
return xabuild;
55+
xabuild = Path.GetFullPath (Path.Combine (Root, "..", "..", "..", "..", "..", "..", "..", "out", "bin", "xabuild"));
5356
if (File.Exists (xabuild))
5457
return xabuild;
5558
return Path.GetFullPath (Path.Combine (Root, "..", "..", "tools", "scripts", "xabuild"));

0 commit comments

Comments
 (0)