Support for next version of Visual Studio