Skip to content
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

[main] Update dependencies from mono/linker #49577

Merged
merged 7 commits into from
Mar 17, 2021
Merged

[main] Update dependencies from mono/linker #49577

merged 7 commits into from
Mar 17, 2021

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Mar 13, 2021 •
edited
Loading

This pull request updates the following dependencies

From https://github.com/mono/linker

  • Subscription: 0d6d6ae4-f71f-4395-53e6-08d8e409d87d
  • Build: 20210317.1
  • Date Produced: 3/17/2021 11:11 AM
  • Commit: c0ed4ef448496b0dc7db3aeb27bbb194fcdccb58
  • Branch: refs/heads/main

@dotnet-maestro
Update dependencies from https://github.com/mono/linker build 20210312.2
2390d9f 
Microsoft.NET.ILLink.Tasks
 From Version 6.0.100-preview.2.21126.1 -> To Version 6.0.100-preview.2.21162.2
@dotnet-issue-labeler
Copy link

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

@eerhardt
Copy link
Member

I cherry-picked my changes from https://github.com/dotnet/runtime/pull/49540/files over here. I'm not sure why the bot opened 2 PRs updating the linker. But it looks like this one has a better chance of making it since #49540 appears broken.

@marek-safar
Copy link
Contributor

I'm not sure why the bot opened 2 PRs updating the linker.

Someone make linker changes batchable so I undid that change as that's not what we want for linker updates.

This was referenced Mar 15, 2021
Open
Closed
@eerhardt
Copy link
Member

runtime failures are #49569

eerhardt and others added 3 commits March 15, 2021 12:14
@eerhardt
Respond to PR feedback
05d6cb1
@dotnet-maestro
Update dependencies from https://github.com/mono/linker build 20210316.1
1ced1ef 
Microsoft.NET.ILLink.Tasks
 From Version 6.0.100-preview.2.21126.1 -> To Version 6.0.100-preview.2.21166.1
@marek-safar
Merge remote-tracking branch 'origin/main' into darc-main-b850e279-0a…
0e39575 
…c3-41f1-96b0-6ada43adcefe
@eerhardt
Copy link
Member

The runtime leg passed. Can this be merged?

@akoeplinger
Copy link
Member

This does seem to break the runtime-staging Android AOT leg. From the binlog:

Can't find custom attr constructor image: /Users/alexander/dev/runtime/artifacts/bin/Android.Device_Emulator.Aot.Test/net6.0-Debug/android-x64/publish/Microsoft.DotNet.XHarness.TestRunners.Common.dll mtoken: 0x0a000064 due to: Could not load file or assembly 'System.Runtime, Version=4.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' or one of its dependencies.
* Assertion at /Users/alexander/dev/runtime/src/mono/mono/metadata/assembly.c:2116, condition `is_ok (error)' not met, function:mono_assembly_load_friends, Could not load file or assembly 'System.Runtime, Version=4.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' or one of its dependencies.

We could temporarily disable those if this PR is needed to unblock someone.

@dotnet-maestro
Update dependencies from https://github.com/mono/linker build 20210317.1
3caa6e3 
Microsoft.NET.ILLink.Tasks
 From Version 6.0.100-preview.2.21126.1 -> To Version 6.0.100-preview.2.21167.1
@marek-safar
Copy link
Contributor

@akoeplinger could you please disable them to unblock the bump

@akoeplinger akoeplinger mentioned this pull request Mar 17, 2021
Closed
@marek-safar marek-safar merged commit 2d0fe49 into main Mar 17, 2021
@marek-safar marek-safar deleted the darc-main-b850e279-0ac3-41f1-96b0-6ada43adcefe branch March 17, 2021 19:56
@ghost ghost locked as resolved and limited conversation to collaborators Apr 16, 2021
@karelz karelz added this to the 6.0.0 milestone May 20, 2021
@danmoseley danmoseley added the area-codeflow for labeling automated codeflow label Jul 28, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@eerhardt eerhardt eerhardt approved these changes

@steveharter steveharter steveharter approved these changes

@eiriktsarpalis eiriktsarpalis Awaiting requested review from eiriktsarpalis

@jozkee jozkee Awaiting requested review from jozkee

@layomia layomia Awaiting requested review from layomia

Assignees
No one assigned
Labels
area-codeflow for labeling automated codeflow
Projects
None yet
Milestone
6.0.0
Development

Successfully merging this pull request may close these issues.
6 participants
@eerhardt @marek-safar @akoeplinger @steveharter @karelz @danmoseley