From 34908608b903a6f0c8ea13383e511161a27ae743 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Thu, 6 Sep 2018 17:23:55 +0200 Subject: [PATCH 1/3] Fix CA errors. --- src/GitHub.TeamFoundation.14/RegistryHelper.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/GitHub.TeamFoundation.14/RegistryHelper.cs b/src/GitHub.TeamFoundation.14/RegistryHelper.cs index 92e252676..f4fa44eb3 100644 --- a/src/GitHub.TeamFoundation.14/RegistryHelper.cs +++ b/src/GitHub.TeamFoundation.14/RegistryHelper.cs @@ -9,6 +9,7 @@ using GitHub.Models; using GitHub.Services; using Microsoft.Win32; using Serilog; +using static System.FormattableString; namespace GitHub.TeamFoundation { @@ -18,7 +19,7 @@ namespace GitHub.TeamFoundation static RegistryKey OpenGitKey(string path) { - var keyName = $"Software\\Microsoft\\VisualStudio\\{MajorVersion}.0\\TeamFoundation\\GitSourceControl\\{path}"; + var keyName = Invariant($"Software\\Microsoft\\VisualStudio\\{MajorVersion}.0\\TeamFoundation\\GitSourceControl\\{path}"); return Registry.CurrentUser.OpenSubKey(keyName, true); } @@ -64,7 +65,7 @@ namespace GitHub.TeamFoundation const string MRUKeyPath = "MRUSettingsLocalProjectLocationEntries"; internal static string SetDefaultProjectPath(string path) { - var newProjectDialogKeyPath = $"Software\\Microsoft\\VisualStudio\\{MajorVersion}.0\\NewProjectDialog"; + var newProjectDialogKeyPath = Invariant($"Software\\Microsoft\\VisualStudio\\{MajorVersion}.0\\NewProjectDialog"); var old = String.Empty; try From 99d416fe0f4de40552853d73fe860e1810c36f14 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Thu, 6 Sep 2018 17:24:10 +0200 Subject: [PATCH 2/3] Reinstate base class. Can't remember why this was removed. --- test/GitHub.TeamFoundation.UnitTests/VSGitExtTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/GitHub.TeamFoundation.UnitTests/VSGitExtTests.cs b/test/GitHub.TeamFoundation.UnitTests/VSGitExtTests.cs index 5de6ff8ca..7f1041f0f 100644 --- a/test/GitHub.TeamFoundation.UnitTests/VSGitExtTests.cs +++ b/test/GitHub.TeamFoundation.UnitTests/VSGitExtTests.cs @@ -17,7 +17,7 @@ using static Microsoft.VisualStudio.VSConstants; public class VSGitExtTests { - public class TheConstructor + public class TheConstructor : TestBaseClass { [TestCase(true, 1)] [TestCase(false, 0)] From c05585e53e855eaf2671e2286b4974ad31b68d42 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Thu, 6 Sep 2018 18:49:18 +0200 Subject: [PATCH 3/3] Reinstate other VSGitExtTests base classes. Really no idea why I removed these... --- test/GitHub.TeamFoundation.UnitTests/VSGitExtTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/GitHub.TeamFoundation.UnitTests/VSGitExtTests.cs b/test/GitHub.TeamFoundation.UnitTests/VSGitExtTests.cs index 7f1041f0f..8a2ebb497 100644 --- a/test/GitHub.TeamFoundation.UnitTests/VSGitExtTests.cs +++ b/test/GitHub.TeamFoundation.UnitTests/VSGitExtTests.cs @@ -63,7 +63,7 @@ public class VSGitExtTests } } - public class TheActiveRepositoriesChangedEvent + public class TheActiveRepositoriesChangedEvent : TestBaseClass { [Test] public void GitExtPropertyChangedEvent_ActiveRepositoriesChangedIsFired() @@ -133,7 +133,7 @@ public class VSGitExtTests } } - public class TheActiveRepositoriesProperty + public class TheActiveRepositoriesProperty : TestBaseClass { [Test] public void RepositoryOpenContextNotActive_IsEmpty()