[main] Source code updates from dotnet/sdk - #8053
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. |
|
Azure Pipelines: 2 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run. |
Diff: https://github.com/dotnet/sdk/compare/f6880635674f844c78fefa618a2d15e861d71b2e..f6880635674f844c78fefa618a2d15e861d71b2e From: dotnet/sdk@f688063 To: dotnet/sdk@f688063 The following files had conflicts that were resolved by a user: - src/sdk/src/Cli/dotnet/Commands/NuGet/NuGetCommand.cs
|
there was a conflict in the |
|
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/dotnet/sdk
Diff the source with this PR branch