[main] Source code updates from nuget/nuget.client#7339
Conversation
|
Caution 🚨 Action Required — Conflict detectedA conflict was detected when trying to update this PR with changes from build The conflicts in the following files need to be manually resolved:
ℹ️ To resolve the conflicts, please follow these steps:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
33c8740 to
b9b01f4
Compare
|
Caution 🚨 Action Required — Conflict detectedA conflict was detected when trying to update this PR with changes from build The conflicts in the following files need to be manually resolved:
ℹ️ To resolve the conflicts, please follow these steps:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
b9b01f4 to
47d3cfa
Compare
|
Caution 🚨 Action Required — Conflict detectedA conflict was detected when trying to update this PR with changes from build The conflicts in the following files need to be manually resolved:
ℹ️ To resolve the conflicts, please follow these steps:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
nuget.client upgraded Microsoft.Internal.VisualStudio.Shell.Framework from 17.10.40173 to 18.8.850 as part of a VS17->VS18 sweep. VMR side had not moved from the previous-flow value, so taking the incoming version is the correct resolution. Mirrors the resolution applied to PR #7355. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
Note PRs from original repository included in this codeflow update:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
Note
This is a codeflow update. It may contain both source code changes from
the source repo
as well as dependency updates. Learn more here.
This pull request brings the following source code changes
From https://github.com/nuget/nuget.client
Diff the source with this PR branch