diff --git a/.gitignore b/.gitignore
index f38431f..30b7784 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,5 @@ source/Samples/.octopack
 _ReSharper*
 source/Samples/packages
 !source/build
+_NCrunch_*/
+*.v3.ncrunch*
diff --git a/source/OctoPack.Tasks/OctoPack.Tasks.csproj b/source/OctoPack.Tasks/OctoPack.Tasks.csproj
index 0d648de..79334a4 100644
--- a/source/OctoPack.Tasks/OctoPack.Tasks.csproj
+++ b/source/OctoPack.Tasks/OctoPack.Tasks.csproj
@@ -64,26 +64,7 @@
     <Compile Include="Util\VersionExtensions.cs" />
     <Compile Include="Util\XmlElementExtensions.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\build\OctoPack.targets">
-      <Link>OctoPack.targets</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\build\NuGet.exe">
-      <Link>NuGet.exe</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>dir
-xcopy * ..\..\..\Samples\.octopack\ /Y
-copy nuget.exe ..\..\..\Samples\.nuget\</PostBuildEvent>
-  </PropertyGroup>
   <Import Project="..\packages\GitVersionTask.3.6.2\build\portable-net+sl+win+wpa+wp\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.6.2\build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -91,7 +72,7 @@ copy nuget.exe ..\..\..\Samples\.nuget\</PostBuildEvent>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\GitVersionTask.3.6.2\build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.3.6.2\build\portable-net+sl+win+wpa+wp\GitVersionTask.targets'))" />
   </Target>
