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.

Sign up for GitHub

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

Jump to bottom

Bump to mono:2020-02 #7795

Merged
merged 35 commits into from
Mar 20, 2020
Merged

Bump to mono:2020-02 #7795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
3fb9dbc
Bump to mono:2020-02
directhex Feb 4, 2020
6983576
Chase mono/linker changes in mmp and mtouch.
imhameed Feb 6, 2020
4bbfee6
Merge branch 'master' into mono-2020-02
Feb 6, 2020
1b7da16
Merge remote-tracking branch 'origin/master' into mono-2020-02
imhameed Feb 7, 2020
a9f0f29
Merge branch 'master' into mono-2020-02
Feb 7, 2020
72e834b
Merge branch 'master' into mono-2020-02
imhameed Feb 9, 2020
7608b73
Merge branch 'master' into mono-2020-02
imhameed Feb 10, 2020
e43539d
Bump to mono/mono@688a178aa4b89e45d28d4a13c62e5d6051d474c2
imhameed Feb 11, 2020
73cd4d7
Merge branch 'master' into mono-2020-02
imhameed Feb 11, 2020
cf7b1b7
Merge branch 'master' into mono-2020-02
imhameed Feb 18, 2020
7e01d21
Bump to mono/mono@5070e45d54b1542e8d6b52b94c05069a8620325b
imhameed Feb 18, 2020
dbba204
Merge branch 'master' into mono-2020-02
imhameed Feb 19, 2020
61acf71
Bump to mono/mono@bfd182bd20d22923ca43fe2de59ca6056eb6dacd
imhameed Feb 19, 2020
4fa5f44
Merge branch 'master' into mono-2020-02
imhameed Feb 22, 2020
f4908d9
Bump to mono/mono@950644e9de7717e6d8e19dc646d61aa2c96ea568
imhameed Feb 22, 2020
c4ebd45
Merge branch 'master' into mono-2020-02
imhameed Feb 25, 2020
67f6a97
Bump to mono/mono@23b4f40e1b412fc0a8d39c99c3d8df1354222859
imhameed Feb 25, 2020
0bbdf2d
Merge branch 'master' into mono-2020-02
imhameed Feb 27, 2020
d4a62ca
Bump to mono/mono@2aa8108972d4edeab3cd32a1456af82359a636e6
imhameed Feb 27, 2020
70462db
[msbuild] Enable parallel build
radical Mar 2, 2020
719d877
Merge remote-tracking branch 'origin/master' into mon-2020-02
radical Mar 2, 2020
b551467
Merge branch 'master' into mono-2020-02
imhameed Mar 4, 2020
2a7a6d2
Bump to mono/mono@72c8e7c7ff9b583a5035248bc7396c160da2ab9c
imhameed Mar 4, 2020
889b711
Merge branch 'master' into mono-2020-02
imhameed Mar 9, 2020
335e335
Bump to mono/mono@8cac8ee9c39563804c2dfa05c510d2d0a7143370
imhameed Mar 9, 2020
4ddb701
Merge branch 'master' into mono-2020-02
imhameed Mar 10, 2020
3b7dc8e
Bump to mono/mono@3a4122f14fb70fe1c73fb6a9a0e8f8ad09874b79
imhameed Mar 10, 2020
1578763
Merge branch 'master' into mono-2020-02
imhameed Mar 11, 2020
06dc757
Bump to mono/mono@338349925cd380cad2d19c6c15184cf22cf14800
imhameed Mar 11, 2020
ecfba4a
Bump mono to latests commit.
mandel-macaque Mar 12, 2020
6642411
Merge branch 'master' into mono-2020-02
spouliot Mar 12, 2020
af45478
bump to mono head.
mandel-macaque Mar 13, 2020
5b69980
Merge branch 'master' into mono-2020-02
mandel-macaque Mar 18, 2020
4822cbb
Merge branch 'master' into mono-2020-02
mandel-macaque Mar 18, 2020
d2ce4c2
Merge branch 'master' into mono-2020-02
mandel-macaque Mar 18, 2020
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
10 changes: 5 additions & 5 deletions Make.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ include $(TOP)/mk/mono.mk
MONO_HASH := $(NEEDED_MONO_VERSION)

# Minimum Mono version for building XI/XM
MIN_MONO_VERSION=6.10.0.91
MAX_MONO_VERSION=6.10.99
MIN_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2019-12/94/b27b2d7f6118dff79cc238a22040ee93da39bab4/MonoFramework-MDK-6.10.0.91.macos10.xamarin.universal.pkg
MIN_MONO_VERSION=6.12.0.39
MAX_MONO_VERSION=6.12.99
MIN_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2020-02/41/338349925cd380cad2d19c6c15184cf22cf14800/MonoFramework-MDK-6.12.0.39.macos10.xamarin.universal.pkg

