Fix forwarding DOTNET_ROOT #49634
Merged
Fix forwarding DOTNET_ROOT #49634
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
Youssef1313
reviewed
Jul 2, 2025
Youssef1313
reviewed
Jul 2, 2025
nohwnd
commented
Jul 2, 2025
Youssef1313
reviewed
Jul 2, 2025
Youssef1313
reviewed
Jul 2, 2025
Youssef1313
reviewed
Jul 4, 2025
|
|
||
| // We rename env variable to support --arch switch that relies on DOTNET_ROOT/DOTNET_ROOT(x86) | ||
| // We provide VSTEST_WINAPPHOST_ only in case of testhost*.exe removing VSTEST_WINAPPHOST_ prefix and passing as env vars. | ||
| return (hasRootVariable, $"VSTEST_WINAPPHOST_{rootVariableName}", rootValue); |
There was a problem hiding this comment.
I'm double checking, this is fine because this logic isn't going to be used with old vstest.console.exe because it's guaranteed that we use vstest.console.exe that's part of SDK, and we will only merge this PR after inserting the fix on vstest side. Is that correct?
There was a problem hiding this comment.
Yes, the old way of doing this can be removed. It also does not seem that people use that env variable on its own.
Youssef1313
approved these changes
Jul 4, 2025
|
Update merged, let's test it together. #49809 |
This was referenced Jul 17, 2025
|
/backport to release/9.0.3xx |
|
Started backporting to release/9.0.3xx: https://github.com/dotnet/sdk/actions/runs/16902587194 |
|
@nohwnd backporting to "release/9.0.3xx" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix forwarding dotnet_root
Using index info to reconstruct a base tree...
A src/Cli/dotnet/Commands/Test/TestCommand.cs
A src/Cli/dotnet/Commands/Test/VSTestForwardingApp.cs
A src/Cli/dotnet/Commands/VSTest/VSTestCommand.cs
M src/Cli/dotnet/Parser.cs
A test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetVsTestForwardingApp.cs
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): src/Cli/dotnet/Commands/Test/TestCommand.cs deleted in HEAD and modified in Fix forwarding dotnet_root. Version Fix forwarding dotnet_root of src/Cli/dotnet/Commands/Test/TestCommand.cs left in tree.
CONFLICT (modify/delete): src/Cli/dotnet/Commands/Test/VSTestForwardingApp.cs deleted in HEAD and modified in Fix forwarding dotnet_root. Version Fix forwarding dotnet_root of src/Cli/dotnet/Commands/Test/VSTestForwardingApp.cs left in tree.
CONFLICT (modify/delete): src/Cli/dotnet/Commands/VSTest/VSTestCommand.cs deleted in HEAD and modified in Fix forwarding dotnet_root. Version Fix forwarding dotnet_root of src/Cli/dotnet/Commands/VSTest/VSTestCommand.cs left in tree.
Auto-merging src/Cli/dotnet/Parser.cs
CONFLICT (content): Merge conflict in src/Cli/dotnet/Parser.cs
Auto-merging test/dotnet.Tests/dotnet-msbuild/GivenDotnetVsTestForwardingApp.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Fix forwarding dotnet_root
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Use VSTEST_DOTNET_ROOT_PATH and VSTEST_DOTNET_ROOT_ARCHITECTURE to tell to child vstest.console where the dotnet sdk is, so we can use it to setup dotnet_root for testhost.exe correctly, so testhost can pick up privately instaled dotnet sdk.
Needs microsoft/vstest#15184 to be merged first.
Fix #49436