diff --git a/lib/16.0/Microsoft.TeamFoundation.Client.dll b/lib/16.0/Microsoft.TeamFoundation.Client.dll index 2280436cf0..d42abde8f0 100644 Binary files a/lib/16.0/Microsoft.TeamFoundation.Client.dll and b/lib/16.0/Microsoft.TeamFoundation.Client.dll differ diff --git a/lib/16.0/Microsoft.TeamFoundation.Common.dll b/lib/16.0/Microsoft.TeamFoundation.Common.dll index 5f96474375..d537d70f35 100644 Binary files a/lib/16.0/Microsoft.TeamFoundation.Common.dll and b/lib/16.0/Microsoft.TeamFoundation.Common.dll differ diff --git a/lib/16.0/Microsoft.TeamFoundation.Controls.dll b/lib/16.0/Microsoft.TeamFoundation.Controls.dll index 598e9fe14a..bdb525c762 100644 Binary files a/lib/16.0/Microsoft.TeamFoundation.Controls.dll and b/lib/16.0/Microsoft.TeamFoundation.Controls.dll differ diff --git a/lib/16.0/Microsoft.TeamFoundation.Git.Client.dll b/lib/16.0/Microsoft.TeamFoundation.Git.Client.dll index 917f58f4ae..5911b7e179 100644 Binary files a/lib/16.0/Microsoft.TeamFoundation.Git.Client.dll and b/lib/16.0/Microsoft.TeamFoundation.Git.Client.dll differ diff --git a/lib/16.0/Microsoft.TeamFoundation.Git.Controls.dll b/lib/16.0/Microsoft.TeamFoundation.Git.Controls.dll index bda68a21df..29f24fe79e 100644 Binary files a/lib/16.0/Microsoft.TeamFoundation.Git.Controls.dll and b/lib/16.0/Microsoft.TeamFoundation.Git.Controls.dll differ diff --git a/lib/16.0/Microsoft.TeamFoundation.Git.Provider.dll b/lib/16.0/Microsoft.TeamFoundation.Git.Provider.dll index 0ccb6da2e7..7d28d587ad 100644 Binary files a/lib/16.0/Microsoft.TeamFoundation.Git.Provider.dll and b/lib/16.0/Microsoft.TeamFoundation.Git.Provider.dll differ diff --git a/src/GitHub.TeamFoundation.14/Services/TeamExplorerServices.cs b/src/GitHub.TeamFoundation.14/Services/TeamExplorerServices.cs index 404b1d728f..8cbb426bbd 100644 --- 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(); 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(); + gitActionsExt?.InitializeOrPushRepositoryToGitService(); + } +#endif + public async Task ShowRepositorySettingsRemotesAsync() { var te = serviceProvider.TryGetService();