Fixed test to run under xbuild

Author: dellis1972

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -2198,7 +2199,8 @@ public void IfAndroidJarDoesNotExistThrowXA5207 ()
 		public void ValidateUseLatestAndroid ()
 		{
 			var path = Path.Combine ("temp", TestName);
-			var referencesPath = CreateFauxReferencesDirectory (Path.Combine (path, "xbuild-frameworks"), new ApiInfo[] {
+			var referencesPath = CreateFauxReferencesDirectory (Path.Combine (path, "xbuild-frameworks"), new ApiInfo [] {
+				new ApiInfo () { Id = 23, Level = 23, Name = "Marshmallow", FrameworkVersion = "v6.0", Stable = true },
 				new ApiInfo () { Id = 26, Level = 26, Name = "Oreo", FrameworkVersion = "v8.0", Stable = true },
 				new ApiInfo () { Id = 27, Level = 27, Name = "Oreo", FrameworkVersion = "v8.1", Stable = false },
 			});
@@ -2207,33 +2209,36 @@ public void ValidateUseLatestAndroid ()
 				TargetFrameworkVersion = "v8.0",
 				UseLatestPlatformSdk = false,
 			};
+			var targetFramework = new string [] {
+				$"TargetFrameworkRootPath={referencesPath}",
+			};
+			var envVar = new Dictionary<string, string>  {
+				{ "XBUILD_FRAMEWORK_FOLDERS_PATH", referencesPath },
+			};
 			using (var builder = CreateApkBuilder (Path.Combine (path, proj.ProjectName))) {
 				builder.ThrowOnBuildFailure = false;
 				builder.Target = "_SetLatestTargetFrameworkVersion";
-				Assert.True (builder.Build (proj, parameters: new string [] {
-					$"TargetFrameworkRootPath={referencesPath}",
-				}), string.Format ("Build should have succeeded"));
-				Assert.IsTrue (builder.LastBuildOutput.ContainsText ("_TargetFrameworkVersion=v8.0"), "_TargetFrameworkVersion should be v8.0");
+				Assert.True (builder.Build (proj, parameters: targetFramework, environmentVariables: envVar),
+					string.Format ("First Build should have succeeded"));
+				Assert.IsTrue (builder.LastBuildOutput.ContainsOccurances ("TargetFrameworkVersion: v8.0", 2), "TargetFrameworkVersion should be v8.0");
 
 				proj.TargetFrameworkVersion = "v8.1";
-				Assert.True (builder.Build (proj, parameters: new string [] {
-					$"TargetFrameworkRootPath={referencesPath}",
-				}), string.Format ("Build should have succeeded"));
-				Assert.IsTrue (builder.LastBuildOutput.ContainsText ("_TargetFrameworkVersion=v8.1"), "_TargetFrameworkVersion should be v8.1");
+				Assert.True (builder.Build (proj, parameters: targetFramework, environmentVariables: envVar),
+					string.Format ("Second Build should have succeeded"));
+				Assert.IsTrue (builder.LastBuildOutput.ContainsOccurances ("TargetFrameworkVersion: v8.1", 2), "TargetFrameworkVersion should be v8.1");
 
 				proj.UseLatestPlatformSdk = true;
 				proj.TargetFrameworkVersion = "v8.1";
-				Assert.True (builder.Build (proj, parameters: new string [] {
-					$"TargetFrameworkRootPath={referencesPath}",
-				}), string.Format ("Build should have succeeded"));
-				Assert.IsTrue (builder.LastBuildOutput.ContainsText ("_TargetFrameworkVersion=v8.1"), "_TargetFrameworkVersion should be v8.1");
+				Assert.True (builder.Build (proj, parameters: targetFramework, environmentVariables: envVar),
+					string.Format ("Third Build should have succeeded"));
+				Assert.IsTrue (builder.LastBuildOutput.ContainsOccurances ("TargetFrameworkVersion: v8.1", 2), "TargetFrameworkVersion should be v8.1");
 
 				proj.UseLatestPlatformSdk = true;
 				proj.TargetFrameworkVersion = "v6.0";
-				Assert.True (builder.Build (proj, parameters: new string [] {
-					$"TargetFrameworkRootPath={referencesPath}",
-				}), string.Format ("Build should have succeeded"));
-				Assert.IsTrue (builder.LastBuildOutput.ContainsText ("_TargetFrameworkVersion=v8.0"), "_TargetFrameworkVersion should be v8.0");
+				Assert.True (builder.Build (proj, parameters: targetFramework, environmentVariables: envVar),
+					string.Format ("Forth Build should have succeeded"));
+				Assert.IsTrue (builder.LastBuildOutput.ContainsOccurances ("TargetFrameworkVersion: v6.0", 1), "TargetFrameworkVersion should initially be v6.0");
+				Assert.IsTrue (builder.LastBuildOutput.ContainsOccurances ("TargetFrameworkVersion: v8.0", 1), "TargetFrameworkVersion should be v8.0");
 
 
 			}

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/BuildHelper.cs

@@ -60,6 +60,17 @@ public static bool ContainsText (this IEnumerable<string> collection, string exp
 			}
 			return false;
 		}
+
+		public static bool ContainsOccurances (this IEnumerable<string> collection, string expected, int count)
+		{
+			int found = 0;
+			foreach (var line in collection) {
+				if (line.Contains (expected)) {
+					found++;
+				}
+			}
+			return found == count;
+		}
 	}
 }
 

tools/scripts/xabuild

@@ -133,7 +133,11 @@ case "$MSBUILD" in
 		XABUILD_FLAGS+=(/p:TargetFrameworkRootPath="$TARGETS_DIR-frameworks/")
 		;;
 	*xbuild*)
-		export XBUILD_FRAMEWORK_FOLDERS_PATH="$TARGETS_DIR-frameworks"
+		if [ -z "$XBUILD_FRAMEWORK_FOLDERS_PATH" ]; then
+			export XBUILD_FRAMEWORK_FOLDERS_PATH="$TARGETS_DIR-frameworks"
+		else 
+			export XBUILD_FRAMEWORK_FOLDERS_PATH="$XBUILD_FRAMEWORK_FOLDERS_PATH"
+		fi
 		;;
 esac