[dev] Source code updates from dotnet/dotnet - #7559
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. |
Diff: https://github.com/dotnet/dotnet/compare/50dbab4de210e882172b07934e9666313b7065f1..50dbab4de210e882172b07934e9666313b7065f1 From: dotnet/dotnet@50dbab4 To: dotnet/dotnet@50dbab4 The following files had conflicts that were resolved by a user: - build/common.project.props
Caution
This is an unsafe codeflow update⚠️ Please review carefully as it may contain undesirable changes and/or reverts.
This PR is a self-corrective attempt most likely caused by a recent change in codeflow subscriptions which results in the currently flown branch
mainbeing divergent from the previously flown<branch not available>.It may contain both source code changes from the VMR
as well as dependency updates. Learn more here.
If the changes in this PR look wrong, you also have the option to reset the VMR's contents to match the repository:
This pull request brings the following source code changes
From https://github.com/dotnet/dotnet
Updated Dependencies
Associated changes in source repos
Diff the source with this PR branch