From de0118b89745fd4d4847895ec394283c588083b2 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 29 May 2024 15:17:38 -0400 Subject: [PATCH 1/5] Bump to dotnet/android-api-docs@c14203771a The xamarin/android-api-docs repo has been archived and replaced with https://github.com/dotnet/android-api-docs. --- .gitmodules | 2 +- external/android-api-docs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index e01e3a515fd..fd7e2679b2a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "external/android-api-docs"] path = external/android-api-docs - url = https://github.com/xamarin/android-api-docs + url = https://github.com/dotnet/android-api-docs branch = main [submodule "external/constexpr-xxh3"] path = external/constexpr-xxh3 diff --git a/external/android-api-docs b/external/android-api-docs index 9b7ea12a136..c14203771af 160000 --- a/external/android-api-docs +++ b/external/android-api-docs @@ -1 +1 @@ -Subproject commit 9b7ea12a1366b566f32a93bef20fc079288d9244 +Subproject commit c14203771afc5d1d91bd3e1b855c9bf144bcec81 From 7c16995c9b4a035a65d1743098d0bef9ec6dcf58 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 29 May 2024 17:57:37 -0400 Subject: [PATCH 2/5] Update external docs paths --- build-tools/automation/azure-pipelines-apidocs.yaml | 2 +- src/Mono.Android/Mono.Android.targets | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build-tools/automation/azure-pipelines-apidocs.yaml b/build-tools/automation/azure-pipelines-apidocs.yaml index a7cbed9eff6..70d1fcee250 100644 --- a/build-tools/automation/azure-pipelines-apidocs.yaml +++ b/build-tools/automation/azure-pipelines-apidocs.yaml @@ -1,4 +1,4 @@ -# Pipeline for updating and uploading android-api-docs/docs/Mono.Android/en/* +# Pipeline for updating and uploading android-api-docs/docs/xml/* # https://dev.azure.com/devdiv/DevDiv/_build?definitionId=15262 # This pipeline can be manually ran against a given branch to generate a new set of Mono.Android docs. diff --git a/src/Mono.Android/Mono.Android.targets b/src/Mono.Android/Mono.Android.targets index f9859ed408b..dbec298bc5c 100644 --- a/src/Mono.Android/Mono.Android.targets +++ b/src/Mono.Android/Mono.Android.targets @@ -242,6 +242,7 @@ $(DocsApiLevel) net-android-$(DocsApiLevel).0 $(_MonoAndroidNETDefaultOutDir)Mono.Android.xml + <_ExternalDocsRoot>$(XamarinAndroidSourcePath)external/android-api-docs/docs/xml <_LogPrefix>$(MSBuildThisFileDirectory)../../bin/Build$(Configuration)/UpdateApiDocs-$([System.DateTime]::Now.ToString ("yyyyMMddTHHmmss")) <_Mdoc Condition=" '$(Pkgmdoc)' != '' ">"$(Pkgmdoc)/tools/net471/mdoc.exe" <_Mdoc Condition=" '$(Pkgmdoc)' == '' ">"$(XAPackagesDir)/mdoc/$(MdocPackageVersion)/tools/net471/mdoc.exe" @@ -277,7 +278,7 @@ <_Libdir>-L "$(DotNetPreviewPath)packs/Microsoft.NETCore.App.Ref" - <_Output>-o "$(MSBuildThisFileDirectory)../../external/android-api-docs/docs/Mono.Android/en" + <_Output>-o "$(_ExternalDocsRoot)" <_DocTypeArgs Condition=" '$(DocTypeName)' != '' ">--type=$(DocTypeName) <_RootFxDir>$(BaseIntermediateOutputPath)docs-gen-temp/ <_FxConfig>-fx "$(_RootFxDir)" @@ -335,7 +336,7 @@ - <_MsxDocSourceFile Include="$(XamarinAndroidSourcePath)external\android-api-docs\docs\Mono.Android\en\**" /> + <_MsxDocSourceFile Include="$(_ExternalDocsRoot)\**" /> @@ -344,7 +345,7 @@ Inputs="@(_MsxDocSourceFile)" Outputs="$(DocsExportOutput)"> From 33b27a6cdee9810978c878d096c1739292228752 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Thu, 27 Jun 2024 16:31:18 -0400 Subject: [PATCH 3/5] Bump to dotnet/android-api-docs@e0970e7e --- external/android-api-docs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/android-api-docs b/external/android-api-docs index c14203771af..e0970e7eee4 160000 --- a/external/android-api-docs +++ b/external/android-api-docs @@ -1 +1 @@ -Subproject commit c14203771afc5d1d91bd3e1b855c9bf144bcec81 +Subproject commit e0970e7eee43ab9992c5c79f7dd49da55181add2 From 2f803dd6250aa953d1ebf3b08e81df3e91910c26 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Thu, 27 Jun 2024 17:21:11 -0400 Subject: [PATCH 4/5] Update .gdnsuppress --- .gdn/.gdnsuppress | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gdn/.gdnsuppress b/.gdn/.gdnsuppress index 05025c8dc59..fada1dfadd9 100644 --- a/.gdn/.gdnsuppress +++ b/.gdn/.gdnsuppress @@ -13,41 +13,41 @@ } }, "results": { - "28e1a7a1157c8739dce8ac1bbd828a471e477444ec50d2656d0440948b58a274": { - "signature": "28e1a7a1157c8739dce8ac1bbd828a471e477444ec50d2656d0440948b58a274", + "900efdc86dc2e568955f256c15344038d504db1c7cc819beee79a0e83e729285": { + "signature": "900efdc86dc2e568955f256c15344038d504db1c7cc819beee79a0e83e729285", "alternativeSignatures": [], "memberOf": [ "default" ], "justification": "FillEventHistory+Event API documentation with generic example password.", - "createdDate": "2024-02-21 20:58:02Z" + "createdDate": "2024-06-27 20:43:25Z" }, - "0b7cc0b28f27b0eeb2a415f10e62c32675dd2d4edcffe35600eae35f8064004e": { - "signature": "0b7cc0b28f27b0eeb2a415f10e62c32675dd2d4edcffe35600eae35f8064004e", + "546ee3b1e3df455989e1689c68bd5bebabe5b191c680b15ba02ee5f71bf4354c": { + "signature": "546ee3b1e3df455989e1689c68bd5bebabe5b191c680b15ba02ee5f71bf4354c", "alternativeSignatures": [], "memberOf": [ "default" ], "justification": "Android.Service.Autofill.FillEventHistory+Event API documentation with generic example password.", - "createdDate": "2024-02-21 20:58:02Z" + "createdDate": "2024-06-27 20:43:25Z" }, - "e57727a14a28f6fd8f4aa87cd3c4b33401dfea1078ce32fb3cbdf342e8adf63d": { - "signature": "e57727a14a28f6fd8f4aa87cd3c4b33401dfea1078ce32fb3cbdf342e8adf63d", + "dc29fa2c200acb75acd13ef4da8a4139fb37618e4072f5ee06a40e07e3b31b95": { + "signature": "dc29fa2c200acb75acd13ef4da8a4139fb37618e4072f5ee06a40e07e3b31b95", "alternativeSignatures": [], "memberOf": [ "default" ], "justification": "Javax.Crypto.ISecretKey API documentation with generic example password.", - "createdDate": "2024-02-21 20:58:02Z" + "createdDate": "2024-06-27 20:43:25Z" }, - "15c51590a2e2bb503a7277448e05357f5fd8d4cb2f9b9b7446e41c872cceaac4": { - "signature": "15c51590a2e2bb503a7277448e05357f5fd8d4cb2f9b9b7446e41c872cceaac4", + "85ecf4cad9f76c3946ce6105b708ca822142bd1f1ac4092164f48af5923ca1f1": { + "signature": "85ecf4cad9f76c3946ce6105b708ca822142bd1f1ac4092164f48af5923ca1f1", "alternativeSignatures": [], "memberOf": [ "default" ], "justification": "Javax.Security.Auth.Callback.PasswordCallback API documentation with generic example password.", - "createdDate": "2024-02-21 20:58:02Z" + "createdDate": "2024-06-27 20:43:25Z" }, "1ccf925aa704efd1035bac38e94d2e629fb5b0d1784d5473e4a52e6d13db16ee": { "signature": "1ccf925aa704efd1035bac38e94d2e629fb5b0d1784d5473e4a52e6d13db16ee", From 1b857e8db47fbd1683d0a7c1604a971a6a81a14f Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Fri, 28 Jun 2024 11:24:35 -0400 Subject: [PATCH 5/5] Bump to dotnet/android-api-docs@394ca6ebb --- external/android-api-docs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/android-api-docs b/external/android-api-docs index e0970e7eee4..394ca6ebb49 160000 --- a/external/android-api-docs +++ b/external/android-api-docs @@ -1 +1 @@ -Subproject commit e0970e7eee43ab9992c5c79f7dd49da55181add2 +Subproject commit 394ca6ebb4901169d134710e278d05dc6e0e16d6