[build] changes to fix the CI

Context: https://travis-ci.org/mono/Embeddinator-4000/jobs/471012684
Context: https://travis-ci.org/mono/Embeddinator-4000/jobs/471026456
Context: https://travis-ci.org/mono/Embeddinator-4000/jobs/471037351

First issue we are hitting is a missing version of Cake on MyGet:

    Unable to find version '0.23.0' of package 'Cake'.
      https://www.myget.org/F/cake/api/v3/index.json: Package 'Cake.0.23.0' is not found on source 'https://www.myget.org/F/cake/api/v3/index.json'.

To fix this:

- Let's remove `MyGet.config` and just use NuGet
- Update Cake to 0.31, I recently used that version on another project

Next issue is that the build will not work using JDK 10:

    Compiling binding code...
        Invoking: /usr/libexec/java_home
            /Library/Java/JavaVirtualMachines/jdk-10.0.1.jdk/Contents/Home
        Invoking: /Library/Java/JavaVirtualMachines/jdk-10.0.1.jdk/Contents/Home/bin/javac
    ...
    Fatal Error: Unable to find package java.lang in classpath or bootclasspath

To fix this we should use the `-v 1.8` switch on every call to `java_home`.

Next issue is that we aren't specifying a version with the `#tool`
directive:

    The 'tool' directive is attempting to install the 'NUnit.ConsoleRunner' package
    without specifying a package version number.

After that we were hitting issues where Xamarin.iOS\Mac\Mono were having trouble being provisioned, so I bumped them all to current stable.

Then a few test fixes, including some from https://github.com/mono/Embeddinator-4000/pull/714 originally.

This fixes Jenkins and part fixes the other builds. @jonathanpeppers will look at those later

.cake/MyGet.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <add key="Cake MyGet Feed" value="https://www.myget.org/F/cake/api/v3/index.json" />
-  </packageSources>
-</configuration>

.cake/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-    <package id="Cake" version="0.23.0" />
+    <package id="Cake" version="0.31.0" />
 </packages>

binder/Utils/XamarinAndroid.cs

