Skip to content

[docs] Don't overwrite xml produced by docs build #8451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 24, 2023
Merged

[docs] Don't overwrite xml produced by docs build #8451

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5b6452
[docs] Don't overwrite xml produced by docs build
pjcollins Oct 23, 2023
bb8f7a2
Fix prop name
pjcollins Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/Mono.Android/Mono.Android.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@
<DocsApiLevel Condition=" '$(DocsApiLevel)' == '' ">34</DocsApiLevel>
<DocsPlatformId Condition=" '$(DocsPlatformId)' == '' ">$(DocsApiLevel)</DocsPlatformId>
<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>
Expand All @@ -249,7 +250,7 @@
<!-- Generate documentation using MDoc -->
<Target Name="UpdateExternalDocumentation">
<MSBuild Projects="$(MSBuildThisFileDirectory)Mono.Android.csproj"
Properties="TargetFramework=$(DotNetTargetFramework)"
Properties="TargetFramework=$(DotNetTargetFramework);DocsExportOutput=$(BaseIntermediateOutputPath)Mono.Android.temp.xml"
Targets="_UpdateExternalDocumentation;_RunMdoc;_ExportMsxDoc;_GenerateApiDocsDiff"
/>
</Target>
Expand Down Expand Up @@ -286,7 +287,7 @@
<_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://docs.microsoft.com/en-us/dotnet/api/android?view=xamarin-android-sdk-9 -->
and https://learn.microsoft.com/en-us/dotnet/api/android?view=xamarin-android-sdk-13 -->
<FrameworksXmlContent>
<![CDATA[
<Frameworks>
Expand All @@ -296,7 +297,7 @@
</FrameworksXmlContent>
</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. xamarin-android-sdk-12) -->
Copy Mono.Android.dll and Java.Interop.dll to the %(Source) path described in frameworks.xml (e.g. net-android-34.0) -->
<RemoveDir Directories="$(_RootFxDir)" />
<MakeDir Directories="$(_RootFxDir)" />
<MakeDir Directories="$(_RootFxDir)$(DocsFxMoniker)" />
Expand Down Expand Up @@ -338,9 +339,9 @@
<Target Name="_ExportMsxDoc"
DependsOnTargets="_FindDocSourceFiles"
Inputs="@(_MsxDocSourceFile)"
Outputs="$(_MonoAndroidNETDefaultOutDir)Mono.Android.xml">
Outputs="$(DocsExportOutput)">
<Exec
Command="$(ManagedRuntime) $(ManagedRuntimeArgs) $(_Mdoc) --debug export-msxdoc -o &quot;$(_MonoAndroidNETDefaultOutDir)Mono.Android.xml&quot; &quot;$(XamarinAndroidSourcePath)external/android-api-docs/docs/Mono.Android/en/&quot;"
Command="$(ManagedRuntime) $(ManagedRuntimeArgs) $(_Mdoc) --debug export-msxdoc -o &quot;$(DocsExportOutput)&quot; &quot;$(XamarinAndroidSourcePath)external/android-api-docs/docs/Mono.Android/en/&quot;"
/>
</Target>

Expand Down