Skip to content

Commit 7d3535d

Browse files
authored
[Mono.Android] Use .NET version of mdoc (#9225)
Fixes: #7974 We've been intermittently running into issues when building Mono.Android on our PR build pool ever since commit 41b0124 which made mono an optional build dependency. Update mdoc invocations to use the .NET version of the tool to remove one of the last parts of the build that still depends on mono.
1 parent 52acbaf commit 7d3535d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/Mono.Android/Mono.Android.targets

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,8 @@
244244
<DocsExportOutput Condition=" '$(DocsExportOutput)' == '' ">$(_MonoAndroidNETDefaultOutDir)Mono.Android.xml</DocsExportOutput>
245245
<_ExternalDocsRoot>$(XamarinAndroidSourcePath)external/android-api-docs/docs/xml</_ExternalDocsRoot>
246246
<_LogPrefix>$(MSBuildThisFileDirectory)../../bin/Build$(Configuration)/UpdateApiDocs-$([System.DateTime]::Now.ToString ("yyyyMMddTHHmmss"))</_LogPrefix>
247-
<_Mdoc Condition=" '$(Pkgmdoc)' != '' ">"$(Pkgmdoc)/tools/net471/mdoc.exe"</_Mdoc>
248-
<_Mdoc Condition=" '$(Pkgmdoc)' == '' ">"$(XAPackagesDir)/mdoc/$(MdocPackageVersion)/tools/net471/mdoc.exe"</_Mdoc>
247+
<_Mdoc Condition=" '$(Pkgmdoc)' != '' ">"$(Pkgmdoc)/tools/net6.0/mdoc.dll"</_Mdoc>
248+
<_Mdoc Condition=" '$(Pkgmdoc)' == '' ">"$(XAPackagesDir)/mdoc/$(MdocPackageVersion)/tools/net6.0/mdoc.dll"</_Mdoc>
249249
</PropertyGroup>
250250

251251
<!-- Generate documentation using MDoc -->
@@ -310,11 +310,11 @@
310310
Lines="$(FrameworksXmlContent)"
311311
/>
312312
<Exec
313-
Command="$(ManagedRuntime) $(ManagedRuntimeArgs) $(_Mdoc) fx-bootstrap -fx $(_RootFxDir) -importContent true"
313+
Command="dotnet $(_Mdoc) fx-bootstrap -fx $(_RootFxDir) -importContent true"
314314
WorkingDirectory="$(MSBuildThisFileDirectory)"
315315
/>
316316
<Exec
317-
Command="$(ManagedRuntime) $(ManagedRuntimeArgs) $(_Mdoc) update $(_Libdir) $(_Output) $(_DocTypeArgs) $(_FxConfig) $(_ExtraMdocArgs)"
317+
Command="dotnet $(_Mdoc) update $(_Libdir) $(_Output) $(_DocTypeArgs) $(_FxConfig) $(_ExtraMdocArgs)"
318318
WorkingDirectory="$(MSBuildThisFileDirectory)"
319319
/>
320320
</Target>
@@ -345,7 +345,7 @@
345345
Inputs="@(_MsxDocSourceFile)"
346346
Outputs="$(DocsExportOutput)">
347347
<Exec
348-
Command="$(ManagedRuntime) $(ManagedRuntimeArgs) $(_Mdoc) --debug export-msxdoc -o &quot;$(DocsExportOutput)&quot; &quot;$(_ExternalDocsRoot)&quot;"
348+
Command="dotnet $(_Mdoc) --debug export-msxdoc -o &quot;$(DocsExportOutput)&quot; &quot;$(_ExternalDocsRoot)&quot;"
349349
/>
350350
</Target>
351351

0 commit comments

Comments
 (0)