Upgrading to .NET 6