• This issue is blocking
• This issue is causing unreasonable pain

The SDK in the past has not used automated codeflow as it typically has merge conflicts in the eng* folder. Often these conflicts are related to the nuget.config file, versions.props, and versions.details.xml file.

Starting in .net 6, source build was heavily focused on 6.0.1xx and requested automated codeflow up to main so we've had that going for the past 9 month. We trained a vendor to resolve the merge conflicts but always accepting the higher branch code for conflicts in the eng* folder. This has worked reasonably well but source build has requested we continue having codeflow for .net 6 and .net 7 branches.

That means eventually we could have a change from 6.0.1xx that has to flow to 6.0.3xx, 6.0.4xx, 7.0.1xx, 7.0.3xx, 7.0.4xx, and then main having likely merge conflicts at each stage. That makes this pain rise to the level of filing this issue.

https://github.com/dotnet/sdk/pulls?q=is%3Apr+author%3Adotnet-maestro-bot
https://github.com/dotnet/installer/pulls?q=is%3Apr+author%3Adotnet-maestro-bot