Bump to mono/mono@29b1ac19 (dotnet#3449)

Changes: http://github.com/mono/mono/compare/2c3aeaf3780de7392a0d3cbe4dcf86846eb4dffa...29b1ac19c961b959a09097dbc0fe4cd567cc5298 $ git diff --shortstat 2c3aeaf3..29b1ac19 1528 files changed, 45421 insertions(+), 21967 deletions(-) Changes: mono/api-doc-tools@d03e819...5da8127 $ git diff --shortstat d03e8198..5da8127a 1001 files changed, 86168 insertions(+), 11863 deletions(-) Changes: mono/api-snapshot@e09042d...1ca8e82 $ git diff --shortstat e09042da..1ca8e82f 28 files changed, 612 insertions(+), 217 deletions(-) Changes: dotnet/cecil@a6c8f5e...cb6c1ca $ git diff --shortstat a6c8f5e1..cb6c1ca9 13 files changed, 233 insertions(+), 88 deletions(-) Changes: mono/corefx@4806207...470e0e1 $ git diff --shortstat 4806207f...470e0e10 4 files changed, 31 insertions(+), 12 deletions(-) Changes: dotnet/linker@ebe2a1f...1f87de3 $ git diff --shortstat ebe2a1f4...1f87de35 90 files changed, 3219 insertions(+), 1224 deletions(-) Changes: dotnet/java-interop@75b1189...4fd3539 $ git diff --shortstat 75b11891...4fd35393 34 files changed, 448 insertions(+), 52 deletions(-) Upstream-Fixes: https://bugs.winehq.org/show_bug.cgi?id=47561 Upstream-Fixes: https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/967582 Upstream-Fixes: https://github.com/dotnet/coreclr/issues/25071 Upstream-Fixes: https://github.com/dotnet/coreclr/issues/25242 Upstream-Fixes: https://github.com/dotnet/coreclr/issues/25632 Upstream-Fixes: https://github.com/dotnet/coreclr/issues/25709 Upstream-Fixes: https://github.com/dotnet/corefx/issues/37955 Upstream-Fixes: https://github.com/dotnet/corefx/issues/38455 Upstream-Fixes: mono/mono#7377 Upstream-Fixes: mono/mono#8747 Upstream-Fixes: mono/mono#9621 Upstream-Fixes: mono/mono#9664 Upstream-Fixes: mono/mono#9706 Upstream-Fixes: mono/mono#10201 Upstream-Fixes: mono/mono#10645 Upstream-Fixes: mono/mono#10748 Upstream-Fixes: mono/mono#10848 Upstream-Fixes: mono/mono#12141 Upstream-Fixes: mono/mono#13311 Upstream-Fixes: mono/mono#13408 Upstream-Fixes: mono/mono#13412 Upstream-Fixes: mono/mono#13891 Upstream-Fixes: mono/mono#13923 Upstream-Fixes: mono/mono#13945 Upstream-Fixes: mono/mono#14170 Upstream-Fixes: mono/mono#14214 Upstream-Fixes: mono/mono#14214 Upstream-Fixes: mono/mono#14215 Upstream-Fixes: mono/mono#14243 Upstream-Fixes: mono/mono#14377 Upstream-Fixes: mono/mono#14495 Upstream-Fixes: mono/mono#14555 Upstream-Fixes: mono/mono#14724 Upstream-Fixes: mono/mono#14729 Upstream-Fixes: mono/mono#14772 Upstream-Fixes: mono/mono#14792 Upstream-Fixes: mono/mono#14793 Upstream-Fixes: mono/mono#14809 Upstream-Fixes: mono/mono#14830 Upstream-Fixes: mono/mono#14839 Upstream-Fixes: mono/mono#14841 Upstream-Fixes: mono/mono#14847 Upstream-Fixes: mono/mono#14864 Upstream-Fixes: mono/mono#14871 Upstream-Fixes: mono/mono#14917 Upstream-Fixes: mono/mono#14945 Upstream-Fixes: mono/mono#14946 Upstream-Fixes: mono/mono#14948 Upstream-Fixes: mono/mono#14957 Upstream-Fixes: mono/mono#14959 Upstream-Fixes: mono/mono#14960 Upstream-Fixes: mono/mono#14961 Upstream-Fixes: mono/mono#14963 Upstream-Fixes: mono/mono#14971 Upstream-Fixes: mono/mono#14972 Upstream-Fixes: mono/mono#14975 Upstream-Fixes: mono/mono#15023 Upstream-Fixes: mono/mono#15048 Upstream-Fixes: mono/mono#15058 Upstream-Fixes: mono/mono#15080 Upstream-Fixes: mono/mono#15182 Upstream-Fixes: mono/mono#15188 Upstream-Fixes: mono/mono#15189 Upstream-Fixes: mono/mono#15261 Upstream-Fixes: mono/mono#15262 Upstream-Fixes: mono/mono#15263 Upstream-Fixes: mono/mono#15265 Upstream-Fixes: mono/mono#15268 Upstream-Fixes: mono/mono#15307 Upstream-Fixes: mono/mono#15324 Upstream-Fixes: mono/mono#15329 Upstream-Fixes: mono/mono#15330 Upstream-Fixes: mono/mono#15441 Upstream-Fixes: mono/mono#15446 Upstream-Fixes: mono/mono#15503 Upstream-Fixes: mono/mono#15541 Upstream-Fixes: mono/mono#15551 Upstream-Fixes: mono/mono#15556 Upstream-Fixes: mono/mono#15596 Upstream-Fixes: mono/mono#15691 Upstream-Fixes: mono/mono#15692 Upstream-Fixes: mono/mono#15740 Upstream-Fixes: mono/mono#15751 Upstream-Fixes: mono/mono#15760 Upstream-Fixes: mono/mono#15781 Upstream-Fixes: mono/mono#15794 Upstream-Fixes: mono/mono#15825 Upstream-Fixes: mono/mono#15853 Upstream-Fixes: mono/mono#15878 Upstream-Fixes: mono/mono#15887 Upstream-Fixes: mono/mono#15990 Upstream-Fixes: mono/mono#16032 Upstream-Fixes: mono/mono#16411 Upstream-Fixes: mono/mono#16486 Upstream-Fixes: https://github.com/mono/mono/issues/25709 Upstream-Fixes: https://github.com/mono/mono/issues/38821 Upstream-Fixes: dotnet#3112 Upstream-Fixes: dotnet#3168 Update `build-tools/automation/build.groovy` so that it fully cleans the build tree before starting the build, so that the vestigial mono submodule (removed in 0c9f83b) is *actually* removed from the build tree, so that we don't inadvertently use *ancient* submodule contents.
jonpryor · Sep 6, 2019 · 9a302a6 · 9a302a6
1 parent be0fd15
commit 9a302a6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/.external b/.external
@@ -1,2 +1,2 @@
 xamarin/monodroid:d16-4@6f1e0752acdd8ffd250793b84a9c8bc99fa642c8
-mono/mono:2019-06@2c3aeaf3780de7392a0d3cbe4dcf86846eb4dffa
+mono/mono:2019-08@29b1ac19c961b959a09097dbc0fe4cd567cc5298
diff --git a/Configuration.props b/Configuration.props
@@ -79,10 +79,10 @@
     <AndroidSupportedTargetJitAbis Condition=" '$(AndroidSupportedTargetJitAbis)' == '' ">armeabi-v7a:arm64-v8a:x86</AndroidSupportedTargetJitAbis>
     <JavaInteropSourceDirectory Condition=" '$(JavaInteropSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\Java.Interop</JavaInteropSourceDirectory>
     <MonoSourceDirectory>$(MSBuildThisFileDirectory)external\mono</MonoSourceDirectory>
-    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">6.4.0</MonoRequiredMinimumVersion>
-    <MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">6.5.0</MonoRequiredMaximumVersion>
+    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">6.6.0</MonoRequiredMinimumVersion>
+    <MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">6.7.0</MonoRequiredMaximumVersion>
     <IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' ">True</IgnoreMaxMonoVersion>
-    <MonoRequiredDarwinMinimumVersion>$(MonoRequiredMinimumVersion).98</MonoRequiredDarwinMinimumVersion>
+    <MonoRequiredDarwinMinimumVersion>$(MonoRequiredMinimumVersion).54</MonoRequiredDarwinMinimumVersion>
     <LinkerSourceDirectory>$(MSBuildThisFileDirectory)external\mono\sdks\out\android-sources\external\linker\src</LinkerSourceDirectory>
     <OpenTKSourceDirectory>$(MSBuildThisFileDirectory)external\opentk</OpenTKSourceDirectory>
     <MingwZlibRootDirectory Condition=" '$(ZlibRootDirectory)' == '' And '$(HostOS)' == 'Linux' ">\usr</MingwZlibRootDirectory>

diff --git a/build-tools/automation/build.groovy b/build-tools/automation/build.groovy
@@ -146,6 +146,12 @@ timestamps {
                 sh "rm -rf ${packagePath}"
             }
 
+            sh "git clean -xdff"
+            sh "git submodule foreach --recursive git clean -xdff"
+            sh "git submodule foreach --recursive git reset --hard HEAD"
+            sh "git submodule sync"
+            sh "git submodule update --recursive --init --force"
+
             sh "mkdir -p ${packagePath}"
         }
 

diff --git a/external/Java.Interop b/external/Java.Interop