Skip to content

Avoid XA5207 for design-time builds #7434

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 1 commit into from
Oct 6, 2022
Merged

Avoid XA5207 for design-time builds #7434

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
7 changes: 4 additions & 3 deletions src/Xamarin.Android.Build.Tasks/Tasks/GetJavaPlatformJar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public class GetJavaPlatformJar : AndroidTask

public string AndroidManifest { get; set; }

public bool DesignTimeBuild { get; set; }

[Output]
public string JavaPlatformJarPath { get; set; }

Expand Down Expand Up @@ -84,12 +86,11 @@ public override bool RunTask ()
}

platform = GetTargetSdkVersion (platform, target_sdk);
JavaPlatformJarPath = MonoAndroidHelper.TryGetAndroidJarPath (Log, platform);
JavaPlatformJarPath = MonoAndroidHelper.TryGetAndroidJarPath (Log, platform, designTimeBuild: DesignTimeBuild);
TargetSdkVersion = MonoAndroidHelper.SupportedVersions.GetApiLevelFromId (platform).ToString ();
if (JavaPlatformJarPath == null)
return !Log.HasLoggedErrors;

TargetSdkVersion = MonoAndroidHelper.SupportedVersions.GetApiLevelFromId (platform).ToString ();

return !Log.HasLoggedErrors;
}

Expand Down
2 changes: 2 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 @@ -1365,6 +1365,8 @@ public void IfAndroidJarDoesNotExistThrowXA5207 ()
if (!Builder.UseDotNet)
proj.TargetFrameworkVersion = builder.LatestTargetFrameworkVersion ();
builder.ThrowOnBuildFailure = false;
Assert.IsTrue (builder.DesignTimeBuild (proj), "DesignTime build should succeed.");
Assert.IsFalse (builder.LastBuildOutput.ContainsText ("error XA5207:"), "XA5207 should not have been raised.");
builder.Target = "AndroidPrepareForBuild";
Assert.IsFalse (builder.Build (proj, parameters: new string [] {
$"AndroidSdkBuildToolsVersion=24.0.1",
Expand Down
10 changes: 6 additions & 4 deletions 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 @@ -443,13 +443,15 @@ public static IEnumerable<string> Executables (string executable)
yield return executable;
}

public static string TryGetAndroidJarPath (TaskLoggingHelper log, string platform)
public static string TryGetAndroidJarPath (TaskLoggingHelper log, string platform, bool designTimeBuild = false)
{
var platformPath = MonoAndroidHelper.AndroidSdk.TryGetPlatformDirectoryFromApiLevel (platform, MonoAndroidHelper.SupportedVersions);
if (platformPath == null) {
var expectedPath = MonoAndroidHelper.AndroidSdk.GetPlatformDirectoryFromId (platform);
var sdkManagerMenuPath = OS.IsWindows ? Properties.Resources.XA5207_SDK_Manager_Windows : Properties.Resources.XA5207_SDK_Manager_macOS;
log.LogCodedError ("XA5207", Properties.Resources.XA5207, platform, Path.Combine (expectedPath, "android.jar"), sdkManagerMenuPath);
if (!designTimeBuild) {
var expectedPath = MonoAndroidHelper.AndroidSdk.GetPlatformDirectoryFromId (platform);
var sdkManagerMenuPath = OS.IsWindows ? Properties.Resources.XA5207_SDK_Manager_Windows : Properties.Resources.XA5207_SDK_Manager_macOS;
log.LogCodedError ("XA5207", Properties.Resources.XA5207, platform, Path.Combine (expectedPath, "android.jar"), sdkManagerMenuPath);
}
return null;
}
return Path.Combine (platformPath, "android.jar");
Expand Down
4 changes: 3 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Xamarin.Android.Tooling.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ projects.
<Target Name="_GetJavaPlatformJar">
<GetJavaPlatformJar
AndroidSdkPlatform="$(_AndroidApiLevel)"
AndroidManifest="$(_AndroidManifestAbs)">
AndroidManifest="$(_AndroidManifestAbs)"
DesignTimeBuild="$(DesignTimeBuild)"
>
<Output TaskParameter="JavaPlatformJarPath" PropertyName="JavaPlatformJarPath" />
<Output TaskParameter="TargetSdkVersion" PropertyName="_AndroidTargetSdkVersion" />
</GetJavaPlatformJar>
Expand Down