Move CreateVSGitExt into VSGitExtFactory

Author: jcansdale

src/GitHub.VisualStudio/GitHub.VisualStudio.csproj

@@ -328,6 +328,7 @@
     <Compile Include="Services\UsageTracker.cs" />
     <Compile Include="Services\LoginManagerDispatcher.cs" />
     <Compile Include="Services\UsageTrackerDispatcher.cs" />
+    <Compile Include="Services\VSGitExtFactory.cs" />
     <Compile Include="Services\VSGitExtDispatcher.cs" />
     <Compile Include="Settings\Constants.cs" />
     <Compile Include="Services\ConnectionManager.cs" />

src/GitHub.VisualStudio/GitHubPackage.cs

@@ -1,7 +1,4 @@
-extern alias TF14;
-extern alias TF15;
-
-using System;
+using System;
 using System.ComponentModel.Composition;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
@@ -25,8 +22,6 @@
 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
 {
@@ -268,7 +263,7 @@ async Task<object> CreateService(IAsyncServiceContainer container, CancellationT
             else if (serviceType == typeof(IVSGitExt))
             {
                 var dte = await GetServiceAsync(typeof(DTE)) as DTE;
-                return CreateVSGitExt(dte.Version);
+                return VSGitExtFactory.Create(dte.Version, this);
             }
             else if (serviceType == typeof(IGitHubToolWindowManager))
             {
@@ -281,20 +276,5 @@ async Task<object> CreateService(IAsyncServiceContainer container, CancellationT
                 return sp.TryGetService(serviceType);
             }
         }
-
-        IVSGitExt CreateVSGitExt(string dteVersion)
-        {
-            // DTE.Version always ends with ".0" even for later minor versions.
-            switch (dteVersion)
-            {
-                case "14.0":
-                    return new Lazy<IVSGitExt>(() => new VSGitExt14(GetServiceAsync)).Value;
-                case "15.0":
-                    return new Lazy<IVSGitExt>(() => new VSGitExt15(GetServiceAsync)).Value;
-                default:
-                    log.Error("There is no IVSGitExt implementation for DTE version {Version}", dteVersion);
-                    return null;
-            }
-        }
     }
 }

src/GitHub.VisualStudio/Services/VSGitExtFactory.cs

@@ -0,0 +1,32 @@
+extern alias TF14;
+extern alias TF15;
+
+using System;
+using GitHub.Logging;
+using Serilog;
+using VSGitExt14 = TF14.GitHub.VisualStudio.Base.VSGitExt;
+using VSGitExt15 = TF15.GitHub.VisualStudio.Base.VSGitExt;
+using Microsoft.VisualStudio.Shell;
+
+namespace GitHub.Services
+{
+    public class VSGitExtFactory
+    {
+        static readonly ILogger log = LogManager.ForContext<VSGitExtFactory>();
+
+        public static IVSGitExt Create(string dteVersion, IAsyncServiceProvider sp)
+        {
+            // DTE.Version always ends with ".0" even for later minor versions.
+            switch (dteVersion)
+            {
+                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);
+                    return null;
+            }
+        }
+    }
+}