From 4f8b7b72bb729b9567c309d84b9108f2e56062a6 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@gmail.com>
Date: Fri, 20 Oct 2017 14:12:07 +0100
Subject: [PATCH 01/11] Update to NUnit.ConsoleRunner 3.7.0

---
 scripts/Run-NUnit.ps1                    | 8 ++++----
 test/GitHub.UI.UnitTests/packages.config | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/Run-NUnit.ps1 b/scripts/Run-NUnit.ps1
index 804696062d..24a49befee 100644
--- a/scripts/Run-NUnit.ps1
+++ b/scripts/Run-NUnit.ps1
@@ -22,8 +22,8 @@ Push-Location $rootDirectory
 $dll = "src\$Project\bin\$Configuration\$Project.dll"
 
 if ($AppVeyor) {
-    $nunitDirectory = Join-Path $rootDirectory packages\NUnit.Runners.2.6.4\tools
-    $consoleRunner = Join-Path $nunitDirectory nunit-console-x86.exe
+    $nunitDirectory = Join-Path $rootDirectory packages\NUnit.ConsoleRunner.3.7.0\tools
+    $consoleRunner = Join-Path $nunitDirectory nunit3-console.exe
     $args = "-noshadow", "-framework:net-4.5", "-exclude:Timings", $dll
     [object[]] $output = "$consoleRunner " + ($args -join " ")
     & $consoleRunner ($args | %{ "`"$_`"" })
@@ -31,8 +31,8 @@ if ($AppVeyor) {
         $host.SetShouldExit($LastExitCode)
     }
 } else {
-    $nunitDirectory = Join-Path $rootDirectory packages\NUnit.Runners.2.6.4\tools
-    $consoleRunner = Join-Path $nunitDirectory nunit-console-x86.exe
+    $nunitDirectory = Join-Path $rootDirectory packages\NUnit.ConsoleRunner.3.7.0\tools
+    $consoleRunner = Join-Path $nunitDirectory nunit3-console.exe
 
     $xml = Join-Path $rootDirectory "nunit-$Project.xml"
     $outputPath = [System.IO.Path]::GetTempFileName()
diff --git a/test/GitHub.UI.UnitTests/packages.config b/test/GitHub.UI.UnitTests/packages.config
index 7265b3ce6e..13411d720b 100644
--- a/test/GitHub.UI.UnitTests/packages.config
+++ b/test/GitHub.UI.UnitTests/packages.config
@@ -2,4 +2,5 @@
 <packages>
   <package id="NSubstitute" version="2.0.2" targetFramework="net461" />
   <package id="NUnit" version="3.6.1" targetFramework="net461" />
+  <package id="NUnit.ConsoleRunner" version="3.7.0" targetFramework="net461" />
 </packages>
\ No newline at end of file

From f224cbd905743b45b4db87a7fd87d2dd211ceaef Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@gmail.com>
Date: Fri, 20 Oct 2017 14:35:03 +0100
Subject: [PATCH 02/11] Update to NUnit 3.6.1 and NUnit3TestAdapter

Recent version that doesn't require extensive code changes.
---
 .../TrackingCollectionTests.cs                |  4 +--
 .../TrackingCollectionTests.csproj            | 27 +++++++------------
 src/TrackingCollectionTests/packages.config   |  6 ++---
 .../GitHub.UI.UnitTests.csproj                |  3 +++
 4 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/TrackingCollectionTests/TrackingCollectionTests.cs b/src/TrackingCollectionTests/TrackingCollectionTests.cs
index e64f0166f6..a618744a9e 100644
--- a/src/TrackingCollectionTests/TrackingCollectionTests.cs
+++ b/src/TrackingCollectionTests/TrackingCollectionTests.cs
@@ -1980,7 +1980,7 @@ public void RemovingWithNoObservableSetThrows()
     }
 
     [Test]
-    public async void AddingBeforeSubscribingWorks()
+    public async Task AddingBeforeSubscribingWorks()
     {
         ITrackingCollection<Thing> col = new TrackingCollection<Thing>(Observable.Empty<Thing>());
         ReplaySubject<Thing> done = new ReplaySubject<Thing>();
@@ -1993,7 +1993,7 @@ public async void AddingBeforeSubscribingWorks()
             done.OnNext(t);
             if (++count == 2)
                 done.OnCompleted();
-        }, () => {});
+        }, () => { });
 
         await Observable.Timeout(done, TimeSpan.FromMilliseconds(500));
         Assert.AreEqual(2, col.Count);
diff --git a/src/TrackingCollectionTests/TrackingCollectionTests.csproj b/src/TrackingCollectionTests/TrackingCollectionTests.csproj
index cb49396df4..03bc8132eb 100644
--- a/src/TrackingCollectionTests/TrackingCollectionTests.csproj
+++ b/src/TrackingCollectionTests/TrackingCollectionTests.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props')" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
@@ -42,26 +43,10 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="nunit.core.interfaces, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="NUnit.VisualStudio.TestAdapter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=62aa029873c516b4, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Rx-Core.2.2.5-custom\lib\net45\System.Reactive.Core.dll</HintPath>
@@ -151,6 +136,12 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <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\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props'))" />
+  </Target>
   <!-- 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">
diff --git a/src/TrackingCollectionTests/packages.config b/src/TrackingCollectionTests/packages.config
index 54b07dd61f..efc5599724 100644
--- a/src/TrackingCollectionTests/packages.config
+++ b/src/TrackingCollectionTests/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="2.6.4" targetFramework="net452" />
-  <package id="NUnit.Runners" version="2.6.4" targetFramework="net452" />
-  <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net452" />
+  <package id="NUnit" version="3.6.1" targetFramework="net461" />
+  <package id="NUnit.ConsoleRunner" version="3.7.0" targetFramework="net461" />
+  <package id="NUnit3TestAdapter" version="3.8.0" targetFramework="net461" />
   <package id="Rx-Core" version="2.2.5-custom" targetFramework="net452" />
   <package id="Rx-Interfaces" version="2.2.5-custom" targetFramework="net452" />
   <package id="Rx-Linq" version="2.2.5-custom" targetFramework="net452" />
diff --git a/test/GitHub.UI.UnitTests/GitHub.UI.UnitTests.csproj b/test/GitHub.UI.UnitTests/GitHub.UI.UnitTests.csproj
index 6c7e8314a0..8e76c3ace3 100644
--- a/test/GitHub.UI.UnitTests/GitHub.UI.UnitTests.csproj
+++ b/test/GitHub.UI.UnitTests/GitHub.UI.UnitTests.csproj
@@ -88,6 +88,9 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </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.

From 04289fff1611e1281544c29be08031b1cc412fba Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@gmail.com>
Date: Fri, 20 Oct 2017 14:42:54 +0100
Subject: [PATCH 03/11] Move `TrackingCollectionTests` to `test` directory

---
 GitHubVS.sln                                                | 2 +-
 {src => test}/TrackingCollectionTests/ITestOutputHelper.cs  | 0
 .../TrackingCollectionTests/ListenerCollectionTests.cs      | 0
 .../TrackingCollectionTests/Properties/AssemblyInfo.cs      | 0
 {src => test}/TrackingCollectionTests/TestBase.cs           | 0
 {src => test}/TrackingCollectionTests/Thing.cs              | 0
 .../TrackingCollectionTests/TrackingCollectionTests.cs      | 0
 .../TrackingCollectionTests/TrackingCollectionTests.csproj  | 6 +++---
 {src => test}/TrackingCollectionTests/packages.config       | 0
 9 files changed, 4 insertions(+), 4 deletions(-)
 rename {src => test}/TrackingCollectionTests/ITestOutputHelper.cs (100%)
 rename {src => test}/TrackingCollectionTests/ListenerCollectionTests.cs (100%)
 rename {src => test}/TrackingCollectionTests/Properties/AssemblyInfo.cs (100%)
 rename {src => test}/TrackingCollectionTests/TestBase.cs (100%)
 rename {src => test}/TrackingCollectionTests/Thing.cs (100%)
 rename {src => test}/TrackingCollectionTests/TrackingCollectionTests.cs (100%)
 rename {src => test}/TrackingCollectionTests/TrackingCollectionTests.csproj (96%)
 rename {src => test}/TrackingCollectionTests/packages.config (100%)

diff --git a/GitHubVS.sln b/GitHubVS.sln
index 7f6a1bbe38..5507e5b9f8 100644
--- a/GitHubVS.sln
+++ b/GitHubVS.sln
@@ -95,7 +95,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CredentialManagement", "src
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Testing_Net45", "submodules\reactiveui\ReactiveUI.Testing\ReactiveUI.Testing_Net45.csproj", "{DD99FD0F-82F6-4C30-930E-4A1D0DF01D65}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrackingCollectionTests", "src\TrackingCollectionTests\TrackingCollectionTests.csproj", "{7B835A7D-CF94-45E8-B191-96F5A4FE26A8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrackingCollectionTests", "test\TrackingCollectionTests\TrackingCollectionTests.csproj", "{7B835A7D-CF94-45E8-B191-96F5A4FE26A8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.TeamFoundation.14", "src\GitHub.TeamFoundation.14\GitHub.TeamFoundation.14.csproj", "{161DBF01-1DBF-4B00-8551-C5C00F26720D}"
 EndProject
diff --git a/src/TrackingCollectionTests/ITestOutputHelper.cs b/test/TrackingCollectionTests/ITestOutputHelper.cs
similarity index 100%
rename from src/TrackingCollectionTests/ITestOutputHelper.cs
rename to test/TrackingCollectionTests/ITestOutputHelper.cs
diff --git a/src/TrackingCollectionTests/ListenerCollectionTests.cs b/test/TrackingCollectionTests/ListenerCollectionTests.cs
similarity index 100%
rename from src/TrackingCollectionTests/ListenerCollectionTests.cs
rename to test/TrackingCollectionTests/ListenerCollectionTests.cs
diff --git a/src/TrackingCollectionTests/Properties/AssemblyInfo.cs b/test/TrackingCollectionTests/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/TrackingCollectionTests/Properties/AssemblyInfo.cs
rename to test/TrackingCollectionTests/Properties/AssemblyInfo.cs
diff --git a/src/TrackingCollectionTests/TestBase.cs b/test/TrackingCollectionTests/TestBase.cs
similarity index 100%
rename from src/TrackingCollectionTests/TestBase.cs
rename to test/TrackingCollectionTests/TestBase.cs
diff --git a/src/TrackingCollectionTests/Thing.cs b/test/TrackingCollectionTests/Thing.cs
similarity index 100%
rename from src/TrackingCollectionTests/Thing.cs
rename to test/TrackingCollectionTests/Thing.cs
diff --git a/src/TrackingCollectionTests/TrackingCollectionTests.cs b/test/TrackingCollectionTests/TrackingCollectionTests.cs
similarity index 100%
rename from src/TrackingCollectionTests/TrackingCollectionTests.cs
rename to test/TrackingCollectionTests/TrackingCollectionTests.cs
diff --git a/src/TrackingCollectionTests/TrackingCollectionTests.csproj b/test/TrackingCollectionTests/TrackingCollectionTests.csproj
similarity index 96%
rename from src/TrackingCollectionTests/TrackingCollectionTests.csproj
rename to test/TrackingCollectionTests/TrackingCollectionTests.csproj
index 03bc8132eb..84514567c2 100644
--- a/src/TrackingCollectionTests/TrackingCollectionTests.csproj
+++ b/test/TrackingCollectionTests/TrackingCollectionTests.csproj
@@ -103,15 +103,15 @@
       <Project>{252ce1c2-027a-4445-a3c2-e4d6c80a935a}</Project>
       <Name>Splat-Net45</Name>
     </ProjectReference>
-    <ProjectReference Include="..\GitHub.Exports.Reactive\GitHub.Exports.Reactive.csproj">
+    <ProjectReference Include="..\..\src\GitHub.Exports.Reactive\GitHub.Exports.Reactive.csproj">
       <Project>{e4ed0537-d1d9-44b6-9212-3096d7c3f7a1}</Project>
       <Name>GitHub.Exports.Reactive</Name>
     </ProjectReference>
-    <ProjectReference Include="..\GitHub.Exports\GitHub.Exports.csproj">
+    <ProjectReference Include="..\..\src\GitHub.Exports\GitHub.Exports.csproj">
       <Project>{9aea02db-02b5-409c-b0ca-115d05331a6b}</Project>
       <Name>GitHub.Exports</Name>
     </ProjectReference>
-    <ProjectReference Include="..\GitHub.Extensions\GitHub.Extensions.csproj">
+    <ProjectReference Include="..\..\src\GitHub.Extensions\GitHub.Extensions.csproj">
       <Project>{6afe2e2d-6db0-4430-a2ea-f5f5388d2f78}</Project>
       <Name>GitHub.Extensions</Name>
     </ProjectReference>
diff --git a/src/TrackingCollectionTests/packages.config b/test/TrackingCollectionTests/packages.config
similarity index 100%
rename from src/TrackingCollectionTests/packages.config
rename to test/TrackingCollectionTests/packages.config

From 9c764afaee6db48010b7345653cbdff7067ea90c Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@gmail.com>
Date: Fri, 20 Oct 2017 15:21:42 +0100
Subject: [PATCH 04/11] Execute test projects form `test` directory

---
 scripts/Run-NUnit.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Run-NUnit.ps1 b/scripts/Run-NUnit.ps1
index 24a49befee..c27fb0298f 100644
--- a/scripts/Run-NUnit.ps1
+++ b/scripts/Run-NUnit.ps1
@@ -19,7 +19,7 @@ Param(
 
 $rootDirectory = Split-Path (Split-Path $MyInvocation.MyCommand.Path)
 Push-Location $rootDirectory
-$dll = "src\$Project\bin\$Configuration\$Project.dll"
+$dll = "test\$Project\bin\$Configuration\$Project.dll"
 
 if ($AppVeyor) {
     $nunitDirectory = Join-Path $rootDirectory packages\NUnit.ConsoleRunner.3.7.0\tools

From e973a30638d13c1329890ec4d9bebe7316eec4a5 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@gmail.com>
Date: Fri, 20 Oct 2017 15:22:48 +0100
Subject: [PATCH 05/11] Update script for NUnit.ConsoleRunner.3.7.0 arguments

---
 scripts/Run-NUnit.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Run-NUnit.ps1 b/scripts/Run-NUnit.ps1
index c27fb0298f..b41c488552 100644
--- a/scripts/Run-NUnit.ps1
+++ b/scripts/Run-NUnit.ps1
@@ -37,7 +37,7 @@ if ($AppVeyor) {
     $xml = Join-Path $rootDirectory "nunit-$Project.xml"
     $outputPath = [System.IO.Path]::GetTempFileName()
 
-    $args = "-noshadow", "-xml:$xml", "-framework:net-4.5", "-exclude:Timings", $dll
+    $args = "--result=$xml", "--framework:net-4.5", "--where:cat!=Timings", $dll
     [object[]] $output = "$consoleRunner " + ($args -join " ")
 
     $process = Start-Process -PassThru -NoNewWindow -RedirectStandardOutput $outputPath $consoleRunner ($args | %{ "`"$_`"" })

From 77d0409ecd0e2c8baa656b85ff72d262462788a3 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@gmail.com>
Date: Fri, 20 Oct 2017 15:44:34 +0100
Subject: [PATCH 06/11] Execute xUnit tests from `test` directory

---
 scripts/Run-XUnit.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Run-XUnit.ps1 b/scripts/Run-XUnit.ps1
index 58170208be..009dcfdaa9 100644
--- a/scripts/Run-XUnit.ps1
+++ b/scripts/Run-XUnit.ps1
@@ -20,7 +20,7 @@ Param(
 $rootDirectory = Split-Path (Split-Path $MyInvocation.MyCommand.Path)
 Push-Location $rootDirectory
 
-$dll = "src\$Project\bin\$Configuration\$Project.dll"
+$dll = "test\$Project\bin\$Configuration\$Project.dll"
 
 if ($AppVeyor) {
     $xunitDirectory = Join-Path $rootDirectory packages\xunit.runner.console.2.1.0\tools

From c024b284a6de3d6a9e1d73988b46398b5679dbfa Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@gmail.com>
Date: Fri, 20 Oct 2017 15:48:45 +0100
Subject: [PATCH 07/11] Move `UnitTests` project to `test` directory

---
 GitHubVS.sln                                  |  2 +-
 {src => test}/UnitTests/Args.cs               |  0
 {src => test}/UnitTests/FodyWeavers.xml       |  0
 .../UnitTests/GitHub.Api/LoginManagerTests.cs |  0
 .../GitHub.Api/SimpleApiClientFactoryTests.cs |  0
 .../GitHub.Api/SimpleApiClientTests.cs        |  0
 .../GitHub.App/Caches/CredentialCacheTests.cs |  0
 .../GitHub.App/Caches/ImageCacheTests.cs      |  0
 .../Controllers/UIControllerTests.cs          |  0
 .../GitHub.App/Controllers/UIProviderTests.cs |  0
 .../GitHub.App/Models/AccountModelTests.cs    |  0
 .../GitHub.App/Models/ModelServiceTests.cs    |  0
 .../Models/PullRequestModelTests.cs           |  0
 .../GitHub.App/Models/RepositoryHostTests.cs  |  0
 .../GitHub.App/Models/RepositoryModelTests.cs |  0
 .../Services/AvatarProviderTests.cs           |  0
 .../GitHub.App/Services/GitClientTests.cs     |  0
 .../Services/PullRequestServiceTests.cs       |  0
 .../Services/RepositoryCloneServiceTests.cs   |  0
 .../RepositoryCreationServiceTests.cs         |  0
 .../ViewModels/GistCreationViewModelTests.cs  |  0
 .../ViewModels/LoginControlViewModelTests.cs  |  0
 .../ViewModels/LoginToGitHubViewModelTests.cs |  0
 .../PullRequestCreationViewModelTests.cs      |  0
 .../PullRequestDetailViewModelTests.cs        |  0
 .../PullRequestListViewModelTests.cs          |  0
 .../RepositoryCloneViewModelTests.cs          |  0
 .../RepositoryCreationViewModelTests.cs       |  0
 .../RepositoryPublishViewModelTests.cs        |  0
 .../TwoFactorDialogViewModelTests.cs          |  0
 .../Caches/AccountCacheItemTests.cs           |  0
 .../GitHub.Exports/GitServiceTests.cs         |  0
 .../GitHub.Exports/HostAddressTests.cs        |  0
 .../LocalRepositoryModelTests.cs              |  0
 .../GitHub.Exports/VSServicesTests.cs         |  0
 .../UnitTests/GitHub.Extensions/GuardTests.cs |  0
 .../GitHub.Extensions/UriExtensionTests.cs    |  0
 .../GitHub.Primitives/UriStringTests.cs       |  0
 .../UnitTests/GitHub.UI/Converters.cs         |  0
 .../TestAutomation/ResourceValueTests.cs      |  0
 .../GitHub.UI/TwoFactorInputTests.cs          |  0
 .../Services/ConnectionManagerTests.cs        |  0
 .../Services/JsonConnectionCacheTests.cs      |  0
 .../Services/RepositoryPublishServiceTests.cs |  0
 .../Home/GraphsNavigationItemTests.cs         |  0
 .../UI/Views/GitHubPaneViewModelTests.cs      |  0
 .../UnitTests/Helpers/CommandTestHelpers.cs   |  0
 .../UnitTests/Helpers/LazySubstitute.cs       |  0
 .../UnitTests/Helpers/ReactiveTestHelper.cs   |  0
 .../UnitTests/Helpers/TestBaseClass.cs        |  0
 .../UnitTests/Helpers/TestImageCache.cs       |  0
 .../UnitTests/Helpers/TestLoginCache.cs       |  0
 .../UnitTests/Helpers/TestSharedCache.cs      |  0
 .../UnitTests/Properties/AssemblyInfo.cs      |  0
 .../Properties/Resources.Designer.cs          |  0
 .../UnitTests/Properties/Resources.resx       |  0
 {src => test}/UnitTests/Substitutes.cs        |  0
 .../UnitTests/TestDoubles/FakeCommitLog.cs    |  0
 .../TestDoubles/FakeMenuCommandService.cs     |  0
 {src => test}/UnitTests/UnitTests.csproj      | 26 +++++++++----------
 .../XUnit/ConditionalFactAttribute.cs         |  0
 .../UnitTests/XUnit/DelayedMessageBus.cs      |  0
 .../UnitTests/XUnit/RetryFactAttribute.cs     |  0
 .../UnitTests/XUnit/RetryFactDiscoverer.cs    |  0
 .../UnitTests/XUnit/RetryTestCase.cs          |  0
 .../UnitTests/XUnit/STAFactAttribute.cs       |  0
 .../UnitTests/XUnit/STAFactDiscoverer.cs      |  0
 {src => test}/UnitTests/XUnit/STATestCase.cs  |  0
 .../UnitTests/XUnit/STATheoryAttribute.cs     |  0
 .../UnitTests/XUnit/STATheoryDiscoverer.cs    |  0
 {src => test}/UnitTests/app.config            |  0
 {src => test}/UnitTests/packages.config       |  0
 72 files changed, 14 insertions(+), 14 deletions(-)
 rename {src => test}/UnitTests/Args.cs (100%)
 rename {src => test}/UnitTests/FodyWeavers.xml (100%)
 rename {src => test}/UnitTests/GitHub.Api/LoginManagerTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.Api/SimpleApiClientFactoryTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.Api/SimpleApiClientTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/Caches/CredentialCacheTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/Caches/ImageCacheTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/Controllers/UIControllerTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/Controllers/UIProviderTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/Models/AccountModelTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/Models/ModelServiceTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/Models/PullRequestModelTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/Models/RepositoryHostTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/Models/RepositoryModelTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/Services/AvatarProviderTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/Services/GitClientTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/Services/PullRequestServiceTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/Services/RepositoryCloneServiceTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/Services/RepositoryCreationServiceTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/ViewModels/GistCreationViewModelTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/ViewModels/LoginControlViewModelTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/ViewModels/LoginToGitHubViewModelTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/ViewModels/PullRequestCreationViewModelTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/ViewModels/PullRequestDetailViewModelTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/ViewModels/PullRequestListViewModelTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/ViewModels/RepositoryCloneViewModelTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/ViewModels/RepositoryCreationViewModelTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/ViewModels/RepositoryPublishViewModelTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.App/ViewModels/TwoFactorDialogViewModelTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.Exports.Reactive/Caches/AccountCacheItemTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.Exports/GitServiceTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.Exports/HostAddressTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.Exports/LocalRepositoryModelTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.Exports/VSServicesTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.Extensions/GuardTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.Extensions/UriExtensionTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.Primitives/UriStringTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.UI/Converters.cs (100%)
 rename {src => test}/UnitTests/GitHub.UI/TestAutomation/ResourceValueTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.UI/TwoFactorInputTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.VisualStudio/Services/ConnectionManagerTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.VisualStudio/Services/JsonConnectionCacheTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.VisualStudio/Services/RepositoryPublishServiceTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.VisualStudio/TeamExplorer/Home/GraphsNavigationItemTests.cs (100%)
 rename {src => test}/UnitTests/GitHub.VisualStudio/UI/Views/GitHubPaneViewModelTests.cs (100%)
 rename {src => test}/UnitTests/Helpers/CommandTestHelpers.cs (100%)
 rename {src => test}/UnitTests/Helpers/LazySubstitute.cs (100%)
 rename {src => test}/UnitTests/Helpers/ReactiveTestHelper.cs (100%)
 rename {src => test}/UnitTests/Helpers/TestBaseClass.cs (100%)
 rename {src => test}/UnitTests/Helpers/TestImageCache.cs (100%)
 rename {src => test}/UnitTests/Helpers/TestLoginCache.cs (100%)
 rename {src => test}/UnitTests/Helpers/TestSharedCache.cs (100%)
 rename {src => test}/UnitTests/Properties/AssemblyInfo.cs (100%)
 rename {src => test}/UnitTests/Properties/Resources.Designer.cs (100%)
 rename {src => test}/UnitTests/Properties/Resources.resx (100%)
 rename {src => test}/UnitTests/Substitutes.cs (100%)
 rename {src => test}/UnitTests/TestDoubles/FakeCommitLog.cs (100%)
 rename {src => test}/UnitTests/TestDoubles/FakeMenuCommandService.cs (100%)
 rename {src => test}/UnitTests/UnitTests.csproj (95%)
 rename {src => test}/UnitTests/XUnit/ConditionalFactAttribute.cs (100%)
 rename {src => test}/UnitTests/XUnit/DelayedMessageBus.cs (100%)
 rename {src => test}/UnitTests/XUnit/RetryFactAttribute.cs (100%)
 rename {src => test}/UnitTests/XUnit/RetryFactDiscoverer.cs (100%)
 rename {src => test}/UnitTests/XUnit/RetryTestCase.cs (100%)
 rename {src => test}/UnitTests/XUnit/STAFactAttribute.cs (100%)
 rename {src => test}/UnitTests/XUnit/STAFactDiscoverer.cs (100%)
 rename {src => test}/UnitTests/XUnit/STATestCase.cs (100%)
 rename {src => test}/UnitTests/XUnit/STATheoryAttribute.cs (100%)
 rename {src => test}/UnitTests/XUnit/STATheoryDiscoverer.cs (100%)
 rename {src => test}/UnitTests/app.config (100%)
 rename {src => test}/UnitTests/packages.config (100%)

diff --git a/GitHubVS.sln b/GitHubVS.sln
index 5507e5b9f8..ef0511ab00 100644
--- a/GitHubVS.sln
+++ b/GitHubVS.sln
@@ -13,7 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Meta", "Meta", "{72036B62-2
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "src\UnitTests\UnitTests.csproj", "{596595A6-2A3C-469E-9386-9E3767D863A5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "test\UnitTests\UnitTests.csproj", "{596595A6-2A3C-469E-9386-9E3767D863A5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.UI", "src\GitHub.UI\GitHub.UI.csproj", "{346384DD-2445-4A28-AF22-B45F3957BD89}"
 EndProject
diff --git a/src/UnitTests/Args.cs b/test/UnitTests/Args.cs
similarity index 100%
rename from src/UnitTests/Args.cs
rename to test/UnitTests/Args.cs
diff --git a/src/UnitTests/FodyWeavers.xml b/test/UnitTests/FodyWeavers.xml
similarity index 100%
rename from src/UnitTests/FodyWeavers.xml
rename to test/UnitTests/FodyWeavers.xml
diff --git a/src/UnitTests/GitHub.Api/LoginManagerTests.cs b/test/UnitTests/GitHub.Api/LoginManagerTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.Api/LoginManagerTests.cs
rename to test/UnitTests/GitHub.Api/LoginManagerTests.cs
diff --git a/src/UnitTests/GitHub.Api/SimpleApiClientFactoryTests.cs b/test/UnitTests/GitHub.Api/SimpleApiClientFactoryTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.Api/SimpleApiClientFactoryTests.cs
rename to test/UnitTests/GitHub.Api/SimpleApiClientFactoryTests.cs
diff --git a/src/UnitTests/GitHub.Api/SimpleApiClientTests.cs b/test/UnitTests/GitHub.Api/SimpleApiClientTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.Api/SimpleApiClientTests.cs
rename to test/UnitTests/GitHub.Api/SimpleApiClientTests.cs
diff --git a/src/UnitTests/GitHub.App/Caches/CredentialCacheTests.cs b/test/UnitTests/GitHub.App/Caches/CredentialCacheTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/Caches/CredentialCacheTests.cs
rename to test/UnitTests/GitHub.App/Caches/CredentialCacheTests.cs
diff --git a/src/UnitTests/GitHub.App/Caches/ImageCacheTests.cs b/test/UnitTests/GitHub.App/Caches/ImageCacheTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/Caches/ImageCacheTests.cs
rename to test/UnitTests/GitHub.App/Caches/ImageCacheTests.cs
diff --git a/src/UnitTests/GitHub.App/Controllers/UIControllerTests.cs b/test/UnitTests/GitHub.App/Controllers/UIControllerTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/Controllers/UIControllerTests.cs
rename to test/UnitTests/GitHub.App/Controllers/UIControllerTests.cs
diff --git a/src/UnitTests/GitHub.App/Controllers/UIProviderTests.cs b/test/UnitTests/GitHub.App/Controllers/UIProviderTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/Controllers/UIProviderTests.cs
rename to test/UnitTests/GitHub.App/Controllers/UIProviderTests.cs
diff --git a/src/UnitTests/GitHub.App/Models/AccountModelTests.cs b/test/UnitTests/GitHub.App/Models/AccountModelTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/Models/AccountModelTests.cs
rename to test/UnitTests/GitHub.App/Models/AccountModelTests.cs
diff --git a/src/UnitTests/GitHub.App/Models/ModelServiceTests.cs b/test/UnitTests/GitHub.App/Models/ModelServiceTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/Models/ModelServiceTests.cs
rename to test/UnitTests/GitHub.App/Models/ModelServiceTests.cs
diff --git a/src/UnitTests/GitHub.App/Models/PullRequestModelTests.cs b/test/UnitTests/GitHub.App/Models/PullRequestModelTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/Models/PullRequestModelTests.cs
rename to test/UnitTests/GitHub.App/Models/PullRequestModelTests.cs
diff --git a/src/UnitTests/GitHub.App/Models/RepositoryHostTests.cs b/test/UnitTests/GitHub.App/Models/RepositoryHostTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/Models/RepositoryHostTests.cs
rename to test/UnitTests/GitHub.App/Models/RepositoryHostTests.cs
diff --git a/src/UnitTests/GitHub.App/Models/RepositoryModelTests.cs b/test/UnitTests/GitHub.App/Models/RepositoryModelTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/Models/RepositoryModelTests.cs
rename to test/UnitTests/GitHub.App/Models/RepositoryModelTests.cs
diff --git a/src/UnitTests/GitHub.App/Services/AvatarProviderTests.cs b/test/UnitTests/GitHub.App/Services/AvatarProviderTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/Services/AvatarProviderTests.cs
rename to test/UnitTests/GitHub.App/Services/AvatarProviderTests.cs
diff --git a/src/UnitTests/GitHub.App/Services/GitClientTests.cs b/test/UnitTests/GitHub.App/Services/GitClientTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/Services/GitClientTests.cs
rename to test/UnitTests/GitHub.App/Services/GitClientTests.cs
diff --git a/src/UnitTests/GitHub.App/Services/PullRequestServiceTests.cs b/test/UnitTests/GitHub.App/Services/PullRequestServiceTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/Services/PullRequestServiceTests.cs
rename to test/UnitTests/GitHub.App/Services/PullRequestServiceTests.cs
diff --git a/src/UnitTests/GitHub.App/Services/RepositoryCloneServiceTests.cs b/test/UnitTests/GitHub.App/Services/RepositoryCloneServiceTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/Services/RepositoryCloneServiceTests.cs
rename to test/UnitTests/GitHub.App/Services/RepositoryCloneServiceTests.cs
diff --git a/src/UnitTests/GitHub.App/Services/RepositoryCreationServiceTests.cs b/test/UnitTests/GitHub.App/Services/RepositoryCreationServiceTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/Services/RepositoryCreationServiceTests.cs
rename to test/UnitTests/GitHub.App/Services/RepositoryCreationServiceTests.cs
diff --git a/src/UnitTests/GitHub.App/ViewModels/GistCreationViewModelTests.cs b/test/UnitTests/GitHub.App/ViewModels/GistCreationViewModelTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/ViewModels/GistCreationViewModelTests.cs
rename to test/UnitTests/GitHub.App/ViewModels/GistCreationViewModelTests.cs
diff --git a/src/UnitTests/GitHub.App/ViewModels/LoginControlViewModelTests.cs b/test/UnitTests/GitHub.App/ViewModels/LoginControlViewModelTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/ViewModels/LoginControlViewModelTests.cs
rename to test/UnitTests/GitHub.App/ViewModels/LoginControlViewModelTests.cs
diff --git a/src/UnitTests/GitHub.App/ViewModels/LoginToGitHubViewModelTests.cs b/test/UnitTests/GitHub.App/ViewModels/LoginToGitHubViewModelTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/ViewModels/LoginToGitHubViewModelTests.cs
rename to test/UnitTests/GitHub.App/ViewModels/LoginToGitHubViewModelTests.cs
diff --git a/src/UnitTests/GitHub.App/ViewModels/PullRequestCreationViewModelTests.cs b/test/UnitTests/GitHub.App/ViewModels/PullRequestCreationViewModelTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/ViewModels/PullRequestCreationViewModelTests.cs
rename to test/UnitTests/GitHub.App/ViewModels/PullRequestCreationViewModelTests.cs
diff --git a/src/UnitTests/GitHub.App/ViewModels/PullRequestDetailViewModelTests.cs b/test/UnitTests/GitHub.App/ViewModels/PullRequestDetailViewModelTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/ViewModels/PullRequestDetailViewModelTests.cs
rename to test/UnitTests/GitHub.App/ViewModels/PullRequestDetailViewModelTests.cs
diff --git a/src/UnitTests/GitHub.App/ViewModels/PullRequestListViewModelTests.cs b/test/UnitTests/GitHub.App/ViewModels/PullRequestListViewModelTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/ViewModels/PullRequestListViewModelTests.cs
rename to test/UnitTests/GitHub.App/ViewModels/PullRequestListViewModelTests.cs
diff --git a/src/UnitTests/GitHub.App/ViewModels/RepositoryCloneViewModelTests.cs b/test/UnitTests/GitHub.App/ViewModels/RepositoryCloneViewModelTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/ViewModels/RepositoryCloneViewModelTests.cs
rename to test/UnitTests/GitHub.App/ViewModels/RepositoryCloneViewModelTests.cs
diff --git a/src/UnitTests/GitHub.App/ViewModels/RepositoryCreationViewModelTests.cs b/test/UnitTests/GitHub.App/ViewModels/RepositoryCreationViewModelTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/ViewModels/RepositoryCreationViewModelTests.cs
rename to test/UnitTests/GitHub.App/ViewModels/RepositoryCreationViewModelTests.cs
diff --git a/src/UnitTests/GitHub.App/ViewModels/RepositoryPublishViewModelTests.cs b/test/UnitTests/GitHub.App/ViewModels/RepositoryPublishViewModelTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/ViewModels/RepositoryPublishViewModelTests.cs
rename to test/UnitTests/GitHub.App/ViewModels/RepositoryPublishViewModelTests.cs
diff --git a/src/UnitTests/GitHub.App/ViewModels/TwoFactorDialogViewModelTests.cs b/test/UnitTests/GitHub.App/ViewModels/TwoFactorDialogViewModelTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.App/ViewModels/TwoFactorDialogViewModelTests.cs
rename to test/UnitTests/GitHub.App/ViewModels/TwoFactorDialogViewModelTests.cs
diff --git a/src/UnitTests/GitHub.Exports.Reactive/Caches/AccountCacheItemTests.cs b/test/UnitTests/GitHub.Exports.Reactive/Caches/AccountCacheItemTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.Exports.Reactive/Caches/AccountCacheItemTests.cs
rename to test/UnitTests/GitHub.Exports.Reactive/Caches/AccountCacheItemTests.cs
diff --git a/src/UnitTests/GitHub.Exports/GitServiceTests.cs b/test/UnitTests/GitHub.Exports/GitServiceTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.Exports/GitServiceTests.cs
rename to test/UnitTests/GitHub.Exports/GitServiceTests.cs
diff --git a/src/UnitTests/GitHub.Exports/HostAddressTests.cs b/test/UnitTests/GitHub.Exports/HostAddressTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.Exports/HostAddressTests.cs
rename to test/UnitTests/GitHub.Exports/HostAddressTests.cs
diff --git a/src/UnitTests/GitHub.Exports/LocalRepositoryModelTests.cs b/test/UnitTests/GitHub.Exports/LocalRepositoryModelTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.Exports/LocalRepositoryModelTests.cs
rename to test/UnitTests/GitHub.Exports/LocalRepositoryModelTests.cs
diff --git a/src/UnitTests/GitHub.Exports/VSServicesTests.cs b/test/UnitTests/GitHub.Exports/VSServicesTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.Exports/VSServicesTests.cs
rename to test/UnitTests/GitHub.Exports/VSServicesTests.cs
diff --git a/src/UnitTests/GitHub.Extensions/GuardTests.cs b/test/UnitTests/GitHub.Extensions/GuardTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.Extensions/GuardTests.cs
rename to test/UnitTests/GitHub.Extensions/GuardTests.cs
diff --git a/src/UnitTests/GitHub.Extensions/UriExtensionTests.cs b/test/UnitTests/GitHub.Extensions/UriExtensionTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.Extensions/UriExtensionTests.cs
rename to test/UnitTests/GitHub.Extensions/UriExtensionTests.cs
diff --git a/src/UnitTests/GitHub.Primitives/UriStringTests.cs b/test/UnitTests/GitHub.Primitives/UriStringTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.Primitives/UriStringTests.cs
rename to test/UnitTests/GitHub.Primitives/UriStringTests.cs
diff --git a/src/UnitTests/GitHub.UI/Converters.cs b/test/UnitTests/GitHub.UI/Converters.cs
similarity index 100%
rename from src/UnitTests/GitHub.UI/Converters.cs
rename to test/UnitTests/GitHub.UI/Converters.cs
diff --git a/src/UnitTests/GitHub.UI/TestAutomation/ResourceValueTests.cs b/test/UnitTests/GitHub.UI/TestAutomation/ResourceValueTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.UI/TestAutomation/ResourceValueTests.cs
rename to test/UnitTests/GitHub.UI/TestAutomation/ResourceValueTests.cs
diff --git a/src/UnitTests/GitHub.UI/TwoFactorInputTests.cs b/test/UnitTests/GitHub.UI/TwoFactorInputTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.UI/TwoFactorInputTests.cs
rename to test/UnitTests/GitHub.UI/TwoFactorInputTests.cs
diff --git a/src/UnitTests/GitHub.VisualStudio/Services/ConnectionManagerTests.cs b/test/UnitTests/GitHub.VisualStudio/Services/ConnectionManagerTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.VisualStudio/Services/ConnectionManagerTests.cs
rename to test/UnitTests/GitHub.VisualStudio/Services/ConnectionManagerTests.cs
diff --git a/src/UnitTests/GitHub.VisualStudio/Services/JsonConnectionCacheTests.cs b/test/UnitTests/GitHub.VisualStudio/Services/JsonConnectionCacheTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.VisualStudio/Services/JsonConnectionCacheTests.cs
rename to test/UnitTests/GitHub.VisualStudio/Services/JsonConnectionCacheTests.cs
diff --git a/src/UnitTests/GitHub.VisualStudio/Services/RepositoryPublishServiceTests.cs b/test/UnitTests/GitHub.VisualStudio/Services/RepositoryPublishServiceTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.VisualStudio/Services/RepositoryPublishServiceTests.cs
rename to test/UnitTests/GitHub.VisualStudio/Services/RepositoryPublishServiceTests.cs
diff --git a/src/UnitTests/GitHub.VisualStudio/TeamExplorer/Home/GraphsNavigationItemTests.cs b/test/UnitTests/GitHub.VisualStudio/TeamExplorer/Home/GraphsNavigationItemTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.VisualStudio/TeamExplorer/Home/GraphsNavigationItemTests.cs
rename to test/UnitTests/GitHub.VisualStudio/TeamExplorer/Home/GraphsNavigationItemTests.cs
diff --git a/src/UnitTests/GitHub.VisualStudio/UI/Views/GitHubPaneViewModelTests.cs b/test/UnitTests/GitHub.VisualStudio/UI/Views/GitHubPaneViewModelTests.cs
similarity index 100%
rename from src/UnitTests/GitHub.VisualStudio/UI/Views/GitHubPaneViewModelTests.cs
rename to test/UnitTests/GitHub.VisualStudio/UI/Views/GitHubPaneViewModelTests.cs
diff --git a/src/UnitTests/Helpers/CommandTestHelpers.cs b/test/UnitTests/Helpers/CommandTestHelpers.cs
similarity index 100%
rename from src/UnitTests/Helpers/CommandTestHelpers.cs
rename to test/UnitTests/Helpers/CommandTestHelpers.cs
diff --git a/src/UnitTests/Helpers/LazySubstitute.cs b/test/UnitTests/Helpers/LazySubstitute.cs
similarity index 100%
rename from src/UnitTests/Helpers/LazySubstitute.cs
rename to test/UnitTests/Helpers/LazySubstitute.cs
diff --git a/src/UnitTests/Helpers/ReactiveTestHelper.cs b/test/UnitTests/Helpers/ReactiveTestHelper.cs
similarity index 100%
rename from src/UnitTests/Helpers/ReactiveTestHelper.cs
rename to test/UnitTests/Helpers/ReactiveTestHelper.cs
diff --git a/src/UnitTests/Helpers/TestBaseClass.cs b/test/UnitTests/Helpers/TestBaseClass.cs
similarity index 100%
rename from src/UnitTests/Helpers/TestBaseClass.cs
rename to test/UnitTests/Helpers/TestBaseClass.cs
diff --git a/src/UnitTests/Helpers/TestImageCache.cs b/test/UnitTests/Helpers/TestImageCache.cs
similarity index 100%
rename from src/UnitTests/Helpers/TestImageCache.cs
rename to test/UnitTests/Helpers/TestImageCache.cs
diff --git a/src/UnitTests/Helpers/TestLoginCache.cs b/test/UnitTests/Helpers/TestLoginCache.cs
similarity index 100%
rename from src/UnitTests/Helpers/TestLoginCache.cs
rename to test/UnitTests/Helpers/TestLoginCache.cs
diff --git a/src/UnitTests/Helpers/TestSharedCache.cs b/test/UnitTests/Helpers/TestSharedCache.cs
similarity index 100%
rename from src/UnitTests/Helpers/TestSharedCache.cs
rename to test/UnitTests/Helpers/TestSharedCache.cs
diff --git a/src/UnitTests/Properties/AssemblyInfo.cs b/test/UnitTests/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/UnitTests/Properties/AssemblyInfo.cs
rename to test/UnitTests/Properties/AssemblyInfo.cs
diff --git a/src/UnitTests/Properties/Resources.Designer.cs b/test/UnitTests/Properties/Resources.Designer.cs
similarity index 100%
rename from src/UnitTests/Properties/Resources.Designer.cs
rename to test/UnitTests/Properties/Resources.Designer.cs
diff --git a/src/UnitTests/Properties/Resources.resx b/test/UnitTests/Properties/Resources.resx
similarity index 100%
rename from src/UnitTests/Properties/Resources.resx
rename to test/UnitTests/Properties/Resources.resx
diff --git a/src/UnitTests/Substitutes.cs b/test/UnitTests/Substitutes.cs
similarity index 100%
rename from src/UnitTests/Substitutes.cs
rename to test/UnitTests/Substitutes.cs
diff --git a/src/UnitTests/TestDoubles/FakeCommitLog.cs b/test/UnitTests/TestDoubles/FakeCommitLog.cs
similarity index 100%
rename from src/UnitTests/TestDoubles/FakeCommitLog.cs
rename to test/UnitTests/TestDoubles/FakeCommitLog.cs
diff --git a/src/UnitTests/TestDoubles/FakeMenuCommandService.cs b/test/UnitTests/TestDoubles/FakeMenuCommandService.cs
similarity index 100%
rename from src/UnitTests/TestDoubles/FakeMenuCommandService.cs
rename to test/UnitTests/TestDoubles/FakeMenuCommandService.cs
diff --git a/src/UnitTests/UnitTests.csproj b/test/UnitTests/UnitTests.csproj
similarity index 95%
rename from src/UnitTests/UnitTests.csproj
rename to test/UnitTests/UnitTests.csproj
index 5b55c52dcd..97c27e7b7d 100644
--- a/src/UnitTests/UnitTests.csproj
+++ b/test/UnitTests/UnitTests.csproj
@@ -313,55 +313,55 @@
       <Project>{252ce1c2-027a-4445-a3c2-e4d6c80a935a}</Project>
       <Name>Splat-Net45</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DesignTimeStyleHelper\DesignTimeStyleHelper.csproj">
+    <ProjectReference Include="..\..\src\DesignTimeStyleHelper\DesignTimeStyleHelper.csproj">
       <Project>{b1f5c227-456f-437d-bd5f-4c11b7a8d1a0}</Project>
       <Name>DesignTimeStyleHelper</Name>
     </ProjectReference>
-    <ProjectReference Include="..\GitHub.Api\GitHub.Api.csproj">
+    <ProjectReference Include="..\..\src\GitHub.Api\GitHub.Api.csproj">
       <Project>{b389adaf-62cc-486e-85b4-2d8b078df763}</Project>
       <Name>GitHub.Api</Name>
     </ProjectReference>
-    <ProjectReference Include="..\GitHub.App\GitHub.App.csproj">
+    <ProjectReference Include="..\..\src\GitHub.App\GitHub.App.csproj">
       <Project>{1A1DA411-8D1F-4578-80A6-04576BEA2DC5}</Project>
       <Name>GitHub.App</Name>
     </ProjectReference>
-    <ProjectReference Include="..\GitHub.Exports.Reactive\GitHub.Exports.Reactive.csproj">
+    <ProjectReference Include="..\..\src\GitHub.Exports.Reactive\GitHub.Exports.Reactive.csproj">
       <Project>{e4ed0537-d1d9-44b6-9212-3096d7c3f7a1}</Project>
       <Name>GitHub.Exports.Reactive</Name>
     </ProjectReference>
-    <ProjectReference Include="..\GitHub.Exports\GitHub.Exports.csproj">
+    <ProjectReference Include="..\..\src\GitHub.Exports\GitHub.Exports.csproj">
       <Project>{9AEA02DB-02B5-409C-B0CA-115D05331A6B}</Project>
       <Name>GitHub.Exports</Name>
     </ProjectReference>
-    <ProjectReference Include="..\GitHub.Extensions.Reactive\GitHub.Extensions.Reactive.csproj">
+    <ProjectReference Include="..\..\src\GitHub.Extensions.Reactive\GitHub.Extensions.Reactive.csproj">
       <Project>{6559e128-8b40-49a5-85a8-05565ed0c7e3}</Project>
       <Name>GitHub.Extensions.Reactive</Name>
     </ProjectReference>
-    <ProjectReference Include="..\GitHub.Extensions\GitHub.Extensions.csproj">
+    <ProjectReference Include="..\..\src\GitHub.Extensions\GitHub.Extensions.csproj">
       <Project>{6afe2e2d-6db0-4430-a2ea-f5f5388d2f78}</Project>
       <Name>GitHub.Extensions</Name>
     </ProjectReference>
-    <ProjectReference Include="..\GitHub.InlineReviews\GitHub.InlineReviews.csproj">
+    <ProjectReference Include="..\..\src\GitHub.InlineReviews\GitHub.InlineReviews.csproj">
       <Project>{7f5ed78b-74a3-4406-a299-70cfb5885b8b}</Project>
       <Name>GitHub.InlineReviews</Name>
     </ProjectReference>
-    <ProjectReference Include="..\GitHub.TeamFoundation.14\GitHub.TeamFoundation.14.csproj">
+    <ProjectReference Include="..\..\src\GitHub.TeamFoundation.14\GitHub.TeamFoundation.14.csproj">
       <Project>{161DBF01-1DBF-4B00-8551-C5C00F26720D}</Project>
       <Name>GitHub.TeamFoundation.14</Name>
     </ProjectReference>
-    <ProjectReference Include="..\GitHub.UI.Reactive\GitHub.UI.Reactive.csproj">
+    <ProjectReference Include="..\..\src\GitHub.UI.Reactive\GitHub.UI.Reactive.csproj">
       <Project>{158B05E8-FDBC-4D71-B871-C96E28D5ADF5}</Project>
       <Name>GitHub.UI.Reactive</Name>
     </ProjectReference>
-    <ProjectReference Include="..\GitHub.UI\GitHub.UI.csproj">
+    <ProjectReference Include="..\..\src\GitHub.UI\GitHub.UI.csproj">
       <Project>{346384dd-2445-4a28-af22-b45f3957bd89}</Project>
       <Name>GitHub.UI</Name>
     </ProjectReference>
-    <ProjectReference Include="..\GitHub.VisualStudio.UI\GitHub.VisualStudio.UI.csproj">
+    <ProjectReference Include="..\..\src\GitHub.VisualStudio.UI\GitHub.VisualStudio.UI.csproj">
       <Project>{d1dfbb0c-b570-4302-8f1e-2e3a19c41961}</Project>
       <Name>GitHub.VisualStudio.UI</Name>
     </ProjectReference>
-    <ProjectReference Include="..\GitHub.VisualStudio\GitHub.VisualStudio.csproj">
+    <ProjectReference Include="..\..\src\GitHub.VisualStudio\GitHub.VisualStudio.csproj">
       <Project>{11569514-5ae5-4b5b-92a2-f10b0967de5f}</Project>
       <Name>GitHub.VisualStudio</Name>
     </ProjectReference>
diff --git a/src/UnitTests/XUnit/ConditionalFactAttribute.cs b/test/UnitTests/XUnit/ConditionalFactAttribute.cs
similarity index 100%
rename from src/UnitTests/XUnit/ConditionalFactAttribute.cs
rename to test/UnitTests/XUnit/ConditionalFactAttribute.cs
diff --git a/src/UnitTests/XUnit/DelayedMessageBus.cs b/test/UnitTests/XUnit/DelayedMessageBus.cs
similarity index 100%
rename from src/UnitTests/XUnit/DelayedMessageBus.cs
rename to test/UnitTests/XUnit/DelayedMessageBus.cs
diff --git a/src/UnitTests/XUnit/RetryFactAttribute.cs b/test/UnitTests/XUnit/RetryFactAttribute.cs
similarity index 100%
rename from src/UnitTests/XUnit/RetryFactAttribute.cs
rename to test/UnitTests/XUnit/RetryFactAttribute.cs
diff --git a/src/UnitTests/XUnit/RetryFactDiscoverer.cs b/test/UnitTests/XUnit/RetryFactDiscoverer.cs
similarity index 100%
rename from src/UnitTests/XUnit/RetryFactDiscoverer.cs
rename to test/UnitTests/XUnit/RetryFactDiscoverer.cs
diff --git a/src/UnitTests/XUnit/RetryTestCase.cs b/test/UnitTests/XUnit/RetryTestCase.cs
similarity index 100%
rename from src/UnitTests/XUnit/RetryTestCase.cs
rename to test/UnitTests/XUnit/RetryTestCase.cs
diff --git a/src/UnitTests/XUnit/STAFactAttribute.cs b/test/UnitTests/XUnit/STAFactAttribute.cs
similarity index 100%
rename from src/UnitTests/XUnit/STAFactAttribute.cs
rename to test/UnitTests/XUnit/STAFactAttribute.cs
diff --git a/src/UnitTests/XUnit/STAFactDiscoverer.cs b/test/UnitTests/XUnit/STAFactDiscoverer.cs
similarity index 100%
rename from src/UnitTests/XUnit/STAFactDiscoverer.cs
rename to test/UnitTests/XUnit/STAFactDiscoverer.cs
diff --git a/src/UnitTests/XUnit/STATestCase.cs b/test/UnitTests/XUnit/STATestCase.cs
similarity index 100%
rename from src/UnitTests/XUnit/STATestCase.cs
rename to test/UnitTests/XUnit/STATestCase.cs
diff --git a/src/UnitTests/XUnit/STATheoryAttribute.cs b/test/UnitTests/XUnit/STATheoryAttribute.cs
similarity index 100%
rename from src/UnitTests/XUnit/STATheoryAttribute.cs
rename to test/UnitTests/XUnit/STATheoryAttribute.cs
diff --git a/src/UnitTests/XUnit/STATheoryDiscoverer.cs b/test/UnitTests/XUnit/STATheoryDiscoverer.cs
similarity index 100%
rename from src/UnitTests/XUnit/STATheoryDiscoverer.cs
rename to test/UnitTests/XUnit/STATheoryDiscoverer.cs
diff --git a/src/UnitTests/app.config b/test/UnitTests/app.config
similarity index 100%
rename from src/UnitTests/app.config
rename to test/UnitTests/app.config
diff --git a/src/UnitTests/packages.config b/test/UnitTests/packages.config
similarity index 100%
rename from src/UnitTests/packages.config
rename to test/UnitTests/packages.config

From bbd79c71e91f71345229527a87c5af2737af2094 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@gmail.com>
Date: Fri, 20 Oct 2017 16:12:18 +0100
Subject: [PATCH 08/11] Remove obsolete test script

---
 test.cmd | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 test.cmd

diff --git a/test.cmd b/test.cmd
deleted file mode 100644
index c782af306c..0000000000
--- a/test.cmd
+++ /dev/null
@@ -1,8 +0,0 @@
-@rem Tests currently only work on `Release` build.
-@if "%config%" == "" set config=Release
-
-call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\Common7\Tools\VsDevCmd.bat"
-
-msbuild GitHubVS.sln /p:Configuration=%Config%
-VSTest.Console.exe src\UnitTests\bin\%Config%\UnitTests.dll /TestAdapterPath:"."
-VSTest.Console.exe src\TrackingCollectionTests\bin\%Config%\TrackingCollectionTests.dll /TestAdapterPath:"."

From 202b20d7a1c755f4204c0b01c75281712a34953d Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@gmail.com>
Date: Fri, 20 Oct 2017 17:43:28 +0100
Subject: [PATCH 09/11] Isolate failing test in app domain

---
 .../Helpers/SharedDictionaryManagerTests.cs   | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/test/GitHub.UI.UnitTests/Helpers/SharedDictionaryManagerTests.cs b/test/GitHub.UI.UnitTests/Helpers/SharedDictionaryManagerTests.cs
index 64e12b936d..d5521d44e0 100644
--- a/test/GitHub.UI.UnitTests/Helpers/SharedDictionaryManagerTests.cs
+++ b/test/GitHub.UI.UnitTests/Helpers/SharedDictionaryManagerTests.cs
@@ -86,25 +86,30 @@ public void CalledTwice_DisposeNotCalled()
                     var disposable = Substitute.For<IDisposable>();
                     factory.TryAddDisposable(disposable);
 
-                    SharedDictionaryManager.GetCurrentDomainCachingFactory();
-
-                    disposable.Received(0).Dispose();
+                    using (SharedDictionaryManager.GetCurrentDomainCachingFactory())
+                    {
+                        disposable.Received(0).Dispose();
+                    }
                 }
             }
 
             [Test]
             public void InvokeMethodOnNewAssembly_DisposeCalled()
             {
-                using (var factory = SharedDictionaryManager.GetCurrentDomainCachingFactory())
+                // HACK: Why does this need to be in app domain?
+                AppDomainContext.Invoke(new AppDomainSetup { ApplicationBase = AppDomain.CurrentDomain.BaseDirectory }, () =>
                 {
-                    var disposable = Substitute.For<IDisposable>();
-                    factory.TryAddDisposable(disposable);
-
-                    using (InvokeMethodOnNewAssembly(SharedDictionaryManager.GetCurrentDomainCachingFactory))
+                    using (var factory = SharedDictionaryManager.GetCurrentDomainCachingFactory())
                     {
-                        disposable.Received(1).Dispose();
+                        var disposable = Substitute.For<IDisposable>();
+                        factory.TryAddDisposable(disposable);
+
+                        using (InvokeMethodOnNewAssembly(SharedDictionaryManager.GetCurrentDomainCachingFactory))
+                        {
+                            disposable.Received(1).Dispose();
+                        }
                     }
-                }
+                });
             }
 
             static IDisposable InvokeMethodOnNewAssembly<T>(Func<T> func)

From 05f536246fc218bb903a6a10b815033f3fb3ceca Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@gmail.com>
Date: Fri, 20 Oct 2017 17:50:27 +0100
Subject: [PATCH 10/11] Update script submodule to build all tests

---
 script | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script b/script
index ff9ea80d8d..58e42fc767 160000
--- a/script
+++ b/script
@@ -1 +1 @@
-Subproject commit ff9ea80d8df7c33fa94966ce4c8dbbd7896b8a07
+Subproject commit 58e42fc76756649e7fb30dc39ef9120b15a2f712

From dfa2eb21e347eac7427fd330c4f66c559a3b9640 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@gmail.com>
Date: Mon, 30 Oct 2017 12:05:42 +0000
Subject: [PATCH 11/11] Update NUnit args when running on AppVeyor

---
 scripts/Run-NUnit.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Run-NUnit.ps1 b/scripts/Run-NUnit.ps1
index b41c488552..aed96fa5bd 100644
--- a/scripts/Run-NUnit.ps1
+++ b/scripts/Run-NUnit.ps1
@@ -24,7 +24,7 @@ $dll = "test\$Project\bin\$Configuration\$Project.dll"
 if ($AppVeyor) {
     $nunitDirectory = Join-Path $rootDirectory packages\NUnit.ConsoleRunner.3.7.0\tools
     $consoleRunner = Join-Path $nunitDirectory nunit3-console.exe
-    $args = "-noshadow", "-framework:net-4.5", "-exclude:Timings", $dll
+    $args = "--framework:net-4.5", "--where:cat!=Timings", $dll
     [object[]] $output = "$consoleRunner " + ($args -join " ")
     & $consoleRunner ($args | %{ "`"$_`"" })
     if($LastExitCode -ne 0) {