Skip to content

[xabt] fix missing .nupkg output for dotnet pack #10270

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
grendello merged 2 commits into from
Jul 10, 2025
Merged

[xabt] fix missing .nupkg output for dotnet pack #10270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b31d40
[xabt] fix missing `.nupkg` output for `dotnet pack`
jonathanpeppers Jul 8, 2025
7f1c833
Update XASdkTests.cs
jonathanpeppers Jul 9, 2025
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 ....Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AndroidLibraries.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ projects.

<Target Name="_CreateAar"
Condition=" '$(AndroidApplication)' != 'true' "
DependsOnTargets="_CreateAarCache"
DependsOnTargets="_CategorizeAndroidLibraries;_CreateAarCache"
Inputs="@(_CreateAarInputs)"
Outputs="$(_AarOutputPath)">
<CreateAar
Expand Down
36 changes: 31 additions & 5 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using Xamarin.ProjectTools;
using Xamarin.Tools.Zip;
using Microsoft.Android.Build.Tasks;
using Xamarin.Android.Tasks;

namespace Xamarin.Android.Build.Tests
{
Expand Down Expand Up @@ -82,7 +83,7 @@ public void DotNetPack (string dotnetVersion, string platform, int apiLevel)
TextContent = () => "public class Foo { }",
},
new AndroidItem.AndroidResource ("Resources\\raw\\bar.txt") {
BinaryContent = () => Array.Empty<byte> (),
BinaryContent = () => [],
},
new AndroidItem.AndroidLibrary ("sub\\directory\\foo.jar") {
BinaryContent = () => ResourceData.JavaSourceJarTestJar,
Expand All @@ -101,17 +102,22 @@ public String Say (String quote) {
}",
},
},
PackageReferences = {
new Package { Id = "Xamarin.Kotlin.StdLib", Version = "2.0.10.1" },
new Package { Id = "Xamarin.Kotlin.StdLib.Common", Version = "2.0.10.1" },
new Package { Id = "Xamarin.KotlinX.Serialization.Core.Jvm", Version = "1.7.1.1" },
}
};
if (IsPreviewFrameworkVersion (targetFramework)) {
proj.SetProperty ("EnablePreviewFeatures", "true");
}
proj.OtherBuildItems.Add (new AndroidItem.AndroidLibrary ("sub\\directory\\arm64-v8a\\libfoo.so") {
BinaryContent = () => Array.Empty<byte> (),
BinaryContent = () => [],
});
proj.OtherBuildItems.Add (new AndroidItem.AndroidNativeLibrary (default (Func<string>)) {
Update = () => "libfoo.so",
MetadataValues = "Link=x86\\libfoo.so",
BinaryContent = () => Array.Empty<byte> (),
BinaryContent = () => [],
});
proj.OtherBuildItems.Add (new AndroidItem.LibraryProjectZip ("..\\baz.aar") {
WebContent = "https://repo1.maven.org/maven2/com/balysv/material-menu/1.1.0/material-menu-1.1.0.aar",
Expand All @@ -122,17 +128,22 @@ public String Say (String quote) {
WebContent = "https://repo1.maven.org/maven2/com/balysv/material-menu/1.1.0/material-menu-1.1.0.aar",
MetadataValues = "Pack=false;Bind=false",
});
proj.OtherBuildItems.Add (new AndroidItem.AndroidMavenLibrary ("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm") {
MetadataValues = "Version=1.3.3;Bind=false",
BinaryContent = () => [],
});

var projBuilder = CreateDllBuilder ();
projBuilder.Save (proj);
var dotnet = new DotNetCLI (Path.Combine (Root, projBuilder.ProjectDirectory, proj.ProjectFilePath));
Assert.IsTrue (dotnet.Pack (parameters: new [] { "Configuration=Release" }), "`dotnet pack` should succeed");
Assert.IsTrue (dotnet.Pack (parameters: ["Configuration=Release"]), "`dotnet pack` should succeed");

var nupkgPath = Path.Combine (Root, projBuilder.ProjectDirectory, proj.OutputPath, $"{proj.ProjectName}.1.0.0.nupkg");
FileAssert.Exists (nupkgPath);
using var nupkg = ZipHelper.OpenZip (nupkgPath);
string aarPath = $"lib/{dotnetVersion}-android{apiLevel}.0/{proj.ProjectName}.aar";
nupkg.AssertContainsEntry (nupkgPath, aarPath);
nupkg.AssertContainsEntry (nupkgPath, $"lib/{dotnetVersion}-android{apiLevel}.0/{proj.ProjectName}.dll");
nupkg.AssertContainsEntry (nupkgPath, $"lib/{dotnetVersion}-android{apiLevel}.0/{proj.ProjectName}.aar");
nupkg.AssertContainsEntry (nupkgPath, $"lib/{dotnetVersion}-android{apiLevel}.0/bar.aar");
nupkg.AssertDoesNotContainEntry (nupkgPath, "content/bar.aar");
nupkg.AssertDoesNotContainEntry (nupkgPath, "content/sub/directory/bar.aar");
Expand All @@ -142,6 +153,21 @@ public String Say (String quote) {
nupkg.AssertDoesNotContainEntry (nupkgPath, $"contentFiles/any/{dotnetVersion}-android{apiLevel}.0/nopack.aar");
nupkg.AssertContainsEntry (nupkgPath, $"lib/{dotnetVersion}-android{apiLevel}.0/baz.aar");
nupkg.AssertDoesNotContainEntry (nupkgPath, $"lib/{dotnetVersion}-android{apiLevel}.0/_Microsoft.Android.Resource.Designer.dll");

// NOTE: this is not fixed yet in .NET 9
if (dotnetVersion == "net10.0") {
using var aarStream = new MemoryStream ();
var aarEntry = nupkg.ReadEntry (aarPath);
aarEntry.Extract (aarStream);
aarStream.Seek (0, SeekOrigin.Begin);

// Look for libs/29CAF121D5FD8E3D.jar, libs/A1AFA985571E728E.jar
using var aar = ZipArchive.Open (aarStream);
int count = aar.Count (e =>
e.FullName.StartsWith ("libs/", StringComparison.OrdinalIgnoreCase) &&
e.FullName.EndsWith (".jar", StringComparison.OrdinalIgnoreCase));
Assert.AreEqual (2, count, $"There should be 2 .jar files in the {aarPath} archive, but found {count}.");
}
}

static readonly object[] DotNetTargetFrameworks = new object[] {
Expand Down
4 changes: 1 addition & 3 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/AndroidBuildActions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ public static class AndroidBuildActions
public const string AndroidInterfaceDescription = "AndroidInterfaceDescription";
public const string AndroidJavaSource = "AndroidJavaSource";
public const string AndroidJavaLibrary = "AndroidJavaLibrary";
/// <summary>
/// Only supported in .NET 5+
/// </summary>
public const string AndroidLibrary = "AndroidLibrary";
public const string AndroidMavenLibrary = "AndroidMavenLibrary";
public const string AndroidLintConfig = "AndroidLintConfig";
public const string AndroidNativeLibrary = "AndroidNativeLibrary";
public const string _AndroidRemapMembers = "_AndroidRemapMembers";
Expand Down
13 changes: 12 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/AndroidItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,18 @@ public AndroidLibrary (Func<string> include)
{
}
}
public class AndroidLintConfig : BuildItem
public class AndroidMavenLibrary : BuildItem
{
public AndroidMavenLibrary (string include)
: this (() => include)
{
}
public AndroidMavenLibrary (Func<string> include)
: base (AndroidBuildActions.AndroidMavenLibrary, include)
{
}
}
public class AndroidLintConfig : BuildItem
{
public AndroidLintConfig (string include)
: this (() => include)
Expand Down
Loading