Clean existing .dotnet dir #2895
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
ellahathaway
approved these changes
Oct 14, 2025
Member
Author
|
/backport to main |
Contributor
Member
Author
|
/backport to release/10.0.1xx |
Contributor
|
Started backporting to release/10.0.1xx: https://github.com/dotnet/dotnet/actions/runs/18506008850 |
Contributor
|
@mthalman backporting to "main" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Clean existing .dotnet dir
Using index info to reconstruct a base tree...
M eng/pipelines/templates/jobs/vmr-build.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/templates/jobs/vmr-build.yml
CONFLICT (content): Merge conflict in eng/pipelines/templates/jobs/vmr-build.yml
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 Clean existing .dotnet dir
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
|
@mthalman backporting to "release/10.0.1xx" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Clean existing .dotnet dir
Using index info to reconstruct a base tree...
M eng/pipelines/templates/jobs/vmr-build.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/templates/jobs/vmr-build.yml
CONFLICT (content): Merge conflict in eng/pipelines/templates/jobs/vmr-build.yml
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 Clean existing .dotnet dir
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Member
Author
|
/backport to main |
Member
Author
|
/backport to release/10.0.1xx |
Contributor
Contributor
|
Started backporting to release/10.0.1xx: https://github.com/dotnet/dotnet/actions/runs/18539636307 |
This was referenced Oct 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Signed builds in the 10.0.2xx branch fail in the
SB_CentOSStream10_Offline_MsftSdk_x64job with the following error in the Prep Source Build step:This happens because the "Install .NET 8.0 SDK for MicroBuild Plugin" step has already installed an SDK at that location.
This is resolved by ensuring the
.dotnetdirectory is removed. The SDK installed for MicroBuild is no longer needed at this point in the build.