DevOps

Visual Studio 2017 Fixes