-  <!-- 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/source/OctoPack.Tests/Installation/OctoPackInstallationTests.cs b/source/OctoPack.Tests/Installation/OctoPackInstallationTests.cs
new file mode 100644
index 0000000..2bca8e2
--- /dev/null
+++ b/source/OctoPack.Tests/Installation/OctoPackInstallationTests.cs
@@ -0,0 +1,164 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using Microsoft.Build.Evaluation;
+using NUnit.Framework;
+
+namespace OctoPack.Tests.Installation
+{
+    [TestFixture]
+    public class OctoPackInstallationTests
+    {
+
+
+        public static string Root { get; private set; }
+        public static string SampleProjectDirectory { get; private set; }
+        public static string TestProjectFile { get; private set; }
+
+        [SetUp]
+        public static void SetUp()
+        {
+            Root = new Uri(typeof(OctoPackInstallationTests).Assembly.CodeBase).LocalPath;
+            while (!(Root.EndsWith("source") || Root.EndsWith("source\\")))
+            {
+                Root = Path.GetFullPath(Path.Combine(Root, "..\\"));
+            }
+
+            SampleProjectDirectory = Path.Combine(Root, "OctoPack.Tests.SampleGitVersionAssembly");
+
+            TestProjectFile = Path.Combine(SampleProjectDirectory, "OctoPack.Tests.SampleGitVersionAssembly.csproj").CreateTestProjectFile();
+        }
+
+        [TearDown]
+        public static void TearDown()
+        {
+            try
+            {
+                File.Delete(TestProjectFile);
+            }
+            catch
+            {
+                // Swallow any exception--just making an attempt to clean up after ourselves.
+            }
+        }
+
+        [Test]
+        public void ProperlyInstallsOctoPackIntoProjects()
+        {
+            var targetsFile = Path.Combine(SampleProjectDirectory, "build", "OctoPack.targets");
+
+            bool result = TestProjectFile.InstallOctoPack();
+
+            Assert.That(result, Is.True, "Failed to install OctoPack into the project file '{0}'.", TestProjectFile);
+
+            var projectCollection = new ProjectCollection();
+            var project = projectCollection.LoadProject(TestProjectFile);
+            var imports = project.Xml.Imports.Where(i => i.Project.Contains("OctoPack"));
+            var octoPackTargetsImport = imports.Last();
+            Assert.That(octoPackTargetsImport.Project, Is.StringEnding(project.GetRelativePathToFile(targetsFile)));
+        }
+
+        [Test]
+        public void ProperlyUninstallsOctoPackFromProjects()
+        {
+            TestProjectFile.InstallOctoPack();
+
+            var result = TestProjectFile.UninstallOctoPack();
+
+            var projectCollection = new ProjectCollection();
+            var project = projectCollection.LoadProject(TestProjectFile);
+
+            Assert.That(project.Xml.Imports.Count, Is.EqualTo(2), project.Xml.RawXml);
+            Assert.That(project.Xml.Imports.First().Project, Is.StringEnding("Microsoft.Common.props"));
+            Assert.That(project.Xml.Imports.Last().Project, Is.StringEnding("Microsoft.CSharp.targets"));
+        }
+    }
+
+    static class TestHelpers
+    {
+        private const string TestScript = @"& {
+                Param(
+                    [Parameter(Mandatory, Position = 0)]
+                    [string]$ProjectPath,
+                    [Parameter(Mandatory, Position = 1)]
+                    [string]$ToolsPath,
+                    [Parameter(Mandatory, Position = 2)]
+                    [ValidateSet('Install','Uninstall')]
+                    [string]$Operation
+                )
+                Add-Type -AssemblyName 'Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a';
+                $package = [PSCustomObject]@{ Id = 'OctoPack' };
+                $project = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.LoadProject($ProjectPath) |
+                    Select-Object -First 1 |
+                    Add-Member -MemberType AliasProperty -Name FullName -Value FullPath -PassThru;
+                & """"""$ToolsPath\${Operation}.ps1"""""" -toolsPath $ToolsPath -package $package -project $project;
+            }
+            ";
+
+        private const string Arguments = "-NoProfile -NonInteractive -ExecutionPolicy Unrestricted -Command \"{0}\" \"{1}\" \"{2}\" {3}";
+
+        public static string CreateTestProjectFile(this string projectFilePath)
+        {
+            var projectFileDirectory = Path.GetDirectoryName(projectFilePath);
+            var projectFileFilename = Path.GetFileNameWithoutExtension(projectFilePath);
+
+            var temporaryProjectFilePath = Path.Combine(projectFileDirectory, string.Concat(projectFileFilename, "-Temp.csproj"));
+            if (File.Exists(temporaryProjectFilePath))
+            {
+                File.Delete(temporaryProjectFilePath);
+            }
+
+            File.Copy(projectFilePath, temporaryProjectFilePath, true);
+
+            return temporaryProjectFilePath;
+        }
+
+        public static string GetRelativePathToFile(this Project project, string absolutePath)
+        {
+            return Uri.UnescapeDataString(
+                new Uri(project.FullPath, UriKind.Absolute)
+                    .MakeRelativeUri(new Uri(absolutePath, UriKind.Absolute))
+                    .ToString()
+            )
+            .Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+        }
+
+        public static bool InstallOctoPack(this string projectFilePath) => projectFilePath.ModifyProject("Install");
+
+        public static bool UninstallOctoPack(this string projectFilePath) => projectFilePath.ModifyProject("Uninstall");
+
+        private static bool ModifyProject(this string projectFilePath, string operation)
+        {
+            var toolsDirectoryPath = Path.Combine(OctoPackInstallationTests.Root, "tools");
+
+            var startInfo = new ProcessStartInfo
+            {
+                FileName = "powershell.exe",
+                Arguments = string.Format(
+                    Arguments,
+                    TestScript.Replace(Environment.NewLine, " ").Trim(),
+                    projectFilePath,
+                    toolsDirectoryPath,
+                    operation),
+                UseShellExecute = false,
+                RedirectStandardOutput = true,
+                RedirectStandardError = true,
+                WorkingDirectory = OctoPackInstallationTests.SampleProjectDirectory,
+                LoadUserProfile = false,
+                CreateNoWindow = true
+            };
+
+            var process = Process.Start(startInfo);
+            process.WaitForExit();
+            Console.Out.Write(process.StandardOutput.ReadToEnd());
+            Console.Error.Write(process.StandardError.ReadToEnd());
+
+            var exitCode = process.ExitCode;
+
+            process.Close();
+
+            return exitCode == 0;
+        }
+    }
+}
diff --git a/source/OctoPack.Tests/Integration/BuildFixture.cs b/source/OctoPack.Tests/Integration/BuildFixture.cs
index f2f9729..40bdd36 100644
--- a/source/OctoPack.Tests/Integration/BuildFixture.cs
+++ b/source/OctoPack.Tests/Integration/BuildFixture.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Text;
 using NuGet.Packaging;
 using NUnit.Framework;
@@ -99,6 +100,18 @@ protected static void Clean(string path)
         [TearDown]
         public void TearDown()
         {
+            try
+            {
+                Directory.EnumerateFiles(Path.Combine(Environment.CurrentDirectory, "Sample.TypeScriptApp", "Scripts"))
+                    .Where(f => f.EndsWith(".js") || f.EndsWith(".js.map"))
+                    .ToList()
+                    .ForEach(f => File.Delete(f));
+            }
+            catch
+            {
+                // Swallow -- make an attempt to clean up files which can cause problems across test runs.
+            }
+
             Environment.CurrentDirectory = originalDirectory;
         }
     }
