diff --git a/build/build.cmd b/build/build.cmd
deleted file mode 100644
index 146c26fbc..000000000
--- a/build/build.cmd
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo off
-
-set MSBUILD14_EXE=%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe
-set MSBUILD15_EXE=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\\MSBuild\15.0\bin\MSBuild.exe
-
-call "%MSBUILD14_EXE%" build.proj /t:Clean
-call "%MSBUILD15_EXE%" build.proj /t:Clean
-
-call "%MSBUILD14_EXE%" build.proj /t:Build
-call "%MSBUILD15_EXE%" build.proj /t:Build
-
-call "%MSBUILD15_EXE%" build.proj /t:Package /p:ReleaseVersion=%1
\ No newline at end of file
diff --git a/build/build.proj b/build/build.proj
index ee7ab9197..065a00707 100644
--- a/build/build.proj
+++ b/build/build.proj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Clean;Build;Package" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<UsingTask TaskName="Zip" AssemblyFile="$(MSBuildThisFileDirectory)target\nuget\packages\$(MSBuildTasksPackageId).$(MSBuildTasksPackageVersion)\tools\MSBuild.Community.Tasks.dll"/>
 	<PropertyGroup>
 		<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
@@ -11,17 +11,18 @@
 	<ItemGroup>
 		<VisualStudioVersion Include="2012">
 			<SolutionFile>$(MSBuildThisFileDirectory)..\src\Renci.SshNet.VS2012.sln</SolutionFile>
-			<MSBuildToolsVersion>14.0</MSBuildToolsVersion>
-			<NuGetPackageRestore>true</NuGetPackageRestore>
+			<ToolsVersion>14.0</ToolsVersion>
+			<VisualStudioVersion>14.0</VisualStudioVersion>
 		</VisualStudioVersion>
 		<VisualStudioVersion Include="2015">
 			<SolutionFile>$(MSBuildThisFileDirectory)..\src\Renci.SshNet.VS2015.sln</SolutionFile>
-			<MSBuildToolsVersion>14.0</MSBuildToolsVersion>
-			<NuGetPackageRestore>true</NuGetPackageRestore>
+			<ToolsVersion>14.0</ToolsVersion>
+			<VisualStudioVersion>14.0</VisualStudioVersion>
 		</VisualStudioVersion>
 		<VisualStudioVersion Include="2017">
 			<SolutionFile>$(MSBuildThisFileDirectory)..\src\Renci.SshNet.VS2017.sln</SolutionFile>
-			<MSBuildToolsVersion>15.0</MSBuildToolsVersion>
+			<ToolsVersion>15.0</ToolsVersion>
+			<VisualStudioVersion>15.0</VisualStudioVersion>
 		</VisualStudioVersion>
 	</ItemGroup>
 	<ItemGroup>
@@ -62,15 +63,18 @@
 			<Moniker>uap10</Moniker>
 		</TargetFramework>
 	</ItemGroup>
-	<Target Name="Clean">
+	<Target Name="Clean" DependsOnTargets="CleanSolution">
 		<RemoveDir Directories="$(MSBuildThisFileDirectory)target"/>
+	</Target>
+	<Target Name="CleanSolution" Outputs="%(VisualStudioVersion.Identity)">
+		
 		<ItemGroup>
 			<ProjectToBuild Remove="@(ProjectToBuild)"/>
-			<ProjectToBuild Include="%(VisualStudioVersion.SolutionFile)" Condition="'%(VisualStudioVersion.MSBuildToolsVersion)'=='$(MSBuildToolsVersion)'">
-				<Properties>Configuration=Release</Properties>
+			<ProjectToBuild Include="%(VisualStudioVersion.SolutionFile)">
+				<Properties>Configuration=Release;VisualStudioVersion=%(VisualStudioVersion.VisualStudioVersion)</Properties>
 			</ProjectToBuild>
 		</ItemGroup>
