Skip to content

[runtime] integrate mono 2017-10 (rebased) #2906

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
Closed
lewurm wants to merge 14 commits into from
Closed

[runtime] integrate mono 2017-10 (rebased) #2906

lewurm wants to merge 14 commits into from

Conversation

@lewurm
Copy link
Contributor

@lewurm lewurm commented Oct 18, 2017 •
edited by rolfbjarne
Loading

vargaz and others added 13 commits October 18, 2017 23:51
@vargaz @lewurm
Update the function name used to initialize libmono-profiler-log, its…
ac7a0d6 
… called mono_profiler_init_log () now.
@vargaz @lewurm
[builds] Pass --with-cross-offsets= to crosstv's configure.
160053e
@lewurm
Remove old AppleTls implementation.
70d9f93
@vargaz @lewurm
Bump mono to 2017-08.
bd4c0be
@chamons @lewurm
Reenable link-keep-resources-2 test
48da800 
- This reverts commit 76b759e.
- 2017-08 has linker fix
@luhenry @lewurm
Bump system mono to 2017-10
1ea1036
@luhenry @lewurm
Bump embedded mono to 2017-10
eceeed9
@lewurm
[runtime] reflect eglib move
a636a2d 
mono/mono@9be68f8
@lewurm
[btouch] remove Security.Tls usage from test
73b8cf2
@lewurm
[mtouch tests] update the function name used to initialize libmono-pr…
a3efa00 
…ofiler-log, its called mono_profiler_init_log () now.

see
mono/mono@ea4e4a9

fixes:

```
1) Failed : Xamarin.MTouch.Profiling(tvOS)
  _mono_profiler_startup_log
  Expected: collection containing "_mono_profiler_startup_log"
  But was:  < "_mono_profiler_init_log" >
at Xamarin.MTouch.Profiling (Xamarin.Profile profile) [0x00106] in <511889694a624cc9a50e0e9b259b05c5>:0

2) Failed : Xamarin.MTouch.Profiling(watchOS)
  _mono_profiler_startup_log
  Expected: collection containing "_mono_profiler_startup_log"
  But was:  < "_xamarin_get_block_descriptor", "_mono_profiler_init_log" >
at Xamarin.MTouch.Profiling (Xamarin.Profile profile) [0x00106] in <511889694a624cc9a50e0e9b259b05c5>:0
```
@lewurm
[mmptest] update log profiler options.
9bceddf 
mono/mono@826558a
deprecated the dash prefix for the mlpd path.

`noallocs` or `nocalls` are not needed, neither of them are default anymore.
@lewurm
[mmp regresssion tests] bump mono linker, so mscorlib.xml gets stripped
3d6fc14 
the test was failing in that way:

> Executing link-keep-resources-2...
> [FAIL]	i18n 4/2 data files present: charinfo.nlp, collation.core.bin, collation.tailoring.bin, mscorlib.xml

also update the output, because it's actually expected at least three
elements.

fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=59277
@lewurm
bump mono
82a4bbe 
* fixes crash in tvOS: mono/mono#5812
* fixes BCL tests for watchOS: mono/mono#5820
@dnfclas
Copy link

dnfclas commented Oct 18, 2017

@lewurm,
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

@lewurm lewurm mentioned this pull request Oct 18, 2017
Merged
@monojenkins
Copy link
Collaborator

monojenkins commented Oct 19, 2017

Build failure

rolfbjarne
rolfbjarne approved these changes Oct 19, 2017
View reviewed changes
Copy link
Member

@rolfbjarne rolfbjarne left a comment

Choose a reason for hiding this comment

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

Looks good once the test failure reported by Jenkins is fixed.

@rolfbjarne rolfbjarne added requires-qa-before-merge The pull request requires QA to approve it before it can be merged do-not-merge Do not merge this pull request labels Oct 19, 2017
@monojenkins
Copy link
Collaborator

monojenkins commented Oct 19, 2017

Build success

@luhenry
Copy link
Contributor

luhenry commented Oct 19, 2017

We should probably wait for dotnet/android#943 to be ready to merge before merging this one, as we don't want to risk having different embedded versions between Android and iOS.

@GouriKumari
Copy link
Contributor

GouriKumari commented Oct 25, 2017

Updated automation test info in https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems?id=514854&_a=edit. Based on QA test results, mono-2017-10 can be integrated with macios master. QA approved.

@spouliot
Copy link
Contributor

spouliot commented Oct 26, 2017

@lewurm any reason why this PR made from mono-2017-10 ?

There are other changes (at least tests integration) being merged into the mono-2017-10 branch and they don't show up here.

@luhenry
Copy link
Contributor

luhenry commented Oct 26, 2017

I would also prefer to merge mono-2017-10 (instead of mono-2017-10-rebased).

spouliot
spouliot suggested changes Oct 27, 2017
View reviewed changes
Copy link
Contributor

@spouliot spouliot left a comment

Choose a reason for hiding this comment

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

There are also changes here (e.g. cecil fix) that seems to be in the xamarin:mono-2017-10 branch

@lewurm
Copy link
Contributor Author

lewurm commented Oct 29, 2017

That's very confusing; I wasn't expecting someone to PR against mono-2017-10: #2900

In that case, I agree, we should merge mono-2017-10 instead. See #2905

@lewurm lewurm closed this Oct 29, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dalexsoto dalexsoto dalexsoto approved these changes

@rolfbjarne rolfbjarne rolfbjarne approved these changes

+2 more reviewers

@spouliot spouliot spouliot requested changes

@chamons chamons chamons approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

do-not-merge Do not merge this pull request requires-qa-before-merge The pull request requires QA to approve it before it can be merged

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@lewurm @dnfclas @monojenkins @luhenry @GouriKumari @spouliot @dalexsoto @rolfbjarne @chamons @vargaz