Merge pull request #1536 from github/fixes/deadlock-SwitchToMainThreadAsync

Fix deadlock when VS is opended with GitHub pane visible

Author: grokys

src/GitHub.InlineReviews/InlineReviewsPackage.cs

@@ -28,12 +28,10 @@ protected override async Task InitializeAsync(
             var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));
             var exports = componentModel.DefaultExportProvider;
 
-            // await ThreadingHelper.SwitchToMainThreadAsync() won't return until after a solution
-            // has been loaded. We're using the following instead as a workaround.
-            await ThreadingHelper.MainThreadDispatcher.InvokeAsync(() =>
-                menuService.AddCommands(
-                    exports.GetExportedValue<INextInlineCommentCommand>(),
-                    exports.GetExportedValue<IPreviousInlineCommentCommand>()));
+            await ThreadingHelper.SwitchToMainThreadAsync();
+            menuService.AddCommands(
+                exports.GetExportedValue<INextInlineCommentCommand>(),
+                exports.GetExportedValue<IPreviousInlineCommentCommand>());
         }
     }
 }

src/GitHub.InlineReviews/PullRequestStatusBarPackage.cs

@@ -24,9 +24,8 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
             var serviceProvider = (IGitHubServiceProvider)await GetServiceAsync(typeof(IGitHubServiceProvider));
             var barManager = new PullRequestStatusBarManager(usageTracker, serviceProvider);
 
-            // await ThreadingHelper.SwitchToMainThreadAsync() won't return until after a solution
-            // has been loaded. We're using the following instead as a workaround.
-            await ThreadingHelper.MainThreadDispatcher.InvokeAsync(() => barManager.StartShowingStatus());
+            await ThreadingHelper.SwitchToMainThreadAsync();
+            barManager.StartShowingStatus();
         }
     }
 }

src/GitHub.VisualStudio/GitHubPackage.cs

@@ -59,18 +59,16 @@ async Task InitializeMenus()
             var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));
             var exports = componentModel.DefaultExportProvider;
 
-            // await ThreadingHelper.SwitchToMainThreadAsync() won't return until after a solution
-            // has been loaded. We're using the following instead as a workaround.
-            await ThreadingHelper.MainThreadDispatcher.InvokeAsync(() =>
-                menuService.AddCommands(
-                    exports.GetExportedValue<IAddConnectionCommand>(),
-                    exports.GetExportedValue<IBlameLinkCommand>(),
-                    exports.GetExportedValue<ICopyLinkCommand>(),
-                    exports.GetExportedValue<ICreateGistCommand>(),
-                    exports.GetExportedValue<IOpenLinkCommand>(),
-                    exports.GetExportedValue<IOpenPullRequestsCommand>(),
-                    exports.GetExportedValue<IShowCurrentPullRequestCommand>(),
-                    exports.GetExportedValue<IShowGitHubPaneCommand>()));
+            await ThreadingHelper.SwitchToMainThreadAsync();
+            menuService.AddCommands(
+                exports.GetExportedValue<IAddConnectionCommand>(),
+                exports.GetExportedValue<IBlameLinkCommand>(),
+                exports.GetExportedValue<ICopyLinkCommand>(),
+                exports.GetExportedValue<ICreateGistCommand>(),
+                exports.GetExportedValue<IOpenLinkCommand>(),
+                exports.GetExportedValue<IOpenPullRequestsCommand>(),
+                exports.GetExportedValue<IShowCurrentPullRequestCommand>(),
+                exports.GetExportedValue<IShowGitHubPaneCommand>());
         }
 
         async Task EnsurePackageLoaded(Guid packageGuid)