Support .NET Core 3.1