From 4c233c901eaad182d28a57bb6a83562b12f7fbec Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Mon, 1 Aug 2022 19:21:56 +0200 Subject: [PATCH 1/2] Update Mono.Unix version Previous version of Mono.Unix would try to resolve `libc` p/invokes by looking for the `msvcrt` library, resulting in errors similar to the following: System.DllNotFoundException: Unable to load shared library 'msvcrt' or one of its dependencies. In order to help diagnose loading problems, consider using a tool like strace. If you're using glibc, consider setting the LD_DEBUG environment variable: bin/Debug/lib/packs/Microsoft.Android.Sdk.Linux/33.0.0/tools/Xamarin.Android.Common.targets(2036,3): error XABLD7000: at Mono.Unix.Native.Stdlib.sys_strerror(Int32 errnum) bin/Debug/lib/packs/Microsoft.Android.Sdk.Linux/33.0.0/tools/Xamarin.Android.Common.targets(2036,3): error XABLD7000: at Mono.Unix.Native.Stdlib.strerror(Errno errnum) in /_/src/Mono.Unix/Mono.Unix.Native/Stdlib.cs:line 1158 bin/Debug/lib/packs/Microsoft.Android.Sdk.Linux/33.0.0/tools/Xamarin.Android.Common.targets(2036,3): error XABLD7000: at Xamarin.Tools.Zip.Utilities.GetFileType(String path, Boolean followSymlinks, FilePermissions& fileType) in /Users/runner/work/1/s/LibZipSharp/Xamarin.Tools.Zip/Utilities.Unix.cs:line 145 bin/Debug/lib/packs/Microsoft.Android.Sdk.Linux/33.0.0/tools/Xamarin.Android.Common.targets(2036,3): error XABLD7000: at Xamarin.Tools.Zip.UnixPlatformServices.IsDirectory(ZipArchive archive, String path, Boolean& result) in /Users/runner/work/1/s/LibZipSharp/Xamarin.Tools.Zip/UnixPlatformServices.cs:line 41 bin/Debug/lib/packs/Microsoft.Android.Sdk.Linux/33.0.0/tools/Xamarin.Android.Common.targets(2036,3): error XABLD7000: at Xamarin.Tools.Zip.PlatformServices.CallServices(Func`2 code) in /Users/runner/work/1/s/LibZipSharp/Xamarin.Tools.Zip/PlatformServices.cs:line 160 bin/Debug/lib/packs/Microsoft.Android.Sdk.Linux/33.0.0/tools/Xamarin.Android.Common.targets(2036,3): error XABLD7000: at Xamarin.Tools.Zip.PlatformServices.IsDirectory(ZipArchive archive, String path) in /Users/runner/work/1/s/LibZipSharp/Xamarin.Tools.Zip/PlatformServices.cs:line 77 bin/Debug/lib/packs/Microsoft.Android.Sdk.Linux/33.0.0/tools/Xamarin.Android.Common.targets(2036,3): error XABLD7000: at Xamarin.Tools.Zip.ZipArchive.AddFile(String sourcePath, String archivePath, EntryPermissions permissions, CompressionMethod compressionMethod, Boolean overwriteExisting) in /Users/runner/work/1/s/LibZipSharp/Xamarin.Tools.Zip/ZipArchive.cs:line 435 bin/Debug/lib/packs/Microsoft.Android.Sdk.Linux/33.0.0/tools/Xamarin.Android.Common.targets(2036,3): error XABLD7000: at Xamarin.Android.Tasks.BuildApk.ExecuteWithAbi(String[] supportedAbis, String apkInputPath, String apkOutputPath, Boolean debug, Boolean compress, IDictionary`2 compressedAssembliesInfo, String assemblyStoreApkName) bin/Debug/lib/packs/Microsoft.Android.Sdk.Linux/33.0.0/tools/Xamarin.Android.Common.targets(2036,3): error XABLD7000: at Xamarin.Android.Tasks.BuildApk.RunTask() bin/Debug/lib/packs/Microsoft.Android.Sdk.Linux/33.0.0/tools/Xamarin.Android.Common.targets(2036,3): error XABLD7000: at Microsoft.Android.Build.Tasks.AndroidTask.Execute() in external/xamarin-android-tools/src/Microsoft.Android.Build.BaseTasks/AndroidTask.cs:line 17 --- build-tools/xaprepare/xaprepare/xaprepare.csproj | 2 +- external/xamarin-android-tools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tools/xaprepare/xaprepare/xaprepare.csproj b/build-tools/xaprepare/xaprepare/xaprepare.csproj index c8382018794..6a75be1ba23 100644 --- a/build-tools/xaprepare/xaprepare/xaprepare.csproj +++ b/build-tools/xaprepare/xaprepare/xaprepare.csproj @@ -52,7 +52,7 @@ - + diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index 9c641b3e08e..1c19a7b9532 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit 9c641b3e08e56db37467a64a2c5de2c7f7ddb3ef +Subproject commit 1c19a7b95323020098179f05f06aeb87780c58b6 From 637ea2401f96028b37c151e791f276f0e446119a Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Wed, 3 Aug 2022 14:13:45 +0200 Subject: [PATCH 2/2] Bump LibZipSharp to 2.0.5 --- .gitmodules | 4 ++-- Directory.Build.props | 2 +- external/xamarin-android-tools | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index f8838a54d10..c9a9fb532e1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,5 +40,5 @@ branch = 3.35.2 [submodule "external/xamarin-android-tools"] path = external/xamarin-android-tools - url = https://github.com/xamarin/xamarin-android-tools - branch = main + url = https://github.com/grendello/xamarin-android-tools + branch = update-mono.unix diff --git a/Directory.Build.props b/Directory.Build.props index 11c32ae8d20..a91d924c5c7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -42,7 +42,7 @@ - 2.0.4 + 2.0.5 0.4.1 0.11.4 13.0.1 diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index 1c19a7b9532..2ee4979ae40 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit 1c19a7b95323020098179f05f06aeb87780c58b6 +Subproject commit 2ee4979ae40a58275310beea31c617f2551e2686