[release/10.0.3xx] Source code updates from dotnet/sdk - #5052
#5052[release/10.0.3xx] Source code updates from dotnet/sdk#5052dotnet-maestro[bot] wants to merge 8 commits intorelease/10.0.3xxdotnet/dotnet:release/10.0.3xxfrom darc-release/10.0.3xx-1ec6d8cf-6c28-408d-b985-d87ee62cbf7fdotnet/dotnet:darc-release/10.0.3xx-1ec6d8cf-6c28-408d-b985-d87ee62cbf7fCopy head branch name to clipboard
Conversation
Diff: https://github.com/dotnet/sdk/compare/6e514f6189902a6422a6ab91324804c37035315b..32c9942cd2768f53029e055b7998aa48cba9b3b1 From: dotnet/sdk@6e514f6 To: dotnet/sdk@32c9942 [[ commit created by automation ]]
|
Note PRs from original repository included in this codeflow update:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
Diff: https://github.com/dotnet/sdk/compare/32c9942cd2768f53029e055b7998aa48cba9b3b1..ba6ab4ae38703f26e2cbc341a08be991fab0bb95 From: dotnet/sdk@32c9942 To: dotnet/sdk@ba6ab4a [[ commit created by automation ]]
|
Note PRs from original repository included in this codeflow update: 💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
Diff: https://github.com/dotnet/sdk/compare/ba6ab4ae38703f26e2cbc341a08be991fab0bb95..8cbac4a5cdf27c2bb606a282cc47e60a7c4ced45 From: dotnet/sdk@ba6ab4a To: dotnet/sdk@8cbac4a [[ commit created by automation ]]
|
Note PRs from original repository included in this codeflow update: 💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
Diff: https://github.com/dotnet/sdk/compare/8cbac4a5cdf27c2bb606a282cc47e60a7c4ced45..d40b21888fc01357ea0e54361ee6401c9daa37bd From: dotnet/sdk@8cbac4a To: dotnet/sdk@d40b218 [[ commit created by automation ]]
…b985-d87ee62cbf7f
|
Note PRs from original repository included in this codeflow update: 💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
Diff: https://github.com/dotnet/sdk/compare/d40b21888fc01357ea0e54361ee6401c9daa37bd..6b35c82001fd62cedb45dfa117773a0b5f4e76ce From: dotnet/sdk@d40b218 To: dotnet/sdk@6b35c82 [[ commit created by automation ]]
[[ commit created by automation ]]
Diff: https://github.com/dotnet/sdk/compare/6b35c82001fd62cedb45dfa117773a0b5f4e76ce..a8c3d2038237842f6fbb33e2c12ad9a0406e40a8 From: dotnet/sdk@6b35c82 To: dotnet/sdk@a8c3d20 [[ commit created by automation ]]
|
Note PRs from original repository included in this codeflow update: 💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
|
Caution 🛑 Codeflow Paused — Conflict detectedA conflict was detected when trying to update this PR with changes from build 💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR. 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. |
|
Note PRs from original repository included in this codeflow update: 💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
|
Caution 🛑 Codeflow Paused — Conflict detectedA conflict was detected when trying to update this PR with changes from build 💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR. 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. |
|
Note PRs from original repository included in this codeflow update:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
|
Caution 🛑 Codeflow Paused — Conflict detectedA conflict was detected when trying to update this PR with changes from build 💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR. 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. |
|
Caution 🛑 Codeflow Paused — Conflict detectedA conflict was detected when trying to update this PR with changes from build 💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR. 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. |
|
Caution 🛑 Codeflow Paused — Conflict detectedA conflict was detected when trying to update this PR with changes from build 💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR. 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. |
|
Caution 🛑 Codeflow Paused — Conflict detectedA conflict was detected when trying to update this PR with changes from build 💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR. 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. |
|
Caution 🛑 Codeflow Paused — Conflict detectedA conflict was detected when trying to update this PR with changes from build 💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR. 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. |
|
Caution 🛑 Codeflow Paused — Conflict detectedA conflict was detected when trying to update this PR with changes from build 💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR. 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. |
|
Caution 🛑 Codeflow Paused — Conflict detectedA conflict was detected when trying to update this PR with changes from build 💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR. 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. |
|
Caution 🛑 Codeflow Paused — Conflict detectedA conflict was detected when trying to update this PR with changes from build 💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR. 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. |
|
Caution 🛑 Codeflow Paused — Conflict detectedA conflict was detected when trying to update this PR with changes from build 💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR. 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. |
|
Caution 🛑 Codeflow Paused — Conflict detectedA conflict was detected when trying to update this PR with changes from build 💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR. 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. |
|
I'm busy running the VMR resolution commands locally to try and get this unblocked |
|
VMR conflict resolution failed to run. Closing and retrying using a new PR |
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