[mono] PR tracking the 2017-04 bump. by kumpera · Pull Request #551 · dotnet/android

kumpera · 2017-04-06T18:55:36Z

No description provided.

dnfclas · 2017-04-06T18:55:40Z

@kumpera,
Thanks for having already signed the Contribution License Agreement. Your agreement was validated by .NET Foundation. We will now review your pull request.
Thanks,
.NET Foundation Pull Request Bot

jonpryor · 2017-04-06T20:12:29Z

stderr: error: no such remote ref 3e5c484fe72f9d681206312d33a15f0f93e7dde7
14:58:25 Fetched in submodule path 'external/Java.Interop', but it did not contain 3e5c484fe72f9d681206312d33a15f0f93e7dde7. Direct fetching of that commit failed.

That's probably because 3e5c484 is kumpera/Java.Interop/3e5c484f, not xamarin/Java.Interop/3e5c484f.

If you create a branch from xamarin/Java.Interop and not kumpera/Java.Interop, this will presumably work. Or, if you "fix" the external/Java.Interop ref to instead refer to kumpera/Java.Interop, I imagine that would work.

...or we accept dotnet/java-interop#141 and then you can bump "normally."

That Cecil bump looks "big."

kumpera · 2017-04-06T20:41:38Z

build

The old project for System.Drawing.Primitives was removed in favor of building the assembly with the existing logic in Mono.

# Conflicts: # build-tools/dependencies/dependencies.projitems # external/mono # src/System.Drawing.Primitives/System.Drawing.Primitives.targets # src/netstandard/netstandard.targets

radical · 2017-04-27T16:55:47Z

Can we rebuild this? The CI build is failing with

15:43:47 > git fetch --tags --progress git@github.com:xamarin/xamarin-android +refs/pull/*:refs/remotes/origin/pr/*
15:43:49 ERROR: Error fetching remote repo 'origin'

radical · 2017-04-27T17:00:02Z

build

radical · 2017-04-27T17:20:39Z

17:15:29 /mnt/jenkins/workspace/xamarin-anroid-linux-pr-builder/xamarin-android/build-tools/dependencies/dependencies.mdproj (default targets) ->
17:15:29 /mnt/jenkins/workspace/xamarin-anroid-linux-pr-builder/xamarin-android/build-tools/scripts/RequiredPrograms.targets (CheckForRequiredPrograms target) ->
17:15:29 17:15:29 /mnt/jenkins/workspace/xamarin-anroid-linux-pr-builder/xamarin-android/build-tools/scripts/RequiredPrograms.targets: error : Missing dependency detected. For Linux we do not know how to install program `mono`, version >= 5.2.0.

Could somebody look at this?

jonpryor · 2017-04-27T17:46:59Z

@directhex: wrt @radical's question, is there some preferred mechanism to convince "the" Linux builder to install Mono 5.2 instead of (presumably) the current 4.9?

I think we're going to need some mechanism of specifying which mono version to install, and I'm not sure what that should be. Could we e.g. add a Linux lane specific to this PR so that it installs the correct Mono version until merged on master? Something else?

directhex · 2017-04-28T06:52:20Z

@jonpryor the preferred mechanism crumbles a bit when the request is for a version which isn't in alpha yet.

I already added a mechanism to make it possible to add one-off builds as repositories, what I don't have is any package-related one-off builds of the 5.2 branch. I'll see what I can do.

kumpera · 2017-04-28T16:22:20Z

We ignore linux CI results when testing newer mono. Looks like everything is good now!

radical · 2017-04-28T16:25:53Z

I was looking at this because of https://bugzilla.xamarin.com/show_bug.cgi?id=55287 . Can the bug be closed now?

directhex · 2017-05-02T16:14:39Z

Is Mono master (5.3.x) usable, or does it need to be 5.2?

kumpera · 2017-05-02T19:53:28Z

@directhex I think 5.4 would do it, but it's not strictly needed.

I think this PR is ready for merging as is once the linker conflict is resolved.

kumpera · 2017-05-02T19:54:23Z

@directhex ugg, forget that, we'll need those packages to move this forward.

jonpryor · 2017-05-02T19:56:12Z

The current plans to address the linker conflict are for @radekdoulik to removexamarin-android/external/linker and instead rely on mono's linker checkout. I believe this is intended to land this week.

directhex · 2017-05-03T23:34:45Z

A prealpha repo now exists, with 5.2 packages. What am I doing with it?

jonpryor · 2017-05-04T00:06:12Z

@directhex: Do what you did with PR #445: when the Jenkins+Linux instance is started, have it install the pre alpha repo with 5.2 packages, then continue building.

This should be done for the xamarin-andorid-linux and xamarin-android-linux-pr-builder jobs:

# Conflicts: # external/linker

mono/mono@6ca5ec4mono/mono@c38e4d9

directhex · 2017-05-04T08:10:25Z

build

directhex · 2017-05-04T08:47:20Z

OK, it's not finished building, but it's actually starting now, so my work here is done.

- instead use mono's one in mono/external/linker

radekdoulik · 2017-05-04T11:17:56Z

@marek-safar we are missing this commit here for XA: dotnet/linker@6e4e50c

would you mind if I create a new branch on linker named mono-2017-04, cheery-pick the commit and let mono/2017-04 use the linker branch?

It's another moved assembly.

- the emulators are now timeouting on wrench and it looks like this might fix it. I have tested it on my rodos-playground branch and wrench run the emulators fine there. fingers crossed :-) (cherry-picked from xamarin/monodroid@62278e4)

Revert "[linker] do not use separate linker submodule anymore" This reverts commits 363f6cf and 465e609. - after discussion on slack we decided to keep our own linker submodule, so that linker fixes do not need to go thru mono team before reaching XA. it will allow us to fix linker issues faster

jonpryor · 2017-05-10T18:31:04Z

 <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">


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.

jonpryor · 2017-05-10T18:31:26Z

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


...ditto MarkException.cs

Bump to mono/2017-04/24c4d616.

Context: https://github.com/xamarin/QualityAssurance/pull/3478 Context: https://xqa.blob.core.windows.net/gist/report-60e42aa322884cedbc8908438cc75dad.txt Changes: dotnet/java-interop@d61b329...476597b * dotnet/java-interop@476597b: [tests] Convert to Unix style line endings (#551) One of the Java.Interop unit tests was implicitly depending on line ending consistency, and would fail if the project was built on Windows after commit 130905e, which began executing those tests: 23) Java.InteropTests.JniValueMarshaler_SByte_ContractTests.JniValueMarshalerContractTests`1.CreateReturnValueFromManagedExpression (Java.Interop-Tests) Expected string length 112 but was 100. Strings differ at index 1. Expected: "{\r\n\tJniRuntime __jvm;\r\n\tsbyte __value;\r\n\r\n\ttry\r\n\t{\r\n\t\treturn ..." But was: "{\n\tJniRuntime __jvm;\n\tsbyte __value;\n\n\ttry\n\t{\n\t\treturn __valu..." -------------^ dotnet/java-interop@476597b normalizes line endings, fixing this failure.

kumpera added 4 commits April 6, 2017 11:36

[dependencies] Bump mono to 2017-04
1967612

[dependencies] Bump the linker to the tip of master.
0f92d25

[dependencies] Bump Java.Interop to pick newer cecil
d08dc82

Update the mono submodule branch
4a59cfa

dnfclas added the cla-already-signed label Apr 6, 2017

[dependencies] Bump desktop dep.
7af6375

marek-safar added 2 commits April 7, 2017 14:32

Bump linker
180bc05

Add new linker files
e2f8f20

marek-safar force-pushed the mono-2017-04 branch from c2a6cb4 to e2f8f20Compare April 7, 2017 12:32

kumperaand others added 6 commits April 11, 2017 15:07

Update csproj to use the files that are now on the mono tree.
abbc33d

Bump mono to latest 2017-04
0915d50

Build netstandard.dll and System.Drawing.Primitives.dll facades
d6893bc
The old project for System.Drawing.Primitives was removed in favor of building the assembly with the existing logic in Mono.

Remove file that I forgot to remove in last commit
3223cc2

Merge branch 'master' into mono-2017-04
2eb9865
# Conflicts: # build-tools/dependencies/dependencies.projitems # external/mono # src/System.Drawing.Primitives/System.Drawing.Primitives.targets # src/netstandard/netstandard.targets

Bump mono to latest 2017-04
96c4a60

jonpryor mentioned this pull request May 1, 2017
[Xamarin.Android.Build.Tasks] Make use of --bundled-header when using mkbundle. #578
Merged

akoeplinger added 3 commits May 4, 2017 04:30

Merge branch 'master' into mono-2017-04
19892cb
# Conflicts: # external/linker

Bump mono to latest 2017-04
a38874f

Update framework assemblies list as some where moved to facades
cc53ba6
mono/mono@6ca5ec4mono/mono@c38e4d9

[linker] do not use separate linker submodule anymore
363f6cf
- instead use mono's one in mono/external/linker

akoeplingerand others added 4 commits May 4, 2017 14:36

[linker] Fix wrong source directory
465e609

Add System.Runtime.Loader to facades
f67f0c0
It's another moved assembly.

jonpryor reviewed May 10, 2017
View reviewed changes

radekdoulikand others added 2 commits May 11, 2017 17:23

[linker] bump to sync with mono/external/linker
47fb3ed

Merge branch 'master' into mono-2017-04
60a0a7a
Bump to mono/2017-04/24c4d616.

jonpryor merged commit 8cc4acb into masterMay 12, 2017

github-actionsBot locked and limited conversation to collaborators Feb 5, 2024

Uh oh!

Conversation

kumpera commented Apr 6, 2017

Uh oh!

dnfclas commented Apr 6, 2017

Uh oh!

jonpryor commented Apr 6, 2017

Uh oh!

kumpera commented Apr 6, 2017

Uh oh!

radical commented Apr 27, 2017

Uh oh!

radical commented Apr 27, 2017

Uh oh!

radical commented Apr 27, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jonpryor commented Apr 27, 2017

Uh oh!

directhex commented Apr 28, 2017

Uh oh!

kumpera commented Apr 28, 2017

Uh oh!

radical commented Apr 28, 2017

Uh oh!

directhex commented May 2, 2017

Uh oh!

kumpera commented May 2, 2017

Uh oh!

kumpera commented May 2, 2017

Uh oh!

jonpryor commented May 2, 2017

Uh oh!

directhex commented May 3, 2017

Uh oh!

jonpryor commented May 4, 2017

Uh oh!

directhex commented May 4, 2017

Uh oh!

directhex commented May 4, 2017

Uh oh!

radekdoulik commented May 4, 2017

Uh oh!

jonpryorMay 10, 2017

Choose a reason for hiding this comment

Uh oh!

jonpryorMay 10, 2017

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

radical commented Apr 27, 2017•
edited
Loading