Merge branch 'master' into fixes/1408-change-branch-event-squashed

Author: grokys

src/GitHub.Exports/GitHub.Exports.csproj

@@ -63,6 +63,10 @@
       <HintPath>..\..\packages\Microsoft.VisualStudio.ComponentModelHost.14.0.25424\lib\net45\Microsoft.VisualStudio.ComponentModelHost.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Interop.1.15.103\lib\net35\Microsoft.VisualStudio.Setup.Configuration.Interop.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll</HintPath>
       <Private>True</Private>

src/GitHub.Exports/Services/VSServices.cs

@@ -1,11 +1,15 @@
 using System;
 using System.ComponentModel.Composition;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using GitHub.Logging;
 using GitHub.VisualStudio;
 using Microsoft.VisualStudio;
+using Microsoft.VisualStudio.Setup.Configuration;
+using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Rothko;
 using Serilog;
@@ -145,22 +149,28 @@ void TryCleanupSolutionUserFiles(IOperatingSystem os, string repoPath, string sl
 
         const string RegistryRootKey = @"Software\Microsoft\VisualStudio";
         const string EnvVersionKey = "EnvVersion";
+        const string InstallationNamePrefix = "VisualStudio/";
         string GetVSVersion()
         {
             var version = typeof(Microsoft.VisualStudio.Shell.ActivityLog).Assembly.GetName().Version;
             var keyPath = String.Format(CultureInfo.InvariantCulture, "{0}\\{1}.{2}_Config\\SplashInfo", RegistryRootKey, version.Major, version.Minor);
             try
             {
-                using (var key = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(keyPath))
+                if (version.Major == 14)
                 {
-                    var value = (string)key.GetValue(EnvVersionKey, String.Empty);
-                    if (!String.IsNullOrEmpty(value))
-                        return value;
+                    using (var key = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(keyPath))
+                    {
+                        var value = (string)key.GetValue(EnvVersionKey, String.Empty);
+                        if (!String.IsNullOrEmpty(value))
+                            return value;
+                    }
+                }
+                else
+                {
+                    var setupConfiguration = new SetupConfiguration();
+                    var setupInstance = setupConfiguration.GetInstanceForCurrentProcess();
+                    return setupInstance.GetInstallationName().TrimPrefix(InstallationNamePrefix);
                 }
-                // fallback to poking the CommonIDE assembly, which most closely follows the advertised version.
-                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)
             {

src/GitHub.Exports/packages.config

@@ -4,6 +4,7 @@
   <package id="LibGit2Sharp.NativeBinaries" version="1.0.164" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.ComponentModelHost" version="14.0.25424" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net461" />
+  <package id="Microsoft.VisualStudio.Setup.Configuration.Interop" version="1.15.103" targetFramework="net461" developmentDependency="true" />
   <package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6071" targetFramework="net461" />