Skip to content

Conversation

@dotnet-maestro-bot
Copy link
Contributor

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

This PR merges commits made on release/6.0 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
git pull --ff-only
git checkout release/6.0-maui
git pull --ff-only
git merge --no-ff release/6.0

# 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-to-release/6.0-maui
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/6.0-to-release/6.0-maui

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-to-release/6.0-maui'. 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-to-release/6.0-maui release/6.0-maui
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/6.0-to-release/6.0-maui
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/6.0-to-release/6.0-maui
or if you are using SSH
git checkout -b merge/release/6.0-to-release/6.0-maui release/6.0-maui
git pull git@github.com:dotnet-maestro-bot/runtime merge/release/6.0-to-release/6.0-maui
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/6.0-to-release/6.0-maui

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.

…otnet#64027)

* Fix issue dotnet#61104 and add regression test

The issue tracks the runtime regression failure where
Crossgen2-compiled app is unable to locate a type with non-ASCII
characters in its name. The failure was caused by the fact that
Crossgen2 was incorrectly zero-extended the individual characters
when calculating the hash whereas runtime is sign-extending them.

Thanks

Tomas

* Simplify the regression test per Anton's PR feedback

Co-authored-by: Tomas <trylek@microsoft.com>
@dotnet-maestro-bot dotnet-maestro-bot force-pushed the merge/release/6.0-to-release/6.0-maui branch from e08fc29 to bbfc15c Compare January 20, 2022 17:25
@ghost
Copy link

ghost commented Jan 20, 2022

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.

@akoeplinger akoeplinger added the area-codeflow for labeling automated codeflow label Jan 24, 2022
@akoeplinger akoeplinger merged commit 059caa2 into dotnet:release/6.0-maui Jan 25, 2022
@ghost ghost locked as resolved and limited conversation to collaborators Feb 24, 2022
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.

2 participants