Bump mono to a hash with archives and use them. (#7299)

* Bump mono to a hash with archives and use them.

New commits in mono/mono:

* mono/mono@6af4ae7635 [2019-06][ci] Add Xcode 11.2beta2 for XI/XM Mono SDK builds

Diff: 476d72b9e3..6af4ae7635

* Bump mono to get min iOS version fix.

New commits in mono/mono:

* mono/mono@3775d5ac0a [sdks] Bump min iOS version to 7.0.

Diff: 6af4ae7635..3775d5ac0a

* [xharness] Bump mtouch tests timeout to 3h, we have a couple of new PR bots which are old and slow.

The new PR bots are late 2012 mac minis, so quite slow.

Make.config

@@ -3,7 +3,7 @@ include $(TOP)/mk/subdirs.mk
 # calculate commit distance and store it in a file so that we don't have to re-calculate it every time make is executed.
 
 -include $(TOP)/Make.config.inc
-$(TOP)/Make.config.inc: $(TOP)/Make.config
+$(TOP)/Make.config.inc: $(TOP)/Make.config $(TOP)/mk/mono.mk
 	@rm -f $@
 	@printf "IOS_COMMIT_DISTANCE:=$(shell LANG=C; export LANG && git --git-dir $(TOP)/.git log `git --git-dir $(TOP)/.git blame -- ./Make.versions HEAD | grep IOS_PACKAGE_VERSION= | sed 's/ .*//' `..HEAD --oneline | wc -l | sed 's/ //g')\n" >> $@
 	@printf "MAC_COMMIT_DISTANCE:=$(shell LANG=C; export LANG && git --git-dir $(TOP)/.git log `git --git-dir $(TOP)/.git blame -- ./Make.versions HEAD | grep MAC_PACKAGE_VERSION= | sed 's/ .*//' `..HEAD --oneline | wc -l | sed 's/ //g')\n" >> $@
@@ -62,6 +62,7 @@ IOS_PACKAGE_UPDATE_ID=$(shell printf "2%02d%02d%02d%03d" $(IOS_PACKAGE_VERSION_M
 XCODE_VERSION=11.2
 XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_11.2_beta_2.xip
 XCODE_DEVELOPER_ROOT=/Applications/Xcode112-beta2.app/Contents/Developer
+XCODE_PRODUCT_BUILD_VERSION:=$(shell /usr/libexec/PlistBuddy -c 'Print :ProductBuildVersion' $(XCODE_DEVELOPER_ROOT)/../version.plist)
 
 # Mono version embedded in XI/XM (NEEDED_MONO_VERSION/BRANCH) are specified in mk/mono.mk
 include $(TOP)/mk/mono.mk
@@ -352,10 +353,11 @@ JENKINS_RESULTS_DIRECTORY ?= $(abspath $(TOP)/jenkins-results)
 # Clone files instead of copying them on APFS file systems. Much faster.
 CP:=$(shell df -t apfs / >/dev/null 2>&1 && echo "cp -c" || echo "cp")
 
+XCODE_ARCHIVE_VERSION=xcode-$(XCODE_PRODUCT_BUILD_VERSION)
 MONO_IOS_FILENAME:=ios-release-Darwin-$(MONO_HASH).7z
-MONO_IOS_URL:=https://xamjenkinsartifact.azureedge.net/mono-sdks/$(MONO_IOS_FILENAME)
+MONO_IOS_URL:=https://xamjenkinsartifact.azureedge.net/mono-sdks/$(XCODE_ARCHIVE_VERSION)/$(MONO_IOS_FILENAME)
 MONO_MAC_FILENAME:=mac-release-Darwin-$(MONO_HASH).7z
-MONO_MAC_URL:=https://xamjenkinsartifact.azureedge.net/mono-sdks/$(MONO_MAC_FILENAME)
+MONO_MAC_URL:=https://xamjenkinsartifact.azureedge.net/mono-sdks/$(XCODE_ARCHIVE_VERSION)/$(MONO_MAC_FILENAME)
 
 # Setup various variables depending on whether mono is downloaded or built from source
 ifeq ($(MONO_BUILD_FROM_SOURCE),)

mk/mono.mk

@@ -1,5 +1,5 @@
-NEEDED_MONO_VERSION := 476d72b9e32ea58a7a8bda53af8cc8f5b7ffe6bb
-NEEDED_MONO_BRANCH := 2019-06
+NEEDED_MONO_VERSION := 3775d5ac0adcbd3c40ecc65286e1c4a1ad1b5965
+NEEDED_MONO_BRANCH := 2019-06-xcode11.2
 
 MONO_DIRECTORY := mono
 MONO_MODULE    := https://github.com/mono/mono

tests/xharness/Jenkins.cs

@@ -1007,7 +1007,7 @@ namespace xharness
 				TestProject = new TestProject (Path.GetFullPath (Path.Combine (Harness.RootDirectory, "mtouch", "mtouch.csproj"))),
 				Platform = TestPlatform.iOS,
 				TestName = "MTouch tests",
-				Timeout = TimeSpan.FromMinutes (120),
+				Timeout = TimeSpan.FromMinutes (180),
 				Ignored = !IncludeMtouch,
 				InProcess = true,
 			};