From e9a392a99b1f04cc4799c7b88996e39c18a9c955 Mon Sep 17 00:00:00 2001
From: Peter Collins <pecolli@microsoft.com>
Date: Fri, 10 Nov 2023 16:17:22 -0500
Subject: [PATCH 1/2] [Mono.Android] Replicate automated docs build

Updates mdoc to version 5.9.2.4, and updates the `_RunMdoc` target to
use the same commands and parameters as the [automated docs build][0].

[0]: https://apidrop.visualstudio.com/Content%20CI/_build?definitionId=5552
---
 Directory.Build.props                 |  2 +-
 src/Mono.Android/Mono.Android.targets | 44 +++++++++++++++------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 64033ca5019..0da7c849110 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -51,7 +51,7 @@
     <SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
     <ELFSharpVersion>2.13.1</ELFSharpVersion>
     <HumanizerVersion>2.14.1</HumanizerVersion>
-    <MdocPackageVersion Condition=" '$(MdocPackageVersion)' == '' ">5.8.9.2</MdocPackageVersion>
+    <MdocPackageVersion Condition=" '$(MdocPackageVersion)' == '' ">5.9.2.4</MdocPackageVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Mono.Android/Mono.Android.targets b/src/Mono.Android/Mono.Android.targets
index bb938db0ceb..760460959fa 100644
--- a/src/Mono.Android/Mono.Android.targets
+++ b/src/Mono.Android/Mono.Android.targets
@@ -243,8 +243,8 @@
     <DocsFxMoniker Condition=" '$(DocsFxMoniker)' == '' ">net-android-$(DocsApiLevel).0</DocsFxMoniker>
     <DocsExportOutput Condition=" '$(DocsExportOutput)' == '' ">$(_MonoAndroidNETDefaultOutDir)Mono.Android.xml</DocsExportOutput>
     <_LogPrefix>$(MSBuildThisFileDirectory)../../bin/Build$(Configuration)/UpdateApiDocs-$([System.DateTime]::Now.ToString ("yyyyMMddTHHmmss"))</_LogPrefix>
-    <_Mdoc Condition=" '$(Pkgmdoc)' != '' ">"$(Pkgmdoc)/tools/mdoc.exe"</_Mdoc>
-    <_Mdoc Condition=" '$(Pkgmdoc)' == '' ">"$(XAPackagesDir)/mdoc/$(MdocPackageVersion)/tools/mdoc.exe"</_Mdoc>
+    <_Mdoc Condition=" '$(Pkgmdoc)' != '' ">"$(Pkgmdoc)/tools/net471/mdoc.exe"</_Mdoc>
+    <_Mdoc Condition=" '$(Pkgmdoc)' == '' ">"$(XAPackagesDir)/mdoc/$(MdocPackageVersion)/tools/net471/mdoc.exe"</_Mdoc>
   </PropertyGroup>
 
   <!-- Generate documentation using MDoc -->
@@ -277,40 +277,44 @@
   <Target Name="_RunMdoc">
     <PropertyGroup>
       <_Libdir>-L "$(DotNetPreviewPath)packs/Microsoft.NETCore.App.Ref"</_Libdir>
-      <_AssemblyBasename>$(_MonoAndroidNETDefaultOutDir)Mono.Android</_AssemblyBasename>
-      <_ImportXml>-i "$(_AssemblyBasename).xml"</_ImportXml>
-      <_Assembly>$(_AssemblyBasename).dll</_Assembly>
-      <_JIAssembly>$(_MonoAndroidNETDefaultOutDir)Java.Interop.dll</_JIAssembly>
       <_Output>-o "$(MSBuildThisFileDirectory)../../external/android-api-docs/docs/Mono.Android/en"</_Output>
       <_DocTypeArgs Condition=" '$(DocTypeName)' != '' ">--type=$(DocTypeName)</_DocTypeArgs>
       <_RootFxDir>$(BaseIntermediateOutputPath)docs-gen-temp/</_RootFxDir>
       <_FxConfig>-fx "$(_RootFxDir)"</_FxConfig>
-      <_Lang>--lang fsharp</_Lang>
-      <!-- $(FrameworksXmlContent) describes the docs versions found at android-api-docs/tree/master/docs/Mono.Android/en/FrameworksIndex/
-            and https://learn.microsoft.com/en-us/dotnet/api/android?view=xamarin-android-sdk-13 -->
-      <FrameworksXmlContent>
-<![CDATA[
-<Frameworks>
-  <Framework Name="$(DocsFxMoniker)" Source="$(DocsFxMoniker)" />
-</Frameworks>
-]]>
-      </FrameworksXmlContent>
+      <_ExtraMdocArgs>-lang docid -lang fsharp --debug --delete</_ExtraMdocArgs>
     </PropertyGroup>
