Resharper upgrades