[6.0-staging] Disable DllImportSearchPathsTest in mobile #86576
Conversation
|
This is a test-only change so no tactics approval necessary. |
akoeplinger
added
Servicing-approved
|
Tagging subscribers to this area: @directhex Issue DetailsLoading assemblies from subdirectories is not supported, this ports the fix from main to 6.0 Fixes #86271
|
Loading assemblies from subdirectories is not supported, this ports the fix from main to 6.0 Fixes #86271
Do we need a similar PR for 7.0? |
Not really, in main/7.0 this job runs in runtime-extra-platforms which doesn't get triggered automatically. |
But if someone triggers runtime-extra-platforms in 7.0, they'll hit the failure, right? |
|
Yes. Let me backport to 7.0 as well so we're good there too. |
|
/backport to release/7.0-staging |
|
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/5069357570 |
|
@akoeplinger backporting to release/7.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: [6.0] Disable DllImportSearchPathsTest in mobile
Using index info to reconstruct a base tree...
M src/tests/Interop/DllImportSearchPaths/DllImportSearchPathsTest.cs
M src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging src/tests/issues.targets
CONFLICT (content): Merge conflict in src/tests/issues.targets
Auto-merging src/tests/Interop/DllImportSearchPaths/DllImportSearchPathsTest.cs
CONFLICT (content): Merge conflict in src/tests/Interop/DllImportSearchPaths/DllImportSearchPathsTest.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 [6.0] Disable DllImportSearchPathsTest in mobile
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@akoeplinger an error occurred while backporting to release/7.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Port of dotnet#86576 to 7.0
ghost
locked as resolved and limited conversation to collaborators
Loading assemblies from subdirectories is not supported, this ports the fix from main to 6.0
Fixes #86271