Skip to content
New issue

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

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

Already on GitHub? # to your account

Bump mono to 5.4.0.0 #631

Merged
merged 49 commits into from
Sep 5, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
76cef03
Bump mono to 5.4.0.0
luhenry Jun 5, 2017
0bf122c
[linker] add new source files to project file
lewurm Jun 6, 2017
cc6a7e8
[mono] bump to https://github.com/mono/mono/commit/ac71acfd526a3763bb…
lewurm Jun 6, 2017
26846b7
bump mono and java.interop
lewurm Jun 6, 2017
588aaa1
bump mono
lewurm Jun 7, 2017
dcc7e47
bump mono
lewurm Jun 9, 2017
17ae5c2
bump mono
lewurm Jun 12, 2017
d69494a
bump mono
lewurm Jun 14, 2017
2868769
Updated submodule references
luhenry Jun 14, 2017
5cf27f9
Updated reference to mono
luhenry Jun 15, 2017
9b74651
bump mono
lewurm Jun 20, 2017
f2e2998
bump mono, java.interop and linker
lewurm Jun 21, 2017
2b92f3a
bump mono desktop package
lewurm Jun 21, 2017
93fd979
bump MonoRequiredMinimumVersion
lewurm Jun 21, 2017
3e8a1fb
Merge remote-tracking branch 'origin/master' into mono-2017-06
lewurm Jul 18, 2017
3559b60
bump mono
lewurm Jul 18, 2017
690845b
bump java.interop
lewurm Jul 19, 2017
86d7164
bump libzipsharp
lewurm Jul 19, 2017
e4fc7ad
bump linker
lewurm Jul 19, 2017
8ca38ce
bump mono
lewurm Jul 19, 2017
f2d5245
Merge remote-tracking branch 'origin/master' into mono-2017-06
lewurm Aug 7, 2017
979ab34
bump mono
lewurm Aug 7, 2017
67672d9
bump linker
lewurm Aug 7, 2017
bcab75b
bump java.interop
lewurm Aug 7, 2017
b8157eb
bump libzipsharp
lewurm Aug 7, 2017
f10d69c
revert linker changes from 0bf122c7246274fcce1f5dc17cce4d019e4d7b95
lewurm Aug 7, 2017
ecfbfb3
revert bump of libzipsharp
lewurm Aug 7, 2017
3ba036f
use d15-4 branch for java.interop
lewurm Aug 7, 2017
6ade128
bump MDK version
lewurm Aug 7, 2017
b92d10a
bump xamarin-android-api-compatibility
lewurm Aug 7, 2017
c6a3069
bump llvm
lewurm Aug 7, 2017
52fbfe8
bump xamarin-android-api-compatibility
lewurm Aug 9, 2017
cc1fd12
Merge remote-tracking branch 'origin/master' into mono-2017-06
lewurm Aug 10, 2017
83d9b74
bump mono
lewurm Aug 10, 2017
d8ea7b2
Merge remote-tracking branch 'origin/master' into mono-2017-06
lewurm Aug 11, 2017
460b62a
[debug] dump build output
lewurm Aug 17, 2017
3fd6c08
Merge remote-tracking branch 'origin/master' into mono-2017-06
lewurm Aug 22, 2017
6bbe4f3
bump java.interop
lewurm Aug 22, 2017
e0f32ff
Merge remote-tracking branch 'origin/master' into mono-2017-06
lewurm Aug 24, 2017
52097a1
bump linker
lewurm Aug 24, 2017
e811134
Merge remote-tracking branch 'origin/master' into mono-2017-06
lewurm Aug 27, 2017
d89b91f
bump xamarin-android-api-compatibility to master
lewurm Aug 27, 2017
68dc359
Merge remote-tracking branch 'origin/master' into mono-2017-06
lewurm Aug 31, 2017
d70f3d3
bump mono
lewurm Aug 31, 2017
0685f18
bump mono
lewurm Sep 4, 2017
2aaec1f
Merge remote-tracking branch 'origin/master' into mono-2017-06 and bu…
lewurm Sep 5, 2017
1cb5b91
Revert "[debug] dump build output"
lewurm Sep 5, 2017
f6c3e63
minimize diff to master
lewurm Sep 5, 2017
fbbe725
.gitmodules: s/d15-4/master/ for xamarin-android-api-compatibility
lewurm Sep 5, 2017
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
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions Configuration.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions build-tools/dependencies/dependencies.projitems
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion external/linker
2 changes: 1 addition & 1 deletion external/llvm
2 changes: 1 addition & 1 deletion external/mono
Submodule mono updated 4379 files