Port https://github.com/NuGet/Home/issues/4989 to 3.1.4xx. cc @wli3 @dsplaisted @marcpopMSFT Create an issue per the sync-up. I can do the port myself once https://github.com/dotnet/sdk/issues/10947 is merged.