ff

Author: dellis1972

src/Xamarin.Android.Build.Tasks/Tasks/ResolveSdksTask.cs

@@ -430,7 +430,6 @@ bool ValidateApiLevels ()
 						"Support for this API will be added in a future release.");
 					AndroidApiLevel = SupportedApiLevel;
 				}
-				Log.LogDebugMessage ($"1:{AndroidApiLevel} 2:{SupportedApiLevel} 3:{maxInstalled} 4:{maxSupported}");
 				if (!string.IsNullOrWhiteSpace (TargetFrameworkVersion)) {
 					var userSelected = MonoAndroidHelper.SupportedVersions.GetApiLevelFromFrameworkVersion (TargetFrameworkVersion);
 					// overwrite using user version only if it is 

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

@@ -2232,6 +2232,8 @@ public void IfAndroidJarDoesNotExistThrowXA5207 ()
 		public void ValidateUseLatestAndroid ()
 		{
 			var path = Path.Combine ("temp", TestName);
+			var androidSdkPath = CreateFauxAndroidSdkDirectory (Path.Combine (path, "android-sdk"),
+				"23.0.6", minApiLevel: 10, maxApiLevel: 28, alphaApiLevel: "P");
 			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 },
@@ -2243,39 +2245,40 @@ public void ValidateUseLatestAndroid ()
 				TargetFrameworkVersion = "v8.0",
 				UseLatestPlatformSdk = false,
 			};
-			var targetFramework = new string [] {
+			var parameters = new string [] {
 				$"TargetFrameworkRootPath={referencesPath}",
+				$"AndroidSdkDirectory={androidSdkPath}",
 			};
 			var envVar = new Dictionary<string, string>  {
 				{ "XBUILD_FRAMEWORK_FOLDERS_PATH", referencesPath },
 			};
 			using (var builder = CreateApkBuilder (Path.Combine (path, proj.ProjectName), false, false)) {
 				builder.ThrowOnBuildFailure = false;
 				builder.Target = "_SetLatestTargetFrameworkVersion";
-				Assert.True (builder.Build (proj, parameters: targetFramework, environmentVariables: envVar),
+				Assert.True (builder.Build (proj, parameters: parameters, 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.0";
-				Assert.True (builder.Build (proj, parameters: targetFramework, environmentVariables: envVar),
+				Assert.True (builder.Build (proj, parameters: parameters, environmentVariables: envVar),
 					string.Format ("Second Build should have succeeded"));
 				Assert.IsTrue (builder.LastBuildOutput.ContainsOccurances ("TargetFrameworkVersion: v8.0", 2), "TargetFrameworkVersion should be v8.0");
 
 				proj.UseLatestPlatformSdk = true;
 				proj.TargetFrameworkVersion = "v8.1";
-				Assert.True (builder.Build (proj, parameters: targetFramework, environmentVariables: envVar),
+				Assert.True (builder.Build (proj, parameters: parameters, 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 = "v8.99";
-				Assert.True (builder.Build (proj, parameters: targetFramework, environmentVariables: envVar),
+				Assert.True (builder.Build (proj, parameters: parameters, environmentVariables: envVar),
 					string.Format ("Third Build should have succeeded"));
 				Assert.IsTrue (builder.LastBuildOutput.ContainsOccurances ("TargetFrameworkVersion: v8.99", 2), "TargetFrameworkVersion should be v8.99");
 
 				proj.UseLatestPlatformSdk = true;
 				proj.TargetFrameworkVersion = "v6.0";
-				Assert.True (builder.Build (proj, parameters: targetFramework, environmentVariables: envVar),
+				Assert.True (builder.Build (proj, parameters: parameters, 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.1", 1), "TargetFrameworkVersion should be v8.1");

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

@@ -104,7 +104,7 @@ protected string RunProcess (string exe, string args) {
 			return result;
 		}
 
-		protected string CreateFauxAndroidSdkDirectory (string path, string buildToolsVersion, int minApiLevel = 10, int maxApiLevel = 26)
+		protected string CreateFauxAndroidSdkDirectory (string path, string buildToolsVersion, int minApiLevel = 10, int maxApiLevel = 26, string alphaApiLevel = "")
 		{
 			var androidSdkDirectory = Path.Combine (Root, path);
 			var androidSdkToolsPath = Path.Combine (androidSdkDirectory, "tools");
@@ -128,6 +128,11 @@ protected string CreateFauxAndroidSdkDirectory (string path, string buildToolsVe
 				Directory.CreateDirectory(dir);
 				File.WriteAllText (Path.Combine (dir, "android.jar"), "");
 			}
+			if (!string.IsNullOrEmpty (alphaApiLevel)) {
+				var dir = Path.Combine (androidSdkPlatformsPath, $"android-{alphaApiLevel}");
+				Directory.CreateDirectory (dir);
+				File.WriteAllText (Path.Combine (dir, "android.jar"), "");
+			}
 			return androidSdkDirectory;
 		}