Expose IVSGitExt as async VS service

Author: jcansdale

src/GitHub.Exports/Services/IGitHubServiceProvider.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using System.ComponentModel.Composition.Hosting;
 using System.Runtime.InteropServices;
 using GitHub.VisualStudio;
@@ -28,5 +29,7 @@ Ret GetService<T, Ret>() where T : class
         /// <param name="owner">The owner, which either has to match what was passed to AddService,
         /// or if it's null, the service will be removed without checking for ownership</param>
         void RemoveService(Type t, object owner);
+
+        Task<object> GetServiceAsync(Type serviceType);
     }
 }

src/GitHub.InlineReviews/PullRequestStatusBarPackage.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Windows;
 using System.Threading;
 using System.Runtime.InteropServices;
 using GitHub.Services;
@@ -22,13 +21,9 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
         {
             var usageTracker = (IUsageTracker)await GetServiceAsync(typeof(IUsageTracker));
             var serviceProvider = (IGitHubServiceProvider)await GetServiceAsync(typeof(IGitHubServiceProvider));
+            var gitExt = (IVSGitExt)await GetServiceAsync(typeof(IVSGitExt));
 
-            // NOTE: ThreadingHelper.SwitchToMainThreadAsync() doesn't return until a solution is loaded. Using Dispatcher.Invoke instead.
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                var gitExt = serviceProvider.GetService<IVSGitExt>();
-                new PullRequestStatusBarManager(gitExt, usageTracker, serviceProvider);
-            });
+            new PullRequestStatusBarManager(gitExt, usageTracker, serviceProvider);
         }
     }
 }

src/GitHub.TeamFoundation.14/Services/VSGitExt.cs

@@ -6,7 +6,6 @@
 using GitHub.Models;
 using GitHub.Services;
 using GitHub.Logging;
-using GitHub.Helpers;
 using GitHub.TeamFoundation.Services;
 using Serilog;
 using Microsoft.VisualStudio.TeamFoundation.Git.Extensibility;
@@ -20,8 +19,6 @@ namespace GitHub.VisualStudio.Base
     /// Initialization for this service will be done asynchronously and the <see cref="IGitExt" /> service will be
     /// retrieved on the Main thread. This means the service can be constructed and subscribed to on a background thread.
     /// </remarks>
-    [Export(typeof(IVSGitExt))]
-    [PartCreationPolicy(CreationPolicy.Shared)]
     public class VSGitExt : IVSGitExt
     {
         static readonly ILogger log = LogManager.ForContext<VSGitExt>();
@@ -99,7 +96,7 @@ async Task ContextChangedAsync()
 
         async Task<bool> TryInitialize()
         {
-            gitService = await GetServiceAsync<IGitExt>();
+            gitService = (IGitExt)await serviceProvider.GetServiceAsync(typeof(IGitExt));
             if (gitService != null)
             {
                 gitService.PropertyChanged += (s, e) =>
@@ -122,13 +119,6 @@ async Task<bool> TryInitialize()
             return false;
         }
 
-        async Task<T> GetServiceAsync<T>() where T : class
-        {
-            // GetService must be called from the Main thread.
-            await ThreadingHelper.SwitchToMainThreadAsync();
-            return serviceProvider.GetService<T>();
-        }
-
         void RefreshActiveRepositories()
         {
             try

src/GitHub.VisualStudio/GitHub.VisualStudio.csproj

@@ -679,13 +679,15 @@
       <Private>True</Private>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIXLocalOnly>
+      <Aliases>TF14</Aliases>
     </ProjectReference>
     <ProjectReference Include="..\GitHub.TeamFoundation.15\GitHub.TeamFoundation.15.csproj">
       <Project>{161dbf01-1dbf-4b00-8551-c5c00f26720e}</Project>
       <Name>GitHub.TeamFoundation.15</Name>
       <Private>True</Private>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIXLocalOnly>
+      <Aliases>TF15</Aliases>
     </ProjectReference>
     <ProjectReference Include="..\GitHub.UI.Reactive\GitHub.UI.Reactive.csproj">
       <Project>{158b05e8-fdbc-4d71-b871-c96e28d5adf5}</Project>

src/GitHub.VisualStudio/GitHubPackage.cs

@@ -1,4 +1,7 @@
-using System;
+extern alias TF14;
+extern alias TF15;
+
+using System;
 using System.ComponentModel.Composition;
 using System.Diagnostics;
 using System.Reflection;
@@ -22,6 +25,8 @@
 using Octokit;
 using Serilog;
 using Task = System.Threading.Tasks.Task;
+using VSGitExt14 = TF14.GitHub.VisualStudio.Base.VSGitExt;
+using VSGitExt15 = TF15.GitHub.VisualStudio.Base.VSGitExt;
 
 namespace GitHub.VisualStudio
 {
@@ -107,12 +112,28 @@ public GHClient(IProgram program)
         }
     }
 
+    [PartCreationPolicy(CreationPolicy.Shared)]
+    public class VSGitExtPart
+    {
+        readonly IGitHubServiceProvider serviceProvider;
+
+        [ImportingConstructor]
+        public VSGitExtPart(IGitHubServiceProvider serviceProvider)
+        {
+            this.serviceProvider = serviceProvider;
+        }
+
+        [Export(typeof(IVSGitExt))]
+        public IVSGitExt VSGitExt => serviceProvider.GetService<IVSGitExt>();
+    }
+
     [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
     [ProvideService(typeof(ILoginManager), IsAsyncQueryable = true)]
     [ProvideService(typeof(IMenuProvider), IsAsyncQueryable = true)]
     [ProvideService(typeof(IGitHubServiceProvider), IsAsyncQueryable = true)]
     [ProvideService(typeof(IUsageTracker), IsAsyncQueryable = true)]
     [ProvideService(typeof(IUsageService), IsAsyncQueryable = true)]
+    [ProvideService(typeof(IVSGitExt), IsAsyncQueryable = true)]
     [ProvideService(typeof(IGitHubToolWindowManager))]
     [Guid(ServiceProviderPackageId)]
     public sealed class ServiceProviderPackage : AsyncPackage, IServiceProviderPackage, IGitHubToolWindowManager
@@ -150,6 +171,7 @@ Version VSVersion
         protected override Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
         {
             AddService(typeof(IGitHubServiceProvider), CreateService, true);
+            AddService(typeof(IVSGitExt), CreateService, true);
             AddService(typeof(IUsageTracker), CreateService, true);
             AddService(typeof(IUsageService), CreateService, true);
             AddService(typeof(ILoginManager), CreateService, true);
@@ -258,6 +280,11 @@ async Task<object> CreateService(IAsyncServiceContainer container, CancellationT
                 var serviceProvider = await GetServiceAsync(typeof(IGitHubServiceProvider)) as IGitHubServiceProvider;
                 return new UsageTracker(serviceProvider, usageService);
             }
+            else if (serviceType == typeof(IVSGitExt))
+            {
+                var sp = await GetServiceAsync(typeof(IGitHubServiceProvider)) as IGitHubServiceProvider;
+                return CreateVSGitExt(sp);
+            }
             else if (serviceType == typeof(IGitHubToolWindowManager))
             {
                 return this;
@@ -269,5 +296,18 @@ async Task<object> CreateService(IAsyncServiceContainer container, CancellationT
                 return sp.TryGetService(serviceType);
             }
         }
+
+        IVSGitExt CreateVSGitExt(IGitHubServiceProvider sp)
+        {
+            switch (VSVersion.Major)
+            {
+                case 14:
+                    return new Lazy<IVSGitExt>(() => new VSGitExt14(sp)).Value;
+                case 15:
+                    return new Lazy<IVSGitExt>(() => new VSGitExt15(sp)).Value;
+                default:
+                    return null;
+            }
+        }
     }
 }

src/GitHub.VisualStudio/Services/GitHubServiceProvider.cs

@@ -71,6 +71,8 @@ public IServiceProvider GitServiceProvider
         public object TryGetService(Type t) => theRealProvider.TryGetService(t);
 
         public T TryGetService<T>() where T : class => theRealProvider.TryGetService<T>();
+
+        public Task<object> GetServiceAsync(Type serviceType) => theRealProvider.GetServiceAsync(serviceType);
     }
 
     /// <summary>
@@ -309,5 +311,7 @@ public void Dispose()
             Dispose(true);
             GC.SuppressFinalize(this);
         }
+
+        public Task<object> GetServiceAsync(Type serviceType) => asyncServiceProvider.GetServiceAsync(serviceType);
     }
 }