Skip to content

[tests] InstallAndroidDependenciesTest can use platform-tools 34.0.1 #7873

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
merged 2 commits into from
Mar 11, 2023
Merged

[tests] InstallAndroidDependenciesTest can use platform-tools 34.0.1 #7873

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bda162f
[tests] `InstallAndroidDependenciesTest` can use `platform-tools` 34.0.1
jonpryor Mar 10, 2023
fe58770
Address feedback
jonpryor Mar 11, 2023
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
37 changes: 35 additions & 2 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 @@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Xml;
using System.Xml.Linq;
using NUnit.Framework;
using Xamarin.Android.Tools;
Expand Down Expand Up @@ -31,6 +32,7 @@ public void InstallAndroidDependenciesTest ()
var proj = new XamarinAndroidApplicationProject {
TargetSdkVersion = apiLevel.ToString (),
};
const string ExpectedPlatformToolsVersion = "34.0.1";
using (var b = CreateApkBuilder ()) {
b.CleanupAfterSuccessfulBuild = false;
string defaultTarget = b.Target;
Expand All @@ -39,19 +41,50 @@ public void InstallAndroidDependenciesTest ()
Assert.IsTrue (b.Build (proj, parameters: new string [] {
"AcceptAndroidSDKLicenses=true",
"AndroidManifestType=GoogleV2", // Need GoogleV2 so we can install API-32
"AndroidSdkPlatformToolsVersion=34.0.0",
$"AndroidSdkPlatformToolsVersion={ExpectedPlatformToolsVersion}",
}), "InstallAndroidDependencies should have succeeded.");
b.Target = defaultTarget;
b.BuildLogFile = "build.log";
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 `{sdkPath}`.");
bool usedNewDir = b.LastBuildOutput.ContainsText ($"Output Property: _AndroidSdkDirectory={sdkPath}");
if (!usedNewDir) {
// Is this because the platform-tools version changed (again?!)
try {
var currentPlatformToolsVersion = GetCurrentPlatformToolsVersion ();
if (currentPlatformToolsVersion != ExpectedPlatformToolsVersion) {
Assert.Fail ($"_AndroidSdkDirectory not set to new SDK path `{sdkPath}`, *probably* because Google's repository has a newer platform-tools package! " +
$"repository2-3.xml contains platform-tools {currentPlatformToolsVersion}; expected {ExpectedPlatformToolsVersion}!");
}
}
catch (Exception e) {
TestContext.WriteLine ($"Could not extract platform-tools version from repository2-3.xml: {e}");
}
}
Assert.IsTrue (usedNewDir, $"_AndroidSdkDirectory was not set to new SDK path `{sdkPath}`.");
Assert.IsTrue (b.LastBuildOutput.ContainsText ($"JavaPlatformJarPath={sdkPath}"), $"JavaPlatformJarPath did not contain new SDK path `{sdkPath}`.");
}
} finally {
Environment.SetEnvironmentVariable ("TEST_ANDROID_SDK_PATH", old);
}
}

static string GetCurrentPlatformToolsVersion ()
{
var s = new XmlReaderSettings {
XmlResolver = null,
};
var r = XmlReader.Create ("https://dl-ssl.google.com/android/repository/repository2-3.xml", s);
var d = XDocument.Load (r);

var platformToolsPackage = d.Root.Elements ("remotePackage")
.Where (e => "platform-tools" == (string) e.Attribute("path"))
.FirstOrDefault ();

var revision = platformToolsPackage.Element ("revision");

return $"{revision.Element ("major")}.{revision.Element ("minor")}.{revision.Element ("micro")}";
}

[Test]
[TestCase ("AotAssemblies", false)]
[TestCase ("AndroidEnableProfiledAot", false)]
Expand Down