# Minimum Mono version for Xamarin.Mac apps using the system mono
MIN_XM_MONO_VERSION=6.4.0.94
Expand Down Expand Up @@ -281,8 +281,8 @@ SYSTEM_CSC=$(MONO_PREFIX)/bin/csc
SYSTEM_SN=$(MONO_PREFIX)/bin/sn
SYSTEM_MONO=$(MONO_PREFIX)/bin/mono
SYSTEM_MONO32=$(MONO_PREFIX)/bin/mono32
SYSTEM_XBUILD=$(MONO_PREFIX)/bin/msbuild /p:Features=strict
SYSTEM_MSBUILD=unset MSBuildExtensionsPath && $(MONO_PREFIX)/bin/msbuild /p:Features=strict
SYSTEM_XBUILD=$(MONO_PREFIX)/bin/msbuild /p:Features=strict /m
SYSTEM_MSBUILD=unset MSBuildExtensionsPath && $(MONO_PREFIX)/bin/msbuild /p:Features=strict /m
SYSTEM_RESGEN=$(MONO_PREFIX)/bin/resgen

XIBUILD_EXE_PATH=$(abspath $(TOP)/tools/xibuild/bin/Debug/xibuild.exe)
Expand Down
4 changes: 2 additions & 2 deletions mk/mono.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
NEEDED_MONO_VERSION := 2ff898859b8b75f123a5c895959a7e82dc829ea5
NEEDED_MONO_BRANCH := 2019-12
NEEDED_MONO_VERSION := d90665a422e9f8d015585b3ca381d74faa033cc4
NEEDED_MONO_BRANCH := 2020-02

MONO_DIRECTORY := mono
MONO_MODULE := https://github.com/mono/mono
4 changes: 2 additions & 2 deletions tools/linker/MonoTouch.Tuner/ListExportedSymbols.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ void ProcessMethod (MethodDefinition method)
}
}

if (MarkStep.IsPropertyMethod (method)) {
var property = MarkStep.GetProperty (method);
if (method.IsPropertyMethod ()) {
var property = method.GetProperty ();
object symbol;
// The Field attribute may have been linked away, but we've stored it in an annotation.
if (property != null && Context.Annotations.GetCustomAnnotations ("ExportedFields").TryGetValue (property, out symbol)) {
Expand Down
4 changes: 2 additions & 2 deletions tools/linker/MonoTouch.Tuner/MonoTouchMarkStep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,15 +189,15 @@ void ProcessSystemCore (TypeDefinition type)
case "CallSite":
var cs_ops = type.Module.GetType ("System.Runtime.CompilerServices.CallSiteOps");
if (cs_ops != null)
MarkMethods (ResolveTypeDefinition (cs_ops));
MarkMethods (cs_ops.Resolve ());

break;
case "CallSite`1":
MarkNamedMethod (type, "get_Update");

var ud = type.Module.GetType ("System.Dynamic.UpdateDelegates");
if (ud != null)
MarkMethods (ResolveTypeDefinition (ud));
MarkMethods (ud.Resolve ());

break;
}
Expand Down
12 changes: 12 additions & 0 deletions tools/mmp/mmp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,18 @@
<Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\OutputException.cs">
<Link>Linker\OutputException.cs</Link>
</Compile>
<Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\IReflectionPatternRecorder.cs">
<Link>Linker\IReflectionPatternRecorder.cs</Link>
</Compile>
<Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\IDependencyRecorder.cs">
<Link>Linker\IDependencyRecorder.cs</Link>
</Compile>
<Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\XmlDependencyRecorder.cs">
<Link>Linker\XmlDependencyRecorder.cs</Link>
</Compile>
<Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\LoggingReflectionPatternRecorder.cs">
<Link>Linker\LoggingReflectionPatternRecorder.cs</Link>
</Compile>
<Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\BaseStep.cs">
<Link>Linker.Steps\BaseStep.cs</Link>
</Compile>
Expand Down
13 changes: 13 additions & 0 deletions tools/mtouch/mtouch.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<AssemblyName>mtouch</AssemblyName>
<RootNamespace>mtouch</RootNamespace>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand Down Expand Up @@ -165,6 +166,18 @@
<Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\OutputException.cs">
<Link>Linker\OutputException.cs</Link>
</Compile>
<Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\IReflectionPatternRecorder.cs">
<Link>Linker\IReflectionPatternRecorder.cs</Link>
</Compile>
<Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\IDependencyRecorder.cs">
<Link>Linker\IDependencyRecorder.cs</Link>
</Compile>
<Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\XmlDependencyRecorder.cs">
<Link>Linker\XmlDependencyRecorder.cs</Link>
</Compile>
<Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\LoggingReflectionPatternRecorder.cs">
<Link>Linker\LoggingReflectionPatternRecorder.cs</Link>
</Compile>
<Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\BaseStep.cs">
<Link>Linker.Steps\BaseStep.cs</Link>
</Compile>
Expand Down