Merge branch 'master' into refactor/sdk-csproj

Author: Andreia Gaita

appveyor.yml

@@ -24,11 +24,6 @@ test:
   categories:
     except:
       - Timings
-after_test:
-- ps: |  
-    choco install --no-progress opencover.portable codecov
-    OpenCover.Console.exe --% "-target:nunit3-console.exe" "-targetargs: test\GitHub.Api.UnitTests\bin\Release\GitHub.Api.UnitTests.dll test\GitHub.App.UnitTests\bin\Release\GitHub.App.UnitTests.dll test\GitHub.Exports.Reactive.UnitTests\bin\Release\GitHub.Exports.Reactive.UnitTests.dll test\GitHub.Exports.UnitTests\bin\Release\GitHub.Exports.UnitTests.dll test\GitHub.Extensions.UnitTests\bin\Release\GitHub.Extensions.UnitTests.dll test\GitHub.InlineReviews.UnitTests\bin\Release\GitHub.InlineReviews.UnitTests.dll test\GitHub.Primitives.UnitTests\bin\Release\GitHub.Primitives.UnitTests.dll test\GitHub.TeamFoundation.UnitTests\bin\Release\GitHub.TeamFoundation.UnitTests.dll test\GitHub.UI.UnitTests\bin\Release\GitHub.UI.UnitTests.dll test\GitHub.VisualStudio.UnitTests\bin\Release\GitHub.VisualStudio.UnitTests.dll test\MetricsTests\MetricsTests\bin\Release\MetricsTests.dll test\TrackingCollectionTests\bin\Release\TrackingCollectionTests.dll --where cat!=Timings --inprocess --noresult" -filter:"+[GitHub*]* -[GitHub*UnitTests]*" -register:user -output:".\coverage.xml"
-    codecov -f "coverage.xml"
 on_success:
 - ps: |
     if ($full_build) {

src/GitHub.InlineReviews/GitHub.InlineReviews.csproj

@@ -160,9 +160,6 @@
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
-    <None Include="source.extension.vsixmanifest">
-      <SubType>Designer</SubType>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\submodules\octokit.net\Octokit\Octokit.csproj">

src/GitHub.InlineReviews/source.extension.vsixmanifest

@@ -74,9 +74,6 @@
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
-    <None Include="source.extension.vsixmanifest">
-      <SubType>Designer</SubType>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\submodules\reactiveui\ReactiveUI\ReactiveUI_Net45.csproj">

src/GitHub.StartPage/GitHub.StartPage.csproj

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -14,50 +15,42 @@ namespace GitHub.TeamFoundation
     internal class RegistryHelper
     {
         static readonly ILogger log = LogManager.ForContext<RegistryHelper>();
-        const string TEGitKey = @"Software\Microsoft\VisualStudio\14.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()
         {
-            var key = OpenGitKey("Repositories");
-
-            if (key != null)
+            using (var key = OpenGitKey("Repositories"))
             {
-                using (key)
+                if (key == null)
                 {
-                    return key.GetSubKeyNames().Select(x =>
-                    {
-                        var subkey = key.OpenSubKey(x);
+                    return Enumerable.Empty<ILocalRepositoryModel>();
+                }
 
-                        if (subkey != null)
+                return key.GetSubKeyNames().Select(x =>
+                {
+                    using (var subkey = key.OpenSubKey(x))
+                    {
+                        try
                         {
-                            using (subkey)
-                            {
-                                try
-                                {
-                                    var path = subkey?.GetValue("Path") as string;
-                                    if (path != null && Directory.Exists(path))
-                                        return new LocalRepositoryModel(path, GitService.GitServiceHelper);
-                                }
-                                catch (Exception)
-                                {
-                                    // no sense spamming the log, the registry might have ton of stale things we don't care about
-                                }
-
-                            }
+                            var path = subkey?.GetValue("Path") as string;
+                            if (path != null && Directory.Exists(path))
+                                return new LocalRepositoryModel(path, GitService.GitServiceHelper);
+                        }
+                        catch (Exception)
+                        {
+                            // no sense spamming the log, the registry might have ton of stale things we don't care about
                         }
-
                         return null;
-                    })
-                    .Where(x => x != null)
-                    .ToList();
-                }
+                    }
+                })
+                .Where(x => x != null)
+                .ToList();
             }
-
-            return new ILocalRepositoryModel[0];
         }
 
         internal static string PokeTheRegistryForLocalClonePath()
@@ -68,23 +61,24 @@ internal static string PokeTheRegistryForLocalClonePath()
             }
         }
 
-        const string NewProjectDialogKeyPath = @"Software\Microsoft\VisualStudio\14.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)
@@ -132,5 +126,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;
     }
 }

src/GitHub.StartPage/source.extension.vsixmanifest

@@ -1,4 +1,4 @@
-#if TEAMEXPLORER15
+#if !TEAMEXPLORER14
 // Microsoft.VisualStudio.Shell.Framework has an alias to avoid conflict with IAsyncServiceProvider
 extern alias SF15;
 using ServiceProgressData = SF15::Microsoft.VisualStudio.Shell.ServiceProgressData;

src/GitHub.TeamFoundation.14/RegistryHelper.cs

@@ -179,6 +179,9 @@
     <Compile Include="..\GitHub.TeamFoundation.14\Home\ForkNavigationItem.cs">
       <Link>Home\ForkNavigationItem.cs</Link>
     </Compile>
+    <Compile Include="..\GitHub.TeamFoundation.14\RegistryHelper.cs">
+      <Link>RegistryHelper.cs</Link>
+    </Compile>
     <Compile Include="..\GitHub.TeamFoundation.14\Services\LocalRepositoryModelFactory.cs">
       <Link>Services\LocalRepositoryModelFactory.cs</Link>
     </Compile>
@@ -248,7 +251,6 @@
     <Compile Include="..\GitHub.TeamFoundation.14\Services\VSGitServices.cs">
       <Link>Services\VSGitServices.cs</Link>
     </Compile>
-    <Compile Include="RegistryHelper.cs" />
     <Compile Include="..\common\SolutionInfo.cs">
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>

src/GitHub.TeamFoundation.14/Services/VSGitServices.cs

@@ -30,6 +30,7 @@ public IVSGitExt Create()
                 case 14:
                     return Create(() => new VSGitExt14(asyncServiceProvider));
                 case 15:
+                case 16:
                     return Create(() => new VSGitExt15(asyncServiceProvider));
                 default:
                     log.Error("There is no IVSGitExt implementation for DTE version {Version}", vsVersion);