Integration with Visual Studio 2015 and 2019

bugs://84360 got reopened.