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/8.0-rc1' => 'release/8.0' #92374

Conversation

dotnet-maestro-bot
Copy link
Contributor

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

This PR merges commits made on release/8.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/8.0-rc1
git pull --ff-only
git checkout release/8.0
git pull --ff-only
git merge --no-ff release/8.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/8.0-rc1-to-release/8.0
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.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/8.0-rc1-to-release/8.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/8.0-rc1-to-release/8.0 release/8.0
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/8.0-rc1-to-release/8.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.0
or if you are using SSH
git checkout -b merge/release/8.0-rc1-to-release/8.0 release/8.0
git pull git@github.com:dotnet-maestro-bot/runtime merge/release/8.0-rc1-to-release/8.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.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.

github-actions bot and others added 2 commits September 20, 2023 08:10
…ers (dotnet#92317)

* Events for IL methods without IL headers

Dynamically generated methods like UnsafeAccessor
functions are marked as IL, but don't contain an IL
header. The lack of header is an indication the IL must
be generated at runtime.

* Debugger check for no IL header

* Update src/coreclr/debug/daccess/stack.cpp

Co-authored-by: Tlakaelel Axayakatl Ceja <tlakaelel.ceja@microsoft.com>

* Review feedback

* Remove redundent calls and another spot to check.

* Move header include

---------

Co-authored-by: Aaron R Robinson <arobins@microsoft.com>
Co-authored-by: Tlakaelel Axayakatl Ceja <tlakaelel.ceja@microsoft.com>
* Fix wasi build.

* dummy change in wasi README to trigger a build

* dummy change in wasi to trigger a build

---------

Co-authored-by: Zoltan Varga <vargaz@gmail.com>
Co-authored-by: Ankit Jain <radical@gmail.com>
@dotnet-issue-labeler dotnet-issue-labeler bot added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Sep 20, 2023
@radical
Copy link
Member

radical commented Sep 20, 2023

WBT failure can be ignored.

@carlossanlop
Copy link
Member

Ok I linked all the failures I could find. I don't think any of them were related to the two changes included here.

@jeffschwMSFT @AaronRobinsonMSFT @mmitche FYI I'll have to merge this new PR because there was a second fix introduced shortly after the IL one. As mentioned in Matt's comment here, it's weird that there is a diff in this PR, yet the change has already merged to release/8.0. I'd like to think nothing will break once I merge this.

@carlossanlop carlossanlop merged commit 904d3a4 into dotnet:release/8.0 Sep 21, 2023
299 of 341 checks passed
@ghost ghost locked as resolved and limited conversation to collaborators Oct 22, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-codeflow for labeling automated codeflow Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants