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-rc2' => 'release/8.0' #92401

Conversation

dotnet-maestro-bot
Copy link
Contributor

I detected changes in the release/8.0-rc2 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-rc2 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-rc2
git pull --ff-only
git checkout release/8.0
git pull --ff-only
git merge --no-ff release/8.0-rc2

# 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-rc2-to-release/8.0
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc2-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-rc2-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-rc2-to-release/8.0 release/8.0
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/8.0-rc2-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-rc2-to-release/8.0
or if you are using SSH
git checkout -b merge/release/8.0-rc2-to-release/8.0 release/8.0
git pull [email protected]:dotnet-maestro-bot/runtime merge/release/8.0-rc2-to-release/8.0
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc2-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 3 commits September 21, 2023 02:24
dotnet@1b788f4
added a new value to our MonoRgctxInfoType enum type, but appears
that all cases where not full adjusted. Running System.Buffers tests
in full AOT hits the assert in info_equal about missing case,
https://github.com/dotnet/runtime/blob/0dc5903679606b072adac70a268cdb77d1147b3e/src/mono/mono/mini/mini-generic-sharing.c#L2908.

This commit adds the new enum value and align handling similar to other cases added
by that commit.

Co-authored-by: lateralusX <[email protected]>
…net#92365)

* Fixes for LLVM AOT on Windows from @lateralusX

* fix HOST/TARGET issue

---------

Co-authored-by: Jo Shields <[email protected]>
…and enregistered refs (dotnet#92360)

* Fix issue with enregistered values

* Fix assert and enregistered ref reporting

* Fix issue from merge

---------

Co-authored-by: Lee Culver <[email protected]>
Co-authored-by: Juan Sebastian Hoyos Ayala <[email protected]>
Co-authored-by: Juan Hoyos <[email protected]>
@ghost
Copy link

ghost commented Sep 21, 2023

Tagging subscribers to this area: @dotnet/area-infrastructure-libraries
See info in area-owners.md if you want to be subscribed.

Issue Details

I detected changes in the release/8.0-rc2 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-rc2 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-rc2
git pull --ff-only
git checkout release/8.0
git pull --ff-only
git merge --no-ff release/8.0-rc2

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

Author: dotnet-maestro-bot
Assignees: -
Labels:

area-Infrastructure-libraries

Milestone: -

@carlossanlop carlossanlop added Servicing-approved Approved for servicing release area-Infrastructure area-codeflow for labeling automated codeflow and removed area-Infrastructure-libraries labels Sep 21, 2023
@ghost
Copy link

ghost commented Sep 21, 2023

Tagging subscribers to this area: @dotnet/runtime-infrastructure
See info in area-owners.md if you want to be subscribed.

Issue Details

I detected changes in the release/8.0-rc2 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-rc2 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-rc2
git pull --ff-only
git checkout release/8.0
git pull --ff-only
git merge --no-ff release/8.0-rc2

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

Author: dotnet-maestro-bot
Assignees: -
Labels:

Servicing-approved, area-Infrastructure, area-codeflow

Milestone: -

@carlossanlop carlossanlop added this to the 8.0.0 milestone Sep 21, 2023
…dotnet#92411)

* [CI][Android] Build mono runtime for Android on PRs

* [CI][Android] Build and run smoke tests

* Mimic ios/tvos devices job

---------

Co-authored-by: mdh1418 <[email protected]>
github-actions bot and others added 3 commits September 21, 2023 15:37
The containment checks for vector broadcasts were missing a size check,
meaning that a uint broadcast could contain a ubyte/ushort indirection.
That would lead to out-of-bounds reads.

Fix dotnet#83387

Co-authored-by: Jakob Botsch Nielsen <[email protected]>
@carlossanlop carlossanlop merged commit 24658f3 into dotnet:release/8.0 Sep 22, 2023
183 of 186 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 area-Infrastructure Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants