Skip to content

[release/6.0] Update dependencies from mono/linker - #57700

Merged
ViktorHofer merged 1 commit into
release/6.0from
darc-release/6.0-9c1a9ec7-954b-4633-b1a6-0f834ed84cb2
Aug 19, 2021
Merged

[release/6.0] Update dependencies from mono/linker#57700
ViktorHofer merged 1 commit into
release/6.0from
darc-release/6.0-9c1a9ec7-954b-4633-b1a6-0f834ed84cb2

Conversation

@dotnet-maestro

Copy link
Copy Markdown
Contributor

This pull request updates the following dependencies

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

  • Subscription: 30d40141-6ab6-4b9b-da07-08d961c27f17
  • Build: 20210818.3
  • Date Produced: 8/18/2021 11:03 PM
  • Commit: 5b2391c2c56af47350a5789375e8dbddc692e67f
  • Branch: refs/heads/release/6.0

Microsoft.NET.ILLink.Tasks
From Version 6.0.100-preview.6.21416.1 -> To Version 6.0.100-preview.6.21418.3
@ghost

Copy link
Copy Markdown

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.

@stephentoub

Copy link
Copy Markdown
Member

@ViktorHofer, @mmitche, for dependency flow PRs into release/6.0 and release/6.0-rc1, are we merging those when CI is green?

@ViktorHofer

ViktorHofer commented Aug 19, 2021

Copy link
Copy Markdown
Member

Yes, these should be fine to merge. Unsure why the target branch is release/6.0 instead of release/6.0-rc1 though. Commits going into release/6.0-rc1 will be automatically mirrored by the maestro bot into release/6.0. I will send out an email for that later today.

@stephentoub

Copy link
Copy Markdown
Member

Commits going into release/6.0-rc1 will be automatically mirrored by the maestro bot into release/6.0

They will? Then why are we being encouraged to dual check-in other backports?

@ViktorHofer

ViktorHofer commented Aug 19, 2021

Copy link
Copy Markdown
Member

Then why are we being encouraged to dual check-in other backports?

Because the people that recommended to dual check-in didn't know that a bot was planned to be used for this. Discussed this with @danmoseley and @mmitche offline the previous weeks. As Dan is out this week, this information didn't get to his direct reports.

As said, I will send out a mail for that later today after I get the green light from @mmitche.

@ViktorHofer
ViktorHofer changed the base branch from release/6.0 to release/6.0-rc1August 19, 2021 15:05
@ViktorHofer
ViktorHofer deleted the darc-release/6.0-9c1a9ec7-954b-4633-b1a6-0f834ed84cb2 branch August 19, 2021 15:06
@ViktorHofer

ViktorHofer commented Aug 19, 2021

Copy link
Copy Markdown
Member

Closing as there will be a new dependency update opened targeting release/6.0-rc1.

@mmitche

Copy link
Copy Markdown
Member

You can't use the inter-merge bot for dependency merges, as there are two different sets of flow, one for rc1 and one for rc2 (release/6.0). Those source from different branches on mono/linker (release/6.0-rc1 vs. release/6.0).

@ViktorHofer
ViktorHofer restored the darc-release/6.0-9c1a9ec7-954b-4633-b1a6-0f834ed84cb2 branch August 19, 2021 16:12
@ViktorHofer
ViktorHofer changed the base branch from release/6.0-rc1 to release/6.0August 19, 2021 16:12
@ViktorHofer

ViktorHofer commented Aug 19, 2021

Copy link
Copy Markdown
Member

Merging as this was 100% green when closing.

@ViktorHofer
ViktorHofer merged commit b614529 into release/6.0Aug 19, 2021
@ViktorHofer
ViktorHofer deleted the darc-release/6.0-9c1a9ec7-954b-4633-b1a6-0f834ed84cb2 branch August 19, 2021 16:13
@runfoapprunfoappBot mentioned this pull request Aug 19, 2021
@danmoseleydanmoseley added the area-codeflow for labeling automated codeflow label Aug 23, 2021
@ghostghost locked as resolved and limited conversation to collaborators Sep 22, 2021
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-codeflowfor labeling automated codeflow

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@stephentoub@ViktorHofer@mmitche@akoeplinger@danmoseley