Skip to content

Conversation

jozkee
Copy link
Member

@jozkee jozkee commented Jun 17, 2025

Reverts #116514 and then git pull upstream release/9.0.
Sorry!

elinor-fung and others added 14 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
…9.0-2025-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 jozkee self-assigned this Jun 17, 2025
@jozkee jozkee added Servicing-approved Approved for servicing release area-codeflow for labeling automated codeflow area-Infrastructure-libraries NO-SQUASH The PR should not be squashed labels Jun 17, 2025
Copy link
Contributor

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

@Copilot Copilot AI review requested due to automatic review settings June 17, 2025 19:58
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot wasn't able to review any files in this pull request.

@jozkee
Copy link
Member Author

jozkee commented Jun 17, 2025

/ba-g no code changes

@jozkee jozkee requested a review from a team June 17, 2025 20:16
@jozkee jozkee merged commit b1ec39e into dotnet:release/9.0-staging Jun 17, 2025
27 of 28 checks passed
@jozkee jozkee deleted the revert-9.0-port branch June 17, 2025 20:44
@github-actions github-actions bot locked and limited conversation to collaborators Jul 18, 2025
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-libraries NO-SQUASH The PR should not be squashed Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants