Merge branch 'master' into refactor/comment-viewmodels

Author: jcansdale

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

@@ -37,7 +37,7 @@ public class VSGitServices : IVSGitServices
         [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Used in VS2017")]
         readonly Lazy<IStatusBarNotificationService> statusBar;
         [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Used in VS2015")]
-        readonly Lazy<IVSServices> vsServices;
+        readonly Lazy<ITeamExplorerServices> teamExplorerServices;
 
         /// <summary>
         /// This MEF export requires specific versions of TeamFoundation. IGitExt is declared here so
@@ -50,11 +50,11 @@ public class VSGitServices : IVSGitServices
         [ImportingConstructor]
         public VSGitServices(IGitHubServiceProvider serviceProvider,
             Lazy<IStatusBarNotificationService> statusBar,
-            Lazy<IVSServices> vsServices)
+            Lazy<ITeamExplorerServices> teamExplorerServices)
         {
             this.serviceProvider = serviceProvider;
             this.statusBar = statusBar;
-            this.vsServices = vsServices;
+            this.teamExplorerServices = teamExplorerServices;
         }
 
         // The Default Repository Path that VS uses is hidden in an internal
@@ -90,7 +90,6 @@ public async Task Clone(
             await StartClonenOnConnectPageAsync(teamExplorer, cloneUrl, clonePath, recurseSubmodules);
             NavigateToHomePage(teamExplorer); // Show progress on Team Explorer - Home
             await WaitForCloneOnHomePageAsync(teamExplorer);
-            vsServices.Value.TryOpenRepository(clonePath); // Show the repository on Team Explorer - Home
 #else
             var gitExt = serviceProvider.GetService<IGitActionsExt>();
             var typedProgress = ((Progress<ServiceProgressData>)progress) ?? new Progress<ServiceProgressData>();
@@ -100,6 +99,8 @@ public async Task Clone(
             NavigateToHomePage(teamExplorer); // Show progress on Team Explorer - Home
             await cloneTask;
 #endif
+            // Change Team Explorer context to the newly cloned repository
+            teamExplorerServices.Value.OpenRepository(clonePath);
         }
 
         static async Task StartClonenOnConnectPageAsync(

test/Launcher/InstallAndStart.csproj

@@ -3,7 +3,7 @@
     <TargetFramework>net461</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="VsixTesting.Installer" Version="0.1.36-beta-g2c36f902a0" />
+    <PackageReference Include="VsixTesting.Installer" Version="0.1.38-beta-g6b91b368d9" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\GitHub.VisualStudio\GitHub.VisualStudio.csproj" />

test/Launcher/Properties/launchSettings.json

@@ -11,6 +11,10 @@
     "Visual Studio 2017 - Team Explorer": {
       "executablePath": "$(VsixTestingInstallerPath)",
       "commandLineArgs": "/ApplicationPath \"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\TeamExplorer\\Common7\\IDE\\devenv.exe\" /RootSuffix Exp /InstallAndStart \"$(SolutionDir)\\build\\$(Configuration)\\GitHub.VisualStudio.vsix\""
+    },
+    "Visual Studio 2019 - Preview": {
+      "executablePath": "$(VsixTestingInstallerPath)",
+      "commandLineArgs": "/ApplicationPath \"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Preview\\Common7\\IDE\\devenv.exe\" /RootSuffix Exp /InstallAndStart \"$(SolutionDir)\\build\\$(Configuration)\\GitHub.VisualStudio.vsix\""
     }
   }
 }