Skip to content

Conversation

@surayya-MS
Copy link
Member

Follow-up to #11538

@surayya-MS surayya-MS requested a review from a team as a code owner March 7, 2025 16:33
@surayya-MS surayya-MS requested a review from rainersigwald March 7, 2025 16:34
@surayya-MS
Copy link
Member Author

dotnet/sdk#47328

@surayya-MS surayya-MS self-assigned this Mar 7, 2025
@surayya-MS surayya-MS merged commit cce4d88 into dotnet:main Mar 7, 2025
10 checks passed
@surayya-MS surayya-MS deleted the upgrade-solutionperistence branch March 7, 2025 17:24
@maridematte
Copy link
Member

/backport to vs17.14

@github-actions
Copy link
Contributor

Started backporting to vs17.14: https://github.com/dotnet/msbuild/actions/runs/13788530939

@github-actions
Copy link
Contributor

@maridematte an error occurred while backporting to "vs17.14", please check the run log for details!

Error: @maridematte is not a repo collaborator, backporting is not allowed. If you're a collaborator please make sure your dotnet team membership visibility is set to Public on https://github.com/orgs/dotnet/people?query=maridematte

@maridematte
Copy link
Member

/backport to vs17.14

@github-actions
Copy link
Contributor

Started backporting to vs17.14: https://github.com/dotnet/msbuild/actions/runs/13788843084

@github-actions
Copy link
Contributor

@maridematte backporting to "vs17.14" failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: upgrade Microsoft.VisualStudio.SolutionPersistence to 1.0.52
Using index info to reconstruct a base tree...
M	eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
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 upgrade Microsoft.VisualStudio.SolutionPersistence to 1.0.52
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

This was referenced Oct 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants