github
diff --git a/‎GitHubVS.sln‎
Lines changed: 0 additions & 12 deletions b/‎GitHubVS.sln‎
Lines changed: 0 additions & 12 deletions
diff --git a/‎src/GitHub.TeamFoundation.15/RegistryHelper.cs‎
Lines changed: 11 additions & 8 deletions b/‎src/GitHub.TeamFoundation.15/RegistryHelper.cs‎
Lines changed: 11 additions & 8 deletions
@@ -125,8 +125,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.TeamFoundation.UnitT
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio.UnitTests", "test\GitHub.VisualStudio.UnitTests\GitHub.VisualStudio.UnitTests.csproj", "{8B14F90B-0781-465D-AB94-19C8C56E3A94}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.TeamFoundation.16", "src\GitHub.TeamFoundation.16\GitHub.TeamFoundation.16.csproj", "{F074E95F-A9A0-403F-8633-D112582B8A70}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -506,16 +504,6 @@ Global
 		{8B14F90B-0781-465D-AB94-19C8C56E3A94}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8B14F90B-0781-465D-AB94-19C8C56E3A94}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
 		{8B14F90B-0781-465D-AB94-19C8C56E3A94}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
-		{F074E95F-A9A0-403F-8633-D112582B8A70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F074E95F-A9A0-403F-8633-D112582B8A70}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F074E95F-A9A0-403F-8633-D112582B8A70}.DebugCodeAnalysis|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU
-		{F074E95F-A9A0-403F-8633-D112582B8A70}.DebugCodeAnalysis|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU
-		{F074E95F-A9A0-403F-8633-D112582B8A70}.DebugWithoutVsix|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU
-		{F074E95F-A9A0-403F-8633-D112582B8A70}.DebugWithoutVsix|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU
-		{F074E95F-A9A0-403F-8633-D112582B8A70}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F074E95F-A9A0-403F-8633-D112582B8A70}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F074E95F-A9A0-403F-8633-D112582B8A70}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
-		{F074E95F-A9A0-403F-8633-D112582B8A70}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 
@@ -3,8 +3,6 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using GitHub.Logging;
 using GitHub.Models;
 using GitHub.Services;
@@ -16,10 +14,11 @@ namespace GitHub.TeamFoundation
     internal class RegistryHelper
     {
         static readonly ILogger log = LogManager.ForContext<RegistryHelper>();
-        const string TEGitKey = @"Software\Microsoft\VisualStudio\15.0\TeamFoundation\GitSourceControl";
+
         static RegistryKey OpenGitKey(string path)
         {
-            return Microsoft.Win32.Registry.CurrentUser.OpenSubKey(TEGitKey + "\\" + path, true);
+            var keyName = $"Software\\Microsoft\\VisualStudio\\{MajorVersion}.0\\TeamFoundation\\GitSourceControl\\{path}";
+            return Registry.CurrentUser.OpenSubKey(keyName, true);
         }
 
         internal static IEnumerable<ILocalRepositoryModel> PokeTheRegistryForRepositoryList()
@@ -56,23 +55,24 @@ internal static string PokeTheRegistryForLocalClonePath()
             }
         }
 
-        const string NewProjectDialogKeyPath = @"Software\Microsoft\VisualStudio\15.0\NewProjectDialog";
         const string MRUKeyPath = "MRUSettingsLocalProjectLocationEntries";
         internal static string SetDefaultProjectPath(string path)
         {
+            var newProjectDialogKeyPath = $"Software\\Microsoft\\VisualStudio\\{MajorVersion}.0\\NewProjectDialog";
+
             var old = String.Empty;
             try
             {
-                var newProjectKey = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(NewProjectDialogKeyPath, true) ??
-                                    Microsoft.Win32.Registry.CurrentUser.CreateSubKey(NewProjectDialogKeyPath);
+                var newProjectKey = Registry.CurrentUser.OpenSubKey(newProjectDialogKeyPath, true) ??
+                                    Registry.CurrentUser.CreateSubKey(newProjectDialogKeyPath);
 
                 if (newProjectKey == null)
                 {
                     throw new GitHubLogicException(
                         string.Format(
                             CultureInfo.CurrentCulture,
                             "Could not open or create registry key '{0}'",
-                            NewProjectDialogKeyPath));
+                            newProjectDialogKeyPath));
                 }
 
                 using (newProjectKey)
@@ -120,5 +120,8 @@ internal static string SetDefaultProjectPath(string path)
             }
             return old;
         }
+
+        // Major version number of the current devenv process
+        static int MajorVersion => Process.GetCurrentProcess().MainModule.FileVersionInfo.FileMajorPart;
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`	`using System.Diagnostics;`
`4`	`4`	`using System.Globalization;`
`5`	`5`	`using System.Linq;`
`6`		`-using System.Text;`
`7`		`-using System.Threading.Tasks;`
`8`	`6`	`using GitHub.Logging;`
`9`	`7`	`using GitHub.Models;`
`10`	`8`	`using GitHub.Services;`
`@@ -16,10 +14,11 @@ namespace GitHub.TeamFoundation`
`16`	`14`	`internal class RegistryHelper`
`17`	`15`	`{`
`18`	`16`	`static readonly ILogger log = LogManager.ForContext<RegistryHelper>();`
`19`		`- const string TEGitKey = @"Software\Microsoft\VisualStudio\15.0\TeamFoundation\GitSourceControl";`
	`17`	`+`
`20`	`18`	`static RegistryKey OpenGitKey(string path)`
`21`	`19`	`{`
`22`		`- return Microsoft.Win32.Registry.CurrentUser.OpenSubKey(TEGitKey + "\\" + path, true);`
	`20`	`+ var keyName = $"Software\\Microsoft\\VisualStudio\\{MajorVersion}.0\\TeamFoundation\\GitSourceControl\\{path}";`
	`21`	`+ return Registry.CurrentUser.OpenSubKey(keyName, true);`
`23`	`22`	`}`
`24`	`23`
`25`	`24`	`internal static IEnumerable<ILocalRepositoryModel> PokeTheRegistryForRepositoryList()`
`@@ -56,23 +55,24 @@ internal static string PokeTheRegistryForLocalClonePath()`
`56`	`55`	`}`
`57`	`56`	`}`
`58`	`57`
`59`		`- const string NewProjectDialogKeyPath = @"Software\Microsoft\VisualStudio\15.0\NewProjectDialog";`
`60`	`58`	`const string MRUKeyPath = "MRUSettingsLocalProjectLocationEntries";`
`61`	`59`	`internal static string SetDefaultProjectPath(string path)`
`62`	`60`	`{`
	`61`	`+ var newProjectDialogKeyPath = $"Software\\Microsoft\\VisualStudio\\{MajorVersion}.0\\NewProjectDialog";`
	`62`	`+`
`63`	`63`	`var old = String.Empty;`
`64`	`64`	`try`
`65`	`65`	`{`
`66`		`- var newProjectKey = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(NewProjectDialogKeyPath, true) ??`
`67`		`- Microsoft.Win32.Registry.CurrentUser.CreateSubKey(NewProjectDialogKeyPath);`
	`66`	`+ var newProjectKey = Registry.CurrentUser.OpenSubKey(newProjectDialogKeyPath, true) ??`
	`67`	`+ Registry.CurrentUser.CreateSubKey(newProjectDialogKeyPath);`
`68`	`68`
`69`	`69`	`if (newProjectKey == null)`
`70`	`70`	`{`
`71`	`71`	`throw new GitHubLogicException(`
`72`	`72`	`string.Format(`
`73`	`73`	`CultureInfo.CurrentCulture,`
`74`	`74`	`"Could not open or create registry key '{0}'",`
`75`		`- NewProjectDialogKeyPath));`
	`75`	`+ newProjectDialogKeyPath));`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`using (newProjectKey)`
`@@ -120,5 +120,8 @@ internal static string SetDefaultProjectPath(string path)`
`120`	`120`	`}`
`121`	`121`	`return old;`
`122`	`122`	`}`
	`123`	`+`
	`124`	`+ // Major version number of the current devenv process`
	`125`	`+ static int MajorVersion => Process.GetCurrentProcess().MainModule.FileVersionInfo.FileMajorPart;`
`123`	`126`	`}`
`124`	`127`	`}`