Revert "Factor b/g loading menu code into AsyncMenuPackage"

This reverts commit 5730008.

Author: jcansdale

src/GitHub.InlineReviews/InlineReviewsPackage.cs

@@ -1,8 +1,9 @@
 using System;
+using System.ComponentModel.Design;
 using System.Runtime.InteropServices;
+using System.Threading;
 using GitHub.Commands;
 using GitHub.InlineReviews.Views;
-using GitHub.Services.Vssdk;
 using GitHub.Services.Vssdk.Commands;
 using GitHub.VisualStudio;
 using Microsoft.VisualStudio.ComponentModelHost;
@@ -16,16 +17,25 @@ namespace GitHub.InlineReviews
     [ProvideAutoLoad(Guids.UIContext_Git, PackageAutoLoadFlags.BackgroundLoad)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [ProvideToolWindow(typeof(PullRequestCommentsPane), DocumentLikeTool = true)]
-    public class InlineReviewsPackage : AsyncMenuPackage
+    public class InlineReviewsPackage : AsyncPackage
     {
-        protected override async Task InitializeMenusAsync(OleMenuCommandService menuService)
+        protected override async Task InitializeAsync(
+            CancellationToken cancellationToken,
+            IProgress<ServiceProgressData> progress)
         {
+            var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));
             var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));
             var exports = componentModel.DefaultExportProvider;
 
             menuService.AddCommands(
                 exports.GetExportedValue<INextInlineCommentCommand>(),
                 exports.GetExportedValue<IPreviousInlineCommentCommand>());
         }
+
+        // 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);
     }
 }

src/GitHub.Services.Vssdk/AsyncMenuPackage.cs

@@ -139,7 +139,6 @@
     <Compile Include="..\common\SolutionInfo.cs">
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>
-    <Compile Include="AsyncMenuPackage.cs" />
     <Compile Include="Commands\MenuCommandServiceExtensions.cs" />
     <Compile Include="Commands\VsCommand.cs" />
     <Compile Include="Commands\VsCommandBase.cs" />

src/GitHub.Services.Vssdk/GitHub.Services.Vssdk.csproj

@@ -2,6 +2,7 @@
 using System.Windows;
 using System.Threading;
 using System.Threading.Tasks;
+using System.ComponentModel.Design;
 using System.ComponentModel.Composition;
 using System.Runtime.InteropServices;
 using GitHub.Api;
@@ -13,7 +14,6 @@
 using GitHub.Services.Vssdk.Commands;
 using GitHub.ViewModels.GitHubPane;
 using GitHub.VisualStudio.UI;
-using GitHub.Services.Vssdk;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.Shell;
@@ -29,15 +29,35 @@ namespace GitHub.VisualStudio
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [ProvideAutoLoad(Guids.UIContext_Git, PackageAutoLoadFlags.BackgroundLoad)]
     [ProvideOptionPage(typeof(OptionsPage), "GitHub for Visual Studio", "General", 0, 0, supportsAutomation: true)]
-    public class GitHubPackage : AsyncMenuPackage
+    public class GitHubPackage : AsyncPackage
     {
         static readonly ILogger log = LogManager.ForContext<GitHubPackage>();
 
-        protected async override Task InitializeMenusAsync(OleMenuCommandService menuService)
+        protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
         {
             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);
+
+        void LogVersionInformation()
+        {
+            var packageVersion = ApplicationInfo.GetPackageVersion(this);
+            var hostVersionInfo = ApplicationInfo.GetHostVersionInfo();
+            log.Information("Initializing GitHub Extension v{PackageVersion} in {$FileDescription} ({$ProductVersion})",
+                packageVersion, hostVersionInfo.FileDescription, hostVersionInfo.ProductVersion);
+        }
 
+        async Task InitializeMenus()
+        {
+            var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));
             var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));
             var exports = componentModel.DefaultExportProvider;
 
@@ -52,14 +72,6 @@ protected async override Task InitializeMenusAsync(OleMenuCommandService menuSer
                 exports.GetExportedValue<IShowGitHubPaneCommand>());
         }
 
-        void LogVersionInformation()
-        {
-            var packageVersion = ApplicationInfo.GetPackageVersion(this);
-            var hostVersionInfo = ApplicationInfo.GetHostVersionInfo();
-            log.Information("Initializing GitHub Extension v{PackageVersion} in {$FileDescription} ({$ProductVersion})",
-                packageVersion, hostVersionInfo.FileDescription, hostVersionInfo.ProductVersion);
-        }
-
         async Task EnsurePackageLoaded(Guid packageGuid)
         {
             var shell = await GetServiceAsync(typeof(SVsShell)) as IVsShell;