Skip to content

[Xamarin.Android.Build.Tasks] Fix <InstallAndroidDependencies/> #4969

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

Merged
jonpryor merged 1 commit into from
Aug 3, 2020
+8 −6
Merged

[Xamarin.Android.Build.Tasks] Fix <InstallAndroidDependencies/> #4969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .external
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
xamarin/monodroid:master@5784a746112babd9ef801e0a6bc3fe2694bdf64c
xamarin/monodroid:master@b12a3e8d57a5bdbdc8e829b8f2de80f3cf51e89f
mono/mono:2020-02@83105ba22461455f4343d6bb14976eba8b0b3f39
12 changes: 7 additions & 5 deletions ...Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidDependenciesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,23 @@ public class AndroidDependenciesTests : BaseTest
public void InstallAndroidDependenciesTest ()
{
AssertCommercialBuild ();
if (IsWindows) {
// TODO: we need: https://github.com/xamarin/android-sdk-installer/pull/450
Assert.Ignore ("InstallAndroidDependencies currently fails on Windows");
}
var old = Environment.GetEnvironmentVariable ("ANDROID_SDK_PATH");
try {
string sdkPath = Path.Combine (Root, "temp", TestName, "android-sdk");
Environment.SetEnvironmentVariable ("ANDROID_SDK_PATH", sdkPath);
if (Directory.Exists (sdkPath))
Directory.Delete (sdkPath, true);
Directory.CreateDirectory (sdkPath);
var proj = new XamarinAndroidApplicationProject ();
using (var b = CreateApkBuilder ()) {
b.CleanupAfterSuccessfulBuild = false;
string defaultTarget = b.Target;
b.Target = "InstallAndroidDependencies";
Assert.IsTrue (b.Build (proj, parameters: new string [] { "AcceptAndroidSDKLicenses=true" }), "InstallAndroidDependencies should have succeeded.");
b.Target = defaultTarget;
Assert.IsTrue (b.Build (proj), "build should have succeeded.");
Assert.IsTrue (b.Build (proj, true), "build should have succeeded.");
Assert.IsTrue (b.LastBuildOutput.ContainsText ($"Output Property: _AndroidSdkDirectory={sdkPath}"), "_AndroidSdkDirectory was not set to new SDK path.");
Assert.IsTrue (b.LastBuildOutput.ContainsText ($"JavaPlatformJarPath={sdkPath}"), "JavaPlatformJarPath did not contain new SDK path.");
}
} finally {
Environment.SetEnvironmentVariable ("ANDROID_SDK_PATH", old);
Expand Down