Update for latest VS Xamarin changes
Import patch from Clancey to switch to xml writing