diff --git a/source/OctoPack.Tests/Integration/SampleSolutionBuildFixture.cs b/source/OctoPack.Tests/Integration/SampleSolutionBuildFixture.cs
index 8a64920..81982af 100644
--- a/source/OctoPack.Tests/Integration/SampleSolutionBuildFixture.cs
+++ b/source/OctoPack.Tests/Integration/SampleSolutionBuildFixture.cs
@@ -181,6 +181,8 @@ public void ShouldSupportWeirdTeamCityStuff()
         [Test]
         public void ShouldReportOutDirPackageLocationToTeamCity()
         {
+            File.Copy("Sample.ConsoleApp\\Sample.ConsoleApp.csproj", "Sample.ConsoleApp\\Sample.ConsoleApp.csproj.teamcity", true);
+
             MsBuild("Sample.ConsoleApp\\Sample.ConsoleApp.csproj.teamcity /p:RunOctoPack=true /p:OctoPackPackageVersion=1.0.10 /p:OctoPackPublishPackagesToTeamCity=true /p:Configuration=Release /v:m",
                 output => Assert.That(output, Is.StringMatching(@"##teamcity\[publishArtifacts .*\\bin\\Release\\Sample.ConsoleApp.1.0.10.nupkg'\]")),
                 environmentVariables: new Dictionary<string, string> { { "TEAMCITY_VERSION", "10.0" } });
diff --git a/source/OctoPack.Tests/OctoPack.Tests.csproj b/source/OctoPack.Tests/OctoPack.Tests.csproj
index 414071e..d7814aa 100644
--- a/source/OctoPack.Tests/OctoPack.Tests.csproj
+++ b/source/OctoPack.Tests/OctoPack.Tests.csproj
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnitTestAdapter.2.3.0\build\NUnitTestAdapter.props" Condition="Exists('..\packages\NUnitTestAdapter.2.3.0\build\NUnitTestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{2AAFB125-1A9F-45E6-A11C-770132432F16}</ProjectGuid>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>OctoPack.Tests</RootNamespace>
@@ -37,6 +39,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Build" />
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Web.XmlTransform">
       <HintPath>..\packages\Microsoft.Web.Xdt.1.0.0\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
@@ -94,6 +97,7 @@
     <Compile Include="..\Solution Items\VersionInfo.cs">
       <Link>Properties\VersionInfo.cs</Link>
     </Compile>
+    <Compile Include="Installation\OctoPackInstallationTests.cs" />
     <Compile Include="Integration\BuildFixture.cs" />
     <Compile Include="Integration\SampleSolutionBuildFixture.cs" />
     <Compile Include="Tasks\AssemblyExtensionsTests.cs" />
@@ -103,15 +107,24 @@
     <Compile Include="Tasks\OctopusPhysicalFileSystemTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OctoPack.Tasks\OctoPack.Tasks.csproj">
       <Project>{BEF74811-0C8D-45D4-B9DE-232795A3A84D}</Project>
       <Name>OctoPack.Tasks</Name>
     </ProjectReference>
+    <ProjectReference Include="..\OctoPack.Tests.NonGitVersionAssembly\OctoPack.Tests.NonGitVersionAssembly.csproj">
+      <Project>{45d3ed88-922a-4c2f-a8ed-67722fc1e709}</Project>
+      <Name>OctoPack.Tests.NonGitVersionAssembly</Name>
+      <Private>True</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\OctoPack.Tests.SampleGitVersionAssembly\OctoPack.Tests.SampleGitVersionAssembly.csproj">
+      <Project>{7c18cb5f-1144-4476-83ce-ef387472a5f6}</Project>
+      <Name>OctoPack.Tests.SampleGitVersionAssembly</Name>
+      <Private>True</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\GitVersionTask.3.6.2\build\dotnet\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.6.2\build\dotnet\GitVersionTask.targets')" />
@@ -120,12 +133,30 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\GitVersionTask.3.6.2\build\dotnet\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.3.6.2\build\dotnet\GitVersionTask.targets'))" />
+    <Error Condition="!Exists('..\packages\NUnitTestAdapter.2.3.0\build\NUnitTestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnitTestAdapter.2.3.0\build\NUnitTestAdapter.props'))" />
   </Target>
-  <!-- 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>
   <Target Name="AfterBuild">
   </Target>
   -->
+  <PropertyGroup>
+    <BuildDependsOn>
+      $(BuildDependsOn);
+      OctoPackSlnCopyItemsForTests
+    </BuildDependsOn>
+  </PropertyGroup>
+  <Target Name="OctoPackSlnCopyItemsForTests">
+    <PropertyGroup>
+      <OctoPackSlnBuildDirectory>$(MSBuildThisFileDirectory)\..\build\</OctoPackSlnBuildDirectory>
+      <OctoPackSlnSamplesDirectory>$(MSBuildThisFileDirectory)\..\Samples\</OctoPackSlnSamplesDirectory>
+    </PropertyGroup>
+    <CreateItem Include="$(OctoPackSlnBuildDirectory)Octopack.*;$(OctoPackSlnBuildDirectory)Nuget.exe;$(OutDir)OctoPack.Tasks.dll">
+      <Output TaskParameter="Include" ItemName="OctoPackTestsFilesToCopy" />
+    </CreateItem>
+    <Copy SourceFiles="@(OctoPackTestsFilesToCopy)" DestinationFolder="$(OctoPackSlnSamplesDirectory).octopack" />
+    <Copy SourceFiles="$(OctoPackSlnBuildDirectory)Nuget.exe" DestinationFolder="$(OctoPackSlnSamplesDirectory).nuget" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/source/OctoPack.Tests/Tasks/AssemblyExtensionsTests.cs b/source/OctoPack.Tests/Tasks/AssemblyExtensionsTests.cs
index a3d1d7c..f47b8b1 100644
--- a/source/OctoPack.Tests/Tasks/AssemblyExtensionsTests.cs
+++ b/source/OctoPack.Tests/Tasks/AssemblyExtensionsTests.cs
@@ -1,6 +1,7 @@
-using System.IO;
-using System.Reflection;
+using System.Reflection;
 using NUnit.Framework;
+using GitVerAsm = OctoPack.Tests.SampleGitVersionAssembly;
+using NoGitVerAsm = OctoPack.Tests.NonGitVersionAssembly;
 
 namespace OctoPack.Tests.Tasks
 {
@@ -10,7 +11,7 @@ public class AssemblyExtensionsTests
         [Test]
         public void AssertAssemblyVersion_WhereNoGitVersionProperty_ReturnsNull()
         {
-            var assemblyPath = GetAssemblyFullPath("OctoPack.Tests.NonGitVersionAssembly");
+            var assemblyPath = Assembly.GetAssembly(typeof(NoGitVerAsm.ClassReferencingDependency)).FullLocalPath();
             var gitversion = AssemblyExtensions.GetNuGetVersionFromGitVersionInformation(assemblyPath);
             Assert.That(gitversion, Is.Null);
         }
@@ -18,36 +19,17 @@ public void AssertAssemblyVersion_WhereNoGitVersionProperty_ReturnsNull()
         [Test]
         public void AssertAssemblyVersion_WhereDependentAssemblyOnlyInSource_GetsGitVersion()
         {
-            var assemblyPath = GetAssemblyFullPath("OctoPack.Tests.SampleGitVersionAssembly");
+            var assemblyPath = Assembly.GetAssembly(typeof(GitVerAsm.ClassReferencingDependency)).FullLocalPath();
             var gitversion = AssemblyExtensions.GetNuGetVersionFromGitVersionInformation(assemblyPath);
             Assert.That(gitversion, Is.EqualTo("1.1.1-tests"));
         }
 
         [Test]
-        public void AssertAssembly_WhereDependentAssemblyNotEventInSource_GetsGitVersion()
+        public void AssertAssembly_WhereDependentAssemblyNotEvenInSource_GetsGitVersion()
         {
-            var assemblyPath = GetAssemblyFullExceptionPath("OctoPack.Tests.SampleGitVersionAssembly");
+            var assemblyPath = Assembly.GetAssembly(typeof(GitVerAsm.ClassReferencingDependency)).FullLocalPath();
             var gitversion = AssemblyExtensions.GetNuGetVersionFromGitVersionInformation(assemblyPath);
             Assert.That(gitversion, Is.EqualTo("1.1.1-tests"));
         }
-
-        private string GetAsseblyLocation(string name)
-        {
-            var currentAssemblyPath = Assembly.GetExecutingAssembly().FullLocalPath();
-            var configuration = new FileInfo(currentAssemblyPath).Directory.Name;
-            return Path.Combine(currentAssemblyPath, "..", "..", "..", "..", name, "bin", configuration);
-        }
-
-        private string GetAssemblyFullPath(string name)
-        {
-            var assemblyPath = Path.Combine(GetAsseblyLocation(name), $"{name}.dll");
-            return new FileInfo(assemblyPath).FullName;
-        }
-
-        private string GetAssemblyFullExceptionPath(string name)
-        {
-            var assemblyPath = Path.Combine(GetAsseblyLocation(name), "StandAloneDll", $"{ name}.dll");
-            return new FileInfo(assemblyPath).FullName;
-        }
     }
 }
\ No newline at end of file
diff --git a/source/OctoPack.Tests/packages.config b/source/OctoPack.Tests/packages.config
index 724079a..c43f005 100644
--- a/source/OctoPack.Tests/packages.config
+++ b/source/OctoPack.Tests/packages.config
@@ -11,4 +11,5 @@
   <package id="NuGet.Packaging.Core.Types" version="3.4.3" targetFramework="net45" />
   <package id="NuGet.Versioning" version="3.4.3" targetFramework="net45" />
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
-</packages>
\ No newline at end of file
+  <package id="NUnitTestAdapter" version="2.3.0" targetFramework="net45" />
+</packages>
diff --git a/source/OctoPack.sln b/source/OctoPack.sln
index 1af2e04..a79c5fb 100644
--- a/source/OctoPack.sln
+++ b/source/OctoPack.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.12
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30320.27
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OctoPack.Tasks", "OctoPack.Tasks\OctoPack.Tasks.csproj", "{BEF74811-0C8D-45D4-B9DE-232795A3A84D}"
 EndProject
@@ -26,6 +26,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OctoPack.Tests.SampleDllDependency", "OctoPack.Tests.SampleDllDependency\OctoPack.Tests.SampleDllDependency.csproj", "{58CAD859-2241-4750-8A32-932166129F72}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OctoPack.Tests.SampleExeDependency", "OctoPack.Tests.SampleExeDependency\OctoPack.Tests.SampleExeDependency.csproj", "{5DCD7348-929B-42BE-A1CD-5DDA91C6477B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -52,6 +54,10 @@ Global
 		{58CAD859-2241-4750-8A32-932166129F72}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{58CAD859-2241-4750-8A32-932166129F72}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{58CAD859-2241-4750-8A32-932166129F72}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5DCD7348-929B-42BE-A1CD-5DDA91C6477B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5DCD7348-929B-42BE-A1CD-5DDA91C6477B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5DCD7348-929B-42BE-A1CD-5DDA91C6477B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5DCD7348-929B-42BE-A1CD-5DDA91C6477B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/source/Samples/.gitignore b/source/Samples/.gitignore
new file mode 100644
index 0000000..42abb80
--- /dev/null
+++ b/source/Samples/.gitignore
@@ -0,0 +1,3 @@
+*.csproj.teamcity
+*.js
+*.js.map
diff --git a/source/Samples/Sample.ConsoleApp/Sample.ConsoleApp.csproj.teamcity b/source/Samples/Sample.ConsoleApp/Sample.ConsoleApp.csproj.teamcity
deleted file mode 100644
index eccf369..0000000
--- a/source/Samples/Sample.ConsoleApp/Sample.ConsoleApp.csproj.teamcity
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{77368AC2-07C1-4EB9-9575-327823B2240F}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Sample.ConsoleApp</RootNamespace>
-    <AssemblyName>Sample.ConsoleApp</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Sample.ConsoleApp2\App.config">
-      <Link>App.config</Link>
-    </None>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <Import Project="..\.octopack\Octopack.targets" />
-</Project>
\ No newline at end of file
diff --git a/source/Samples/Sample.ConsoleAppWithGitVersion/Sample.ConsoleAppWithGitVersion.csproj.teamcity b/source/Samples/Sample.ConsoleAppWithGitVersion/Sample.ConsoleAppWithGitVersion.csproj.teamcity
deleted file mode 100644
index 8a65c88..0000000
--- a/source/Samples/Sample.ConsoleAppWithGitVersion/Sample.ConsoleAppWithGitVersion.csproj.teamcity
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{77368AC2-07C1-4EB9-9575-327823B2240F}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Sample.ConsoleAppWithGitVersion</RootNamespace>
-    <AssemblyName>Sample.ConsoleAppWithGitVersion</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Sample.ConsoleAppWithGitVersion2\App.config">
-      <Link>App.config</Link>
-    </None>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <Import Project="..\.octopack\Octopack.targets" />
-</Project>
\ No newline at end of file
diff --git a/source/Samples/Sample.ConsoleAppWithNamespacedGitVersion/Sample.ConsoleAppWithNamespacedGitVersion.csproj.teamcity b/source/Samples/Sample.ConsoleAppWithNamespacedGitVersion/Sample.ConsoleAppWithNamespacedGitVersion.csproj.teamcity
deleted file mode 100644
index 8a65c88..0000000
--- a/source/Samples/Sample.ConsoleAppWithNamespacedGitVersion/Sample.ConsoleAppWithNamespacedGitVersion.csproj.teamcity
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{77368AC2-07C1-4EB9-9575-327823B2240F}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Sample.ConsoleAppWithGitVersion</RootNamespace>
-    <AssemblyName>Sample.ConsoleAppWithGitVersion</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Sample.ConsoleAppWithGitVersion2\App.config">
-      <Link>App.config</Link>
-    </None>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <Import Project="..\.octopack\Octopack.targets" />
-</Project>
\ No newline at end of file
diff --git a/source/Samples/Sample.TypeScriptApp/Scripts/MyTypedScript.UI.js b/source/Samples/Sample.TypeScriptApp/Scripts/MyTypedScript.UI.js
deleted file mode 100644
index eab30d2..0000000
--- a/source/Samples/Sample.TypeScriptApp/Scripts/MyTypedScript.UI.js
+++ /dev/null
@@ -1,4 +0,0 @@
-function greeter2(person) {
-    return "Hello, " + person.firstname + " " + person.lastname;
-}
-var user = { firstname: "Jane", lastname: "User" };
diff --git a/source/Samples/Sample.TypeScriptApp/Scripts/MyTypedScript.UI.js.map b/source/Samples/Sample.TypeScriptApp/Scripts/MyTypedScript.UI.js.map
deleted file mode 100644
index 90cfb3f..0000000
--- a/source/Samples/Sample.TypeScriptApp/Scripts/MyTypedScript.UI.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"MyTypedScript.UI.js","sourceRoot":"","sources":["MyTypedScript.UI.ts"],"names":["greeter2"],"mappings":"AAKA,SAAS,QAAQ,CAAC,MAAc;IAC5BA,MAAMA,CAACA,SAASA,GAAGA,MAAMA,CAACA,SAASA,GAAGA,GAAGA,GAAGA,MAAMA,CAACA,QAAQA,CAACA;AAChEA,CAACA;AAED,IAAI,IAAI,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC"}
\ No newline at end of file
diff --git a/source/Samples/Sample.TypeScriptApp/Scripts/MyTypedScript.js b/source/Samples/Sample.TypeScriptApp/Scripts/MyTypedScript.js
deleted file mode 100644
index 184af89..0000000
--- a/source/Samples/Sample.TypeScriptApp/Scripts/MyTypedScript.js
+++ /dev/null
@@ -1,4 +0,0 @@
-function greeter(person) {
-    return "Hello, " + person.firstname + " " + person.lastname;
-}
-var user = { firstname: "Jane", lastname: "User" };
diff --git a/source/Samples/Sample.TypeScriptApp/Scripts/MyTypedScript.js.map b/source/Samples/Sample.TypeScriptApp/Scripts/MyTypedScript.js.map
deleted file mode 100644
index 09fd2c2..0000000
--- a/source/Samples/Sample.TypeScriptApp/Scripts/MyTypedScript.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"MyTypedScript.js","sourceRoot":"","sources":["MyTypedScript.ts"],"names":["greeter"],"mappings":"AAKA,SAAS,OAAO,CAAC,MAAc;IAC3BA,MAAMA,CAACA,SAASA,GAAGA,MAAMA,CAACA,SAASA,GAAGA,GAAGA,GAAGA,MAAMA,CAACA,QAAQA,CAACA;AAChEA,CAACA;AAED,IAAI,IAAI,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC"}
\ No newline at end of file
diff --git a/source/packages/NUnitTestAdapter.2.3.0/.signature.p7s b/source/packages/NUnitTestAdapter.2.3.0/.signature.p7s
new file mode 100644
index 0000000..8682e6c
Binary files /dev/null and b/source/packages/NUnitTestAdapter.2.3.0/.signature.p7s differ
diff --git a/source/packages/NUnitTestAdapter.2.3.0/LICENSE.txt b/source/packages/NUnitTestAdapter.2.3.0/LICENSE.txt
new file mode 100644
index 0000000..68da1e1
--- /dev/null
+++ b/source/packages/NUnitTestAdapter.2.3.0/LICENSE.txt
@@ -0,0 +1,21 @@
+Copyright (c) 2011-2020 Charlie Poole
+Copyright (c) 2014-2020 Terje Sandstrom
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff --git a/source/packages/NUnitTestAdapter.2.3.0/NUnitTestAdapter.2.3.0.nupkg b/source/packages/NUnitTestAdapter.2.3.0/NUnitTestAdapter.2.3.0.nupkg
new file mode 100644
index 0000000..06a139c
Binary files /dev/null and b/source/packages/NUnitTestAdapter.2.3.0/NUnitTestAdapter.2.3.0.nupkg differ
diff --git a/source/packages/NUnitTestAdapter.2.3.0/build/Mono.Cecil.Mdb.dll b/source/packages/NUnitTestAdapter.2.3.0/build/Mono.Cecil.Mdb.dll
new file mode 100644
index 0000000..1f03289
Binary files /dev/null and b/source/packages/NUnitTestAdapter.2.3.0/build/Mono.Cecil.Mdb.dll differ
diff --git a/source/packages/NUnitTestAdapter.2.3.0/build/Mono.Cecil.Pdb.dll b/source/packages/NUnitTestAdapter.2.3.0/build/Mono.Cecil.Pdb.dll
new file mode 100644
index 0000000..0c4dd59
Binary files /dev/null and b/source/packages/NUnitTestAdapter.2.3.0/build/Mono.Cecil.Pdb.dll differ
diff --git a/source/packages/NUnitTestAdapter.2.3.0/build/Mono.Cecil.Rocks.dll b/source/packages/NUnitTestAdapter.2.3.0/build/Mono.Cecil.Rocks.dll
new file mode 100644
index 0000000..0f37b8c
Binary files /dev/null and b/source/packages/NUnitTestAdapter.2.3.0/build/Mono.Cecil.Rocks.dll differ
diff --git a/source/packages/NUnitTestAdapter.2.3.0/build/Mono.Cecil.dll b/source/packages/NUnitTestAdapter.2.3.0/build/Mono.Cecil.dll
new file mode 100644
index 0000000..9dc7206
Binary files /dev/null and b/source/packages/NUnitTestAdapter.2.3.0/build/Mono.Cecil.dll differ
diff --git a/source/packages/NUnitTestAdapter.2.3.0/build/NUnit.VisualStudio.TestAdapter.dll b/source/packages/NUnitTestAdapter.2.3.0/build/NUnit.VisualStudio.TestAdapter.dll
new file mode 100644
index 0000000..85b535b
Binary files /dev/null and b/source/packages/NUnitTestAdapter.2.3.0/build/NUnit.VisualStudio.TestAdapter.dll differ
diff --git a/source/packages/NUnitTestAdapter.2.3.0/build/NUnitTestAdapter.props b/source/packages/NUnitTestAdapter.2.3.0/build/NUnitTestAdapter.props
new file mode 100644
index 0000000..358a19e
--- /dev/null
+++ b/source/packages/NUnitTestAdapter.2.3.0/build/NUnitTestAdapter.props
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ItemGroup>
+        <Content Include="$(MSBuildThisFileDirectory)NUnit.VisualStudio.TestAdapter.dll">
+            <Link>NUnit.VisualStudio.TestAdapter.dll</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Visible>False</Visible>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)Mono.Cecil.dll" >
+            <Link>Mono.Cecil.dll</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Visible>False</Visible>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)Mono.Cecil.Mdb.dll" >
+            <Link>Mono.Cecil.Mdb.dll</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Visible>False</Visible>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)Mono.Cecil.Pdb.dll" >
+            <Link>Mono.Cecil.Pdb.dll</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Visible>False</Visible>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)Mono.Cecil.Rocks.dll" >
+            <Link>Mono.Cecil.Rocks.dll</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Visible>False</Visible>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)nunit.core.dll">
+            <Link>nunit.core.dll</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Visible>False</Visible>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)nunit.core.interfaces.dll">
+            <Link>nunit.core.interfaces.dll</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Visible>False</Visible>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)nunit.util.dll">
+            <Link>nunit.util.dll</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Visible>False</Visible>
+        </Content>
+     </ItemGroup>
+</Project>
+
diff --git a/source/packages/NUnitTestAdapter.2.3.0/build/nunit.core.dll b/source/packages/NUnitTestAdapter.2.3.0/build/nunit.core.dll
new file mode 100644
index 0000000..0c375b8
Binary files /dev/null and b/source/packages/NUnitTestAdapter.2.3.0/build/nunit.core.dll differ
diff --git a/source/packages/NUnitTestAdapter.2.3.0/build/nunit.core.interfaces.dll b/source/packages/NUnitTestAdapter.2.3.0/build/nunit.core.interfaces.dll
new file mode 100644
index 0000000..be28783
Binary files /dev/null and b/source/packages/NUnitTestAdapter.2.3.0/build/nunit.core.interfaces.dll differ
diff --git a/source/packages/NUnitTestAdapter.2.3.0/build/nunit.util.dll b/source/packages/NUnitTestAdapter.2.3.0/build/nunit.util.dll
new file mode 100644
index 0000000..dd915a6
Binary files /dev/null and b/source/packages/NUnitTestAdapter.2.3.0/build/nunit.util.dll differ
diff --git a/source/tools/Install.ps1 b/source/tools/Install.ps1
index f7f330e..2928684 100644
--- a/source/tools/Install.ps1
+++ b/source/tools/Install.ps1
@@ -3,16 +3,16 @@ param($installPath, $toolsPath, $package, $project)
 	$buildPath = '..\build'
     $targetsFile = [System.IO.Path]::Combine($toolsPath, $buildPath, $package.Id + '.targets')
 	$targetsFile = [System.IO.Path]::GetFullPath($targetsFile)
- 
+
     # Need to load MSBuild assembly if it's not loaded yet.
     Add-Type -AssemblyName 'Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
 
     # Grab the loaded MSBuild project for the project
     $msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
 
-	#Short circuit if OctoPack has already been installed (this could be by convention in newer versions of NuGet)
+	# Short circuit if OctoPack has already been installed (this could be by convention in newer versions of NuGet)
 	$existingImports = @()
-	$existingImports = $existingImports += $msbuild.Xml.Imports | Where-Object { $_.Project.EndsWith($package.Id + '.targets') }
+	$existingImports = $existingImports += $msbuild.Xml.Imports | Where-Object { $_.Project -imatch "$($package.Id)\.targets`$" }
 	if ($existingImports -and $existingImports.length)
 	{
 		Write-Host "It looks like OctoPack has been installed, skipping Install.ps1"
@@ -20,10 +20,11 @@ param($installPath, $toolsPath, $package, $project)
 	}
 
     # Make the path to the targets file relative.
-    $projectUri = new-object Uri($project.FullName, [System.UriKind]::Absolute)
+    $projectUri = new-object Uri -ArgumentList $project.FullName, [System.UriKind]::Absolute
+
     $targetUri = new-object Uri($targetsFile, [System.UriKind]::Absolute)
     $relativePath = [System.Uri]::UnescapeDataString($projectUri.MakeRelativeUri($targetUri).ToString()).Replace([System.IO.Path]::AltDirectorySeparatorChar, [System.IO.Path]::DirectorySeparatorChar)
