Use ApplicationInfo.GetHostVersionInfo not DTE.Version

Author: jcansdale

src/GitHub.VisualStudio/GitHubPackage.cs

@@ -261,7 +261,8 @@ async Task<object> CreateService(IAsyncServiceContainer container, CancellationT
             }
             else if (serviceType == typeof(IVSGitExt))
             {
-                return await VSGitExtFactory.Create(this);
+                var vsVersion = ApplicationInfo.GetHostVersionInfo().FileMajorPart;
+                return VSGitExtFactory.Create(vsVersion, this);
             }
             else if (serviceType == typeof(IGitHubToolWindowManager))
             {

src/GitHub.VisualStudio/Services/VSGitExtFactory.cs

@@ -2,11 +2,10 @@
 extern alias TF15;
 
 using System;
-using System.Threading.Tasks;
 using System.ComponentModel.Composition;
+using GitHub.Info;
 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;
@@ -24,19 +23,16 @@ public VSGitExtFactory(IGitHubServiceProvider serviceProvider)
             VSGitExt = serviceProvider.GetService<IVSGitExt>();
         }
 
-        public async static Task<IVSGitExt> Create(IAsyncServiceProvider sp)
+        public static IVSGitExt Create(int vsVersion, IAsyncServiceProvider sp)
         {
-            var dte = await sp.GetServiceAsync(typeof(DTE)) as DTE;
-
-            // DTE.Version always ends with ".0" even for later minor versions.
-            switch (dte.Version)
+            switch (vsVersion)
             {
-                case "14.0":
+                case 14:
                     return Create(() => new VSGitExt14(sp.GetServiceAsync));
-                case "15.0":
+                case 15:
                     return Create(() => new VSGitExt15(sp.GetServiceAsync));
                 default:
-                    log.Error("There is no IVSGitExt implementation for DTE version {Version}", dte.Version);
+                    log.Error("There is no IVSGitExt implementation for DTE version {Version}", vsVersion);
                     return null;
             }
         }