Dealing with breaking change in latest mono/xamarin update