diff --git a/.gitignore b/.gitignore
index 6948f2a..b4b615a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -310,3 +310,4 @@ __pycache__/
 *.pyc
 # Cake - Uncomment if you are using it
 tools/
+!tools/packages.config
diff --git a/build.cake b/build.cake
index b8d0f41..d2993e5 100644
--- a/build.cake
+++ b/build.cake
@@ -1,5 +1,3 @@
-#tool nuget:?package=NUnit.ConsoleRunner&version=3.5.0
-
 //////////////////////////////////////////////////////////////////////
 // ARGUMENTS
 //////////////////////////////////////////////////////////////////////
@@ -65,6 +63,7 @@ var packageName = "NUnit3TestAdapter-" + packageVersion;
 var PROJECT_DIR = Context.Environment.WorkingDirectory.FullPath + "/";
 var PACKAGE_DIR = PROJECT_DIR + "package/";
 var PACKAGE_IMAGE_DIR = PACKAGE_DIR + packageName + "/";
+var SRC_DIR = PROJECT_DIR + "src/";
 var TOOLS_DIR = PROJECT_DIR + "tools/";
 var BIN_DIR = PROJECT_DIR + "bin/" + configuration + "/";
 var DEMO_BIN_DIR = PROJECT_DIR + "demo/NUnitTestDemo/bin/" + configuration + "/";
@@ -179,7 +178,6 @@ Task("CreatePackageDir")
 	});
 
 Task("CreateWorkingImage")
-	.IsDependentOn("Build")
 	.IsDependentOn("CreatePackageDir")
 	.Does(() =>
 	{
@@ -213,7 +211,7 @@ Task("PackageZip")
 
 Task("PackageNuGet")
 	.IsDependentOn("CreateWorkingImage")
-	.Does(() => 
+	.Does(() =>
 	{
         NuGetPack("nuget/NUnit3TestAdapter.nuspec", new NuGetPackSettings()
         {
@@ -224,12 +222,11 @@ Task("PackageNuGet")
 	});
 
 Task("PackageVsix")
-	.IsDependentOn("Build")
 	.IsDependentOn("CreatePackageDir")
 	.Does(() =>
 	{
 		CopyFile(
-			BIN_DIR + "NUnit3TestAdapter.vsix", 
+			BIN_DIR + "NUnit3TestAdapter.vsix",
 			PACKAGE_DIR + packageName + ".vsix");
 	});
 
@@ -239,12 +236,10 @@ Task("PackageVsix")
 
 void BuildSolution(string solutionPath, string configuration)
 {
-	MSBuild(solutionPath, new MSBuildSettings()
-		.SetConfiguration(configuration)
-        .SetMSBuildPlatform(MSBuildPlatform.x86)
-		.SetVerbosity(Verbosity.Minimal)
-		.SetNodeReuse(false)
-	);
+	DotNetBuild(solutionPath, settings =>
+		settings.SetConfiguration(configuration)
+        .WithTarget("Build")
+        .WithProperty("NodeReuse", "false"));
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -260,7 +255,6 @@ Task("Test")
 	.IsDependentOn("TestAdapterUsingVSTest");
 
 Task("Package")
-	.IsDependentOn("Build")
 	.IsDependentOn("PackageZip")
 	.IsDependentOn("PackageNuGet")
 	.IsDependentOn("PackageVsix");
diff --git a/src/NUnit3TestAdapterInstall/NUnit3TestAdapterInstall.csproj b/src/NUnit3TestAdapterInstall/NUnit3TestAdapterInstall.csproj
index 84276e3..e9206e1 100644
--- a/src/NUnit3TestAdapterInstall/NUnit3TestAdapterInstall.csproj
+++ b/src/NUnit3TestAdapterInstall/NUnit3TestAdapterInstall.csproj
@@ -114,7 +114,7 @@
     <Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.25907-RC2\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.0.25907-RC2\build\Microsoft.VSSDK.BuildTools.targets'))" />
   </Target>
   <Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.0.25907-RC2\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.25907-RC2\build\Microsoft.VSSDK.BuildTools.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
diff --git a/src/NUnitTestAdapterTests/NUnit3TestAdapterTests.csproj b/src/NUnitTestAdapterTests/NUnit3TestAdapterTests.csproj
index 40d03dc..cc0bb4b 100644
--- a/src/NUnitTestAdapterTests/NUnit3TestAdapterTests.csproj
+++ b/src/NUnitTestAdapterTests/NUnit3TestAdapterTests.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
diff --git a/tools/packages.config b/tools/packages.config
index d910025..f99a0ca 100644
--- a/tools/packages.config
+++ b/tools/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
 	<package id="Cake" version="0.15.2" />
-	<package id="NUnit.ConsoleRunner" version="3.4.1" />
+	<package id="NUnit.ConsoleRunner" version="3.5.0" />
 </packages>