From e5ead47ee8a09a563ba628b2ae14a081d56d30ce Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Fri, 4 Jun 2021 16:59:03 -0400 Subject: [PATCH 1/2] Bump to xamarin/xamarin-android-tools/main@90d76212 Fixes: https://github.com/xamarin/xamarin-android/issues/5432 Fixes: https://github.com/xamarin/xamarin-android/issues/5992 Changes: https://github.com/xamarin/xamarin-android-tools/compare/683f37508b56c76c24b3287a5687743438625341...90d7621256f58e560a51f81730a938cdc11c3469 * xamarin/xamarin-android-tools@90d7621: [BaseTasks] add ABI detection for RIDs (#121) * xamarin/xamarin-android-tools@79e3b97: [JdkInfo] handle invalid XML from /usr/libexec/java_home (#120) * xamarin/xamarin-android-tools@81519fe: Add SECURITY.md (#119) --- Documentation/release-notes/6000.md | 11 +++++++++++ external/xamarin-android-tools | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 Documentation/release-notes/6000.md diff --git a/Documentation/release-notes/6000.md b/Documentation/release-notes/6000.md new file mode 100644 index 00000000000..71652d744c9 --- /dev/null +++ b/Documentation/release-notes/6000.md @@ -0,0 +1,11 @@ +#### Application and library build and deployment + +- [GitHub Issue 5432](https://github.com/xamarin/xamarin-android/issues/5432): + In a .NET 6 application, native libraries can now be contained in directories + which match Android *Resource Identifiers*, not just the legacy Android ABI + names. + +- [GitHub Issue 5992](https://github.com/xamarin/xamarin-android/issues/5992): + If no JDKs are installed on macOS, the build may fail with: + + error XARSD7000: System.Xml.XmlException: Root element is missing. diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index 683f37508b5..90d7621256f 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit 683f37508b56c76c24b3287a5687743438625341 +Subproject commit 90d7621256f58e560a51f81730a938cdc11c3469 From e92f08502405f89ff971b9efdcf94c5262da38b2 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 8 Jun 2021 08:57:47 -0500 Subject: [PATCH 2/2] Bump to xamarin/xamarin-android-tools/main@e3d708c9 * [BaseTasks] fix \-delimited paths on macOS * Reference the new Mono.Unix nuget --- external/xamarin-android-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index 90d7621256f..e3d708c94cd 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit 90d7621256f58e560a51f81730a938cdc11c3469 +Subproject commit e3d708c94cd6f29e05f36d87132022bfb40006be