diff --git a/.external b/.external index 9776dc92a2f..1663acda221 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ xamarin/monodroid:master@3ed4b1921a43a6bf5718e82c923040e2512dd8cf -mono/mono:2019-06@2c3aeaf3780de7392a0d3cbe4dcf86846eb4dffa +mono/mono:2019-08@29b1ac19c961b959a09097dbc0fe4cd567cc5298 diff --git a/Configuration.props b/Configuration.props index 092658754b4..3ef6746d382 100644 --- a/Configuration.props +++ b/Configuration.props @@ -79,10 +79,10 @@ armeabi-v7a:arm64-v8a:x86 $(MSBuildThisFileDirectory)external\Java.Interop $(MSBuildThisFileDirectory)external\mono - 6.4.0 - 6.5.0 + 6.6.0 + 6.7.0 True - $(MonoRequiredMinimumVersion).98 + $(MonoRequiredMinimumVersion).54 $(MSBuildThisFileDirectory)external\mono\sdks\out\android-sources\external\linker\src $(MSBuildThisFileDirectory)external\opentk \usr diff --git a/build-tools/automation/build.groovy b/build-tools/automation/build.groovy index be2de2f433e..2e5e083007a 100644 --- 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 index befdbc03953..be6048ed9c0 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit befdbc03953a567d5ab0ef31423e57f148eb9a0e +Subproject commit be6048ed9c0972f7bf121bf34e40b865fe3891a8