-    <!-- Create a temporary directory which contains frameworks.xml and our framework assembly.
-         Copy Mono.Android.dll and Java.Interop.dll to the %(Source) path described in frameworks.xml (e.g. net-android-34.0) -->
+    <!-- Create a docs framework directory which contains:
+          src/Mono.Android/obj/docs-gen-temp
+          ├── dependencies
+          │   └── net-android-34.0
+          |       └──Java.Interop.dll
+          ├── frameworks.xml
+          └── net-android-34.0
+              ├── Mono.Android.dll
+              └── Mono.Android.xml
+    -->
     <RemoveDir Directories="$(_RootFxDir)" />
     <MakeDir Directories="$(_RootFxDir)" />
     <MakeDir Directories="$(_RootFxDir)$(DocsFxMoniker)" />
     <Copy
-        SourceFiles="$(_Assembly);$(_JIAssembly)"
+        SourceFiles="$(_MonoAndroidNETDefaultOutDir)Mono.Android.dll;$(_MonoAndroidNETDefaultOutDir)Mono.Android.xml"
         DestinationFolder="$(_RootFxDir)$(DocsFxMoniker)"
     />
+    <MakeDir Directories="$(_RootFxDir)dependencies/$(DocsFxMoniker)" />
+    <Copy
+        SourceFiles="$(_MonoAndroidNETDefaultOutDir)Java.Interop.dll"
+        DestinationFolder="$(_RootFxDir)dependencies/$(DocsFxMoniker)"
+    />
     <WriteLinesToFile
         File="$(_RootFxDir)frameworks.xml"
         Lines="$(FrameworksXmlContent)"
     />
     <Exec
-        Command="$(ManagedRuntime) $(ManagedRuntimeArgs) $(_Mdoc) --debug update --use-docid --delete $(_Libdir) $(_ImportXml) $(_Output) $(_DocTypeArgs) $(_FxConfig) $(_Lang)"
+        Command="$(ManagedRuntime) $(ManagedRuntimeArgs) $(_Mdoc) fx-bootstrap -fx $(_RootFxDir) -importContent true"
+        WorkingDirectory="$(MSBuildThisFileDirectory)"
+    />
+    <Exec
+        Command="$(ManagedRuntime) $(ManagedRuntimeArgs) $(_Mdoc) update $(_Libdir) $(_Output) $(_DocTypeArgs) $(_FxConfig) $(_ExtraMdocArgs)"
         WorkingDirectory="$(MSBuildThisFileDirectory)"
     />
   </Target>

From adda3a41ef68ffbd03506469f50892ee7e2f729b Mon Sep 17 00:00:00 2001
From: Peter Collins <pecolli@microsoft.com>
Date: Wed, 15 Nov 2023 12:43:43 -0500
Subject: [PATCH 2/2] Include core assemblies in fx

---
 src/Mono.Android/Mono.Android.targets | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Mono.Android/Mono.Android.targets b/src/Mono.Android/Mono.Android.targets
index 760460959fa..fc239302a69 100644
--- a/src/Mono.Android/Mono.Android.targets
+++ b/src/Mono.Android/Mono.Android.targets
@@ -283,13 +283,17 @@
       <_FxConfig>-fx "$(_RootFxDir)"</_FxConfig>
       <_ExtraMdocArgs>-lang docid -lang fsharp --debug --delete</_ExtraMdocArgs>
     </PropertyGroup>
+    <ItemGroup>
+      <_FxAssembly Include="$(_MonoAndroidNETDefaultOutDir)*.dll" />
+      <_FxAssemblyXml Include="@(_FxAssembly->'%(RelativeDir)%(Filename).xml')" Condition=" Exists('%(RelativeDir)%(Filename).xml') " />
+    </ItemGroup>
     <!-- Create a docs framework directory which contains:
           src/Mono.Android/obj/docs-gen-temp
-          ├── dependencies
-          │   └── net-android-34.0
-          |       └──Java.Interop.dll
           ├── frameworks.xml
           └── net-android-34.0
+              ├── Java.Interop.dll
+              ├── Java.Interop.xml
+              ├── Mono.Android.Runtime.dll
               ├── Mono.Android.dll
               └── Mono.Android.xml
     -->
@@ -297,14 +301,9 @@
     <MakeDir Directories="$(_RootFxDir)" />
     <MakeDir Directories="$(_RootFxDir)$(DocsFxMoniker)" />
     <Copy
-        SourceFiles="$(_MonoAndroidNETDefaultOutDir)Mono.Android.dll;$(_MonoAndroidNETDefaultOutDir)Mono.Android.xml"
+        SourceFiles="@(_FxAssembly);@(_FxAssemblyXml)"
         DestinationFolder="$(_RootFxDir)$(DocsFxMoniker)"
     />
-    <MakeDir Directories="$(_RootFxDir)dependencies/$(DocsFxMoniker)" />
-    <Copy
-        SourceFiles="$(_MonoAndroidNETDefaultOutDir)Java.Interop.dll"
-        DestinationFolder="$(_RootFxDir)dependencies/$(DocsFxMoniker)"
-    />
     <WriteLinesToFile
         File="$(_RootFxDir)frameworks.xml"
         Lines="$(FrameworksXmlContent)"