Make InlineReviewsPackage async.

src/GitHub.InlineReviews/Commands/IPackageResource.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel.Design;
 
 namespace GitHub.InlineReviews.Commands
 {
@@ -11,10 +12,11 @@ public interface IPackageResource
         /// Registers the resource with a package.
         /// </summary>
         /// <param name="package">The package registering the resource.</param>
+        /// <param name="menuService">The menu service to register against.</param>
         /// <remarks>
         /// This method should not be called directly, instead packages should call
         /// <see cref="PackageResources.Register{TPackage}(TPackage)"/> on initialization.
         /// </remarks>
-        void Register(IServiceProvider package);
+        void Register(IServiceProvider package, IMenuCommandService menuService);
     }
 }

src/GitHub.InlineReviews/Commands/PackageResources.cs

@@ -1,6 +1,6 @@
 using System;
-using GitHub.Extensions;
-using GitHub.Services;
+using System.ComponentModel.Composition.Hosting;
+using System.ComponentModel.Design;
 using Microsoft.VisualStudio.Shell;
 
 namespace GitHub.InlineReviews.Commands
@@ -12,18 +12,21 @@ static class PackageResources
         /// </summary>
         /// <typeparam name="TPackage">The type of the package.</typeparam>
         /// <param name="package">The package.</param>
-        public static void Register<TPackage>(TPackage package) where TPackage : Package
+        public static void Register<TPackage>(
+            TPackage package,
+            ExportProvider exportProvider,
+            IMenuCommandService menuService)
+                where TPackage : Package
         {
-            var serviceProvider = package.GetServiceSafe<IGitHubServiceProvider>();
-            var commands = serviceProvider?.ExportProvider?.GetExports<IPackageResource, IExportCommandMetadata>();
+            var commands = exportProvider.GetExports<IPackageResource, IExportCommandMetadata>();
 
             if (commands != null)
             {
                 foreach (var command in commands)
                 {
                     if (command.Metadata.PackageType == typeof(TPackage))
                     {
-                        command.Value.Register(package);
+                        command.Value.Register(package, menuService);
                     }
                 }
             }

src/GitHub.InlineReviews/Commands/VsCommand.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel.Design;
 using System.Windows.Input;
 using GitHub.Extensions;
 using Microsoft.VisualStudio.Shell;
@@ -37,14 +38,14 @@ protected VsCommand(Guid commandSet, int commandId)
         }
 
         /// <inheritdoc/>
-        public override void Register(IServiceProvider package)
+        public override void Register(IServiceProvider package, IMenuCommandService menuService)
         {
             var command = new OleMenuCommand(
                 (s, e) => Execute().Forget(),
                 (s, e) => { },
                 (s, e) => BeforeQueryStatus((OleMenuCommand)s),
                 VsCommandID);
-            Register(package, command);
+            Register(package, menuService, command);
         }
 
         /// <summary>
@@ -88,14 +89,14 @@ protected VsCommand(Guid commandSet, int commandId)
         }
 
         /// <inheritdoc/>
-        public override void Register(IServiceProvider package)
+        public override void Register(IServiceProvider package, IMenuCommandService menuService)
         {
             var command = new OleMenuCommand(
                 (s, e) => Execute((TParam)((OleMenuCmdEventArgs)e).InValue).Forget(),
                 (s, e) => { },
                 (s, e) => BeforeQueryStatus((OleMenuCommand)s),
                 VsCommandID);
-            Register(package, command);
+            Register(package, menuService, command);
         }
 
         /// <summary>

src/GitHub.InlineReviews/Commands/VsCommandBase.cs

@@ -52,7 +52,7 @@ void ICommand.Execute(object parameter)
         }
 
         /// <inheritdoc/>
-        public abstract void Register(IServiceProvider package);
+        public abstract void Register(IServiceProvider package, IMenuCommandService menuService);
 
         /// <summary>
         /// Gets the package that registered the command.
@@ -86,12 +86,10 @@ protected void BeforeQueryStatus(MenuCommand command)
         /// </summary>
         /// <param name="package">The package.</param>
         /// <param name="command">The command.</param>
-        protected void Register(IServiceProvider package, MenuCommand command)
+        protected void Register(IServiceProvider package, IMenuCommandService menuService, MenuCommand command)
         {
             Package = package;
-            var serviceProvider = (IServiceProvider)package;
-            var mcs = (IMenuCommandService)serviceProvider.GetService(typeof(IMenuCommandService));
-            mcs?.AddCommand(command);
+            menuService.AddCommand(command);
         }
     }
 }

src/GitHub.InlineReviews/InlineReviewsPackage.cs

@@ -1,24 +1,32 @@
 using System;
+using System.ComponentModel.Design;
 using System.Runtime.InteropServices;
+using System.Threading;
 using GitHub.InlineReviews.Commands;
 using GitHub.InlineReviews.Views;
 using GitHub.VisualStudio;
+using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
+using Task = System.Threading.Tasks.Task;
 
 namespace GitHub.InlineReviews
 {
-    [PackageRegistration(UseManagedResourcesOnly = true)]
+    [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
     [Guid(Guids.InlineReviewsPackageId)]
     [ProvideAutoLoad(UIContextGuids80.SolutionExists)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [ProvideToolWindow(typeof(PullRequestCommentsPane), DocumentLikeTool=true)]
-    public class InlineReviewsPackage : Package
+    public class InlineReviewsPackage : AsyncPackage
     {
-        protected override void Initialize()
+        protected override async Task InitializeAsync(
+            CancellationToken cancellationToken,
+            IProgress<ServiceProgressData> progress)
         {
-            base.Initialize();
-            PackageResources.Register(this);
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+            var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));
+            var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));
+            PackageResources.Register(this, componentModel.DefaultExportProvider, menuService);
         }
     }
 }