Bump to mono/2017-06/cb6a2fc7

Start using Mono 5.4.0! Bump `$(MonoRequiredMinimumVersion)` to 5.4.0.147. Bumps to linker/master/9fc2a24b Bumps to llvm/master/21492ec9 Bumps to xamarin-android-api-compatibility/master/b26743f1 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=580 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=17325 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=43988 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=44907 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=46482 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=51791 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=52508 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=53038 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=53202 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=53244 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=53792 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=54159 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=54322 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=54388 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=54448 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=54485 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=54976 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=54991 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=55041 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=55083 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=55095 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=55148 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=55348 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=55400 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=55577 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=55603 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=55604 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=55681 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56081 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56111 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56202 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56240 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56242 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56247 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56452 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56462 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56493 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56499 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56567 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56611 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56616 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56627 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56684 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56694 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56814 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56821 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56824 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57002 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57222 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57232 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57242 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57301 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57505 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57629 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57691 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57744 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57796 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57850 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57851 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57930 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57959 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58114 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58210 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58344 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58361 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58399 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58421 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58446 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58454 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58738 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58782 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58829 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58877
dotnet · Sep 5, 2017 · bd18b36 · bd18b36
1 parent 069cb7e
commit bd18b36
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -5,7 +5,7 @@
 [submodule "external/mono"]
 	path = external/mono
 	url = https://github.com/mono/mono.git
-	branch = 2017-04
+	branch = 2017-06
 [submodule "external/mxe"]
 	path = external/mxe
 	url = https://github.com/xamarin/mxe.git
@@ -39,4 +39,4 @@
 [submodule "xamarin-android-api-compatibility"]
 	path = external/xamarin-android-api-compatibility
 	url = https://github.com/xamarin/xamarin-android-api-compatibility.git
-	branch = d15-4
+	branch = master
diff --git a/Configuration.props b/Configuration.props
@@ -53,8 +53,8 @@
     <JavaInteropSourceDirectory Condition=" '$(JavaInteropSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\Java.Interop</JavaInteropSourceDirectory>
     <LlvmSourceDirectory Condition=" '$(LlvmSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\llvm</LlvmSourceDirectory>
     <MonoSourceDirectory>$(MSBuildThisFileDirectory)external\mono</MonoSourceDirectory>
-    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">5.2.0</MonoRequiredMinimumVersion>
-    <MonoRequiredDarwinMinimumVersion>$(MonoRequiredMinimumVersion).114</MonoRequiredDarwinMinimumVersion>
+    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">5.4.0</MonoRequiredMinimumVersion>
+    <MonoRequiredDarwinMinimumVersion>$(MonoRequiredMinimumVersion).147</MonoRequiredDarwinMinimumVersion>
     <LinkerSourceDirectory>$(MSBuildThisFileDirectory)external\linker</LinkerSourceDirectory>
     <OpenTKSourceDirectory>$(MSBuildThisFileDirectory)external\opentk</OpenTKSourceDirectory>
     <LibZipSourceDirectory Condition=" '$(LibZipSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\libzip</LibZipSourceDirectory>

diff --git a/build-tools/dependencies/dependencies.projitems b/build-tools/dependencies/dependencies.projitems
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_DarwinMonoFramework>MonoFramework-MDK-5.2.0.114.macos10.xamarin.universal.pkg</_DarwinMonoFramework>
+    <_DarwinMonoFramework>MonoFramework-MDK-5.4.0.147.macos10.xamarin.universal.pkg</_DarwinMonoFramework>
     <_AptGetInstall>apt-get -f -u install</_AptGetInstall>
   </PropertyGroup>
   <ItemGroup>
@@ -58,7 +58,7 @@
       <MinimumVersion>$(MonoRequiredMinimumVersion)</MinimumVersion>
       <DarwinMinimumVersion>$(MonoRequiredDarwinMinimumVersion)</DarwinMinimumVersion>
       <CurrentVersionCommand>$(MSBuildThisFileDirectory)..\scripts\mono-version</CurrentVersionCommand>
-      <DarwinMinimumUrl>https://bosstoragemirror.blob.core.windows.net/wrench/mono-2017-04/8a/8a4958ae3861143b55981cef3843c328462041f8/$(_DarwinMonoFramework)</DarwinMinimumUrl>
+      <DarwinMinimumUrl>https://bosstoragemirror.blob.core.windows.net/wrench/mono-2017-06/28/28a417c2c0d1a2d1231d8b0a5beea3201208b57d/$(_DarwinMonoFramework)</DarwinMinimumUrl>
       <DarwinInstall>installer -pkg "$(AndroidToolchainCacheDirectory)\$(_DarwinMonoFramework)" -target /</DarwinInstall>
     </RequiredProgram>
   </ItemGroup>

diff --git a/external/linker b/external/linker
diff --git a/external/llvm b/external/llvm
diff --git a/external/mono b/external/mono
diff --git a/external/xamarin-android-api-compatibility b/external/xamarin-android-api-compatibility
+11 −9		lib/CodeGen/AsmPrinter/DwarfMonoException.cpp
+0 −11		lib/Target/X86/X86ISelLowering.cpp