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.

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

[automated] Merge branch 'release/6.0-rc1' => 'release/6.0' #57854

Conversation

dotnet-maestro-bot
Copy link
Contributor

I detected changes in the release/6.0-rc1 branch which have not been merged yet to release/6.0. I'm a robot and am configured to help you automatically keep release/6.0 up to date, so I've opened this PR.

This PR merges commits made on release/6.0-rc1 by the following committers:

  • github-actions[bot]

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/6.0-rc1
git pull --ff-only
git checkout release/6.0
git pull --ff-only
git merge --no-ff release/6.0-rc1

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc1-to-release/6.0
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc1-to-release/6.0

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/6.0-rc1-to-release/6.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/6.0-rc1-to-release/6.0 release/6.0
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/6.0-rc1-to-release/6.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc1-to-release/6.0
or if you are using SSH
git checkout -b merge/release/6.0-rc1-to-release/6.0 release/6.0
git pull git@github.com:dotnet-maestro-bot/runtime merge/release/6.0-rc1-to-release/6.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc1-to-release/6.0

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

…sts. Replace with runtime package version and appropriate property. (dotnet#57828)

Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
@dotnet-maestro-bot dotnet-maestro-bot force-pushed the merge/release/6.0-rc1-to-release/6.0 branch from 4e6d981 to 236e490 Compare August 20, 2021 17:57
@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.

@ghost ghost added the community-contribution Indicates that the PR has been added by a community member label Aug 20, 2021
github-actions bot and others added 2 commits August 20, 2021 13:21
…otnet#57799)

* Add test case

Call a method for the first time after an update has been applied to it.

This will check that the interpreter or JIT does not have to rely on cached
information from the baseline (about the method signature, for example) and
that it can compute it from the delta.

* [hot_reload] Don't look at delta method table rows

The issue is that the ParamList column in EnC deltas is a "suppressed column"
that has the value 0.  So when a method is updated if we use the value
directly, we will break, for example - `mono_metadata_get_param_attrs` which
expects a non-zero index in that column.

CoreCLR solves this by having a set of suppressed columns that are never
updated by deltas.  (CoreCLR's model is to directly mutate the tables of the
baseline image).  In Mono we can eventually do the same thing by writing the
value from the previous generation into the current delta's row.  But right now
since we don't allow parameter modifications, and the only column on a Method
table that we allow to be modified is the RVA - which we look up specially - we
can just always return the baseline image row for the method table.

Fixes dotnet#57643

Co-authored-by: Aleksey Kliger <alklig@microsoft.com>
…dotnet#57787)

* Fix xamarin-android 6161

* Fixing leak.

* Adding wasm debugger test. Fixing using protocol version.

* only get locals in older protocol versions.

Co-authored-by: Thays <thaystg@gmail.com>
DrewScoggins and others added 3 commits August 20, 2021 16:11
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Stephen Toub <stoub@microsoft.com>
@danmoseley danmoseley added area-codeflow for labeling automated codeflow and removed community-contribution Indicates that the PR has been added by a community member labels Aug 23, 2021
@ViktorHofer ViktorHofer merged commit 8ddb633 into dotnet:release/6.0 Aug 23, 2021
@ghost ghost locked as resolved and limited conversation to collaborators Sep 22, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-codeflow for labeling automated codeflow
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants