Factor knowledge of full extension into FullExtensionUtilities

Author: jcansdale

src/GitHub.VisualStudio.16/ExtensionServicesFactory.cs

@@ -0,0 +1,48 @@
+using System;
+using System.IO;
+using System.Reflection;
+using Microsoft;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
+using ICodeContainerProvider = Microsoft.VisualStudio.Shell.CodeContainerManagement.ICodeContainerProvider;
+
+namespace GitHub.VisualStudio
+{
+    public static class FullExtensionUtilities
+    {
+        const string GitHubPackageId = "c3d3dc68-c977-411f-b3e8-03b0dccf7dfc";
+
+        public static bool IsInstalled(IServiceProvider serviceProvider)
+        {
+            ThreadHelper.ThrowIfNotOnUIThread();
+
+            return FindGitHubPackage(serviceProvider) != null;
+        }
+
+        public static ICodeContainerProvider FindGitHubContainerProvider(IServiceProvider serviceProvide)
+        {
+            ThreadHelper.ThrowIfNotOnUIThread();
+
+            if (FindGitHubPackage(serviceProvide) is IVsPackage package)
+            {
+                var baseDirectory = Path.GetDirectoryName(package.GetType().Assembly.Location);
+                var assemblyFile = Path.Combine(baseDirectory, "GitHub.StartPage.dll");
+                var assembly = Assembly.LoadFrom(assemblyFile);
+                var type = assembly.GetType("GitHub.StartPage.GitHubContainerProvider", true);
+                return (ICodeContainerProvider)Activator.CreateInstance(type);
+            }
+
+            return null;
+        }
+
+        public static IVsPackage FindGitHubPackage(IServiceProvider serviceProvider)
+        {
+            ThreadHelper.ThrowIfNotOnUIThread();
+
+            var shell = serviceProvider.GetService(typeof(SVsShell)) as IVsShell;
+            Assumes.Present(shell);
+            shell.LoadPackage(new Guid(GitHubPackageId), out var package);
+            return package;
+        }
+    }
+}

src/GitHub.VisualStudio.16/FullExtensionUtilities.cs

@@ -66,15 +66,14 @@
     <Compile Include="Base\TeamExplorerBasePage.cs" />
     <Compile Include="Base\TeamExplorerBaseSection.cs" />
     <Compile Include="CompositionServices.cs" />
-    <Compile Include="ExtensionServicesFactory.cs" />
+    <Compile Include="FullExtensionUtilities.cs" />
     <Compile Include="Home\GitHubHomeContent.xaml.cs">
       <DependentUpon>GitHubHomeContent.xaml</DependentUpon>
     </Compile>
     <Compile Include="Home\HomeSection.cs" />
     <Compile Include="IExtensionServices.cs" />
     <Compile Include="Images.imagemanifest.cs" />
-    <Compile Include="InBoxExtensionServices.cs" />
-    <Compile Include="InstalledExtensionServices.cs" />
+    <Compile Include="InBoxGitHubContainerProvider.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources.Designer.cs">
       <AutoGen>True</AutoGen>

src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj

@@ -13,14 +13,6 @@
 
 namespace GitHub.VisualStudio
 {
-    public class InBoxExtensionServices : IExtensionServices
-    {
-        public ICodeContainerProvider GetGitHubContainerProvider()
-        {
-            return new InBoxGitHubContainerProvider();
-        }
-    }
-
     [Guid(Guids.CodeContainerProviderId)]
     public class InBoxGitHubContainerProvider : ICodeContainerProvider
     {
@@ -37,12 +29,7 @@ public async Task<CodeContainer> AcquireCodeContainerAsync(RemoteCodeContainer o
 
         async Task<CodeContainer> RunAcquisitionAsync(IProgress<ServiceProgressData> downloadProgress, CancellationToken cancellationToken, string url = null)
         {
-            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
-
-            var componentModel = await ServiceProvider.GetGlobalServiceAsync<SComponentModel, IComponentModel>();
-            Assumes.Present(componentModel);
-
-            var result = await ShowCloneDialogAsync(componentModel, downloadProgress, cancellationToken, url);
+            var result = await ShowCloneDialogAsync(downloadProgress, cancellationToken, url);
             if (result == null)
             {
                 return null;
@@ -69,9 +56,13 @@ async Task<CodeContainer> RunAcquisitionAsync(IProgress<ServiceProgressData> dow
             return codeContainer;
         }
 
-        static async Task<CloneDialogResult> ShowCloneDialogAsync(IComponentModel componentModel,
-            IProgress<ServiceProgressData> downloadProgress, CancellationToken cancellationToken, string url = null)
+        async Task<CloneDialogResult> ShowCloneDialogAsync(IProgress<ServiceProgressData> downloadProgress,
+            CancellationToken cancellationToken, string url = null)
         {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+
+            var componentModel = await ServiceProvider.GetGlobalServiceAsync<SComponentModel, IComponentModel>();
+            Assumes.Present(componentModel);
             var compositionServices = componentModel.DefaultExportProvider.GetExportedValue<CompositionServices>();
             var exportProvider = compositionServices.GetExportProvider();
 

src/GitHub.VisualStudio.16/InBoxExtensionServices.cs renamed to src/GitHub.VisualStudio.16/InBoxGitHubContainerProvider.cs

@@ -19,9 +19,13 @@ protected override ICodeContainerProvider CreateCodeContainerProvider(Guid provi
         {
             ThreadHelper.ThrowIfNotOnUIThread();
 
-            var factory = new ExtensionServicesFactory(this);
-            var services = factory.Create();
-            return services.GetGitHubContainerProvider();
+            var codeContainerProvider = FullExtensionUtilities.FindGitHubContainerProvider(this);
+            if (codeContainerProvider != null)
+            {
+                return codeContainerProvider;
+            }
+
+            return new InBoxGitHubContainerProvider();
         }
     }
 }

src/GitHub.VisualStudio.16/InstalledExtensionServices.cs

@@ -10,6 +10,7 @@
 using GitHub.ViewModels.TeamExplorer;
 using GitHub.VisualStudio;
 using Microsoft.TeamFoundation.Controls;
+using Microsoft.VisualStudio.Shell;
 using ReactiveUI;
 
 
@@ -27,7 +28,6 @@ public class PublishSection : TeamExplorerBaseSection
         public const int Priority = 4;
 
         readonly Guid PushToRemoteSectionId = new Guid("99ADF41C-0022-4C03-B3C2-05047A3F6C2C");
-        readonly Guid GitHubPublishSectionId = new Guid("92655B52-360D-4BF5-95C5-D9E9E596AC76");
 
         [ImportingConstructor]
         public PublishSection(CompositionServices compositionServices)
@@ -58,8 +58,17 @@ protected PublishView View
         /// </summary>
         public override void Initialize(object sender, SectionInitializeEventArgs e)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
+
             base.Initialize(sender, e);
 
+            // Remain hidden when full GitHub extension is installed
+            if (FullExtensionUtilities.IsInstalled(ServiceProvider))
+            {
+                IsVisible = false;
+                return;
+            }
+
             RefreshVisibility();
 
             if (ServiceProvider.GetService(typeof(ITeamExplorerPage)) is ITeamExplorerPage page)
@@ -68,11 +77,6 @@ public override void Initialize(object sender, SectionInitializeEventArgs e)
                 {
                     pushToRemoteSection.PropertyChanged += Section_PropertyChanged;
                 }
-
-                if (page.GetSection(GitHubPublishSectionId) is ITeamExplorerSection gitHubPublishSection)
-                {
-                    gitHubPublishSection.PropertyChanged += Section_PropertyChanged;
-                }
             }
 
             PublishToGitHub = new RelayCommand(o => ShowPublishDialog());
@@ -123,27 +127,27 @@ void Section_PropertyChanged(object sender, PropertyChangedEventArgs e)
 
         void RefreshVisibility()
         {
-            bool IsSectionVisible(ITeamExplorerPage teamExplorerPage, Guid sectionId)
-            {
-                if (teamExplorerPage.GetSection(sectionId) is ITeamExplorerSection pushToRemoteSection)
-                {
-                    return pushToRemoteSection.SectionContent != null && pushToRemoteSection.IsVisible;
-                }
-
-                return false;
-            }
-
             var visible = false;
 
             if (ServiceProvider.GetService(typeof(ITeamExplorerPage)) is ITeamExplorerPage page)
             {
-                visible = IsSectionVisible(page, PushToRemoteSectionId) && !IsSectionVisible(page, GitHubPublishSectionId);
+                visible = IsSectionVisible(page, PushToRemoteSectionId);
             }
 
             if (IsVisible != visible)
             {
                 IsVisible = visible;
             }
         }
+
+        bool IsSectionVisible(ITeamExplorerPage teamExplorerPage, Guid sectionId)
+        {
+            if (teamExplorerPage.GetSection(sectionId) is ITeamExplorerSection pushToRemoteSection)
+            {
+                return pushToRemoteSection.SectionContent != null && pushToRemoteSection.IsVisible;
+            }
+
+            return false;
+        }
     }
 }