Merge "clean up msvs project generation"