Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to mono:2019-08 #3449

Merged
merged 39 commits into from
Sep 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
c12188f
Bump to mono:2019-08
Aug 6, 2019
9809979
Bump to mono/mono:2019-08@3115d3a0c0ad9a3ab321bfe6dab22631d002713b
Aug 7, 2019
5753d3a
Bump to mono/mono:2019-08@409c0a7
Aug 9, 2019
4295f11
Merge remote-tracking branch 'origin/master' into mono-2019-08
Aug 9, 2019
8781b69
Bump to xamarin/Java.Interop/master@807ed48
Aug 12, 2019
ce39d5c
Merge remote-tracking branch 'origin/master' into mono-2019-08
Aug 12, 2019
aed1bb0
Bump mono/2019-08@03be264
Aug 12, 2019
0cbf84a
Added a few build tool changes that were in https://github.com/xamari…
Aug 12, 2019
bdd86ea
Added one remaining change from https://github.com/xamarin/xamarin-an…
Aug 12, 2019
c7eb4f2
Missed on related change from https://github.com/xamarin/xamarin-andr…
Aug 12, 2019
959b07c
Bump Java.Interop to use mono-2019-08 branch
radekdoulik Aug 13, 2019
7dfd683
Merge remote-tracking branch 'origin/master' into mono-2019-08
Aug 14, 2019
4446cc2
Bump to mono/mono:2019-08@c51c609
Aug 14, 2019
1caa1dc
Bump Java.Interop to get recent interfaces fix
radekdoulik Aug 16, 2019
13bfe6b
Merge latest origin/master
Aug 20, 2019
aeee103
Bump to xamarin/java.interop@7d39ea7
Aug 20, 2019
34a4d20
Bump to mono/mono:2019-08@31f480c
Aug 20, 2019
83ac787
Bump xamarin/java.interop@70396fc
Aug 20, 2019
595eb01
Bump to mono/mono:2019-08@d80d33b
Aug 21, 2019
82c96fa
Merge remote-tracking branch 'origin/master' into mono-2019-08
Aug 21, 2019
624d0ec
Bump to mono/mono:2019-08@dc98767
Aug 26, 2019
2c2d7f5
Merge remote-tracking branch 'origin/master' into mono-2019-08
Aug 26, 2019
6ade525
Bump to xamarin/xamarin-android-tools@294f447
Aug 26, 2019
e24f836
Bump to mono/mon:2019-08@75f2ac1
Aug 28, 2019
9745451
Merge remote-tracking branch 'origin/master' into mono-2019-08
Aug 28, 2019
527a65f
Bump to mono/mono:2019-08@585f244
Aug 30, 2019
d0e8cf4
Merge remote-tracking branch 'origin/master' into mono-2019-08
Aug 30, 2019
ecdb4b5
Bump to xamarin/java.interop:mono-2019-08@5dc64a1
Aug 30, 2019
e3cfbaf
Merge remote-tracking branch 'origin/master' into mono-2019-08
Aug 30, 2019
a5ea8de
Merge remote-tracking branch 'origin/master' into mono-2019-08
Aug 30, 2019
e85734e
Bump to xamarin/monodroid:master@ba0a823
Sep 3, 2019
29853c6
Bump to mono/mono:2019-08@1ecb6e5
Sep 3, 2019
86db487
Merge remote-tracking branch 'origin/master' into mono-2019-08
Sep 3, 2019
d5870e7
Bump to mono/mono:2019-08@29b1ac19
Sep 4, 2019
2690c37
Merge remote-tracking branch 'origin/master' into mono-2019-08
Sep 4, 2019
5bc7fd7
Merge remote-tracking branch 'origin/master' into mono-2019-08
Sep 4, 2019
ea90c76
Revert changes to Abi.cs because bb7ffb7 fixed it
Sep 4, 2019
4f9b122
Ensure jenkins cleans up after itself
Sep 5, 2019
56b329f
Bump to xamarin/java.interop:master@be6048e
Sep 5, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .external
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
xamarin/monodroid:master@3ed4b1921a43a6bf5718e82c923040e2512dd8cf
mono/mono:2019-06@2c3aeaf3780de7392a0d3cbe4dcf86846eb4dffa
mono/mono:2019-08@29b1ac19c961b959a09097dbc0fe4cd567cc5298
6 changes: 3 additions & 3 deletions Configuration.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions build-tools/automation/build.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}

Expand Down
2 changes: 1 addition & 1 deletion external/Java.Interop