[main] Source code updates from dotnet/dotnet#15379
[main] Source code updates from dotnet/dotnet#15379dotnet-maestro[bot] wants to merge 4 commits intomainfrom
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/159b6d62add9dd2bbaaaaef8169f3d50f3cd711a..159b6d62add9dd2bbaaaaef8169f3d50f3cd711a From: dotnet/dotnet@159b6d6 To: dotnet/dotnet@159b6d6 The following files had conflicts that were resolved by a user: - eng/Versions.props
|
Pushes us to newer versions of excluded assets, that don't support net8, possibly bug in maestro. Reported here: |
|
Important While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged). You can continue with one of the following options:
💡 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 VMR
as well as dependency updates. Learn more here.
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