-		<MSBuild Projects="@(ProjectToBuild)" Targets="Clean" />
+		<MSBuild Projects="@(ProjectToBuild)" ToolsVersion="%(VisualStudioVersion.ToolsVersion)" Targets="Clean"/>
 	</Target>
 	<Target Name="DownloadNuGet">
 		<MakeDir Directories="$(MSBuildThisFileDirectory)target\nuget"/>
@@ -79,17 +83,17 @@
 			FileName="$(MSBuildThisFileDirectory)target\nuget\nuget.exe"/>
 	</Target>
 	<Target Name="RestoreNuGetPackages" DependsOnTargets="DownloadNuGet" Outputs="%(VisualStudioVersion.Identity)">
-		<Message Text="Restoring nuget packages for '%(VisualStudioVersion.SolutionFile)'..." Importance="High" Condition="'%(VisualStudioVersion.MSBuildToolsVersion)'=='$(MSBuildToolsVersion)' and '%(VisualStudioVersion.NuGetPackageRestore)'=='true'"/>
-		<Exec Command="$(NuGetExe) restore &quot;%(VisualStudioVersion.SolutionFile)&quot;" Condition="'%(VisualStudioVersion.MSBuildToolsVersion)'=='$(MSBuildToolsVersion)' and '%(VisualStudioVersion.NuGetPackageRestore)'=='true'"/>
+		<Message Text="Restoring nuget packages for '%(VisualStudioVersion.SolutionFile)'..." Importance="High"/>
+		<Exec Command="$(NuGetExe) restore &quot;%(VisualStudioVersion.SolutionFile)&quot;"/>
 	</Target>
 	<Target Name="Build" DependsOnTargets="RestoreNuGetPackages" Outputs="%(VisualStudioVersion.Identity)">
 		<ItemGroup>
 			<ProjectToBuild Remove="@(ProjectToBuild)"/>
-			<ProjectToBuild Include="%(VisualStudioVersion.SolutionFile)" Condition="'%(VisualStudioVersion.MSBuildToolsVersion)'=='$(MSBuildToolsVersion)'">
-				<Properties>Configuration=Release</Properties>
+			<ProjectToBuild Include="%(VisualStudioVersion.SolutionFile)">
+				<Properties>Configuration=Release;VisualStudioVersion=%(VisualStudioVersion.VisualStudioVersion)</Properties>
 			</ProjectToBuild>
 		</ItemGroup>
-		<MSBuild Projects="@(ProjectToBuild)" Targets="Rebuild"/>
+		<MSBuild Projects="@(ProjectToBuild)" ToolsVersion="%(VisualStudioVersion.ToolsVersion)" Targets="Rebuild"/>
 	</Target>
 	<Target Name="Package" DependsOnTargets="CreateNuGetPackage;CreateBinPackage;GenerateHelpFile"/>
 	<Target Name="CreateNuGetPackage" DependsOnTargets="CopyBuildOutputToPackage">
diff --git a/src/Renci.SshNet.VS2012.sln b/src/Renci.SshNet.VS2012.sln
index 93b4c3e84..394ac2525 100644
--- a/src/Renci.SshNet.VS2012.sln
+++ b/src/Renci.SshNet.VS2012.sln
@@ -19,7 +19,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Renci.SshNet.WindowsPhone8"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2D6CAE62-D053-476F-9BDD-2B1F27FA9C5D}"
 	ProjectSection(SolutionItems) = preProject
-		..\build\build.cmd = ..\build\build.cmd
 		..\build\build.proj = ..\build\build.proj
 	EndProjectSection
 EndProject
diff --git a/src/Renci.SshNet.VS2015.sln b/src/Renci.SshNet.VS2015.sln
index 8171be891..56a14c913 100644
--- a/src/Renci.SshNet.VS2015.sln
+++ b/src/Renci.SshNet.VS2015.sln
@@ -1,11 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2D6CAE62-D053-476F-9BDD-2B1F27FA9C5D}"
 	ProjectSection(SolutionItems) = preProject
-		..\build\build.cmd = ..\build\build.cmd
 		..\build\build.proj = ..\build\build.proj
 	EndProjectSection
 EndProject