Grab VS version from registry

Author: shana

src/GitHub.Exports/Services/IVSServices.cs

@@ -5,6 +5,8 @@ namespace GitHub.Services
 {
     public interface IVSServices
     {
+        string VSVersion { get; }
+
         void ActivityLogMessage(string message);
         void ActivityLogWarning(string message);
         void ActivityLogError(string message);

src/GitHub.Exports/Services/Services.cs

@@ -84,8 +84,6 @@ public static IVsOutputWindowPane OutputWindowPane
 
         public static IVsUIShell UIShell => GetGlobalService<SVsUIShell, IVsUIShell>();
 
-        public static string VisualStudioVersion => Dte.Version;
-
         public static IVsActivityLog GetActivityLog(this IServiceProvider provider)
         {
             return GetGlobalService<SVsActivityLog, IVsActivityLog>(provider);

src/GitHub.Exports/Services/UsageTracker.cs

@@ -24,6 +24,7 @@ public class UsageTracker : IUsageTracker
         readonly IMetricsService client;
         readonly IConnectionManager connectionManager;
         readonly IPackageSettings userSettings;
+        readonly IVSServices vsservices;
         readonly DispatcherTimer timer;
         readonly string storePath;
 
@@ -37,6 +38,7 @@ public UsageTracker(
             IProgram program,
             IConnectionManager connectionManager,
             IPackageSettings userSettings,
+            IVSServices vsservices,
             [Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)
         {
             fileExists = (path) => System.IO.File.Exists(path);
@@ -46,6 +48,7 @@ public UsageTracker(
 
             this.connectionManager = connectionManager;
             this.userSettings = userSettings;
+            this.vsservices = vsservices;
             this.client = serviceProvider.GetExportedValue<IMetricsService>();
             this.timer = new DispatcherTimer(
                 TimeSpan.FromMinutes(1),
@@ -141,7 +144,7 @@ UsageStore LoadUsage()
 
             result.Model.Lang = CultureInfo.InstalledUICulture.IetfLanguageTag;
             result.Model.AppVersion = AssemblyVersionInformation.Version;
-            result.Model.VSVersion = GitHub.VisualStudio.Services.VisualStudioVersion;
+            result.Model.VSVersion = vsservices.VSVersion;
 
             return result;
         }

src/GitHub.Exports/Services/VSServices.cs

@@ -6,6 +6,7 @@
 using GitHub.VisualStudio;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Shell.Interop;
+using System.Linq;
 
 namespace GitHub.Services
 {
@@ -21,6 +22,17 @@ public VSServices(IUIProvider serviceProvider)
             this.serviceProvider = serviceProvider;
         }
 
+        string vsVersion;
+        public string VSVersion
+        {
+            get
+            {
+                if (vsVersion == null)
+                    vsVersion = GetVSVersion();
+                return vsVersion;
+            }
+        }
+
 
         public void ActivityLogMessage(string message)
         {
@@ -55,5 +67,30 @@ public void ActivityLogWarning(string message)
                     Console.WriteLine(string.Format(CultureInfo.CurrentCulture, "Could not log warning to activity log: {0}", message));
             }
         }
+
+        const string RegistryRootKey = @"Software\Microsoft\VisualStudio";
+        const string EnvVersionKey = "EnvVersion";
+        string GetVSVersion()
+        {
+            var version = VisualStudio.Services.Dte.Version;
+            var keyPath = String.Format(CultureInfo.InvariantCulture, "{0}\\{1}_Config\\SplashInfo", RegistryRootKey, version);
+            try
+            {
+                using (var key = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(keyPath))
+                {
+                    var value = (string)key.GetValue(EnvVersionKey, String.Empty);
+                    if (!String.IsNullOrEmpty(value))
+                        return value;
+                }
+                var asm = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(a => a.FullName.StartsWith("Microsoft.VisualStudio.CommonIDE", StringComparison.OrdinalIgnoreCase));
+                if (asm != null)
+                    return asm.GetName().Version.ToString();
+            }
+            catch(Exception ex)
+            {
+                VsOutputLogger.WriteLine(string.Format(CultureInfo.CurrentCulture, "Error getting the Visual Studio version '{0}'", ex));
+            }
+            return version;
+        }
     }
 }