Updating build system to xbuild