Index: SQLite.Designer/SQLite.Designer.2017.csproj
==================================================================
--- SQLite.Designer/SQLite.Designer.2017.csproj
+++ SQLite.Designer/SQLite.Designer.2017.csproj
@@ -50,13 +50,10 @@
     <Reference Include="System.Xml" />
     <Reference Include="EnvDTE">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Microsoft.Data.ConnectionUI">
-
-
-
       <HintPath>$(VSInstallDir)VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.Data.ConnectionUI.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Data">

Index: Setup/build.bat
==================================================================
--- Setup/build.bat
+++ Setup/build.bat
@@ -63,10 +63,23 @@
 SET TOOLS=%~dp0
 SET TOOLS=%TOOLS:~0,-1%
 
 %_VECHO% Tools = '%TOOLS%'
 
+SET EXTERNALS=%ROOT%\Externals
+SET EXTERNALS=%EXTERNALS:\\=\%
+
+%_VECHO% Externals = '%EXTERNALS%'
+
+IF NOT DEFINED VSWHERE_EXE (
+  SET VSWHERE_EXE=%EXTERNALS%\vswhere\vswhere.exe
+)
+
+SET VSWHERE_EXE=%VSWHERE_EXE:\\=\%
+
+%_VECHO% VsWhereExe = '%VSWHERE_EXE%'
+
 IF EXIST "%TOOLS%\set_%CONFIGURATION%_%PLATFORM%.bat" (
   CALL :fn_ResetErrorLevel
 
   %_AECHO% Running "%TOOLS%\set_%CONFIGURATION%_%PLATFORM%.bat"...
   %__ECHO3% CALL "%TOOLS%\set_%CONFIGURATION%_%PLATFORM%.bat"