[mono] Bump mono to match android (#7104)

* [mono] Bump mono to match android

4546440471...c99adb97ed

* [tests] Add workaround for xamarin/maccore#1996.

mk/mono.mk

@@ -1,4 +1,4 @@
-NEEDED_MONO_VERSION := 4546440471d8817fb89896fa33c3bd2fff1bf000
+NEEDED_MONO_VERSION := c99adb97edc6a57d934105d5c13506518134b585
 NEEDED_MONO_BRANCH := 2019-08
 
 MONO_DIRECTORY := mono

tests/common/ProductTests.cs

@@ -126,6 +126,13 @@ namespace Xamarin.Tests
 							}
 							mono_native_compat_version = version;
 							mono_native_unified_version = new Version (10, 0, 0);
+
+							// This condition and everything inside it is a workaround for https://github.com/xamarin/maccore/issues/1996.
+							if (alternate_version == null || (alternate_version.Major == 7 && version.Major == 7)) {
+								alternate_version = new Version (6, 0, 0);
+								if (!slice.IsDynamicLibrary)
+									mono_native_compat_version = alternate_version;
+							}
 							break;
 						case MachO.LoadCommands.MintvOS:
 							version = SdkVersions.MinTVOSVersion;