Move all construction logic into VSGitExtFactory.Create

Author: jcansdale

src/GitHub.VisualStudio/GitHubPackage.cs

@@ -18,7 +18,6 @@
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
-using EnvDTE;
 using Octokit;
 using Serilog;
 using Task = System.Threading.Tasks.Task;
@@ -262,8 +261,7 @@ async Task<object> CreateService(IAsyncServiceContainer container, CancellationT
             }
             else if (serviceType == typeof(IVSGitExt))
             {
-                var dte = await GetServiceAsync(typeof(DTE)) as DTE;
-                return VSGitExtFactory.Create(dte.Version, this);
+                return await VSGitExtFactory.Create(this);
             }
             else if (serviceType == typeof(IGitHubToolWindowManager))
             {

src/GitHub.VisualStudio/Services/VSGitExtFactory.cs

@@ -2,12 +2,14 @@
 extern alias TF15;
 
 using System;
+using System.Threading.Tasks;
 using System.ComponentModel.Composition;
 using GitHub.Logging;
 using Serilog;
+using EnvDTE;
+using Microsoft.VisualStudio.Shell;
 using VSGitExt14 = TF14.GitHub.VisualStudio.Base.VSGitExt;
 using VSGitExt15 = TF15.GitHub.VisualStudio.Base.VSGitExt;
-using Microsoft.VisualStudio.Shell;
 
 namespace GitHub.Services
 {
@@ -27,17 +29,19 @@ public VSGitExtFactory(IGitHubServiceProvider serviceProvider)
         [Export(typeof(IVSGitExt))]
         public IVSGitExt VSGitExt => serviceProvider.GetService<IVSGitExt>();
 
-        public static IVSGitExt Create(string dteVersion, IAsyncServiceProvider sp)
+        public async static Task<IVSGitExt> Create(IAsyncServiceProvider sp)
         {
+            var dte = await sp.GetServiceAsync(typeof(DTE)) as DTE;
+
             // DTE.Version always ends with ".0" even for later minor versions.
-            switch (dteVersion)
+            switch (dte.Version)
             {
                 case "14.0":
                     return new Lazy<IVSGitExt>(() => new VSGitExt14(sp.GetServiceAsync)).Value;
                 case "15.0":
                     return new Lazy<IVSGitExt>(() => new VSGitExt15(sp.GetServiceAsync)).Value;
                 default:
-                    log.Error("There is no IVSGitExt implementation for DTE version {Version}", dteVersion);
+                    log.Error("There is no IVSGitExt implementation for DTE version {Version}", dte.Version);
                     return null;
             }
         }