- 
+
     # Add the import with a condition, to allow the project to load without the targets present.
     $import = $msbuild.Xml.AddImport($relativePath)
     $import.Condition = "Exists('$relativePath')"
diff --git a/source/tools/Uninstall.ps1 b/source/tools/Uninstall.ps1
index b635c33..62faa74 100644
--- a/source/tools/Uninstall.ps1
+++ b/source/tools/Uninstall.ps1
@@ -1,5 +1,5 @@
 param($installPath, $toolsPath, $package, $project)
- 
+
   # Need to load MSBuild assembly if it's not loaded yet.
   Add-Type -AssemblyName 'Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
 
@@ -10,41 +10,37 @@ param($installPath, $toolsPath, $package, $project)
   $itemsToRemove = @()
 
   # Allow many in case a past package was incorrectly uninstalled
-  $itemsToRemove += $msbuild.Xml.Imports | Where-Object { $_.Project.EndsWith($package.Id + '.targets') }
+  $itemsToRemove += $msbuild.Xml.Imports | Where-Object { $_.Project -imatch "$($package.Id)\.targets`$" }
   $itemsToRemove += $msbuild.Xml.Targets | Where-Object { $_.Name -eq "EnsureOctoPackImported" }
-  
+
   $saveProject = $false
 
   # Remove the elements and save the project
   $saveProject = ($itemsToRemove -and $itemsToRemove.length)
-  foreach ($itemToRemove in $itemsToRemove)
-  {
-	 $msbuild.Xml.RemoveChild($itemToRemove) | out-null
-  }
-
-  $targetImports = @()
-  $targetImports += $msbuild.Xml.Targets | Where-Object { $_.Name -eq "EnsureNuGetPackageBuildImports" }
-  foreach ($targetImport in $targetImports)
-  {
-	$targetImportsToRemove = @()
-	$targetImportsToRemove += $targetImports.Children | Where-Object { $_.Condition.Contains($package.Id + '.targets') }
+  $itemsToRemove | ForEach-Object { <#$null = #> $msbuild.Xml.RemoveChild($_) }
 
-	$saveProject = $saveProject -or ($targetImportsToRemove -and $targetImportsToRemove.length)
-	foreach ($targetImport in $targetImportsToRemove)
-	{
-		$targetImports.RemoveChild($targetImport)
-	}
-  }
+  $msbuild.Xml.Targets |
+      Where-Object { $_.Name -eq "EnsureNuGetPackageBuildImports" } |
+      ForEach-Object {
+          $target = $_;
+          $target.Children |
+              Where-Object { $_.Condition -imatch "$($package.Id)\.targets" } |
+              ForEach-Object {
+                  # This only gets evaluated if the collection has items to enumerate over...
+                  if (!$saveProject) { $saveProject = $true }
+                  $target.RemoveChild($_)
+              }
+      }
 
   if ($saveProject)
   {
-     $isFSharpProject = ($project.Type -eq "F#")
-     if ($isFSharpProject)
-     {
-         $project.Save("")
-     }
-     else
-     {
-         $project.Save()
-     }
+      $isFSharpProject = ($project.Type -eq "F#")
+      if ($isFSharpProject)
+      {
+          $project.Save("")
+      }
+      else
+      {
+          $project.Save()
+      }
   }
\ No newline at end of file