From af2597c877f8a6304ce122af8ac34d3f58c19ca9 Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Thu, 19 Oct 2017 16:40:50 +0100
Subject: [PATCH] [Xamarin.ProjectTools] Fix path to xabuild for monodroid.

The Builder was not checking for the xabuild script in the
`out` directory for the monodroid tree.
---
 .../Tests/Xamarin.ProjectTools/Common/Builder.cs               | 3 +++
 1 file changed, 3 insertions(+)

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 67705d57a61..f74721009a0 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
@@ -50,6 +50,9 @@ public string XABuildExe {
 					#else
 					var xabuild = Path.GetFullPath (Path.Combine (Root, "..", "Release", "bin", "xabuild"));
 					#endif
+					if (File.Exists (xabuild))
+						return xabuild;
+					xabuild = Path.GetFullPath (Path.Combine (Root, "..", "..", "..", "..", "..", "..", "..", "out", "bin", "xabuild"));
 					if (File.Exists (xabuild))
 						return xabuild;
 					return Path.GetFullPath (Path.Combine (Root, "..", "..", "tools", "scripts", "xabuild"));