Merge "msvs-build: use msbuild for vs >= 2005"