Add compiler conditions within ShowPublishSection to only use IGitActionsExt2 under 16.0

Dan Schulte · Dan Schulte · commit 348122afbc5f · 2020-05-19T15:36:22.000-07:00
diff --git a/src/GitHub.TeamFoundation.14/Services/TeamExplorerServices.cs b/src/GitHub.TeamFoundation.14/Services/TeamExplorerServices.cs
@@ -67,8 +67,15 @@ public void ShowHomePage()
 
         public void ShowPublishSection()
         {
+#if TEAMEXPLORER14 || TEAMEXPLORER15
+            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();
+#else
             IGitActionsExt2 gitActionsExt = serviceProvider.TryGetService<IGitActionsExt2>();
             gitActionsExt?.InitializeOrPushRepositoryToGitService();
+#endif
         }
 
         public async Task ShowRepositorySettingsRemotesAsync()

Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,15 @@ public void ShowHomePage()`
`67`	`67`
`68`	`68`	`public void ShowPublishSection()`
`69`	`69`	`{`
	`70`	`+#if TEAMEXPLORER14 \|\| TEAMEXPLORER15`
	`71`	`+ var te = serviceProvider.TryGetService<ITeamExplorer>();`
	`72`	`+ var page = te.NavigateToPage(new Guid(TeamExplorerPageIds.GitCommits), null);`
	`73`	`+ var publish = page?.GetSection(new Guid(GitHubPublishSection.GitHubPublishSectionId)) as GitHubPublishSection;`
	`74`	`+ publish?.Connect();`
	`75`	`+#else`
`70`	`76`	`IGitActionsExt2 gitActionsExt = serviceProvider.TryGetService<IGitActionsExt2>();`
`71`	`77`	`gitActionsExt?.InitializeOrPushRepositoryToGitService();`
	`78`	`+#endif`
`72`	`79`	`}`
`73`	`80`
`74`	`81`	`public async Task ShowRepositorySettingsRemotesAsync()`