Skip to content
This repository was archived by the owner on May 29, 2024. It is now read-only.

Commit 10da545

Browse files
shawnwang-mspjcollinsdavidbritchTianqiZhang
authored
Merge main to live (#38)
* Update docs using dotnet/java-interop@d64087cf (#29) Fixes: dotnet/java-interop#933 Context: dotnet/java-interop#931 Context: dotnet/java-interop#932 Changes: dotnet/java-interop@087684a...d64087c Changes: dotnet/android@aea70ca...05dd813 Changes of note: * Includes a bunch of fixes for method overloads. * Documentation URLs have been updated to *better* match what the Android doc link should be. *Note*: these are still not all *correct*; See dotnet/java-interop#931 and dotnet/java-interop#932. No new documentation warnings or suggestions have been introduced: Total Build Warnings | 1124 Total Build Suggestions | 902 * Update docs using dotnet/java-interop@d3f0c5c (#30) Fixes: dotnet/java-interop#931 Fixes: dotnet/java-interop#932 Context: dotnet/java-interop@d3f0c5c Fixes reference documentation URLs for type members with complex parameters. * Master becomes main. * Update docs using dotnet/java-interop@7716ae53 (#33) Updates API docs against: * dotnet/android@bb2f920 * dotnet/java-interop@51c3dae Notable generator improvements include: * dotnet/java-interop@4cbc07a * dotnet/java-interop@13def0e * dotnet/java-interop@32635fd * Update docs using dotnet/android@ace5f71c (#34) Imports Google-provided API-31 Javadoc documentation for nested types that were previously being ignored. Notable documentation related generator changes: * dotnet/java-interop@4b4fedd3: [generator] Process Javadoc for nested types * dotnet/java-interop@265ad762: [Java.Interop.Tools.JavaSource] Fix tag parsing errors Changes in xamarin-android and java.interop: * dotnet/android@c6dcefb...ace5f71 * dotnet/java-interop@7716ae5...032f1e7 * [SEO][Rollout Monikered Canonical]Add URL moniker (#37) Enable build config to generate canonical URL with moniker Co-authored-by: Peter Collins <pecolli@microsoft.com> Co-authored-by: David Britch <davidbritch@users.noreply.github.com> Co-authored-by: Tianqi Zhang <TianqiZhang@users.noreply.github.com>
1 parent 6c33c13 commit 10da545

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

docs/Mono.Android/en/docfx.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
"template": [],
6262
"dest": "_site",
6363
"xrefService": [ "https://xref.docs.microsoft.com/query?uid={uid}" ],
64+
"isCanonicalUrlWithMoniker": true,
6465
"lruSize": 0
6566
}
66-
}
67+
}

0 commit comments

Comments
 (0)