Skip to content

Merge from 7.0#10926

Merged
mmitche merged 11 commits intodotnet:mainfrom
mmitche:merge-from-7.0
Sep 19, 2022
Merged

Merge from 7.0#10926
mmitche merged 11 commits intodotnet:mainfrom
mmitche:merge-from-7.0

Conversation

@mmitche
Copy link
Copy Markdown
Member

@mmitche mmitche commented Sep 19, 2022

To double check:

@mmitche mmitche requested review from MattGal and joeloff September 19, 2022 21:13
@mmitche
Copy link
Copy Markdown
Member Author

mmitche commented Sep 19, 2022

Primary motivation is a cleanup merge, and getting arcade fixes around wix packing into main.

Copy link
Copy Markdown
Member

@joeloff joeloff left a comment

Choose a reason for hiding this comment

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

We'll need to ensure that we have the EMSDK/Runtime changes ready when this passes validation since the CodeFlow PR by itself will likely cause those repos to fail.

Copy link
Copy Markdown
Member

@MattGal MattGal left a comment

Choose a reason for hiding this comment

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

Seems OK though I thought we generally didn't do this sort of merge?

@mmitche mmitche merged commit 066a2b5 into dotnet:main Sep 19, 2022
@mmitche mmitche deleted the merge-from-7.0 branch September 19, 2022 22:36
@kasperk81 kasperk81 mentioned this pull request Sep 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants