Please start a PR to backport https://github.com/dotnet/sdk/pull/51558/checks?check_run_id=54843914657 to 8.0.4xx. Also, if you can start multiple PRs, backport it to 8.0.1xx and 8.0.3xx as well.