Skip to content

[mono] PR tracking the 2017-04 bump. #551

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

Merged
merged 23 commits into from
May 12, 2017
Merged

[mono] PR tracking the 2017-04 bump. #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1967612
[dependencies] Bump mono to 2017-04
kumpera Apr 6, 2017
0f92d25
[dependencies] Bump the linker to the tip of master.
kumpera Apr 6, 2017
d08dc82
[dependencies] Bump Java.Interop to pick newer cecil
kumpera Apr 6, 2017
4a59cfa
Update the mono submodule branch
kumpera Apr 6, 2017
7af6375
[dependencies] Bump desktop dep.
kumpera Apr 6, 2017
180bc05
Bump linker
marek-safar Apr 7, 2017
e2f8f20
Add new linker files
marek-safar Apr 7, 2017
abbc33d
Update csproj to use the files that are now on the mono tree.
kumpera Apr 11, 2017
0915d50
Bump mono to latest 2017-04
akoeplinger Apr 13, 2017
d6893bc
Build netstandard.dll and System.Drawing.Primitives.dll facades
akoeplinger Apr 13, 2017
3223cc2
Remove file that I forgot to remove in last commit
akoeplinger Apr 14, 2017
2eb9865
Merge branch 'master' into mono-2017-04
akoeplinger Apr 22, 2017
96c4a60
Bump mono to latest 2017-04
akoeplinger Apr 22, 2017
19892cb
Merge branch 'master' into mono-2017-04
akoeplinger May 4, 2017
a38874f
Bump mono to latest 2017-04
akoeplinger May 4, 2017
cc53ba6
Update framework assemblies list as some where moved to facades
akoeplinger May 4, 2017
363f6cf
[linker] do not use separate linker submodule anymore
radekdoulik May 4, 2017
465e609
[linker] Fix wrong source directory
akoeplinger May 4, 2017
f67f0c0
Add System.Runtime.Loader to facades
akoeplinger May 4, 2017
44bd173
[tests] change emulator port so that it is in the valid range
radekdoulik May 4, 2017
f1d810c
Revert "[linker] Fix wrong source directory"
radekdoulik May 10, 2017
47fb3ed
[linker] bump to sync with mono/external/linker
radekdoulik May 11, 2017
60a0a7a
Merge branch 'master' into mono-2017-04
jonpryor May 12, 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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
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-02
branch = 2017-04
[submodule "external/mxe"]
path = external/mxe
url = https://github.com/xamarin/mxe.git
Expand Down
2 changes: 1 addition & 1 deletion Configuration.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<JavaInteropSourceDirectory Condition=" '$(JavaInteropSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\Java.Interop</JavaInteropSourceDirectory>
<LlvmSourceDirectory Condition=" '$(LlvmSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\llvm</LlvmSourceDirectory>
<MonoSourceDirectory>$(MSBuildThisFileDirectory)external\mono</MonoSourceDirectory>
<MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">4.9.3</MonoRequiredMinimumVersion>
<MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">5.2.0</MonoRequiredMinimumVersion>
<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
View file
Open in desktop
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-4.9.3.6.macos10.xamarin.universal.pkg</_DarwinMonoFramework>
<_DarwinMonoFramework>MonoFramework-MDK-5.2.0.20.macos10.xamarin.universal.pkg</_DarwinMonoFramework>
<_AptGetInstall>apt-get -f -u install</_AptGetInstall>
</PropertyGroup>
<ItemGroup>
Expand Down Expand Up @@ -59,7 +59,7 @@
<RequiredProgram Include="$(ManagedRuntime)" Condition=" '$(ManagedRuntime)' != '' ">
<MinimumVersion>$(MonoRequiredMinimumVersion)</MinimumVersion>
<CurrentVersionCommand>$(MSBuildThisFileDirectory)..\scripts\mono-version</CurrentVersionCommand>
<DarwinMinimumUrl>https://bosstoragemirror.blob.core.windows.net/wrench/mono-2017-02/c5/c52c4bd713e19339a5859e73a99dbb4cc21c6d3f/$(_DarwinMonoFramework)</DarwinMinimumUrl>
<DarwinMinimumUrl>https://bosstoragemirror.blob.core.windows.net/wrench/mono-2017-04/92/92503db79568d1ef66a5445cb889ccbb8c8bd343/$(_DarwinMonoFramework)</DarwinMinimumUrl>
<DarwinInstall>installer -pkg "$(AndroidToolchainCacheDirectory)\$(_DarwinMonoFramework)" -target /</DarwinInstall>
</RequiredProgram>
</ItemGroup>
Expand Down
7 changes: 4 additions & 3 deletions build-tools/mono-runtimes/ProfileAssemblies.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
<MonoFacadeAssembly Include="System.Net.WebSockets.dll" />
<MonoFacadeAssembly Include="System.ObjectModel.dll" />
<MonoFacadeAssembly Include="System.Reflection.dll" />
<MonoFacadeAssembly Include="System.Reflection.DispatchProxy.dll" />
<MonoFacadeAssembly Include="System.Reflection.Emit.dll" />
<MonoFacadeAssembly Include="System.Reflection.Emit.ILGeneration.dll" />
<MonoFacadeAssembly Include="System.Reflection.Emit.Lightweight.dll" />
Expand All @@ -77,7 +78,9 @@
<MonoFacadeAssembly Include="System.Runtime.Extensions.dll" />
<MonoFacadeAssembly Include="System.Runtime.Handles.dll" />
<MonoFacadeAssembly Include="System.Runtime.InteropServices.dll" />
<MonoFacadeAssembly Include="System.Runtime.InteropServices.RuntimeInformation.dll" />
<MonoFacadeAssembly Include="System.Runtime.InteropServices.WindowsRuntime.dll" />
<MonoFacadeAssembly Include="System.Runtime.Loader.dll" />
<MonoFacadeAssembly Include="System.Runtime.Numerics.dll" />
<MonoFacadeAssembly Include="System.Runtime.Serialization.Formatters.dll" />
<MonoFacadeAssembly Include="System.Runtime.Serialization.Json.dll" />
Expand Down Expand Up @@ -131,6 +134,7 @@
<MonoFacadeAssembly Include="System.Xml.XmlSerializer.dll" />
<MonoFacadeAssembly Include="System.Xml.XPath.dll" />
<MonoFacadeAssembly Include="System.Xml.XPath.XDocument.dll" />
<MonoFacadeAssembly Include="System.Xml.XPath.XmlDocument.dll" />
<MonoFacadeAssembly Include="System.Xml.Xsl.Primitives.dll" />
<!--
System.Drawing.Primitives and netstandard need a reference to Mono.Android.dll so their
Expand Down Expand Up @@ -172,8 +176,6 @@
<MonoProfileAssembly Include="System.Numerics.dll" />
<MonoProfileAssembly Include="System.Numerics.Vectors.dll" />
<MonoProfileAssembly Include="System.Reflection.Context.dll" />
<MonoProfileAssembly Include="System.Reflection.DispatchProxy.dll" />
<MonoProfileAssembly Include="System.Runtime.InteropServices.RuntimeInformation.dll" />
<MonoProfileAssembly Include="System.Runtime.Serialization.dll" />
<MonoProfileAssembly Include="System.Security.dll" />
<MonoProfileAssembly Include="System.ServiceModel.dll" />
Expand All @@ -185,6 +187,5 @@
<MonoProfileAssembly Include="System.Xml.dll" />
<MonoProfileAssembly Include="System.Xml.Linq.dll" />
<MonoProfileAssembly Include="System.Xml.Serialization.dll" />
<MonoProfileAssembly Include="System.Xml.XPath.XmlDocument.dll" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion build-tools/scripts/UnitTestApks.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<PropertyGroup>
<_TestImageName>XamarinAndroidUnitTestRunner</_TestImageName>
<_AdbEmulatorPort>5600</_AdbEmulatorPort>
<_AdbEmulatorPort>5570</_AdbEmulatorPort>
</PropertyGroup>

<Target Name="AcquireAndroidTarget">
Expand Down
2 changes: 1 addition & 1 deletion external/linker
Open in desktop
Submodule linker updated from 81007d to c7450c
2 changes: 1 addition & 1 deletion external/mono
Open in desktop
Submodule mono updated 1686 files
6 changes: 3 additions & 3 deletions src/Mono.Posix/Mono.Posix.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="$(XamarinAndroidSourcePath)\src\Mono.Posix\Mono.Unix.Native\NativeConvert.Android.cs" />
<Compile Include="$(XamarinAndroidSourcePath)\src\Mono.Posix\Mono.Unix.Android\AndroidUtils.cs" />

<Compile Include="$(XamarinAndroidSourcePath)\src\Mono.Android\Android.Runtime\CPUArchitecture.cs">
<Link>Android.Runtime\CPUArchitecture.cs</Link>
</Compile>
Expand Down Expand Up @@ -128,6 +125,9 @@
<Compile Include="$(MonoSourceDirectory)\mcs\class\Mono.Posix\Mono.Unix.Native\NativeConvert.cs">
<Link>Mono.Unix.Native\NativeConvert.cs</Link>
</Compile>
<Compile Include="$(MonoSourceDirectory)\mcs\class\Mono.Posix\Mono.Unix.Android\AndroidUtils.cs">
<Link>Mono.Unix.Android\AndroidUtils.cs</Link>
</Compile>
<Compile Include="$(MonoSourceDirectory)\mcs\class\Mono.Posix\Mono.Unix.Native\NativeConvert.generated.cs">
<Link>Mono.Unix.Native\NativeConvert.generated.cs</Link>
</Compile>
Expand Down
2 changes: 1 addition & 1 deletion src/System.Drawing.Primitives/System.Drawing.Primitives.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Properties="Configuration=$(Configuration)">
<Output TaskParameter="TargetOutputs" ItemName="MonoAndroidAssembly" />
</MSBuild>
<Exec Command="make -C $(MonoSourceFullPath)\mcs\class\Facades\System.Drawing.Primitives PROFILE=monodroid EXTRA_LIB_MCS_FLAGS=&quot;-r:%(MonoAndroidAssembly.Identity)&quot;" />
<Exec Command="make -C $(MonoSourceFullPath)\mcs\class\Facades\System.Drawing.Primitives PROFILE=monodroid EXTERNAL_FACADE_DRAWING_REFERENCE=&quot;%(MonoAndroidAssembly.Identity)&quot;" />
<Copy
SourceFiles="$(MonoSourceFullPath)\mcs\class\lib\monodroid\Facades\System.Drawing.Primitives.dll"
DestinationFiles="$(OutputPath)\System.Drawing.Primitives.dll"
Expand Down
7 changes: 4 additions & 3 deletions src/Xamarin.Android.Build.Tasks/Linker/Mobile.Tuner/MobileProfile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ public abstract class MobileProfile : Profile {
"System.Numerics",
"System.Numerics.Vectors",
"System.Reflection.Context",
"System.Reflection.DispatchProxy",
"System.Runtime.Serialization",
"System.Runtime.InteropServices.RuntimeInformation",
"System.Security",
"System.ServiceModel",
"System.ServiceModel.Internals",
Expand All @@ -42,7 +40,6 @@ public abstract class MobileProfile : Profile {
"System.Xml",
"System.Xml.Linq",
"System.Xml.Serialization",
"System.Xml.XPath.XmlDocument",
"Microsoft.CSharp",
"Microsoft.VisualBasic",
"Mono.CSharp",
Expand Down Expand Up @@ -118,6 +115,7 @@ public abstract class MobileProfile : Profile {
"System.Net.WebSockets.Client",
"System.Net.WebSockets",
"System.ObjectModel",
"System.Reflection.DispatchProxy",
"System.Reflection.Emit.ILGeneration",
"System.Reflection.Emit.Lightweight",
"System.Reflection.Emit",
Expand All @@ -131,7 +129,9 @@ public abstract class MobileProfile : Profile {
"System.Runtime.Extensions",
"System.Runtime.Handles",
"System.Runtime.InteropServices",
"System.Runtime.InteropServices.RuntimeInformation",
"System.Runtime.InteropServices.WindowsRuntime",
"System.Runtime.Loader",
"System.Runtime.Numerics",
"System.Runtime.Serialization.Formatters",
"System.Runtime.Serialization.Json",
Expand Down Expand Up @@ -183,6 +183,7 @@ public abstract class MobileProfile : Profile {
"System.Xml.ReaderWriter",
"System.Xml.XDocument",
"System.Xml.XPath.XDocument",
"System.Xml.XPath.XmlDocument",
"System.Xml.XPath",
"System.Xml.XmlDocument",
"System.Xml.XmlSerializer",
Expand Down
6 changes: 6 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,12 @@
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker.Steps\MarkStep.cs">
<Link>Linker\Mono.Linker.Steps\MarkStep.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\LoadException.cs">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is currently breaking the build:

13:27:12   CSC : error CS2001: Source file '/Users/builder/jenkins/workspace/xamarin-android-msbuild-pr-builder/external/linker/linker/Mono.Linker/LoadException.cs' could not be found.

linker/81007dfb does not contain a LoadException.cs there.

<Link>Linker\Mono.Linker\LoadException.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\MarkException.cs">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...ditto MarkException.cs

<Link>Linker\Mono.Linker\MarkException.cs</Link>
</Compile>
<Compile Include="Tasks\MergeResources.cs" />
<Compile Include="Tasks\GetConvertedJavaLibraries.cs" />
<Compile Include="Tasks\JavaCompileToolTask.cs" />
Expand Down
2 changes: 1 addition & 1 deletion src/netstandard/netstandard.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Properties="Configuration=$(Configuration)">
<Output TaskParameter="TargetOutputs" ItemName="MonoAndroidAssembly" />
</MSBuild>
<Exec Command="make -C $(MonoSourceFullPath)\mcs\class\Facades\netstandard PROFILE=monodroid EXTRA_LIB_MCS_FLAGS=&quot;-r:%(MonoAndroidAssembly.Identity)&quot;" />
<Exec Command="make -C $(MonoSourceFullPath)\mcs\class\Facades\netstandard PROFILE=monodroid EXTERNAL_FACADE_DRAWING_REFERENCE=&quot;%(MonoAndroidAssembly.Identity)&quot;" />
<Copy
SourceFiles="$(MonoSourceFullPath)\mcs\class\lib\monodroid\Facades\netstandard.dll"
DestinationFiles="$(OutputPath)\netstandard.dll"
Expand Down