Merge branch 'main' into all-assemblies-per-rid

* main:
  [Xamarin.Android.Build.Tasks] Add support for $(AndroidEnableObsoleteOverrideInheritance). (dotnet#8393)
  [Xamarin.Android.Build.Tasks] Make manifestmerger.jar the default. (dotnet#8392)

Author: grendello

Documentation/guides/building-apps/build-properties.md

@@ -469,6 +469,15 @@ Support for this property was added in Xamarin.Android 5.1.
 
 This property is `False` by default.
 
+## AndroidEnableObsoleteOverrideInheritance
+
+A boolean property that determines if bound methods automatically inherit `[Obsolete]`
+attributes from methods they override.
+
+Support for this property was added in .NET 8.
+
+This property is `True` by default.
+
 ## AndroidEnablePreloadAssemblies
 
 A boolean property that controls
@@ -987,9 +996,12 @@ merging *AndroidManifest.xml* files. This is an enum-style property
 where `legacy` selects the original C# implementation
 and `manifestmerger.jar` selects Google's Java implementation.
 
-The default value is currently `legacy`. This will change to
-`manifestmerger.jar` in a future release to align behavior with
-Android Studio.
+The default value is currently `manifestmerger.jar`. If you want to 
+use the old version add the following to your csproj
+
+```xml
+<AndroidManifestMerger>legacy</AndroidManifestMerger>
+```
 
 Google's merger enables support for `xmlns:tools="http://schemas.android.com/tools"`
 as described in the [Android documentation][manifest-merger].

src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.Core.targets

@@ -99,6 +99,7 @@ It is shared between "legacy" binding projects and .NET 5 projects.
         EnableBindingNestedInterfaceTypes="$(AndroidBoundInterfacesContainTypes)"
         EnableBindingInterfaceConstants="$(AndroidBoundInterfacesContainConstants)"
         EnableRestrictToAttributes="$(AndroidEnableRestrictToAttributes)"
+        EnableObsoleteOverrideInheritance="$(AndroidEnableObsoleteOverrideInheritance)"
         Nullable="$(Nullable)"
         UseJavaLegacyResolver="$(_AndroidUseJavaLegacyResolver)"
         NamespaceTransforms="@(AndroidNamespaceReplacement)"

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets

@@ -39,6 +39,7 @@
     <AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods Condition=" '$(AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods)' == '' ">true</AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>
     <AndroidBoundInterfacesContainTypes Condition=" '$(AndroidBoundInterfacesContainTypes)' == '' ">true</AndroidBoundInterfacesContainTypes>
     <AndroidBoundInterfacesContainConstants Condition=" '$(AndroidBoundInterfacesContainConstants)' == '' ">true</AndroidBoundInterfacesContainConstants>
+    <AndroidEnableObsoleteOverrideInheritance Condition=" '$(AndroidEnableObsoleteOverrideInheritance)' == '' ">true</AndroidEnableObsoleteOverrideInheritance>
     <AndroidEnableRestrictToAttributes Condition=" '$(AndroidEnableRestrictToAttributes)' == '' ">obsolete</AndroidEnableRestrictToAttributes>
 
     <!-- Mono components -->

src/Xamarin.Android.Build.Tasks/Tasks/Generator.cs

@@ -52,6 +52,7 @@ public class BindingsGenerator : AndroidDotnetToolTask
 		public bool EnableBindingNestedInterfaceTypes { get; set; }
 		public bool EnableBindingInterfaceConstants { get; set; }
 		public string EnableRestrictToAttributes { get; set; }
+		public bool EnableObsoleteOverrideInheritance { get; set; }
 		public string Nullable { get; set; }
 
 		public ITaskItem[] TransformFiles { get; set; }
@@ -217,6 +218,9 @@ protected override string GenerateCommandLineCommands ()
 					if (EnableBindingStaticAndDefaultInterfaceMethods)
 						features.Add ("default-interface-methods");
 
+					if (!EnableObsoleteOverrideInheritance)
+						features.Add ("do-not-fix-obsolete-overrides");
+
 					if (string.Equals (EnableRestrictToAttributes, "obsolete", StringComparison.OrdinalIgnoreCase))
 						features.Add ("restrict-to-attributes");
 

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildWithLibraryTests.cs

@@ -670,6 +670,8 @@ public void AllResourcesInClassLibrary ([Values (true, false)] bool useAapt2, [V
 			if (Builder.UseDotNet) {
 				lib.RemoveProperty ("OutputType");
 			}
+			lib.AndroidManifest = lib.AndroidManifest.
+				Replace ("application android:label=\"${PROJECT_NAME}\"", "application android:label=\"com.test.foo\" ");
 
 			// Create an "app" that is basically empty and references the library
 			var app = new XamarinAndroidLibraryProject {

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs

@@ -755,6 +755,7 @@ public void MergeLibraryManifest ()
 					KnownPackages.SupportV7AppCompat_27_0_2_1,
 				},
 			};
+			proj.SetProperty ("AndroidManifestMerger", "legacy");
 			proj.Sources.Add (new BuildItem.Source ("TestActivity1.cs") {
 				TextContent = () => @"using System;
 using System.Collections.Generic;

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

@@ -270,7 +270,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 	<AndroidCreatePackagePerAbi Condition=" '$(AndroidCreatePackagePerAbi)' == 'aab' ">False</AndroidCreatePackagePerAbi>
 	<AndroidApkSigningAlgorithm Condition=" '$(AndroidApkSigningAlgorithm)' == '' ">SHA256withRSA</AndroidApkSigningAlgorithm>
 	<AndroidApkDigestAlgorithm  Condition=" '$(AndroidApkDigestAlgorithm)' == '' ">SHA-256</AndroidApkDigestAlgorithm>
-	<AndroidManifestMerger      Condition=" '$(AndroidManifestMerger)' == '' ">legacy</AndroidManifestMerger>
+	<AndroidManifestMerger      Condition=" '$(AndroidManifestMerger)' == '' ">manifestmerger.jar</AndroidManifestMerger>
 
 	<!-- Default Java heap size to 1GB (-Xmx1G) if not specified-->
 	<JavaMaximumHeapSize Condition=" '$(JavaMaximumHeapSize)' == '' ">1G</JavaMaximumHeapSize>