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 68f5558f444..9a803e01fae 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 @@ -83,10 +83,13 @@ 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 e6765673b81..f489c054ca4 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 @@ -380,6 +380,15 @@ public void DotNetBuild (string runtimeIdentifiers, bool isRelease) new BuildItem ("EmbeddedResource", "Foo.es.resx") { TextContent = () => InlineData.ResxWithContents ("Cancelar") }, + new AndroidItem.TransformFile ("Transforms.xml") { + // Remove two methods that introduced warnings: + // Com.Balysv.Material.Drawable.Menu.MaterialMenuView.cs(214,30): warning CS0114: 'MaterialMenuView.OnRestoreInstanceState(IParcelable)' hides inherited member 'View.OnRestoreInstanceState(IParcelable?)'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword. + // Com.Balysv.Material.Drawable.Menu.MaterialMenuView.cs(244,56): warning CS0114: 'MaterialMenuView.OnSaveInstanceState()' hides inherited member 'View.OnSaveInstanceState()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword. + TextContent = () => "", + }, + new AndroidItem.AndroidLibrary ("material-menu-1.1.0.aar") { + WebContent = "https://repo.jfrog.org/artifactory/libs-release-bintray/com/balysv/material-menu/1.1.0/material-menu-1.1.0.aar" + }, } }; proj.MainActivity = proj.DefaultMainActivity.Replace (": Activity", ": AndroidX.AppCompat.App.AppCompatActivity"); @@ -425,8 +434,9 @@ public void DotNetBuild (string runtimeIdentifiers, bool isRelease) FileAssert.Exists (assemblyPath); using (var assembly = AssemblyDefinition.ReadAssembly (assemblyPath)) { var typeName = "Com.Xamarin.Android.Test.Msbuildtest.JavaSourceJarTest"; - var type = assembly.MainModule.GetType (typeName); - Assert.IsNotNull (type, $"{assemblyPath} should contain {typeName}"); + Assert.IsNotNull (assembly.MainModule.GetType (typeName), $"{assemblyPath} should contain {typeName}"); + typeName = "Com.Balysv.Material.Drawable.Menu.MaterialMenuView"; + Assert.IsNotNull (assembly.MainModule.GetType (typeName), $"{assemblyPath} should contain {typeName}"); } var rids = runtimeIdentifiers.Split (';');