Skip to content

Commit

Permalink
[One .NET] add missing API documentation (#6155)
Browse files Browse the repository at this point in the history
Right now in .NET 6, you don't get any `<summary>` documentation on
Android APIs.

This adds files like `Mono.Android.xml` and `Java.Interop.xml` to the
Microsoft.Android.Ref pack to solve this issue.

I also fixed places in `Mono.Android.csproj` that used `net6.0`, so
this will continue to work in a future .NET 7.
  • Loading branch information
jonathanpeppers committed Aug 3, 2021
1 parent 35ccf4e commit 60efd75
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions build-tools/create-packs/Microsoft.Android.Ref.proj
Expand Up @@ -39,6 +39,12 @@ by projects that use the Microsoft.Android framework in .NET 5.

<ItemGroup>
<_PackageFiles Include="@(_AndroidRefPackAssemblies)" PackagePath="$(_AndroidRefPackAssemblyPath)" TargetPath="$(_AndroidRefPackAssemblyPath)" />
<_PackageFiles Include="$(_MonoAndroidNETOutputDir)Java.Interop.xml" PackagePath="$(_AndroidRefPackAssemblyPath)" />
<_PackageFiles
Condition=" '$(CONVERT_JAVADOC_TO_XMLDOC)' == 'true' "
Include="$(_MonoAndroidNETOutputDir)Mono.Android.xml"
PackagePath="$(_AndroidRefPackAssemblyPath)"
/>
<_PackageFiles Include="$(_MonoAndroidNETOutputDir)mono.android.jar" PackagePath="$(_AndroidRefPackAssemblyPath)" />
<_PackageFiles Include="$(_MonoAndroidNETOutputDir)mono.android.dex" PackagePath="$(_AndroidRefPackAssemblyPath)" />
<_PackageFiles Include="$(_MonoAndroidNETOutputDir)AndroidApiInfo.xml" PackagePath="$(_AndroidRefPackAssemblyPath)" />
Expand Down
4 changes: 2 additions & 2 deletions src/Mono.Android/Mono.Android.csproj
Expand Up @@ -25,7 +25,7 @@
</PropertyGroup>

<PropertyGroup>
<IncludeAndroidJavadoc Condition=" '$(IncludeAndroidJavadoc)' == '' And '$(CONVERT_JAVADOC_TO_XMLDOC)' == 'true' And '$(AndroidFrameworkVersion)' == '$(AndroidLatestStableFrameworkVersion)'">True</IncludeAndroidJavadoc>
<IncludeAndroidJavadoc Condition=" '$(IncludeAndroidJavadoc)' == '' And '$(CONVERT_JAVADOC_TO_XMLDOC)' == 'true' And ('$(AndroidFrameworkVersion)' == '$(AndroidLatestStableFrameworkVersion)' or '$(TargetFramework)' != 'monoandroid10')">True</IncludeAndroidJavadoc>
<AndroidJavadocVerbosity Condition=" '$(AndroidJavadocVerbosity)' == '' ">intellisense</AndroidJavadocVerbosity>
</PropertyGroup>

Expand Down Expand Up @@ -93,7 +93,7 @@
</Reference>
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
<ItemGroup Condition=" '$(TargetFramework)' != 'monoandroid10' ">
<ProjectReference Include="..\..\external\Java.Interop\src\Java.Interop\Java.Interop.csproj" />
<EmbeddedResource Include="ILLink/ILLink.LinkAttributes.xml">
<LogicalName>ILLink.LinkAttributes.xml</LogicalName>
Expand Down

0 comments on commit 60efd75

Please sign in to comment.