Merging internal commits for release/8.0 #116554
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…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.
…-merge-8.0-2025-06-10-1311
jozkee
approved these changes
Jun 11, 2025
There was a problem hiding this comment.
Pull Request Overview
This PR merges internal commits for release 8.0, enforcing absolute-path loading in various host resolvers, refining dependency resolution logic, and extending test utilities with new working-directory-ignorance tests.
- Enforce
is_path_rootedchecks before loading coreclr, hostfxr, and hostpolicy libraries - Update
deps_resolverto skip app-deps probing inlibhostmode - Add
TestArtifact.Createhelper and new tests to verify working-directory ignore behavior
Reviewed Changes
Copilot reviewed 10 out of 10 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| src/native/corehost/hostpolicy/standalone/coreclr_resolver.cpp | Add absolute-path check before load_library |
| src/native/corehost/hostpolicy/deps_resolver.cpp | Skip app-deps probing when in libhost mode |
| src/native/corehost/fxr_resolver.h | Add absolute-path check for hostfxr library |
| src/native/corehost/fxr/standalone/hostpolicy_resolver.cpp | Add absolute-path check for hostpolicy library |
| src/native/corehost/apphost/standalone/hostfxr_resolver.cpp | Add absolute-path check before setting status |
| src/installer/tests/TestUtils/TestArtifact.cs | Introduce Create factory method for test artifacts |
| src/installer/tests/HostActivation.Tests/NativeHosting/NativeHostingResultExtensions.cs | Rename extension class and add new assertions |
| src/installer/tests/HostActivation.Tests/NativeHosting/LoadAssemblyAndGetFunctionPointer.cs | Add IgnoreWorkingDirectory test |
| src/installer/tests/HostActivation.Tests/NativeHosting/Ijwhost.cs | Add LoadLibrary_IgnoreWorkingDirectory test |
| src/installer/tests/HostActivation.Tests/NativeHosting/Comhost.cs | Add ActivateClass_IgnoreWorkingDirectory test |
Comments suppressed due to low confidence (4)
src/native/corehost/hostpolicy/standalone/coreclr_resolver.cpp:17
- There are no existing tests covering the new absolute-path check in
resolve_coreclr. Consider adding a unit test that passes a relative path and verifiesresolve_coreclrreturns false.
if (!pal::is_path_rooted(coreclr_dll_path))
src/native/corehost/fxr_resolver.h:48
- No tests currently cover the
is_path_rootedcheck for hostfxr. Add a test case supplying a non-rootedfxr_pathand assert it returnsCoreHostLibMissingFailure.
if (!pal::is_path_rooted(fxr_path))
src/native/corehost/fxr/standalone/hostpolicy_resolver.cpp:184
- The new absolute-path check in
hostpolicy_resolver::loadisn't exercised by tests. Consider adding a test feeding a relativehost_pathand verifying the failure path.
if (!pal::is_path_rooted(host_path))
src/native/corehost/apphost/standalone/hostfxr_resolver.cpp:41
- The constructor check for non-rooted
m_fxr_pathshould be tested. Add a scenario whereapp_rootresolves to a relative path and verifym_status_codeis set to failure.
else if (!pal::is_path_rooted(m_fxr_path))
This was referenced Jun 11, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.