Fix threading when running unit tests

Author: shana

src/GitHub.App/Services/RepositoryCloneService.cs

@@ -7,6 +7,7 @@
 using Microsoft.VisualStudio.Shell;
 using NLog;
 using Rothko;
+using GitHub.Helpers;
 
 namespace GitHub.Services
 {
@@ -48,7 +49,7 @@ public IObservable<Unit> CloneRepository(string cloneUrl, string repositoryName,
 
                 // Once we've done IO switch to the main thread to call vsGitServices.Clone() as this must be
                 // called on the main thread.
-                await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+                await ThreadingHelper.SwitchToMainThreadAsync();
 
                 try
                 {

src/GitHub.Exports/GitHub.Exports.csproj

@@ -96,6 +96,10 @@
       <HintPath>..\..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
@@ -133,6 +137,7 @@
     <Compile Include="Extensions\PropertyNotifierExtensions.cs" />
     <Compile Include="Extensions\SimpleRepositoryModelExtensions.cs" />
     <Compile Include="Helpers\SettingsStore.cs" />
+    <Compile Include="Helpers\ThreadingHelper.cs" />
     <Compile Include="Info\ApplicationInfo.cs" />
     <Compile Include="Models\BranchModel.cs" />
     <Compile Include="Models\IAccount.cs" />

src/GitHub.Exports/Helpers/ThreadingHelper.cs

@@ -0,0 +1,15 @@
+using System.Threading.Tasks;
+using ThreadHelper = Microsoft.VisualStudio.Shell.ThreadHelper;
+using GitHub.Extensions;
+
+namespace GitHub.Helpers
+{
+    public static class ThreadingHelper
+    {
+        public async static Task SwitchToMainThreadAsync()
+        {
+            if (!Guard.InUnitTestRunner())
+                await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+        }
+    }
+}

src/GitHub.Exports/packages.config

@@ -10,6 +10,7 @@
   <package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30729" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net461" />
+  <package id="Microsoft.VisualStudio.Threading" version="14.1.131" targetFramework="net461" />
   <package id="SimpleJson" version="0.38.0" targetFramework="net461" />
   <package id="VSSDK.ComponentModelHost" version="12.0.4" targetFramework="net461" />
   <package id="VSSDK.IDE.12" version="12.0.4" targetFramework="net461" />

src/GitHub.Extensions/Guard.cs

@@ -90,7 +90,7 @@ public static void ArgumentInRange(int value, int minValue, int maxValue, string
         }
 
         // Borrowed from Splat.
-        static bool InUnitTestRunner()
+        public static bool InUnitTestRunner()
         {
             return Splat.ModeDetector.InUnitTestRunner();
         }

src/GitHub.VisualStudio/GitHubPackage.cs

@@ -62,7 +62,7 @@ async Task InitializeMenus()
         {
             var menus = await GetServiceAsync(typeof(IMenuProvider)) as IMenuProvider;
 
-            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+            await ThreadingHelper.SwitchToMainThreadAsync();
 
             foreach (var menu in menus.Menus)
                 serviceProvider.AddCommandHandler(menu.Guid, menu.CmdId, (s, e) => menu.Activate());

src/GitHub.VisualStudio/Services/UsageTracker.cs

@@ -7,11 +7,10 @@
 using System.Windows.Threading;
 using GitHub.Models;
 using GitHub.Settings;
-using Microsoft.VisualStudio.ComponentModelHost;
-using Microsoft.VisualStudio.Shell;
 using Task = System.Threading.Tasks.Task;
 using GitHub.Extensions;
 using System.Threading.Tasks;
+using GitHub.Helpers;
 
 namespace GitHub.Services
 {
@@ -142,7 +141,7 @@ async Task Initialize()
             // improve the startup time of the extension.
             if (userSettings == null)
             {
-                await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+                await ThreadingHelper.SwitchToMainThreadAsync();
 
                 client = uiProvider.GetService<IMetricsService>();
                 connectionManager = uiProvider.GetService<IConnectionManager>();