Once we're on the preview7 SDK we can merge https://github.com/dotnet/arcade/pull/14935 and revert https://github.com/dotnet/arcade/pull/14937