diff --git a/.gitmodules b/.gitmodules
index e73a3f1233b..970428fd05d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -17,7 +17,7 @@
[submodule "external/llvm"]
path = external/llvm
url = https://github.com/mono/llvm.git
- branch = master
+ branch = release_60
[submodule "external/mman-win32"]
path = external/mman-win32
url = https://github.com/witwall/mman-win32.git
@@ -25,7 +25,7 @@
[submodule "external/mono"]
path = external/mono
url = https://github.com/mono/mono.git
- branch = 2018-04
+ branch = 2018-06
[submodule "external/mxe"]
path = external/mxe
url = https://github.com/xamarin/mxe.git
diff --git a/Configuration.props b/Configuration.props
index a2a9c1d17b1..ec78ddb493c 100644
--- a/Configuration.props
+++ b/Configuration.props
@@ -70,8 +70,8 @@
$(MSBuildThisFileDirectory)external\Java.Interop
$(MSBuildThisFileDirectory)external\llvm
$(MSBuildThisFileDirectory)external\mono
- 5.14.0
- 5.15.0
+ 5.16.0
+ 5.17.0
True
$(MonoRequiredMinimumVersion).0
$(MSBuildThisFileDirectory)external\mono\external\linker
diff --git a/build-tools/dependencies/dependencies.projitems b/build-tools/dependencies/dependencies.projitems
index f4a2f60e7da..1bd5d8c2e38 100644
--- a/build-tools/dependencies/dependencies.projitems
+++ b/build-tools/dependencies/dependencies.projitems
@@ -1,7 +1,7 @@
- <_DarwinMonoFramework>MonoFramework-MDK-5.14.0.141.macos10.xamarin.universal.pkg
+ <_DarwinMonoFramework>MonoFramework-MDK-5.16.0.106.macos10.xamarin.universal.pkg
<_AptGetInstall>apt-get -f -u install
@@ -59,7 +59,7 @@
$(MonoRequiredMaximumVersion)
$(MonoRequiredDarwinMinimumVersion)
$(MSBuildThisFileDirectory)..\scripts\mono-version
- https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2018-04/116/8ae8c52383b43892fb7a35dbf0992738bd52fa90/$(_DarwinMonoFramework)
+ https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2018-06/78/341142d7656f43239a041b2c44f00acfb8fa7c59/$(_DarwinMonoFramework)
installer -pkg "$(AndroidToolchainCacheDirectory)\$(_DarwinMonoFramework)" -target /
diff --git a/external/llvm b/external/llvm
index bdb3a116dbf..117a508c0ca 160000
--- a/external/llvm
+++ b/external/llvm
@@ -1 +1 @@
-Subproject commit bdb3a116dbf4a77ef5f6f70d7f845bdaca2b24ca
+Subproject commit 117a508c0ca65b754008e94e3eb97e77edfef04b
diff --git a/external/llvm.tpnitems b/external/llvm.tpnitems
index 4ec2d798d6b..ab9691a8440 100644
--- a/external/llvm.tpnitems
+++ b/external/llvm.tpnitems
@@ -8,10 +8,6 @@
$(MSBuildThisFileDirectory)\llvm\LICENSE.TXT
https://github.com/mono/llvm/
-
- $(MSBuildThisFileDirectory)\llvm\autoconf\LICENSE.TXT
- https://github.com/mono/llvm/tree/master/autoconf/
-
$(MSBuildThisFileDirectory)\llvm\utils\unittest\googletest\LICENSE.TXT
https://github.com/mono/llvm/tree/master/utils/unittest/googletest/
diff --git a/external/mono b/external/mono
index e1af6ea5e72..ab3c897d685 160000
--- a/external/mono
+++ b/external/mono
@@ -1 +1 @@
-Subproject commit e1af6ea5e72629a358fc2f2df888736dd25f4be1
+Subproject commit ab3c897d6851ccf75e840d8b767aafa0d0a32d53
diff --git a/external/xamarin-android-api-compatibility b/external/xamarin-android-api-compatibility
index c550d1bdab4..7ccb4802f3e 160000
--- a/external/xamarin-android-api-compatibility
+++ b/external/xamarin-android-api-compatibility
@@ -1 +1 @@
-Subproject commit c550d1bdab4299e42cb6fce83c828fef313e6678
+Subproject commit 7ccb4802f3efe0ee7a0d5d87c4cfe78832d68aec
diff --git a/src/mono-runtimes/mono-runtimes.projitems b/src/mono-runtimes/mono-runtimes.projitems
index 60d04c497d9..be3fbbf13db 100644
--- a/src/mono-runtimes/mono-runtimes.projitems
+++ b/src/mono-runtimes/mono-runtimes.projitems
@@ -159,7 +159,7 @@
<_MonoCrossRuntime Include="cross-arm-win" Condition="$(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-armeabi-v7a:'))">
$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-strip
- -S
+
armv7-linux-android-
.exe
@@ -168,7 +168,7 @@
<_MonoCrossRuntime Include="cross-arm64-win" Condition="$(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-arm64:'))">
$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix64)-strip
- -S
+
aarch64-v8a-linux-android-
.exe
@@ -177,7 +177,7 @@
<_MonoCrossRuntime Include="cross-x86-win" Condition="$(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-x86:'))">
$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-strip
- -S
+
i686-linux-android-
.exe
@@ -186,7 +186,7 @@
<_MonoCrossRuntime Include="cross-x86_64-win" Condition="$(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-x86_64:'))">
$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix64)-strip
- -S
+
x86_64-linux-android-
.exe
diff --git a/src/mono-runtimes/mono-runtimes.targets b/src/mono-runtimes/mono-runtimes.targets
index 32d9e609865..f164e8a9adb 100644
--- a/src/mono-runtimes/mono-runtimes.targets
+++ b/src/mono-runtimes/mono-runtimes.targets
@@ -44,7 +44,7 @@
<_MonoSdksMxePrefixDir>$(AndroidToolchainDirectory)
<_MonoSdksMxeSrc>$(MSBuildThisFileDirectory)..\..\external\mxe
- <_MonoSdksParameters>CONFIGURATION=$(_MonoSdksConfiguration) IGNORE_PROVISION_MXE=true IGNORE_PROVISION_ANDROID=true IGNORE_PACKAGE_LLVM=true ANDROID_TOOLCHAIN_DIR="$(_MonoSdksAndroidToolchainDir)" ANDROID_TOOLCHAIN_CACHE_DIR="$(_MonoSdksAndroidToolchainCacheDir)" ANDROID_TOOLCHAIN_PREFIX="$(_MonoSdksAndroidToolchainPrefix)" LLVM_SRC="$(_MonoSdksLlvmSrc)" MXE_PREFIX_DIR="$(_MonoSdksMxePrefixDir)" MXE_SRC="$(_MonoSdksMxeSrc)"
+ <_MonoSdksParameters>CONFIGURATION=$(_MonoSdksConfiguration) IGNORE_PROVISION_MXE=true IGNORE_PROVISION_ANDROID=true IGNORE_PROVISION_LLVM=true ANDROID_TOOLCHAIN_DIR="$(_MonoSdksAndroidToolchainDir)" ANDROID_TOOLCHAIN_CACHE_DIR="$(_MonoSdksAndroidToolchainCacheDir)" ANDROID_TOOLCHAIN_PREFIX="$(_MonoSdksAndroidToolchainPrefix)" LLVM_SRC="$(_MonoSdksLlvmSrc)" MXE_PREFIX_DIR="$(_MonoSdksMxePrefixDir)" MXE_SRC="$(_MonoSdksMxeSrc)"
@@ -142,7 +142,7 @@
ToolExe="$(GitToolExe)">
-
+
@@ -158,7 +158,7 @@
<_Now>$([System.DateTime]::Now.Ticks)