Skip to content

[automated] Merge branch 'release/9.0' => 'release/9.0-staging' #116514

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

Merged
merged 12 commits into from
Jun 17, 2025

Conversation

github-actions[bot]
Copy link
Contributor

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

This PR merges commits made on release/9.0 by the following committers:

  • jozkee

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/9.0
git pull --ff-only
git checkout release/9.0-staging
git pull --ff-only
git merge --no-ff release/9.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/runtime HEAD:merge/release/9.0-to-release/9.0-staging
or if you are using SSH
git push [email protected]:dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging

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/9.0-to-release/9.0-staging'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/release/9.0-to-release/9.0-staging origin/release/9.0-staging
git pull https://github.com/dotnet/runtime merge/release/9.0-to-release/9.0-staging
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging
or if you are using SSH
git fetch
git checkout -b merge/release/9.0-to-release/9.0-staging origin/release/9.0-staging
git pull [email protected]:dotnet/runtime merge/release/9.0-to-release/9.0-staging
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

elinor-fung and others added 12 commits May 1, 2025 19:01
…rios (COM, C++/CLI, custom component host) could try to load coreclr from CWD

There is a fallback for apps with no .deps.json where the host will consider the app directory for loading coreclr. In component hosting scenarios, we do not have an app path / directory. We were incorrectly going down the path of looking for coreclr next to the empty app directory, which resulted in looking in the current directory.

This change skips that path for libhost scenarios. It also adds checks that the paths we determine for loading coreclr, hostpolicy, and hostfxr are absolute.
[manual] Merge release/9.0-staging into release/9.0
…25-06-10-1320

Merging internal commits for release/9.0
These queues are non-functional and there is no plan to fix them.

Co-authored-by: Jan Kotas <[email protected]>
@jozkee
Copy link
Member

jozkee commented Jun 16, 2025

/ba-g SSL test failure will be fixed with #116687. Build failure seems unrelated, "Agents can't recover from restarts" have been observed in multiple occasions.

@jozkee jozkee added the Servicing-approved Approved for servicing release label Jun 16, 2025
@jozkee jozkee enabled auto-merge (squash) June 16, 2025 22:48
@jozkee jozkee merged commit c9dfa92 into release/9.0-staging Jun 17, 2025
314 of 367 checks passed
jozkee added a commit to jozkee/runtime that referenced this pull request Jun 17, 2025
@jozkee jozkee deleted the merge/release/9.0-to-release/9.0-staging branch June 17, 2025 19:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants