Skip to content

Update mono to 2017-02 "monthly master" branch #445

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
xmcclure merged 6 commits into from
Mar 20, 2017
Merged

Update mono to 2017-02 "monthly master" branch #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
48b6c59
Update mono to 2017-02 "monthly master" branch and fix a build script
xmcclure Mar 16, 2017
6e9a661
Correct "Exists" logic on monodoc debug files
xmcclure Mar 16, 2017
948ae3b
Bump mono, linker, Java.interop/cecil, and provisioned MDK package.
xmcclure Mar 16, 2017
f7b6dfa
[Xamarin.Android.Build.Tests] Fix two pdb related msbuild tests.
dellis1972 Mar 16, 2017
b79abdd
Bump mono to include offsets-tool patch and alter offsets-tool invoca…
xmcclure Mar 16, 2017
bd950a1
Bump mono for build fixes
xmcclure Mar 16, 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 = mono-4.8.0-branch
branch = 2017-02
[submodule "external/mxe"]
path = external/mxe
url = https://github.com/xamarin/mxe.git
Expand Down
8 changes: 4 additions & 4 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.8.0.489.macos10.xamarin.universal.pkg</_DarwinMonoFramework>
<_DarwinMonoFramework>MonoFramework-MDK-4.9.3.6.macos10.xamarin.universal.pkg</_DarwinMonoFramework>
<_AptGetInstall>apt-get -f -u install</_AptGetInstall>
</PropertyGroup>
<ItemGroup>
Expand Down Expand Up @@ -57,10 +57,10 @@
<UbuntuInstall>$(_AptGetInstall) vim-common</UbuntuInstall>
</RequiredProgram>
<RequiredProgram Include="$(ManagedRuntime)" Condition=" '$(ManagedRuntime)' != '' ">
<MinimumVersion>4.4.0</MinimumVersion>
<MaximumVersion>4.8.99</MaximumVersion>
<MinimumVersion>4.9.3</MinimumVersion>
<MaximumVersion>4.9.99</MaximumVersion>
<CurrentVersionCommand>$(MSBuildThisFileDirectory)..\scripts\mono-version</CurrentVersionCommand>
<DarwinMinimumUrl>https://bosstoragemirror.blob.core.windows.net/wrench/mono-4.8.0/9a/9ac5bf2f0235ab75d2cc6be0866d6ca3ed302977/$(_DarwinMonoFramework)</DarwinMinimumUrl>
<DarwinMinimumUrl>https://bosstoragemirror.blob.core.windows.net/wrench/mono-2017-02/c5/c52c4bd713e19339a5859e73a99dbb4cc21c6d3f/$(_DarwinMonoFramework)</DarwinMinimumUrl>
<DarwinInstall>installer -pkg "$(AndroidToolchainCacheDirectory)\$(_DarwinMonoFramework)" -target /</DarwinInstall>
</RequiredProgram>
</ItemGroup>
Expand Down
8 changes: 8 additions & 0 deletions build-tools/mono-runtimes/mono-runtimes.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@
<ItemGroup>
<!-- cross compilers -->
<_MonoCrossRuntime Include="cross-arm" Condition="$(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':armeabi:'))">
<JitArch>armeabi</JitArch>
<Ar>ar</Ar>
<As>as</As>
<Cc>$(HostCc)</Cc>
Expand All @@ -299,6 +300,7 @@
</_MonoCrossRuntime>

<_MonoCrossRuntime Include="cross-arm64" Condition="$(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':arm64:'))">
<JitArch>arm64-v8a</JitArch>
<Ar>ar</Ar>
<As>as</As>
<Cc>$(HostCc)</Cc>
Expand All @@ -321,6 +323,7 @@
</_MonoCrossRuntime>

<_MonoCrossRuntime Include="cross-x86" Condition="$(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':x86:'))">
<JitArch>x86</JitArch>
<Ar>ar</Ar>
<As>as</As>
<Cc>$(HostCc32)</Cc>
Expand All @@ -343,6 +346,7 @@
</_MonoCrossRuntime>

<_MonoCrossRuntime Include="cross-x86_64" Condition="$(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':x86_64:'))">
<JitArch>x86_64</JitArch>
<Ar>ar</Ar>
<As>as</As>
<Cc>$(HostCc)</Cc>
Expand All @@ -365,6 +369,7 @@
</_MonoCrossRuntime>

<_MonoCrossRuntime Include="cross-arm-win" Condition="$(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-armeabi:'))">
<JitArch>armeabi</JitArch>
<Ar>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-ar</Ar>
<As>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-as</As>
<Cc>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-gcc</Cc>
Expand All @@ -387,6 +392,7 @@
</_MonoCrossRuntime>

<_MonoCrossRuntime Include="cross-arm64-win" Condition="$(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-arm64:'))">
<JitArch>arm64-v8a</JitArch>
<Ar>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-ar</Ar>
<As>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-as</As>
<Cc>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-gcc</Cc>
Expand All @@ -409,6 +415,7 @@
</_MonoCrossRuntime>

<_MonoCrossRuntime Include="cross-x86-win" Condition="$(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-x86:'))">
<JitArch>x86</JitArch>
<Ar>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-ar</Ar>
<As>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-as</As>
<Cc>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-gcc</Cc>
Expand All @@ -431,6 +438,7 @@
</_MonoCrossRuntime>

<_MonoCrossRuntime Include="cross-x86_64-win" Condition="$(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-x86_64:'))">
<JitArch>x86_64</JitArch>
<Ar>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix64)-ar</Ar>
<As>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix64)-as</As>
<Cc>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix64)-gcc</Cc>
Expand Down
37 changes: 24 additions & 13 deletions build-tools/mono-runtimes/mono-runtimes.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
</PropertyGroup>
<ItemGroup>
<MonoDocCopyItem Include="monodoc.dll" />
<MonoDocCopyItem Include="monodoc.dll.mdb" />
<MonoDocCopyItemOptional Include="monodoc.pdb" />
<MonoDocCopyItemOptional Include="monodoc.dll.mdb" />
<MonoDocCopyItem Include="monodoc.dll.config" />
</ItemGroup>
<ItemGroup>
Expand All @@ -25,13 +26,6 @@
<_MonoProfileDir>$(MonoSourceFullPath)\mcs\class\lib\monodroid</_MonoProfileDir>
<_MonoOutputDir>$(MonoSourceFullPath)\mcs\class\lib\net_4_x</_MonoOutputDir>
</PropertyGroup>
<ItemGroup>
<_MonoDocCopyItems Include="@(MonoDocCopyItem->'$(_MonoOutputDir)\%(Identity)')" />
</ItemGroup>
<ItemGroup>
<_MonoDocInstalledItems Include="@(MonoDocCopyItem->'$(_MandroidDir)\%(Identity)')" />
<_MonoDocInstalledItems Include="$(_MandroidDir)\mdoc.exe" />
</ItemGroup>
<PropertyGroup>
<ForceBuildDependsOn>
_BuildLlvm;
Expand Down Expand Up @@ -147,7 +141,7 @@
/>
</Target>
<Target Name="_ConfigureRuntimes"
DependsOnTargets="_BuildLlvm"
DependsOnTargets="_BuildLlvm;_Autogen"
Inputs="$(MonoSourceFullPath)\configure"
Outputs="$(IntermediateOutputPath)\%(_MonoRuntime.Identity)\Makefile">
<MakeDir Directories="$(IntermediateOutputPath)\%(_MonoRuntime.Identity)" />
Expand Down Expand Up @@ -231,7 +225,7 @@
</ItemGroup>
</Target>
<Target Name="_BuildRuntimes"
DependsOnTargets="_GetRuntimesOutputItems"
DependsOnTargets="_GetRuntimesOutputItems;_ConfigureRuntimes"
Inputs="@(_RuntimeBuildStamp)"
Outputs="@(_RuntimeSource);@(_ProfilerSource);@(_MonoPosixHelperSource);@(_BclProfileItems);@(_MonoBtlsSource)">
<Exec
Expand Down Expand Up @@ -333,9 +327,26 @@
DestinationFiles="$(_MandroidDir)\cil-strip.exe"
/>
</Target>
<Target Name="_GetMonodocItems" DependsOnTargets="_BuildRuntimes">
<ItemGroup>
<_MonoDocCopyItems Include="@(MonoDocCopyItem->'$(_MonoOutputDir)\%(Identity)')" />
<_MonoDocCopyItems
Condition=" Exists ('$(_MonoOutputDir)\%(Identity)') "
Include="@(MonoDocCopyItemOptional->'$(_MonoOutputDir)\%(Identity)')"
/>

<_MonoDocInstalledItems Include="@(MonoDocCopyItem->'$(_MandroidDir)\%(Identity)')" />
<_MonoDocInstalledItems
Condition=" Exists ('$(_MonoOutputDir)\%(Identity)') "
Include="@(MonoDocCopyItemOptional->'$(_MandroidDir)\%(Identity)')"
/>
<_MonoDocInstalledItems Include="$(_MandroidDir)\mdoc.exe" />
</ItemGroup>
</Target>
<Target Name="_InstallMonoDoc"
Inputs="@(_MonoDocCopyItems);$(_MonoOutputDir)\mdoc.exe"
Outputs="@(_MonoDocInstalledItems)">
Outputs="@(_MonoDocInstalledItems)"
DependsOnTargets="_GetMonodocItems">
<MakeDir Directories="$(_MandroidDir)" />
<Copy
SourceFiles="@(_MonoDocCopyItems)"
Expand Down Expand Up @@ -442,7 +453,7 @@
<_CppAbiDir Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Linux:'))">linux_64</_CppAbiDir>
</PropertyGroup>
<Exec
Command="MONO_PATH=$(_AotOffsetsDumperSourceDir)\CppSharp\$(_CppAbiDir) $(ManagedRuntime) $(_AotOffsetsDumperSourceDir)\$(_AotOffsetsDumperName) --xamarin-android --android-ndk=&quot;$(AndroidNdkFullPath)&quot; --mono=&quot;$(MonoSourceFullPath)&quot; --monodroid=&quot;$(XamarinAndroidSourcePath)&quot; --abi=&quot;%(_MonoCrossRuntime.TargetAbi)&quot; --out=&quot;$(MSBuildThisFileDirectory)$(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)&quot;"
Command="MONO_PATH=$(_AotOffsetsDumperSourceDir)\CppSharp\$(_CppAbiDir) $(ManagedRuntime) $(_AotOffsetsDumperSourceDir)\$(_AotOffsetsDumperName) --android-ndk=&quot;$(AndroidNdkFullPath)&quot; --mono=&quot;$(MonoSourceFullPath)&quot; --monodroid=&quot;$(XamarinAndroidSourcePath)&quot; --abi=&quot;%(_MonoCrossRuntime.TargetAbi)&quot; --targetdir=&quot;$(MSBuildThisFileDirectory)$(IntermediateOutputPath)\%(_MonoCrossRuntime.JitArch)&quot; --out=&quot;$(MSBuildThisFileDirectory)$(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)&quot;"
WorkingDirectory="$(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)"
/>
<Touch
Expand Down Expand Up @@ -487,7 +498,7 @@
/>
</Target>
<Target Name="GetMonoBundleItems"
DependsOnTargets="_GetRuntimesOutputItems;_PrepareLlvmItems">
DependsOnTargets="_GetRuntimesOutputItems;_GetMonodocItems;_PrepareLlvmItems">
<ItemGroup>
<BundleItem Include="@(_BclInstalledItem)" />
<BundleItem Include="@(_MonoDocInstalledItems)" />
Expand Down
2 changes: 1 addition & 1 deletion external/linker
Open in desktop
Submodule linker updated from d57b8d to dfea33
2 changes: 1 addition & 1 deletion external/mono
Open in desktop
Submodule mono updated 2958 files
4 changes: 2 additions & 2 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ public void BuildBasicApplicationCheckPdb ()
File.Exists (pdbToMdbPath),
"PdbTestLibrary.dll.mdb must be generated next to the .pdb");
Assert.IsTrue (
File.Exists (Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, "android", "assets", "UnnamedProject.dll.mdb")),
"UnnamedProject.dll.mdb must be copied to the Intermediate directory");
File.Exists (Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, "android", "assets", "UnnamedProject.pdb")),
"UnnamedProject.pdb must be copied to the Intermediate directory");
Assert.IsFalse (
File.Exists (Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, "android", "assets", "PdbTestLibrary.pdb")),
"PdbTestLibrary.pdb must not be copied to Intermediate directory");
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void CheckBuildIdIsUnique ()
var allFilesInArchive = Directory.GetFiles (archivePath, "*", SearchOption.AllDirectories);
Assert.IsTrue (allFilesInArchive.Any (x => Path.GetFileName (x) == string.Format ("{0}.dll", proj.ProjectName)), "{0}.dll should exist in {1}",
proj.ProjectName, archivePath);
Assert.IsTrue (allFilesInArchive.Any (x => Path.GetFileName (x) == string.Format ("{0}.dll.mdb", proj.ProjectName)), "{0}.mdb should exist in {1}",
Assert.IsTrue (allFilesInArchive.Any (x => Path.GetFileName (x) == string.Format ("{0}.pdb", proj.ProjectName)), "{0}.pdb should exist in {1}",
proj.ProjectName, archivePath);
foreach (var abi in new string [] { "armeabi-v7a", "x86" }) {
using (var apk = ZipHelper.OpenZip (Path.Combine (outputPath, proj.PackageName + "-" + abi + ".apk"))) {
Expand Down