Skip to content
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

Jump to bottom

[Xamarin.Android.Build.Tasks] Fix message for missing Platform error XA5207 #1152

Merged
merged 3 commits into from
Jan 4, 2018
Merged

[Xamarin.Android.Build.Tasks] Fix message for missing Platform error XA5207 #1152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c2082c
[Xamarin.Android.Build.Tasks] Fix message for missing Platform error …
dellis1972 Jan 3, 2018
7e5ece5
ff
dellis1972 Jan 4, 2018
0ac7de8
ff
dellis1972 Jan 4, 2018
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
27 changes: 27 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2084,6 +2084,33 @@ public void ValidateJavaVersion (string targetFrameworkVersion, string buildTool
Directory.Delete (AndroidSdkDirectory, recursive: true);
}

[Test]
public void IfAndroidJarDoesNotExistThrowXA5207 ()
{
var path = Path.Combine ("temp", TestName);
var AndroidSdkDirectory = CreateFauxAndroidSdkDirectory (Path.Combine (path, "android-sdk"), "24.0.1", minApiLevel: 10, maxApiLevel: 26);
var proj = new XamarinAndroidApplicationProject () {
IsRelease = true,
TargetFrameworkVersion = "v8.1",
UseLatestPlatformSdk = false,
};
using (var builder = CreateApkBuilder (Path.Combine (path, proj.ProjectName), false, false)) {
if (!Directory.Exists (Path.Combine (builder.FrameworkLibDirectory, "xbuild-frameworks", "MonoAndroid", "v8.1")))
Assert.Ignore ("This is a Pull Request Build. Ignoring test.");
builder.ThrowOnBuildFailure = false;
builder.Verbosity = LoggerVerbosity.Diagnostic;
builder.Target = "AndroidPrepareForBuild";
Assert.IsFalse (builder.Build (proj, parameters: new string [] {
$"AndroidSdkBuildToolsVersion=24.0.1",
$"AndroidSdkDirectory={AndroidSdkDirectory}",
$"_AndroidApiLevel=27",
}), "Build should have failed");
Assert.IsTrue (builder.LastBuildOutput.ContainsText ("error XA5207:"), "XA5207 should have been raised.");
Assert.IsTrue (builder.LastBuildOutput.ContainsText ("Could not find android.jar for API Level 27"), "XA5207 should have had a good error message.");
}
Directory.Delete (AndroidSdkDirectory, recursive: true);
}

[Test]
[NonParallelizable]
public void BuildAMassiveApp()
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ public static string TryGetAndroidJarPath (TaskLoggingHelper log, string platfor
var platformPath = MonoAndroidHelper.AndroidSdk.TryGetPlatformDirectoryFromApiLevel (platform, MonoAndroidHelper.SupportedVersions);
if (platformPath == null) {
var expectedPath = MonoAndroidHelper.AndroidSdk.GetPlatformDirectoryFromId (platform);
log.LogError ("XA5207", "Could not find android.jar for API Level {0}. " +
log.LogCodedError ("XA5207", "Could not find android.jar for API Level {0}. " +
"This means the Android SDK platform for API Level {0} is not installed. " +
"Either install it in the Android SDK Manager (Tools > Open Android SDK Manager...), " +
"or change your Xamarin.Android project to target an API version that is installed. " +
Expand Down