Skip to content

Commit

Permalink
Bump to mono:2020-02 (xamarin#7795)
Browse files Browse the repository at this point in the history 
Bump mono to 2020-02 head to be in sync with Android.

Co-authored-by: Imran Hameed <imhameed@microsoft.com>
Co-authored-by: Sebastien Pouliot <sebastien.pouliot@microsoft.com>
Co-authored-by: Ankit Jain <radical@gmail.com>
Co-authored-by: Manuel de la Pena <mandel@microsoft.com>
Co-authored-by: Sebastien Pouliot <sebastien.pouliot@gmail.com>
  • Loading branch information
@directhex @imhameed
@radical @mandel-macaque @spouliot
6 people committed Mar 20, 2020
1 parent 042d821 commit 994b935
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 12 deletions.
10 changes: 5 additions & 5 deletions Make.config
View file
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.1
MAX_MONO_VERSION=6.10.99
MIN_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2019-12/3/7eb7a82f09094facd8772dcb745fd16c7bd401c1/MonoFramework-MDK-6.10.0.1.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
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,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
15 changes: 14 additions & 1 deletion tools/mtouch/mtouch.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
<OutputType>Exe</OutputType>
<AssemblyName>mtouch</AssemblyName>
<RootNamespace>mtouch</RootNamespace>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand Down Expand Up @@ -157,6 +158,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

0 comments on commit 994b935

Please sign in to comment.