Merge pull request #2515 from github/useCreateRepositoryDialog

Change GitHub.TeamFoundation.16 version of TeamExplorerServices
github · May 22, 2020 · c56f7f2 · c56f7f2
2 parents 4b2ce02 + e0eeacf
commit c56f7f2
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 0 deletions.
diff --git a/lib/16.0/Microsoft.TeamFoundation.Client.dll b/lib/16.0/Microsoft.TeamFoundation.Client.dll
diff --git a/lib/16.0/Microsoft.TeamFoundation.Common.dll b/lib/16.0/Microsoft.TeamFoundation.Common.dll
diff --git a/lib/16.0/Microsoft.TeamFoundation.Controls.dll b/lib/16.0/Microsoft.TeamFoundation.Controls.dll
diff --git a/lib/16.0/Microsoft.TeamFoundation.Git.Client.dll b/lib/16.0/Microsoft.TeamFoundation.Git.Client.dll
diff --git a/lib/16.0/Microsoft.TeamFoundation.Git.Controls.dll b/lib/16.0/Microsoft.TeamFoundation.Git.Controls.dll
diff --git a/lib/16.0/Microsoft.TeamFoundation.Git.Provider.dll b/lib/16.0/Microsoft.TeamFoundation.Git.Provider.dll
diff --git a/src/GitHub.TeamFoundation.14/Services/TeamExplorerServices.cs b/src/GitHub.TeamFoundation.14/Services/TeamExplorerServices.cs
@@ -9,6 +9,7 @@
 using EnvDTE;
 using GitHub.VisualStudio.TeamExplorer.Sync;
 using Microsoft.TeamFoundation.Controls;
+using Microsoft.VisualStudio.TeamFoundation.Git.Extensibility;
 using ReactiveUI;
 
 namespace GitHub.Services
@@ -66,12 +67,36 @@ public void ShowHomePage()
 
         public void ShowPublishSection()
         {
+#if TEAMEXPLORER16
+            // Only call InitializeOrPushRepositoryToGitService when IGitActionsExt2 exists
+            if (FindIGitActionsExt2() is object)
+            {
+                InitializeOrPushRepositoryToGitService();
+                return;
+            }
+#endif
+
             var te = serviceProvider.TryGetService<ITeamExplorer>();
             var page = te.NavigateToPage(new Guid(TeamExplorerPageIds.GitCommits), null);
             var publish = page?.GetSection(new Guid(GitHubPublishSection.GitHubPublishSectionId)) as GitHubPublishSection;
             publish?.Connect();
         }
 
+#if TEAMEXPLORER16
+        private static Type FindIGitActionsExt2()
+        {
+            Type type = typeof(IGitActionsExt);
+            string name = $"{type.FullName}2";
+            return type.Assembly.GetType(name, false);
+        }
+
+        private void InitializeOrPushRepositoryToGitService()
+        {
+            IGitActionsExt2 gitActionsExt = serviceProvider.TryGetService<IGitActionsExt2>();
+            gitActionsExt?.InitializeOrPushRepositoryToGitService();
+        }
+#endif
+
         public async Task ShowRepositorySettingsRemotesAsync()
         {
             var te = serviceProvider.TryGetService<ITeamExplorer>();