Always call FindBindingPaths on UI thread

Author: jcansdale

src/GitHub.VisualStudio/GitHubPackage.cs

@@ -188,7 +188,8 @@ async Task CheckBindingPathsAsync()
                 // When running in the Exp instance, ensure there is only one active binding path.
                 // This is necessary when the regular (AllUsers) extension is also installed.
                 // See: https://github.com/github/VisualStudio/issues/1995
-                await BindingPathHelper.CheckBindingPathsAsync(GetType().Assembly, JoinableTaskFactory, this);
+                await JoinableTaskFactory.SwitchToMainThreadAsync();
+                BindingPathHelper.CheckBindingPaths(GetType().Assembly, this);
             }
             catch (Exception e)
             {

src/GitHub.VisualStudio/Helpers/BindingPathHelper.cs

@@ -6,9 +6,7 @@
 using GitHub.Logging;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.VisualStudio.Threading;
 using Serilog;
-using Task = System.Threading.Tasks.Task;
 
 namespace GitHub.VisualStudio.Helpers
 {
@@ -23,13 +21,11 @@ class BindingPathHelper
     {
         static readonly ILogger log = LogManager.ForContext<BindingPathHelper>();
 
-        internal async static Task CheckBindingPathsAsync(
-            Assembly assembly,
-            JoinableTaskFactory jtf,
-            IServiceProvider serviceProvider)
+        internal static void CheckBindingPaths(Assembly assembly, IServiceProvider serviceProvider)
         {
             log.Information("Looking for assembly on wrong binding path");
 
+            ThreadHelper.CheckAccess();
             var bindingPaths = BindingPathUtilities.FindBindingPaths(serviceProvider);
             var bindingPath = BindingPathUtilities.FindRedundantBindingPaths(bindingPaths, assembly.Location)
                 .FirstOrDefault();
@@ -42,7 +38,6 @@ internal async static Task CheckBindingPathsAsync(
             // Log what has been detected
             log.Warning("Found assembly on wrong binding path {BindingPath}", bindingPath);
 
-            await jtf.SwitchToMainThreadAsync();
             var message = string.Format(@"Found assembly on wrong binding path:
 {0}