diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.AvailableItems.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.AvailableItems.targets index 9a803e01fae..4d11ec2c80d 100644 --- a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.AvailableItems.targets +++ b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.AvailableItems.targets @@ -87,6 +87,10 @@ This item group populates the Build Action drop-down in IDEs. + + + + diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs index 4d3610fbcad..5ff367ae9b8 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs @@ -288,6 +288,28 @@ public void DotNetLibraryAarChanges () } } + [Test] + public void AppWithSingleJar () + { + var proj = new XASdkProject { + Sources = { + new AndroidItem.AndroidLibrary ("Jars\\javaclasses.jar") { + BinaryContent = () => ResourceData.JavaSourceJarTestJar, + } + } + }; + + var dotnet = CreateDotNetBuilder (proj); + Assert.IsTrue (dotnet.Build (), "build should succeed"); + + var assemblyPath = Path.Combine (FullProjectDirectory, proj.OutputPath, $"{proj.ProjectName}.dll"); + FileAssert.Exists (assemblyPath); + using (var assembly = AssemblyDefinition.ReadAssembly (assemblyPath)) { + var typeName = "Com.Xamarin.Android.Test.Msbuildtest.JavaSourceJarTest"; + Assert.IsNotNull (assembly.MainModule.GetType (typeName), $"{assemblyPath} should contain {typeName}"); + } + } + [Test] public void GenerateResourceDesigner_false() {