Revert "Allow menuService.AddCommands to be called from a b/g thread"

This reverts commit 0527497.

Author: jcansdale

src/GitHub.InlineReviews/InlineReviewsPackage.cs

@@ -8,6 +8,7 @@
 using GitHub.VisualStudio;
 using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Threading;
 using Task = System.Threading.Tasks.Task;
 
 namespace GitHub.InlineReviews
@@ -27,15 +28,24 @@ protected override async Task InitializeAsync(
             var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));
             var exports = componentModel.DefaultExportProvider;
 
-            menuService.AddCommands(
-                exports.GetExportedValue<INextInlineCommentCommand>(),
-                exports.GetExportedValue<IPreviousInlineCommentCommand>());
+            // Avoid delays when there is ongoing UI activity.
+            // See: https://github.com/github/VisualStudio/issues/1537
+            await JoinableTaskFactory.RunAsync(VsTaskRunContext.UIThreadNormalPriority, InitializeMenus);
         }
 
-        // The IDesignerHost and ISelectionService services are requested by MenuCommandService.EnsureVerbs().
-        // When called from a non-Main thread this would throw despite the fact these services don't exist.
-        // This override allows IMenuCommandService.AddCommands to be called form a background thread.
-        protected override object GetService(Type serviceType)
-            => (serviceType == typeof(ISelectionService) || serviceType == typeof(IDesignerHost)) ? null : base.GetService(serviceType);
+        async Task InitializeMenus()
+        {
+            var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));
+            var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));
+            var exports = componentModel.DefaultExportProvider;
+            var commands = new IVsCommandBase[]
+            {
+                exports.GetExportedValue<INextInlineCommentCommand>(),
+                exports.GetExportedValue<IPreviousInlineCommentCommand>()
+            };
+
+            await JoinableTaskFactory.SwitchToMainThreadAsync();
+            menuService.AddCommands(commands);
+        }
     }
 }

src/GitHub.VisualStudio/GitHubPackage.cs

@@ -38,14 +38,11 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
             LogVersionInformation();
             await base.InitializeAsync(cancellationToken, progress);
             await GetServiceAsync(typeof(IUsageTracker));
-            await InitializeMenus();
-        }
 
-        // The IDesignerHost and ISelectionService services are requested by MenuCommandService.EnsureVerbs().
-        // When called from a non-Main thread this would throw despite the fact these services don't exist.
-        // This override allows IMenuCommandService.AddCommands to be called form a background thread.
-        protected override object GetService(Type serviceType)
-            => (serviceType == typeof(ISelectionService) || serviceType == typeof(IDesignerHost)) ? null : base.GetService(serviceType);
+            // Avoid delays when there is ongoing UI activity.
+            // See: https://github.com/github/VisualStudio/issues/1537
+            await JoinableTaskFactory.RunAsync(VsTaskRunContext.UIThreadNormalPriority, InitializeMenus);
+        }
 
         void LogVersionInformation()
         {
@@ -60,16 +57,20 @@ async Task InitializeMenus()
             var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));
             var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));
             var exports = componentModel.DefaultExportProvider;
-
-            menuService.AddCommands(
+            var commands = new IVsCommandBase[]
+            {
                 exports.GetExportedValue<IAddConnectionCommand>(),
                 exports.GetExportedValue<IBlameLinkCommand>(),
                 exports.GetExportedValue<ICopyLinkCommand>(),
                 exports.GetExportedValue<ICreateGistCommand>(),
                 exports.GetExportedValue<IOpenLinkCommand>(),
                 exports.GetExportedValue<IOpenPullRequestsCommand>(),
                 exports.GetExportedValue<IShowCurrentPullRequestCommand>(),
-                exports.GetExportedValue<IShowGitHubPaneCommand>());
+                exports.GetExportedValue<IShowGitHubPaneCommand>()
+            };
+
+            await JoinableTaskFactory.SwitchToMainThreadAsync();
+            menuService.AddCommands(commands);
         }
 
         async Task EnsurePackageLoaded(Guid packageGuid)