@@ -127,7 +127,7 @@ namespace Embeddinator
         {
             // If we are running on macOS, invoke java_home to figure out Java path.
             if (Platform.IsMacOS)
-                return Helpers.Invoke("/usr/libexec/java_home", null, null).StandardOutput.Trim();
+                return Helpers.Invoke("/usr/libexec/java_home", $"-v {JavaVersion}").StandardOutput.Trim();
     
             string home = Environment.GetEnvironmentVariable("JAVA_HOME");
             if (!string.IsNullOrEmpty(home))

build.cake

@@ -1,5 +1,5 @@
 #!mono .cake/Cake/Cake.exe
-#tool "nuget:?package=NUnit.ConsoleRunner"
+#tool "nuget:?package=NUnit.ConsoleRunner&version=3.6.1"
 
 var target = Argument("target", "Default");
 var configuration = Argument("configuration", "Release");

build.ps1

@@ -166,7 +166,7 @@ if(-Not $SkipToolPackageRestore.IsPresent) {
     }
 
     Write-Verbose -Message "Restoring tools from NuGet..."
-    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`" -configfile MyGet.config"
+    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""
 
     if ($LASTEXITCODE -ne 0) {
         Throw "An error occured while restoring NuGet tools."

build.sh

@@ -80,7 +80,7 @@ if [ ! -f $PACKAGES_CONFIG_MD5 ] || [ "$( cat $PACKAGES_CONFIG_MD5 | sed 's/\r$/
     find . -type d ! -name . | xargs rm -rf
 fi
 
-mono "$NUGET_EXE" install -ExcludeVersion -configfile MyGet.config
+mono "$NUGET_EXE" install -ExcludeVersion
 if [ $? -ne 0 ]; then
     echo "Could not restore NuGet packages."
     exit 1

build/Tests.cake

@@ -182,7 +182,7 @@ string GetJavaSdkPath()
     }
     else if (FileExists("/usr/libexec/java_home"))
     {
-        javaHome = CaptureProcessOutput("/usr/libexec/java_home");
+        javaHome = CaptureProcessOutput("/usr/libexec/java_home", "-v 1.8");
     }
     else
     {

external/Xamarin.Android.Tools

@@ -1 +1 @@
-Subproject commit 938b4f4d7aa857d05f9083e1653f57532a737fc5
+Subproject commit 4c00c223f278afaa7da159d49059a7b28c2b46f4

objcgen/Make.config

@@ -1,14 +1,14 @@
 # Minimum Mono version
-MIN_MONO_VERSION=5.4.1.7
-MAX_MONO_VERSION=5.4.1.7
-MIN_MONO_URL=https://download.mono-project.com/archive/5.4.1/macos-10-universal/MonoFramework-MDK-5.4.1.7.macos10.xamarin.universal.pkg
+MIN_MONO_VERSION=5.16.0.221
+MAX_MONO_VERSION=5.16.0.221
+MIN_MONO_URL=https://download.visualstudio.microsoft.com/download/pr/46c7e581-4431-4247-9290-0d8a01e9d13a/46083944a2325576a03158d60d36a41e/monoframework-mdk-5.16.0.221.macos10.xamarin.universal.pkg
 
 # Minimum Xamarin.iOS version
-MIN_XI_VERSION=11.6.1.3
-MAX_XI_VERSION=11.6.1.3
-MIN_XI_URL=https://dl.xamarin.com/MonoTouch/Mac/xamarin.ios-11.6.1.3.pkg
+MIN_XI_VERSION=12.2.1.12
+MAX_XI_VERSION=12.2.1.12
+MIN_XI_URL=https://download.visualstudio.microsoft.com/download/pr/ae5c9ea8-ff17-448b-ae5f-24c69c2d2a9b/d9d62c813492e750e999699aa8904e40/xamarin.ios-12.2.1.12.pkg
 
 # Minimum Xamarin.Mac version
-MIN_XM_VERSION=4.0.0.215
-MAX_XM_VERSION=4.0.0.215
-MIN_XM_URL=https://dl.xamarin.com/XamarinforMac/Mac/xamarin.mac-4.0.0.215.pkg
+MIN_XM_VERSION=5.2.1.12
+MAX_XM_VERSION=5.2.1.12
+MIN_XM_URL=https://download.visualstudio.microsoft.com/download/pr/f9f9988e-d20f-4a3f-afb0-ac331c87013c/e3b67ed938dbfd32811529e6670301ff/xamarin.mac-5.2.1.12.pkg

objcgen/embedder.cs

@@ -285,6 +285,9 @@ namespace Embeddinator.ObjC
 			}
 		}
 
+		XcodeVersionCheck versionCheck = new XcodeVersionCheck ();
+		Version XcodeVersion => versionCheck.GetVersion (XcodeApp);
+
 		class BuildInfo
 		{
 			public string Sdk;
@@ -343,8 +346,14 @@ namespace Embeddinator.ObjC
 				case Platform.macOSFull:
 				case Platform.macOSModern:
 				case Platform.macOSSystem:
+					string[] macArchs = null;
+					if (Driver.CurrentEmbedder.XcodeVersion >= new Version (10, 0))
+						macArchs = new string[] { "x86_64" };
+					else
+						macArchs = new string[] { "i386", "x86_64" };
+
 					build_infos = new BuildInfo[] {
-					new BuildInfo { Sdk = "MacOSX", Architectures = new string [] { "i386", "x86_64" }, SdkName = "macosx", MinVersion = "10.7" },
+					new BuildInfo { Sdk = "MacOSX", Architectures = macArchs, SdkName = "macosx", MinVersion = "10.7" },
 				};
 					break;
 				case Platform.iOS:

objcgen/utils.cs

@@ -135,4 +135,70 @@ namespace Embeddinator.ObjC
 			File.Copy (source, target, true);
 		}
 	}
+
+	class XcodeVersionCheck
+	{
+		Version version;
+		public Version GetVersion (string path)
+		{
+			if (version == null)
+				version = Version.Parse (GetXcodeVersion (path));
+			return version;
+		}
+
+		static string GetXcodeVersion (string xcode_path)
+		{
+			string version_plist = GetXcodeVersionPath (xcode_path);
+			if (version_plist == null)
+				throw new InvalidOperationException ("Unable to find version information for Xcode: " + xcode_path);
+
+			return GetPListStringValue (version_plist, "CFBundleShortVersionString");
+		}
+
+		static string GetXcodeVersionPath (string xcode_path)
+		{
+			var version_plist = Path.Combine (xcode_path, "Contents/version.plist");
+			if (File.Exists (version_plist))
+				return version_plist;
+
+			version_plist = Path.Combine (xcode_path, "..", "version.plist");
+			if (File.Exists (version_plist))
+				return version_plist;
+
+			return null;
+		}
+
+		static string GetPListStringValue (string plist, string key)
+		{
+			var settings = new System.Xml.XmlReaderSettings ();
+			settings.DtdProcessing = System.Xml.DtdProcessing.Ignore;
+			var doc = new System.Xml.XmlDocument ();
+			using (var fs = new StringReader (ReadPListAsXml (plist))) {
+				using (var reader = System.Xml.XmlReader.Create (fs, settings)) {
+					doc.Load (reader);
+					return doc.DocumentElement.SelectSingleNode ($"//dict/key[text()='{key}']/following-sibling::string[1]/text()").Value;
+				}
+			}
+		}
+
+		public static string ReadPListAsXml (string path)
+		{
+			string tmpfile = null;
+			try {
+				tmpfile = Path.GetTempFileName ();
+				File.Copy (path, tmpfile, true);
+				using (var process = new System.Diagnostics.Process ()) {
+					process.StartInfo.FileName = "plutil";
+					process.StartInfo.Arguments = $"-convert xml1 {Utils.Quote (tmpfile)}";
+					process.Start ();
+					process.WaitForExit ();
+					return File.ReadAllText (tmpfile);
+				}
+			}
+			finally {
+				if (tmpfile != null)
+					File.Delete (tmpfile);
+			}
+		}
+	}
 }

tests/objc-cli/Makefile

@@ -73,7 +73,7 @@ test-xctest-leaks: ../leaktest/bin/Debug/leaktest.exe $(MANAGED_DLL) debug/libma
 	mono --debug ../leaktest/bin/Debug/leaktest.exe `xcrun -f xctest` -XCTest All $(abspath libmanaged/Tests.xctest)
 
 libLeakCheckAtExit.dylib: leak-at-exit.c
-	clang -arch i386 -arch x86_64 -shared $< -o $@
+	clang -arch x86_64 -shared $< -o $@
 
 test-static: test-static-macos test-static-ios test-static-tvos test-static-watchos
 

tests/objcgentest/EmbedderTest.cs

@@ -24,7 +24,7 @@ namespace DriverTest
 				valid = "armv7, armv7s, arm64, i386, x86_64";
 				break;
 			case Platform.macOS:
-				valid = "i386, x86_64";
+				valid = "x86_64";
 				break;
 			case Platform.tvOS:
 				valid = "arm64, x86_64";

tests/objcgentest/ManagedTest.cs

@@ -222,7 +222,7 @@ namespace ExecutionTests
 				case Platform.macOS:
 					Dlldir = "generic";
 					Dllname = "managed.dll";
-					Abi = "i386,x86_64";
+					Abi = "x86_64";
 					return;
 				case Platform.iOS:
 					Dlldir = "ios";