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

* main:
  [Mono.Android] Generate API docs with "full" verbosity (dotnet#8435)
  [profiled-aot] update profile for .NET 8 GA (dotnet#8428)
  Bump to xamarin/Java.Interop/main@3c83179 (dotnet#8429)
  [Xamarin.Android.Build.Tasks] Small refactoring to `AddKeepAlives` method (dotnet#8423)
  [Xamarin.Android.Build.Tasks] Fixup indirect resource references (dotnet#8416)

Author: grendello

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

@@ -29,6 +29,12 @@ parameters:
   type: string
   default: default
 
+- name: javadocVerbosity
+  displayName: AndroidJavadocVerbosity property value
+  type: string
+  default: default
+
+
 # Global variables
 variables:
 - template: yaml-templates/variables.yaml
@@ -40,6 +46,8 @@ variables:
   value: ''
 - name: MdocPackageVersionArg
   value: ''
+- name: AndroidJavadocVerbosity
+  value: ''
 
 
 stages:
@@ -79,6 +87,10 @@ stages:
       - script: echo "##vso[task.setvariable variable=MdocPackageVersionArg]-p:MdocPackageVersion=${{ parameters.mdocVersion }}"
         displayName: set MdocPackageVersionArg
 
+    - ${{ if ne(parameters.javadocVerbosity, 'default') }}:
+      - script: echo "##vso[task.setvariable variable=AndroidJavadocVerbosity]-p:AndroidJavadocVerbosity=${{ parameters.javadocVerbosity }}"
+        displayName: set AndroidJavadocVerbosity
+
     - template: yaml-templates/use-dot-net.yaml
 
     - task: NuGetAuthenticate@0
@@ -97,15 +109,21 @@ stages:
 
     - script: >-
         make update-api-docs CONFIGURATION=$(XA.Build.Configuration)
-        MSBUILD_ARGS='$(DocsApiLevelArg) $(DocsPlatformIdArg) $(DocsFxVersionArg) $(MdocPackageVersionArg)'
+        MSBUILD_ARGS='$(DocsApiLevelArg) $(DocsPlatformIdArg) $(DocsFxVersionArg) $(MdocPackageVersionArg) $(AndroidJavadocVerbosity)'
       workingDirectory: $(Build.SourcesDirectory)
       displayName: make update-api-docs
 
-    - template: yaml-templates/upload-results.yaml
-      parameters:
-        artifactName: Build Results - API Docs Update
-        includeBuildResults: true
-        condition: always()
+    - script: >
+        mkdir -p $(Build.StagingDirectory)/docs-binaries &&
+        ln $(Build.SourcesDirectory)/bin/$(XA.Build.Configuration)/lib/xamarin.android/xbuild-frameworks/Microsoft.Android/34/*.dll $(Build.StagingDirectory)/docs-binaries/ &&
+        ln $(Build.SourcesDirectory)/bin/$(XA.Build.Configuration)/lib/xamarin.android/xbuild-frameworks/Microsoft.Android/34/*.xml $(Build.StagingDirectory)/docs-binaries/
+      displayName: copy docs files
+
+    - task: PublishPipelineArtifact@1
+      displayName: upload docs files
+      inputs:
+        artifactName: Binaries
+        targetPath: $(Build.StagingDirectory)/docs-binaries
 
     - script: >
         mkdir -p $(Build.StagingDirectory)/api-doc-diff &&
@@ -118,6 +136,12 @@ stages:
         artifactName: Api Docs Diff
         targetPath: $(Build.StagingDirectory)/api-doc-diff
 
+    - template: yaml-templates/upload-results.yaml
+      parameters:
+        artifactName: Build Results - API Docs Update
+        includeBuildResults: true
+        condition: always()
+
     - powershell: |
         $docsUpdateBinlog = Get-ChildItem -Path "$(Build.SourcesDirectory)/bin/Build$(XA.Build.Configuration)" -Filter *UpdateApiDocs-*.binlog | Select-Object -First 1
         $buildLog = "$(Build.SourcesDirectory)/bin/Build$(XA.Build.Configuration)/temp-build.log"

external/Java.Interop

@@ -37,7 +37,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(IncludeAndroidJavadoc)' == 'True' ">
-    <AndroidJavadocVerbosity Condition=" '$(AndroidJavadocVerbosity)' == '' ">intellisense+extraremarks</AndroidJavadocVerbosity>
+    <AndroidJavadocVerbosity Condition=" '$(AndroidJavadocVerbosity)' == '' ">full</AndroidJavadocVerbosity>
     <DocumentationFile>$(OutputPath)Mono.Android.xml</DocumentationFile>
     <NoWarn>$(NoWarn);CS1572;CS1573;CS1574;CS1584;CS1587;CS1591;CS1658;</NoWarn>
   </PropertyGroup>

src/Mono.Android/Mono.Android.csproj

@@ -86,18 +86,13 @@ bool AddKeepAlives (TypeDefinition type)
 		{
 			bool changed = false;
 			foreach (MethodDefinition method in type.Methods) {
-				if (!method.CustomAttributes.Any (a => a.AttributeType.FullName == "Android.Runtime.RegisterAttribute"))
+				if (method.Parameters.Count == 0)
 					continue;
 
-				if (method.Parameters.Count == 0)
+				if (!method.CustomAttributes.Any (a => a.AttributeType.FullName == "Android.Runtime.RegisterAttribute"))
 					continue;
 
-				var processor = method.Body.GetILProcessor ();
-				var module = method.DeclaringType.Module;
 				var instructions = method.Body.Instructions;
-				var end = instructions.Last ();
-				if (end.Previous.OpCode == OpCodes.Endfinally)
-					end = end.Previous;
 
 				var found = false;
 				for (int off = Math.Max (0, instructions.Count - 6); off < instructions.Count; off++) {
@@ -111,6 +106,12 @@ bool AddKeepAlives (TypeDefinition type)
 				if (found)
 					continue;
 
+				var processor = method.Body.GetILProcessor ();
+				var module = method.DeclaringType.Module;
+				var end = instructions.Last ();
+				if (end.Previous.OpCode == OpCodes.Endfinally)
+					end = end.Previous;
+
 				for (int i = 0; i < method.Parameters.Count; i++) {
 					if (method.Parameters [i].ParameterType.IsValueType || method.Parameters [i].ParameterType.FullName == "System.String")
 						continue;

src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/AddKeepAlivesStep.cs

@@ -139,6 +139,32 @@ string GetNativeTypeNameFromManagedTypeName (string name)
 			}
 		}
 
+		string GetFixupKey (Instruction instruction, string designerFullName)
+		{
+			string line = instruction.ToString ();
+			int idx = line.IndexOf (designerFullName, StringComparison.Ordinal);
+			if (idx >= 0) {
+				return line.Substring (idx + designerFullName.Length);
+			}
+			if (instruction.Operand is FieldReference fieldRef &&
+					(fieldRef.DeclaringType?.ToString()?.Contains (".Resource/") ?? false)) {
+				var canResolve = false;
+				try {
+					var resolved  = fieldRef.Resolve ();
+					canResolve    = resolved != null;
+				} catch (Exception) {
+				}
+				if (canResolve)
+					return null;
+				var type  = fieldRef.DeclaringType.FullName;
+				var s     = type.LastIndexOf ('/');
+				type      = type.Substring (s + 1);
+				var key   = type + "::" + fieldRef.Name;
+				return key;
+			}
+			return null;
+		}
+
 		protected override void FixBody (MethodBody body, TypeDefinition designer)
 		{
 			// replace
@@ -152,18 +178,16 @@ protected override void FixBody (MethodBody body, TypeDefinition designer)
 			{
 				if (i.OpCode != OpCodes.Ldsfld)
 					continue;
-				string line = i.ToString ();
-				int idx = line.IndexOf (designerFullName, StringComparison.Ordinal);
-				if (idx >= 0) {
-					string key = line.Substring (idx + designerFullName.Length);
+				var key = GetFixupKey (i, designerFullName);
+				if (key != null) {
 					LogMessage ($"Looking for {key}.");
 					var found = lookup.TryGetValue (key, out MethodDefinition method);
 					if (!found) {
 						LogMessage ($"DEBUG! Failed to find {key}! Trying case insensitive lookup.");
 						found = lookupCaseInsensitive.TryGetValue (key, out method);
 					}
 					if (found) {
-						var importedMethod = designer.Module.ImportReference (method);
+						var importedMethod = body.Method.Module.ImportReference (method);
 						var newIn = Instruction.Create (OpCodes.Call, importedMethod);
 						instructions.Add (i, newIn);
 					} else {

src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FixLegacyResourceDesignerStep.cs

@@ -60,6 +60,37 @@ protected bool FindResourceDesigner (AssemblyDefinition assembly, bool mainAppli
 
 				}
 			}
+
+			if (string.IsNullOrEmpty(designerFullName)) {
+				LogMessage ($"Inspecting member references for assembly: {assembly.FullName};");
+				var memberRefs = assembly.MainModule.GetMemberReferences ();
+				foreach (var memberRef in memberRefs) {
+					string declaringType = memberRef.DeclaringType?.ToString () ?? string.Empty;
+					if (!declaringType.Contains (".Resource/")) {
+						continue;
+					}
+					if (declaringType.Contains ("_Microsoft.Android.Resource.Designer")) {
+						continue;
+					}
+					var resolved = false;
+					try {
+						var def = memberRef.Resolve ();
+						if (resolved = def != null) {
+							LogMessage ($"Resolved member `{memberRef?.Name}`");
+						}
+					} catch (Exception ex) {
+						LogMessage ($"Exception resolving member `{memberRef?.Name}`: {ex}");
+						resolved = false;
+					}
+					if (!resolved) {
+						LogMessage ($"Adding _Linker.Generated.Resource to {assembly.Name.Name}. Could not resolve {memberRef?.Name} : {declaringType}");
+						designer = new TypeDefinition ("_Linker.Generated", "Resource", TypeAttributes.Public | TypeAttributes.AnsiClass);
+						designer.BaseType = new TypeDefinition ("System", "Object", TypeAttributes.Public | TypeAttributes.AnsiClass);
+						return true;
+					}
+				}
+			}
+
 			if (string.IsNullOrEmpty(designerFullName))
 				return false;
 

src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/LinkDesignerBase.cs

@@ -1,5 +1,6 @@
 // This class represents common code paths we always want to AOT
 
+// DateTime.Now
 // string interpolation & split
 // int.Parse(), int.ToString()
 // Culture-aware string comparisons
@@ -15,8 +16,11 @@ static class CommonMethods
     // Returns '200 OK' if the caller wants to set that on the UI
     public static async Task<string> Invoke()
     {
-        var url = $"https://httpstat.us/{200}";
+        // NOTE: alternate web services if one of these is down
+        //var url = $"https://httpstat.us/{200}";
+        var url = $"https://httpbin.org/status/{200}";
 
+        var now = DateTime.Now;
         var foo = "foo";
         foo.StartsWith("f");
         foo.Contains("o");