Merge branch 'main' into dev/grendel/perfetto-integration

* main:
  [tests] verify trimmer warnings where appropriate (#9076)
  Bump to jbevain/cecil@8c123e1 (#9078)
  [trimming] remove `$(NullabilityInfoContextSupport)` (#9069)
  [build] Bump `$(XABuildToolsVersion)`=35 (#9071)
  [ci] Move PR build to shared pool (#8854)
  Use AsyncTask from xamarin-android-tools (#9017)
  Bump to dotnet/sdk@02c06d398a 9.0.100-preview.7.24351.1 (#9067)
  [trimming] use public `$(MetricsSupport)` property (#9068)
  [ci] Update resourceManagement.yml (#9070)
  Bump to dotnet/android-api-docs@c14203771a (#8992)
  [trimming] remove `$(_AggressiveAttributeTrimming)` by default (#9062)

Author: grendello

.external

@@ -1 +1 @@
-xamarin/monodroid:main@e11d9a5af8f00a88d15bd87c777608f17c4ece78
+xamarin/monodroid:main@038240c52a7dc2e66b9ad2ddb20b9886836eaec9

.gdn/.gdnsuppress

@@ -13,41 +13,41 @@
     }
   },
   "results": {
-    "28e1a7a1157c8739dce8ac1bbd828a471e477444ec50d2656d0440948b58a274": {
-      "signature": "28e1a7a1157c8739dce8ac1bbd828a471e477444ec50d2656d0440948b58a274",
+    "900efdc86dc2e568955f256c15344038d504db1c7cc819beee79a0e83e729285": {
+      "signature": "900efdc86dc2e568955f256c15344038d504db1c7cc819beee79a0e83e729285",
       "alternativeSignatures": [],
       "memberOf": [
         "default"
       ],
       "justification": "FillEventHistory+Event API documentation with generic example password.",
-      "createdDate": "2024-02-21 20:58:02Z"
+      "createdDate": "2024-06-27 20:43:25Z"
     },
-    "0b7cc0b28f27b0eeb2a415f10e62c32675dd2d4edcffe35600eae35f8064004e": {
-      "signature": "0b7cc0b28f27b0eeb2a415f10e62c32675dd2d4edcffe35600eae35f8064004e",
+    "546ee3b1e3df455989e1689c68bd5bebabe5b191c680b15ba02ee5f71bf4354c": {
+      "signature": "546ee3b1e3df455989e1689c68bd5bebabe5b191c680b15ba02ee5f71bf4354c",
       "alternativeSignatures": [],
       "memberOf": [
         "default"
       ],
       "justification": "Android.Service.Autofill.FillEventHistory+Event API documentation with generic example password.",
-      "createdDate": "2024-02-21 20:58:02Z"
+      "createdDate": "2024-06-27 20:43:25Z"
     },
-    "e57727a14a28f6fd8f4aa87cd3c4b33401dfea1078ce32fb3cbdf342e8adf63d": {
-      "signature": "e57727a14a28f6fd8f4aa87cd3c4b33401dfea1078ce32fb3cbdf342e8adf63d",
+    "dc29fa2c200acb75acd13ef4da8a4139fb37618e4072f5ee06a40e07e3b31b95": {
+      "signature": "dc29fa2c200acb75acd13ef4da8a4139fb37618e4072f5ee06a40e07e3b31b95",
       "alternativeSignatures": [],
       "memberOf": [
         "default"
       ],
       "justification": "Javax.Crypto.ISecretKey API documentation with generic example password.",
-      "createdDate": "2024-02-21 20:58:02Z"
+      "createdDate": "2024-06-27 20:43:25Z"
     },
-    "15c51590a2e2bb503a7277448e05357f5fd8d4cb2f9b9b7446e41c872cceaac4": {
-      "signature": "15c51590a2e2bb503a7277448e05357f5fd8d4cb2f9b9b7446e41c872cceaac4",
+    "85ecf4cad9f76c3946ce6105b708ca822142bd1f1ac4092164f48af5923ca1f1": {
+      "signature": "85ecf4cad9f76c3946ce6105b708ca822142bd1f1ac4092164f48af5923ca1f1",
       "alternativeSignatures": [],
       "memberOf": [
         "default"
       ],
       "justification": "Javax.Security.Auth.Callback.PasswordCallback API documentation with generic example password.",
-      "createdDate": "2024-02-21 20:58:02Z"
+      "createdDate": "2024-06-27 20:43:25Z"
     },
     "1ccf925aa704efd1035bac38e94d2e629fb5b0d1784d5473e4a52e6d13db16ee": {
       "signature": "1ccf925aa704efd1035bac38e94d2e629fb5b0d1784d5473e4a52e6d13db16ee",

.github/policies/resourceManagement.yml

@@ -49,7 +49,7 @@ configuration:
           days: 14
       actions:
       - addReply:
-          reply: This issue will now be closed since it had been marked `possibly-stale` but received no further activity in the past 14 days. It is still possible to reopen or comment on the issue, but please note that the issue will be locked if it remains inactive for another 30 days.
+          reply: This issue will now be closed since it had been marked "possibly-stale" but received no further activity in the past 14 days. It is still possible to reopen or comment on the issue, but please note that the issue will be locked if it remains inactive for another 30 days.
       - closeIssue
     eventResponderTasks:
     - if:

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "external/android-api-docs"]
     path = external/android-api-docs
-    url = https://github.com/xamarin/android-api-docs
+    url = https://github.com/dotnet/android-api-docs
     branch = main
 [submodule "external/constexpr-xxh3"]
     path = external/constexpr-xxh3

Configuration.props

@@ -121,8 +121,8 @@
     <XABuildToolsPackagePrefixLinux></XABuildToolsPackagePrefixLinux>
     <XABuildToolsPackagePrefix Condition=" '$(HostOS)' == 'Darwin' ">$(XABuildToolsPackagePrefixMacOS)</XABuildToolsPackagePrefix>
     <XABuildToolsPackagePrefix Condition=" '$(HostOS)' == 'Windows' ">$(XABuildToolsPackagePrefixWindows)</XABuildToolsPackagePrefix>
-    <XABuildToolsVersion>34</XABuildToolsVersion>
-    <XABuildToolsFolder Condition="'$(XABuildToolsFolder)' == ''">34.0.0</XABuildToolsFolder>
+    <XABuildToolsVersion>35</XABuildToolsVersion>
+    <XABuildToolsFolder Condition="'$(XABuildToolsFolder)' == ''">35.0.0</XABuildToolsFolder>
     <XAPlatformToolsPackagePrefix Condition=" '$(HostOS)' == 'Darwin' "></XAPlatformToolsPackagePrefix>
     <XAPlatformToolsVersion>34.0.5</XAPlatformToolsVersion>
     <XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">1.15.1</XABundleToolVersion>

Directory.Build.props

@@ -43,7 +43,7 @@
   <PropertyGroup>
     <LibZipSharpVersion>3.3.0</LibZipSharpVersion>
     <MicroBuildCoreVersion>1.0.0</MicroBuildCoreVersion>
-    <MonoCecilVersion>0.11.4</MonoCecilVersion>
+    <MonoCecilVersion>0.11.5</MonoCecilVersion>
     <NewtonsoftJsonPackageVersion>13.0.3</NewtonsoftJsonPackageVersion>
     <NuGetApiPackageVersion>5.4.0</NuGetApiPackageVersion>
     <LZ4PackageVersion>1.1.11</LZ4PackageVersion>

Documentation/guides/MSBuildBestPractices.md

@@ -612,7 +612,7 @@ public class MyTask : AndroidTask
 The benefit here is that if an unhandled exception is thrown, `MyTask`
 will automatically generate proper error codes.
 
-`AndroidAsyncTask` has an additional override for doing work on a
+`AsyncTask` has an additional override for doing work on a
 background thread:
 
 ```csharp

build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj

@@ -18,6 +18,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\xa-prep-tasks\xa-prep-tasks.csproj" />
+    <ProjectReference Include="..\..\external\xamarin-android-tools\src\Microsoft.Android.Build.BaseTasks\Microsoft.Android.Build.BaseTasks.csproj" />
     <ProjectReference Include="..\..\external\xamarin-android-tools\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj" />
   </ItemGroup>
 

build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunParallelCmds.cs

@@ -3,17 +3,19 @@
 using System.Text;
 using System.Diagnostics;
 
+using Microsoft.Android.Build.Tasks;
+
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
-using Xamarin.Build;
-
 using Tasks = System.Threading.Tasks;
 
 namespace Xamarin.Android.Tools.BootstrapTasks
 {
 	public class RunParallelCmds : AsyncTask
 	{
+		public override string TaskPrefix => "RPCMD";
+
 		[Required]
 		public ITaskItem[] Commands { get; set; }
 

build-tools/automation/azure-pipelines-apidocs.yaml

@@ -1,4 +1,4 @@
-# Pipeline for updating and uploading android-api-docs/docs/Mono.Android/en/*
+# Pipeline for updating and uploading android-api-docs/docs/xml/*
 # https://dev.azure.com/devdiv/DevDiv/_build?definitionId=15262
 
 # This pipeline can be manually ran against a given branch to generate a new set of Mono.Android docs.
@@ -58,8 +58,10 @@ stages:
   - job: mac_build_update_docs
     displayName: Update API Docs
     pool:
-      name: VSEng-Xamarin-RedmondMac-Android-Untrusted
-      demands: macOS.Name -equals Monterey
+      name: VSEng-VSMac-Xamarin-Shared
+      demands:
+      - macOS.Name -equals Ventura
+      - macOS.Architecture -equals x64
     timeoutInMinutes: 120
     workspace:
       clean: all