From 2e04cf3805669434de0bcf53faf076c0368fb857 Mon Sep 17 00:00:00 2001
From: Stanley Goldman <Stanley.Goldman@gmail.com>
Date: Wed, 22 May 2019 15:33:33 -0400
Subject: [PATCH 01/31] Functionality to add Publish to GitHub Essentials

co-authored-by: Jamie Cansdale <jcansdale@gmail.com>
---
 .../Base/TeamExplorerBase.cs                  | 173 ++++++++++++++++++
 .../Base/TeamExplorerBaseNavigationItem.cs    |  73 ++++++++
 .../Base/TeamExplorerBaseNavigationLink.cs    |  73 ++++++++
 .../Base/TeamExplorerBasePage.cs              |  96 ++++++++++
 .../Base/TeamExplorerBaseSection.cs           | 117 ++++++++++++
 .../GitHub.VisualStudio.16.csproj             |  23 +++
 .../Sync/PublishSection.cs                    |  93 ++++++++++
 .../Sync/PublishView.xaml                     |  14 ++
 .../Sync/PublishView.xaml.cs                  |  50 +++++
 .../source.extension.vsixmanifest             |   1 +
 10 files changed, 713 insertions(+)
 create mode 100644 src/GitHub.VisualStudio.16/Base/TeamExplorerBase.cs
 create mode 100644 src/GitHub.VisualStudio.16/Base/TeamExplorerBaseNavigationItem.cs
 create mode 100644 src/GitHub.VisualStudio.16/Base/TeamExplorerBaseNavigationLink.cs
 create mode 100644 src/GitHub.VisualStudio.16/Base/TeamExplorerBasePage.cs
 create mode 100644 src/GitHub.VisualStudio.16/Base/TeamExplorerBaseSection.cs
 create mode 100644 src/GitHub.VisualStudio.16/Sync/PublishSection.cs
 create mode 100644 src/GitHub.VisualStudio.16/Sync/PublishView.xaml
 create mode 100644 src/GitHub.VisualStudio.16/Sync/PublishView.xaml.cs

diff --git a/src/GitHub.VisualStudio.16/Base/TeamExplorerBase.cs b/src/GitHub.VisualStudio.16/Base/TeamExplorerBase.cs
new file mode 100644
index 0000000000..93f0714e11
--- /dev/null
+++ b/src/GitHub.VisualStudio.16/Base/TeamExplorerBase.cs
@@ -0,0 +1,173 @@
+/*
+* Copyright (c) Microsoft Corporation. All rights reserved. This code released
+* under the terms of the Microsoft Limited Public License (MS-LPL).
+*/
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using Microsoft.TeamFoundation.Client;
+using Microsoft.TeamFoundation.Controls;
+
+namespace Microsoft.TeamExplorerSample
+{
+    /// <summary>
+    /// Team Explorer plugin common base class.
+    /// </summary>
+    public class TeamExplorerBase : IDisposable, INotifyPropertyChanged
+    {
+        #region Members
+
+        private bool m_contextSubscribed = false;
+
+        #endregion
+
+        /// <summary>
+        /// Get/set the service provider.
+        /// </summary>
+        public IServiceProvider ServiceProvider
+        {
+            get { return m_serviceProvider; }
+            set
+            {
+                // Unsubscribe from Team Foundation context changes
+                if (m_serviceProvider != null)
+                {
+                    UnsubscribeContextChanges();
+                }
+
+                m_serviceProvider = value;
+                
+                // Subscribe to Team Foundation context changes
+                if (m_serviceProvider != null)
+                {
+                    SubscribeContextChanges();
+                }
+            }
+        }
+        private IServiceProvider m_serviceProvider = null;
+
+        /// <summary>
+        /// Get the requested service from the service provider.
+        /// </summary>
+        public T GetService<T>()
+        {
+            Debug.Assert(this.ServiceProvider != null, "GetService<T> called before service provider is set");
+            if (this.ServiceProvider != null)
+            {
+                return (T)this.ServiceProvider.GetService(typeof(T));
+            }
+
+            return default(T);
+        }
+
+        /// <summary>
+        /// Show a notification in the Team Explorer window.
+        /// </summary>
+        protected Guid ShowNotification(string message, NotificationType type)
+        {
+            ITeamExplorer teamExplorer = GetService<ITeamExplorer>();
+            if (teamExplorer != null)
+            {
+                Guid guid = Guid.NewGuid();
+                teamExplorer.ShowNotification(message, type, NotificationFlags.None, null, guid);
+                return guid;
+            }
+
+            return Guid.Empty;
+        }
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose.
+        /// </summary>
+        public virtual void Dispose()
+        {
+            UnsubscribeContextChanges();
+        }
+
+        #endregion
+
+        #region INotifyPropertyChanged
+
+        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raise the PropertyChanged event for the specified property.
+        /// </summary>
+        /// <param name="propertyName">Property name</param>
+        protected void RaisePropertyChanged(string propertyName)
+        {
+            if (this.PropertyChanged != null)
+            {
+                this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            }
+        }
+
+        #endregion
+
+        #region Team Foundation Context
+
+        /// <summary>
+        /// Subscribe to context changes.
+        /// </summary>
+        protected void SubscribeContextChanges()
+        {
+            Debug.Assert(this.ServiceProvider != null, "ServiceProvider must be set before subscribing to context changes");
+            if (this.ServiceProvider == null || m_contextSubscribed)
+            {
+                return;
+            }
+
+            ITeamFoundationContextManager tfContextManager = GetService<ITeamFoundationContextManager>();
+            if (tfContextManager != null)
+            {
+                tfContextManager.ContextChanged += ContextChanged;
+                m_contextSubscribed = true;
+            }
+        }
+
+        /// <summary>
+        /// Unsubscribe from context changes.
+        /// </summary>
+        protected void UnsubscribeContextChanges()
+        {
+            if (this.ServiceProvider == null || !m_contextSubscribed)
+            {
+                return;
+            }
+
+            ITeamFoundationContextManager tfContextManager = GetService<ITeamFoundationContextManager>();
+            if (tfContextManager != null)
+            {
+                tfContextManager.ContextChanged -= ContextChanged;
+            }
+        }
+
+        /// <summary>
+        /// ContextChanged event handler.
+        /// </summary>
+        protected virtual void ContextChanged(object sender, ContextChangedEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Get the current Team Foundation context.
+        /// </summary>
+        protected ITeamFoundationContext CurrentContext
+        {
+            get
+            {
+                ITeamFoundationContextManager tfContextManager = GetService<ITeamFoundationContextManager>();
+                if (tfContextManager != null)
+                {
+                    return tfContextManager.CurrentContext;
+                }
+
+                return null;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseNavigationItem.cs b/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseNavigationItem.cs
new file mode 100644
index 0000000000..b9fe4c8622
--- /dev/null
+++ b/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseNavigationItem.cs
@@ -0,0 +1,73 @@
+/*
+* Copyright (c) Microsoft Corporation. All rights reserved. This code released
+* under the terms of the Microsoft Limited Public License (MS-LPL).
+*/
+using System;
+using System.ComponentModel.Composition;
+using Microsoft.TeamFoundation.Controls;
+using Microsoft.VisualStudio.Shell;
+
+namespace Microsoft.TeamExplorerSample
+{
+    /// <summary>
+    /// Team Explorer base navigation item class.
+    /// </summary>
+    public class TeamExplorerBaseNavigationItem : TeamExplorerBase, ITeamExplorerNavigationItem
+    {
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        public TeamExplorerBaseNavigationItem(IServiceProvider serviceProvider)
+        {
+            this.ServiceProvider = serviceProvider;
+        }
+
+        #region ITeamExplorerNavigationItem
+
+        /// <summary>
+        /// Get/set the item text.
+        /// </summary>
+        public string Text
+        {
+            get { return m_text; }
+            set { m_text = value; RaisePropertyChanged("Text"); }
+        }
+        private string m_text;
+
+        /// <summary>
+        /// Get/set the item image.
+        /// </summary>
+        public System.Drawing.Image Image
+        {
+            get { return m_image; }
+            set { m_image = value; RaisePropertyChanged("Image"); }
+        }
+        private System.Drawing.Image m_image;
+
+        /// <summary>
+        /// Get/set the IsVisible flag.
+        /// </summary>
+        public bool IsVisible
+        {
+            get { return m_isVisible; }
+            set { m_isVisible = value; RaisePropertyChanged("IsVisible"); }
+        }
+        private bool m_isVisible = true;
+
+        /// <summary>
+        /// Invalidate the item state.
+        /// </summary>
+        public virtual void Invalidate()
+        {
+        }
+
+        /// <summary>
+        /// Execute the item action.
+        /// </summary>
+        public virtual void Execute()
+        {
+        }
+
+        #endregion
+    }
+}
diff --git a/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseNavigationLink.cs b/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseNavigationLink.cs
new file mode 100644
index 0000000000..960a67f80d
--- /dev/null
+++ b/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseNavigationLink.cs
@@ -0,0 +1,73 @@
+/*
+* Copyright (c) Microsoft Corporation. All rights reserved. This code released
+* under the terms of the Microsoft Limited Public License (MS-LPL).
+*/
+using System;
+using System.ComponentModel.Composition;
+using Microsoft.TeamFoundation.Controls;
+using Microsoft.VisualStudio.Shell;
+
+namespace Microsoft.TeamExplorerSample
+{
+    /// <summary>
+    /// Team Explorer base navigation link class.
+    /// </summary>
+    public class TeamExplorerBaseNavigationLink : TeamExplorerBase, ITeamExplorerNavigationLink
+    {
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        public TeamExplorerBaseNavigationLink(IServiceProvider serviceProvider)
+        {
+            this.ServiceProvider = serviceProvider;
+        }
+
+        #region ITeamExplorerNavigationLink
+
+        /// <summary>
+        /// Get/set the item text.
+        /// </summary>
+        public string Text
+        {
+            get { return m_text; }
+            set { m_text = value; RaisePropertyChanged("Text"); }
+        }
+        private string m_text;
+
+        /// <summary>
+        /// Get/set the IsEnabled flag.
+        /// </summary>
+        public bool IsEnabled
+        {
+            get { return m_isEnabled; }
+            set { m_isEnabled = value; RaisePropertyChanged("IsEnabled"); }
+        }
+        private bool m_isEnabled = true;
+
+        /// <summary>
+        /// Get/set the IsVisible flag.
+        /// </summary>
+        public bool IsVisible
+        {
+            get { return m_isVisible; }
+            set { m_isVisible = value; RaisePropertyChanged("IsVisible"); }
+        }
+        private bool m_isVisible = true;
+
+        /// <summary>
+        /// Invalidate the link state.
+        /// </summary>
+        public virtual void Invalidate()
+        {
+        }
+
+        /// <summary>
+        /// Execute the link action.
+        /// </summary>
+        public virtual void Execute()
+        {
+        }
+
+        #endregion
+    }
+}
diff --git a/src/GitHub.VisualStudio.16/Base/TeamExplorerBasePage.cs b/src/GitHub.VisualStudio.16/Base/TeamExplorerBasePage.cs
new file mode 100644
index 0000000000..98f5a60ffc
--- /dev/null
+++ b/src/GitHub.VisualStudio.16/Base/TeamExplorerBasePage.cs
@@ -0,0 +1,96 @@
+/*
+* Copyright (c) Microsoft Corporation. All rights reserved. This code released
+* under the terms of the Microsoft Limited Public License (MS-LPL).
+*/
+using System;
+using System.ComponentModel;
+using Microsoft.TeamFoundation.Controls;
+
+namespace Microsoft.TeamExplorerSample
+{
+    /// <summary>
+    /// Team Explorer page base class.
+    /// </summary>
+    public class TeamExplorerBasePage : TeamExplorerBase, ITeamExplorerPage
+    {
+        #region ITeamExplorerPage
+
+        /// <summary>
+        /// Initialize the page.
+        /// </summary>
+        public virtual void Initialize(object sender, PageInitializeEventArgs e)
+        {
+            this.ServiceProvider = e.ServiceProvider;
+        }
+
+        /// <summary>
+        /// Loaded handler that is called once the page and all sections
+        /// have been initialized.
+        /// </summary>
+        public virtual void Loaded(object sender, PageLoadedEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Save context handler that is called before a page is unloaded.
+        /// </summary>
+        public virtual void SaveContext(object sender, PageSaveContextEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Get/set the page title.
+        /// </summary>
+        public string Title
+        {
+            get { return m_title; }
+            set { m_title = value; RaisePropertyChanged("Title"); }
+        }
+        private string m_title;
+
+        /// <summary>
+        /// Get/set the page content.
+        /// </summary>
+        public object PageContent
+        {
+            get { return m_pageContent; }
+            set { m_pageContent = value; RaisePropertyChanged("PageContent"); }
+        }
+        private object m_pageContent;
+
+        /// <summary>
+        /// Get/set the IsBusy flag.
+        /// </summary>
+        public bool IsBusy
+        {
+            get { return m_isBusy; }
+            set { m_isBusy = value; RaisePropertyChanged("IsBusy"); }
+        }
+        private bool m_isBusy = false;
+
+        /// <summary>
+        /// Refresh the page contents.
+        /// </summary>
+        public virtual void Refresh()
+        {
+        }
+
+        /// <summary>
+        /// Cancel any running operations.
+        /// </summary>
+        public virtual void Cancel()
+        {
+        }
+
+        /// <summary>
+        /// Get the requested extensibility service from the page.  Return
+        /// null if the service is not offered by this page.
+        /// </summary>
+        public virtual object GetExtensibilityService(Type serviceType)
+        {
+            return null;
+        }
+
+        #endregion
+    }
+}
diff --git a/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseSection.cs b/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseSection.cs
new file mode 100644
index 0000000000..2eb2677106
--- /dev/null
+++ b/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseSection.cs
@@ -0,0 +1,117 @@
+/*
+* Copyright (c) Microsoft Corporation. All rights reserved. This code released
+* under the terms of the Microsoft Limited Public License (MS-LPL).
+*/
+using System;
+using System.ComponentModel;
+using Microsoft.TeamFoundation.Controls;
+
+namespace Microsoft.TeamExplorerSample
+{
+    /// <summary>
+    /// Team Explorer base section class.
+    /// </summary>
+    public class TeamExplorerBaseSection : TeamExplorerBase, ITeamExplorerSection
+    {
+        #region ITeamExplorerSection
+
+        /// <summary>
+        /// Initialize the section.
+        /// </summary>
+        public virtual void Initialize(object sender, SectionInitializeEventArgs e)
+        {
+            this.ServiceProvider = e.ServiceProvider;
+        }
+
+        /// <summary>
+        /// Save context handler that is called before a section is unloaded.
+        /// </summary>
+        public virtual void SaveContext(object sender, SectionSaveContextEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Get/set the section title.
+        /// </summary>
+        public string Title
+        {
+            get { return m_title; }
+            set { m_title = value; RaisePropertyChanged("Title"); }
+        }
+        private string m_title;
+
+        /// <summary>
+        /// Get/set the section content.
+        /// </summary>
+        public object SectionContent
+        {
+            get { return m_sectionContent; }
+            set { m_sectionContent = value; RaisePropertyChanged("SectionContent"); }
+        }
+        private object m_sectionContent;
+
+        /// <summary>
+        /// Get/set the IsVisible flag.
+        /// </summary>
+        public bool IsVisible
+        {
+            get { return m_isVisible; }
+            set { m_isVisible = value; RaisePropertyChanged("IsVisible"); }
+        }
+        private bool m_isVisible = true;
+
+        /// <summary>
+        /// Get/set the IsExpanded flag.
+        /// </summary>
+        public bool IsExpanded
+        {
+            get { return m_isExpanded; }
+            set { m_isExpanded = value; RaisePropertyChanged("IsExpanded"); }
+        }
+        private bool m_isExpanded = true;
+
+        /// <summary>
+        /// Get/set the IsBusy flag.
+        /// </summary>
+        public bool IsBusy
+        {
+            get { return m_isBusy; }
+            set { m_isBusy = value; RaisePropertyChanged("IsBusy"); }
+        }
+        private bool m_isBusy = false;
+
+        /// <summary>
+        /// Called when the section is loaded.
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public virtual void Loaded(object sender, SectionLoadedEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Refresh the section contents.
+        /// </summary>
+        public virtual void Refresh()
+        {
+        }
+
+        /// <summary>
+        /// Cancel any running operations.
+        /// </summary>
+        public virtual void Cancel()
+        {
+        }
+
+        /// <summary>
+        /// Get the requested extensibility service from the section.  Return
+        /// null if the service is not offered by this section.
+        /// </summary>
+        public virtual object GetExtensibilityService(Type serviceType)
+        {
+            return null;
+        }
+
+        #endregion
+    }
+}
diff --git a/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj b/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj
index 7e94f4e4dc..e3391b2e57 100644
--- a/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj
+++ b/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj
@@ -60,6 +60,11 @@
     <Compile Include="..\common\SolutionInfo.cs">
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>
+    <Compile Include="Base\TeamExplorerBase.cs" />
+    <Compile Include="Base\TeamExplorerBaseNavigationItem.cs" />
+    <Compile Include="Base\TeamExplorerBaseNavigationLink.cs" />
+    <Compile Include="Base\TeamExplorerBasePage.cs" />
+    <Compile Include="Base\TeamExplorerBaseSection.cs" />
     <Compile Include="CompositionServices.cs" />
     <Compile Include="ExtensionServicesFactory.cs" />
     <Compile Include="IExtensionServices.cs" />
@@ -73,6 +78,10 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="StartPagePackage.cs" />
+    <Compile Include="Sync\PublishSection.cs" />
+    <Compile Include="Sync\PublishView.xaml.cs">
+      <DependentUpon>PublishView.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Images.imagemanifest">
@@ -155,6 +164,14 @@
       <HintPath>..\..\build\Content\Markdig.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.TeamFoundation.Client, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\16.0\Microsoft.TeamFoundation.Client.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.TeamFoundation.Controls, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\16.0\Microsoft.TeamFoundation.Controls.dll</HintPath>
+    </Reference>
     <Reference Include="Octokit, Version=0.0.0.0, Culture=neutral, PublicKeyToken=5525be5bc50478ea, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\build\Content\Octokit.dll</HintPath>
@@ -253,6 +270,12 @@
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Page Include="Sync\PublishView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
new file mode 100644
index 0000000000..2351f42bc7
--- /dev/null
+++ b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
@@ -0,0 +1,93 @@
+/*
+* Copyright (c) Microsoft Corporation. All rights reserved. This code released
+* under the terms of the Microsoft Limited Public License (MS-LPL).
+*/
+using System;
+using System.ComponentModel;
+using Microsoft.TeamFoundation.Controls;
+
+namespace Microsoft.TeamExplorerSample.Sync
+{
+    /// <summary>
+    /// Publish section.
+    /// </summary>
+    [TeamExplorerSection(SectionId, TeamExplorerPageIds.GitCommits, Priority)]
+    public class PublishSection : TeamExplorerBaseSection
+    {
+        public const string SectionId = "35B18474-005D-4A2A-9CCF-FFFFEB60F1F5";
+        public const int Priority = 4;
+
+        readonly Guid PushToRemoteSectionId = new Guid("99ADF41C-0022-4C03-B3C2-05047A3F6C2C");
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        public PublishSection()
+            : base()
+        {
+            this.Title = "Publish to GitHub";
+            this.IsExpanded = true;
+            this.IsBusy = false;
+            this.SectionContent = new PublishView();
+            this.View.ParentSection = this;
+        }
+
+        /// <summary>
+        /// Get the view.
+        /// </summary>
+        protected PublishView View
+        {
+            get { return this.SectionContent as PublishView; }
+        }
+
+        /// <summary>
+        /// Initialize override.
+        /// </summary>
+        public override void Initialize(object sender, SectionInitializeEventArgs e)
+        {
+            base.Initialize(sender, e);
+
+            RefreshVisibility();
+
+            if (ServiceProvider.GetService(typeof(ITeamExplorerPage)) is ITeamExplorerPage page)
+            {
+                if (page.GetSection(PushToRemoteSectionId) is ITeamExplorerSection pushToRemoteSection)
+                {
+                    pushToRemoteSection.PropertyChanged += Section_PropertyChanged;
+                }
+            }
+        }
+
+        void Section_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            switch (e.PropertyName)
+            {
+                case nameof(ITeamExplorerSection.IsVisible):
+                case nameof(ITeamExplorerSection.SectionContent):
+                    RefreshVisibility();
+                    break;
+            }
+        }
+
+        void RefreshVisibility()
+        {
+            var visible = false;
+
+            if (ServiceProvider.GetService(typeof(ITeamExplorerPage)) is ITeamExplorerPage page)
+            {
+                if (page.GetSection(PushToRemoteSectionId) is ITeamExplorerSection pushToRemoteSection)
+                {
+                    if (pushToRemoteSection.SectionContent != null && pushToRemoteSection.IsVisible)
+                    {
+                        visible = true;
+                    }
+                }
+            }
+
+            if (IsVisible != visible)
+            {
+                IsVisible = visible;
+            }
+        }
+    }
+}
diff --git a/src/GitHub.VisualStudio.16/Sync/PublishView.xaml b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml
new file mode 100644
index 0000000000..013742be90
--- /dev/null
+++ b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml
@@ -0,0 +1,14 @@
+<UserControl x:Class="Microsoft.TeamExplorerSample.Sync.PublishView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300"
+             DataContext="{Binding RelativeSource={RelativeSource Self}}">
+
+    <WrapPanel HorizontalAlignment="Right" Margin="0,0,14,0">
+        <Button Content="Publish Git Repo" />
+    </WrapPanel>
+
+</UserControl>
diff --git a/src/GitHub.VisualStudio.16/Sync/PublishView.xaml.cs b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml.cs
new file mode 100644
index 0000000000..78ecfae21a
--- /dev/null
+++ b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml.cs
@@ -0,0 +1,50 @@
+/*
+* Copyright (c) Microsoft Corporation. All rights reserved. This code released
+* under the terms of the Microsoft Limited Public License (MS-LPL).
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Microsoft.TeamExplorerSample.Sync
+{
+    /// <summary>
+    /// Interaction logic for SelectedFileInfoView.xaml
+    /// </summary>
+    public partial class PublishView : UserControl
+    {
+        public PublishView()
+        {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// Parent section.
+        /// </summary>
+        public PublishSection ParentSection
+        {
+            get { return (PublishSection)GetValue(ParentSectionProperty); }
+            set { SetValue(ParentSectionProperty, value); }
+        }
+        public static readonly DependencyProperty ParentSectionProperty =
+            DependencyProperty.Register("ParentSection", typeof(PublishSection), typeof(PublishView));
+
+        /// <summary>
+        /// Set encoding button Click event handler.
+        /// </summary>
+        private void setEncodingButton_Click(object sender, RoutedEventArgs e)
+        {
+        }
+    }
+}
diff --git a/src/GitHub.VisualStudio.16/source.extension.vsixmanifest b/src/GitHub.VisualStudio.16/source.extension.vsixmanifest
index 617594436a..cb3fdee4d6 100644
--- a/src/GitHub.VisualStudio.16/source.extension.vsixmanifest
+++ b/src/GitHub.VisualStudio.16/source.extension.vsixmanifest
@@ -18,5 +18,6 @@
     <Assets>
         <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
         <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="GitHub.VisualStudio.UI.16" d:VsixSubPath="UI" Path="|GitHub.VisualStudio.UI.16|" AssemblyName="|GitHub.VisualStudio.UI.16;AssemblyName|" />
+        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
     </Assets>
 </PackageManifest>
\ No newline at end of file

From 3bf04a539d65389f743cb7498160bbccc64e3f49 Mon Sep 17 00:00:00 2001
From: Stanley Goldman <Stanley.Goldman@gmail.com>
Date: Thu, 23 May 2019 11:07:36 -0400
Subject: [PATCH 02/31] Hiding the publish section to favor the main package

---
 .../Sync/PublishSection.cs                    | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
index 2351f42bc7..8a308a64c2 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
+++ b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
@@ -18,6 +18,7 @@ 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");
 
         /// <summary>
         /// Constructor.
@@ -55,6 +56,11 @@ public override void Initialize(object sender, SectionInitializeEventArgs e)
                 {
                     pushToRemoteSection.PropertyChanged += Section_PropertyChanged;
                 }
+
+                if (page.GetSection(GitHubPublishSectionId) is ITeamExplorerSection gitHubPublishSection)
+                {
+                    gitHubPublishSection.PropertyChanged += Section_PropertyChanged;
+                }
             }
         }
 
@@ -71,17 +77,21 @@ 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)
             {
-                if (page.GetSection(PushToRemoteSectionId) is ITeamExplorerSection pushToRemoteSection)
-                {
-                    if (pushToRemoteSection.SectionContent != null && pushToRemoteSection.IsVisible)
-                    {
-                        visible = true;
-                    }
-                }
+                visible = IsSectionVisible(page, PushToRemoteSectionId) && !IsSectionVisible(page, GitHubPublishSectionId);
             }
 
             if (IsVisible != visible)

From d0a1cd85acf6d303643a49b539c558f0ddd82f11 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Thu, 23 May 2019 16:00:44 +0100
Subject: [PATCH 03/31] Make publish view consistent with Azure DevOps

Use same colors and layout.
---
 .../Images.imagemanifest.cs                   | 11 ++-
 .../StartPagePackage.cs                       |  2 +-
 .../Sync/PublishView.xaml                     | 68 ++++++++++++++++++-
 3 files changed, 74 insertions(+), 7 deletions(-)

diff --git a/src/GitHub.VisualStudio.16/Images.imagemanifest.cs b/src/GitHub.VisualStudio.16/Images.imagemanifest.cs
index 099832f489..36001981e0 100644
--- a/src/GitHub.VisualStudio.16/Images.imagemanifest.cs
+++ b/src/GitHub.VisualStudio.16/Images.imagemanifest.cs
@@ -1,8 +1,13 @@
-namespace GitHub.VisualStudio
+using System;
+using Microsoft.VisualStudio.Imaging.Interop;
+
+namespace GitHub.VisualStudio
 {
-    internal class Images
+    public class Images
     {
         internal const string ImageMonikerGuid = "{de556d01-f3bc-4521-abc3-3e04b537f9c9}";
-        internal const int Logo = 1;
+        internal const int LogoId = 1;
+
+        public static ImageMoniker Logo { get; } = new ImageMoniker { Guid = new Guid(ImageMonikerGuid), Id = LogoId };
     }
 }
diff --git a/src/GitHub.VisualStudio.16/StartPagePackage.cs b/src/GitHub.VisualStudio.16/StartPagePackage.cs
index 83b5f6abf7..bb04159d05 100644
--- a/src/GitHub.VisualStudio.16/StartPagePackage.cs
+++ b/src/GitHub.VisualStudio.16/StartPagePackage.cs
@@ -12,7 +12,7 @@ namespace GitHub.StartPage
     [ProvideBindingPath(SubPath = "UI")]
     [PackageRegistration(UseManagedResourcesOnly = true)]
     [Guid(Guids.StartPagePackageId)]
-    [ProvideCodeContainerProvider("GitHub Container", Guids.StartPagePackageId, Images.ImageMonikerGuid, Images.Logo, "#110", "#111", typeof(InBoxGitHubContainerProvider))]
+    [ProvideCodeContainerProvider("GitHub Container", Guids.StartPagePackageId, Images.ImageMonikerGuid, Images.LogoId, "#110", "#111", typeof(InBoxGitHubContainerProvider))]
     public sealed class StartPagePackage : ExtensionPointPackage
     {
         protected override ICodeContainerProvider CreateCodeContainerProvider(Guid provider)
diff --git a/src/GitHub.VisualStudio.16/Sync/PublishView.xaml b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml
index 013742be90..59c518ce82 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishView.xaml
+++ b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml
@@ -3,12 +3,74 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
+             xmlns:mtcw="clr-namespace:Microsoft.TeamFoundation.Controls.WPF;assembly=Microsoft.TeamFoundation.Controls"
+             xmlns:local="clr-namespace:GitHub.VisualStudio;assembly="
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300"
              DataContext="{Binding RelativeSource={RelativeSource Self}}">
 
-    <WrapPanel HorizontalAlignment="Right" Margin="0,0,14,0">
-        <Button Content="Publish Git Repo" />
-    </WrapPanel>
+    <UserControl.Resources>
+        <SolidColorBrush
+            x:Key="SubduedTextBrushKey" 
+            Color="{Binding Source={x:Static mtcw:TeamFoundationColors.Instance}, Path=SubduedTextColor, Mode=OneWay}" />
+    </UserControl.Resources>
+
+    <StackPanel Margin="6,0,0,0">
+        
+        <!-- heading -->
+        <Grid Margin="6,6,6,5">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <!--Icon -->
+            <imaging:CrispImage
+            Width="32"
+            Height="32"
+            Grid.Column="0"
+            HorizontalAlignment="Center" 
+            VerticalAlignment="Top" 
+            Margin="0,2,8,2"
+            SnapsToDevicePixels="True"
+            Visibility="Visible"
+            Moniker="{x:Static local:Images.Logo}" />
+
+            <!--Service name, provider -->
+            <StackPanel Orientation="Vertical"
+                VerticalAlignment="Center"
+                Grid.Column="1">
+                <TextBlock x:Name="Name"     Text="GitHub"  TextTrimming="CharacterEllipsis" FontWeight="SemiBold" />
+                <TextBlock x:Name="Provider" Text="GitHub, Inc" TextTrimming="CharacterEllipsis"
+                           Foreground="{StaticResource SubduedTextBrushKey}" />
+            </StackPanel>
+        </Grid>
+
+        <Grid x:Name="GetStartedGrid" x:Uid="GetStartedGrid">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+            <WrapPanel x:Name="GetStartedPanel" Grid.Row="0" Grid.ColumnSpan="2">
+                <!-- Description text -->
+                <TextBlock    x:Name="Description"
+                              x:Uid="Description"
+                              Text="Powerful collaboration, code review, and code management for open source and private projects."
+                              MaxHeight="100"
+                              TextWrapping="Wrap" 
+                              TextTrimming="WordEllipsis" />
+            </WrapPanel>
+            <WrapPanel Grid.Row="1" Grid.Column="1" HorizontalAlignment="Right" Margin="0,0,14,0">
+                <Button x:Uid="publishARepoButton" x:Name="publishARepoButton"
+                            Grid.Column="0" Content="Publish to GitHub" />
+            </WrapPanel>
+        </Grid>
+        
+    </StackPanel>
 
 </UserControl>

From 1507adab3235a75177450ad6702242f43f4ed4cc Mon Sep 17 00:00:00 2001
From: Stanley Goldman <Stanley.Goldman@gmail.com>
Date: Thu, 30 May 2019 11:31:05 -0400
Subject: [PATCH 04/31] Starting to display the RepositoryPublishView

co-authored-by: Jamie Cansdale <jcansdale@gmail.com>
---
 .../GitHub.VisualStudio.16.csproj             |   4 ++
 .../Sync/PublishSection.cs                    |  39 +++++++++++++++++-
 .../Sync/PublishView.xaml                     |   5 +--
 .../Sync/PublishView.xaml.cs                  |   7 ----
 .../UI/GitHub.Resources.dll                   | Bin 0 -> 60928 bytes
 .../source.extension.vsixmanifest             |   1 +
 6 files changed, 44 insertions(+), 12 deletions(-)
 create mode 100644 src/GitHub.VisualStudio.16/UI/GitHub.Resources.dll

diff --git a/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj b/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj
index e3391b2e57..a87fb0adb3 100644
--- a/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj
+++ b/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj
@@ -88,6 +88,10 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
+    <Content Include="UI\GitHub.Resources.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
diff --git a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
index 8a308a64c2..9b4f3352ca 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
+++ b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
@@ -4,7 +4,15 @@
 */
 using System;
 using System.ComponentModel;
+using System.Windows.Input;
+using GitHub.Factories;
+using GitHub.Primitives;
+using GitHub.ViewModels.TeamExplorer;
 using Microsoft.TeamFoundation.Controls;
+using Microsoft.VisualStudio.ComponentModelHost;
+using GitHub.VisualStudio;
+using Microsoft.VisualStudio.Threading;
+using Task = System.Threading.Tasks.Task;
 
 namespace Microsoft.TeamExplorerSample.Sync
 {
@@ -19,7 +27,7 @@ public class PublishSection : TeamExplorerBaseSection
 
         readonly Guid PushToRemoteSectionId = new Guid("99ADF41C-0022-4C03-B3C2-05047A3F6C2C");
         readonly Guid GitHubPublishSectionId = new Guid("92655B52-360D-4BF5-95C5-D9E9E596AC76");
-
+        
         /// <summary>
         /// Constructor.
         /// </summary>
@@ -29,7 +37,9 @@ public PublishSection()
             this.Title = "Publish to GitHub";
             this.IsExpanded = true;
             this.IsBusy = false;
-            this.SectionContent = new PublishView();
+            this.SectionContent = new PublishView(){
+                DataContext = this
+            };
             this.View.ParentSection = this;
         }
 
@@ -41,6 +51,8 @@ protected PublishView View
             get { return this.SectionContent as PublishView; }
         }
 
+        public ICommand PublishToGitHub { get; set; }
+
         /// <summary>
         /// Initialize override.
         /// </summary>
@@ -62,8 +74,31 @@ public override void Initialize(object sender, SectionInitializeEventArgs e)
                     gitHubPublishSection.PropertyChanged += Section_PropertyChanged;
                 }
             }
+
+            PublishToGitHub = new RelayCommand(o => DoPublishToGitHub().Forget());
         }
 
+        async Task DoPublishToGitHub()
+        {
+            var componentModel = await Microsoft.VisualStudio.Shell.ServiceProvider.GetGlobalServiceAsync<SComponentModel, IComponentModel>();
+            ShowPublishDialog(componentModel);
+        }
+
+        void ShowPublishDialog(IComponentModel componentModel)
+        {
+            var compositionServices = new CompositionServices();
+            var compositionContainer = compositionServices.CreateVisualStudioCompositionContainer(componentModel.DefaultExportProvider);
+
+            var factory = compositionContainer.GetExportedValue<IViewViewModelFactory>();
+            var viewModel = compositionContainer.GetExportedValue<IRepositoryPublishViewModel>();
+
+            var frameworkElement = factory.CreateView<IRepositoryPublishViewModel>();
+            frameworkElement.DataContext = viewModel;
+
+            this.SectionContent = frameworkElement;
+        }
+
+
         void Section_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             switch (e.PropertyName)
diff --git a/src/GitHub.VisualStudio.16/Sync/PublishView.xaml b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml
index 59c518ce82..f9141cac44 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishView.xaml
+++ b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml
@@ -7,8 +7,7 @@
              xmlns:mtcw="clr-namespace:Microsoft.TeamFoundation.Controls.WPF;assembly=Microsoft.TeamFoundation.Controls"
              xmlns:local="clr-namespace:GitHub.VisualStudio;assembly="
              mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300"
-             DataContext="{Binding RelativeSource={RelativeSource Self}}">
+             d:DesignHeight="300" d:DesignWidth="300">
 
     <UserControl.Resources>
         <SolidColorBrush
@@ -67,7 +66,7 @@
             </WrapPanel>
             <WrapPanel Grid.Row="1" Grid.Column="1" HorizontalAlignment="Right" Margin="0,0,14,0">
                 <Button x:Uid="publishARepoButton" x:Name="publishARepoButton"
-                            Grid.Column="0" Content="Publish to GitHub" />
+                            Grid.Column="0" Content="Publish to GitHub" Command="{Binding PublishToGitHub}" />
             </WrapPanel>
         </Grid>
         
diff --git a/src/GitHub.VisualStudio.16/Sync/PublishView.xaml.cs b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml.cs
index 78ecfae21a..b24b60bf5f 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishView.xaml.cs
+++ b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml.cs
@@ -39,12 +39,5 @@ public PublishSection ParentSection
         }
         public static readonly DependencyProperty ParentSectionProperty =
             DependencyProperty.Register("ParentSection", typeof(PublishSection), typeof(PublishView));
-
-        /// <summary>
-        /// Set encoding button Click event handler.
-        /// </summary>
-        private void setEncodingButton_Click(object sender, RoutedEventArgs e)
-        {
-        }
     }
 }
diff --git a/src/GitHub.VisualStudio.16/UI/GitHub.Resources.dll b/src/GitHub.VisualStudio.16/UI/GitHub.Resources.dll
new file mode 100644
index 0000000000000000000000000000000000000000..60a88c28061abc8eda2e2042f004ce3b0b3072b0
GIT binary patch
literal 60928
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
T4+n^=CbvrT|7ZSxR0IDHLm4%$

literal 0
HcmV?d00001

diff --git a/src/GitHub.VisualStudio.16/source.extension.vsixmanifest b/src/GitHub.VisualStudio.16/source.extension.vsixmanifest
index 87df601af8..cc0a34a4a8 100644
--- a/src/GitHub.VisualStudio.16/source.extension.vsixmanifest
+++ b/src/GitHub.VisualStudio.16/source.extension.vsixmanifest
@@ -19,5 +19,6 @@
     <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
     <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="GitHub.VisualStudio.UI.16" d:VsixSubPath="UI" Path="|GitHub.VisualStudio.UI.16|" AssemblyName="|GitHub.VisualStudio.UI.16;AssemblyName|" />
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
+    <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="UI\GitHub.Resources.dll" AssemblyName="GitHub.Resources, Version=2.10.2.0, Culture=neutral, PublicKeyToken=bc1bd09f2901c82e" d:VsixSubPath="UI" />
   </Assets>
 </PackageManifest>
\ No newline at end of file

From 07bbffcf5d4422aa428bbc1a525c78a3f2c693d6 Mon Sep 17 00:00:00 2001
From: Stanley Goldman <Stanley.Goldman@gmail.com>
Date: Thu, 30 May 2019 12:05:26 -0400
Subject: [PATCH 05/31] Loading more of the Publish functionality

co-authored-by: Jamie Cansdale <jcansdale@gmail.com>
---
 .../Sync/PublishSection.cs                    | 88 ++++++++++++++++++-
 1 file changed, 85 insertions(+), 3 deletions(-)

diff --git a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
index 9b4f3352ca..c82aec0582 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
+++ b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
@@ -4,14 +4,19 @@
 */
 using System;
 using System.ComponentModel;
+using System.Globalization;
+using System.Reactive.Linq;
 using System.Windows.Input;
 using GitHub.Factories;
+using GitHub.Models;
 using GitHub.Primitives;
 using GitHub.ViewModels.TeamExplorer;
 using Microsoft.TeamFoundation.Controls;
 using Microsoft.VisualStudio.ComponentModelHost;
 using GitHub.VisualStudio;
+using GitHub.VisualStudio.UI;
 using Microsoft.VisualStudio.Threading;
+using ReactiveUI;
 using Task = System.Threading.Tasks.Task;
 
 namespace Microsoft.TeamExplorerSample.Sync
@@ -86,16 +91,93 @@ async Task DoPublishToGitHub()
 
         void ShowPublishDialog(IComponentModel componentModel)
         {
+            /*
+            var factory = ServiceProvider.GetService<IViewViewModelFactory>();
+            var viewModel = ServiceProvider.GetService<IRepositoryPublishViewModel>();
+            */
+
             var compositionServices = new CompositionServices();
             var compositionContainer = compositionServices.CreateVisualStudioCompositionContainer(componentModel.DefaultExportProvider);
 
             var factory = compositionContainer.GetExportedValue<IViewViewModelFactory>();
             var viewModel = compositionContainer.GetExportedValue<IRepositoryPublishViewModel>();
 
-            var frameworkElement = factory.CreateView<IRepositoryPublishViewModel>();
-            frameworkElement.DataContext = viewModel;
+            var busy = viewModel.WhenAnyValue(x => x.IsBusy).Subscribe(x => IsBusy = x);
+
+            var completed = viewModel.PublishRepository
+                .Where(x => x == ProgressState.Success)
+                .Subscribe(_ =>
+                {
+                    var teamExplorer =
+                        VisualStudio.Shell.ServiceProvider.GlobalProvider.GetService(typeof(ITeamExplorer)) as ITeamExplorer;
+                    teamExplorer?.NavigateToPage(new Guid(TeamExplorerPageIds.Home), null);
+
+                    // HandleCreatedRepo(ActiveRepo);
+                });
+
+            var view = factory.CreateView<IRepositoryPublishViewModel>();
+            view.DataContext = viewModel;
+
+            SectionContent = view;
+
+            /*
+
+            var view = factory.CreateView<IRepositoryPublishViewModel>();
+            view.DataContext = viewModel;
+            SectionContent = view;
 
-            this.SectionContent = frameworkElement;
+            Observable.FromEventPattern<RoutedEventHandler, RoutedEventArgs>(
+                    x => view.Unloaded += x,
+                    x => view.Unloaded -= x)
+                .Take(1)
+                .Subscribe(_ =>
+                {
+                    busy.Dispose();
+                    completed.Dispose();
+                });
+
+            */
+        }
+
+        void HandleCreatedRepo(LocalRepositoryModel newrepo)
+        {
+            var msg = String.Format(CultureInfo.CurrentCulture, Constants.Notification_RepoCreated, newrepo.Name, newrepo.CloneUrl);
+            msg += " " + String.Format(CultureInfo.CurrentCulture, Constants.Notification_CreateNewProject, newrepo.LocalPath);
+            ShowNotification(newrepo, msg);
+        }
+
+        private void ShowNotification(LocalRepositoryModel newrepo, string msg)
+        {
+//            var teServices = ServiceProvider.TryGetService<ITeamExplorerServices>();
+//
+//            teServices.ClearNotifications();
+//            teServices.ShowMessage(
+//                msg,
+//                new RelayCommand(o =>
+//                {
+//                    var str = o.ToString();
+//                    /* the prefix is the action to perform:
+//                     * u: launch browser with url
+//                     * c: launch create new project dialog
+//                     * o: launch open existing project dialog 
+//                    */
+//                    var prefix = str.Substring(0, 2);
+//                    if (prefix == "u:")
+//                        OpenInBrowser(ServiceProvider.TryGetService<IVisualStudioBrowser>(), new Uri(str.Substring(2)));
+//                    else if (prefix == "o:")
+//                    {
+//                        if (ErrorHandler.Succeeded(ServiceProvider.GetSolution().OpenSolutionViaDlg(str.Substring(2), 1)))
+//                            ServiceProvider.TryGetService<ITeamExplorer>()?.NavigateToPage(new Guid(TeamExplorerPageIds.Home), null);
+//                    }
+//                    else if (prefix == "c:")
+//                    {
+//                        var vsGitServices = ServiceProvider.TryGetService<IVSGitServices>();
+//                        vsGitServices.SetDefaultProjectPath(newrepo.LocalPath);
+//                        if (ErrorHandler.Succeeded(ServiceProvider.GetSolution().CreateNewProjectViaDlg(null, null, 0)))
+//                            ServiceProvider.TryGetService<ITeamExplorer>()?.NavigateToPage(new Guid(TeamExplorerPageIds.Home), null);
+//                    }
+//                })
+//            );
         }
 
 

From d4603a29c4355eb3009e3cb62b96507d537fceab Mon Sep 17 00:00:00 2001
From: Stanley Goldman <Stanley.Goldman@gmail.com>
Date: Thu, 30 May 2019 15:41:48 -0400
Subject: [PATCH 06/31] Adding missing references

---
 .../GitHub.VisualStudio.16.csproj             | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj b/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj
index a87fb0adb3..c62752bd67 100644
--- a/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj
+++ b/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj
@@ -101,6 +101,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\build\Content\Akavache.dll</HintPath>
     </Reference>
+    <Reference Include="Akavache.Sqlite3, Version=6.0.0.0, Culture=neutral, PublicKeyToken=decff03a04a41f69, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\build\Content\Akavache.Sqlite3.dll</HintPath>
+    </Reference>
     <Reference Include="CredentialManagement, Version=2.9.0.0, Culture=neutral, PublicKeyToken=bc1bd09f2901c82e, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\build\Content\CredentialManagement.dll</HintPath>
@@ -188,6 +192,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\build\Content\Octokit.GraphQL.Core.dll</HintPath>
     </Reference>
+    <Reference Include="Octokit.Reactive, Version=0.0.0.0, Culture=neutral, PublicKeyToken=5525be5bc50478ea, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\build\Content\Octokit.Reactive.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="ReactiveUI, Version=8.7.0.0, Culture=neutral, PublicKeyToken=31f8874b2ce7ed44, processorArchitecture=MSIL">
@@ -224,6 +232,18 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\build\Content\Splat.dll</HintPath>
     </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_v2, Version=1.1.11.121, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\build\Content\SQLitePCLRaw.batteries_v2.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.core, Version=1.1.11.121, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\build\Content\SQLitePCLRaw.core.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.provider.e_sqlite3, Version=1.1.11.121, Culture=neutral, PublicKeyToken=9c301db686d0bd12, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\build\Content\SQLitePCLRaw.provider.e_sqlite3.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Data" />

From d86fad5c4a984430e9fa0074a4f5ead74f9ecc18 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Fri, 31 May 2019 12:10:43 +0100
Subject: [PATCH 07/31] Use local not global ServiceProvider

---
 src/GitHub.VisualStudio.16/Sync/PublishSection.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
index c82aec0582..60ac67dd36 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
+++ b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
@@ -85,7 +85,7 @@ public override void Initialize(object sender, SectionInitializeEventArgs e)
 
         async Task DoPublishToGitHub()
         {
-            var componentModel = await Microsoft.VisualStudio.Shell.ServiceProvider.GetGlobalServiceAsync<SComponentModel, IComponentModel>();
+            var componentModel = ServiceProvider.GetService(typeof(SComponentModel)) as IComponentModel;
             ShowPublishDialog(componentModel);
         }
 
@@ -108,8 +108,7 @@ void ShowPublishDialog(IComponentModel componentModel)
                 .Where(x => x == ProgressState.Success)
                 .Subscribe(_ =>
                 {
-                    var teamExplorer =
-                        VisualStudio.Shell.ServiceProvider.GlobalProvider.GetService(typeof(ITeamExplorer)) as ITeamExplorer;
+                    var teamExplorer = ServiceProvider.GetService(typeof(ITeamExplorer)) as ITeamExplorer;
                     teamExplorer?.NavigateToPage(new Guid(TeamExplorerPageIds.Home), null);
 
                     // HandleCreatedRepo(ActiveRepo);

From 88109fb746a198d2cc501986afbb15ea9ca6cb8a Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Fri, 31 May 2019 12:24:20 +0100
Subject: [PATCH 08/31] Factor out GetExportProvider

---
 .../Sync/PublishSection.cs                    | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
index 60ac67dd36..2eb7cc1cb2 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
+++ b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
@@ -18,6 +18,8 @@
 using Microsoft.VisualStudio.Threading;
 using ReactiveUI;
 using Task = System.Threading.Tasks.Task;
+using Microsoft.VisualStudio.Shell;
+using System.ComponentModel.Composition.Hosting;
 
 namespace Microsoft.TeamExplorerSample.Sync
 {
@@ -80,27 +82,15 @@ public override void Initialize(object sender, SectionInitializeEventArgs e)
                 }
             }
 
-            PublishToGitHub = new RelayCommand(o => DoPublishToGitHub().Forget());
+            PublishToGitHub = new RelayCommand(o => ShowPublishDialog());
         }
 
-        async Task DoPublishToGitHub()
+        void ShowPublishDialog()
         {
-            var componentModel = ServiceProvider.GetService(typeof(SComponentModel)) as IComponentModel;
-            ShowPublishDialog(componentModel);
-        }
-
-        void ShowPublishDialog(IComponentModel componentModel)
-        {
-            /*
-            var factory = ServiceProvider.GetService<IViewViewModelFactory>();
-            var viewModel = ServiceProvider.GetService<IRepositoryPublishViewModel>();
-            */
+            var exportProvide = GetExportProvider();
 
-            var compositionServices = new CompositionServices();
-            var compositionContainer = compositionServices.CreateVisualStudioCompositionContainer(componentModel.DefaultExportProvider);
-
-            var factory = compositionContainer.GetExportedValue<IViewViewModelFactory>();
-            var viewModel = compositionContainer.GetExportedValue<IRepositoryPublishViewModel>();
+            var factory = exportProvide.GetExportedValue<IViewViewModelFactory>();
+            var viewModel = exportProvide.GetExportedValue<IRepositoryPublishViewModel>();
 
             var busy = viewModel.WhenAnyValue(x => x.IsBusy).Subscribe(x => IsBusy = x);
 
@@ -138,6 +128,15 @@ void ShowPublishDialog(IComponentModel componentModel)
             */
         }
 
+        ExportProvider GetExportProvider()
+        {
+            var componentModel = ServiceProvider.GetService(typeof(SComponentModel)) as IComponentModel;
+            Assumes.Present(componentModel);
+            var compositionServices = new CompositionServices();
+            var compositionContainer = compositionServices.CreateVisualStudioCompositionContainer(componentModel.DefaultExportProvider);
+            return compositionContainer;
+        }
+
         void HandleCreatedRepo(LocalRepositoryModel newrepo)
         {
             var msg = String.Format(CultureInfo.CurrentCulture, Constants.Notification_RepoCreated, newrepo.Name, newrepo.CloneUrl);

From e4e574d628b5742c02ffeb5ca0a8963830e7aee2 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Fri, 31 May 2019 12:29:53 +0100
Subject: [PATCH 09/31] Clean up when view is unloaded

---
 src/GitHub.VisualStudio.16/Sync/PublishSection.cs | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
index 2eb7cc1cb2..d7deb3e21e 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
+++ b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
@@ -20,6 +20,7 @@
 using Task = System.Threading.Tasks.Task;
 using Microsoft.VisualStudio.Shell;
 using System.ComponentModel.Composition.Hosting;
+using System.Windows;
 
 namespace Microsoft.TeamExplorerSample.Sync
 {
@@ -107,14 +108,6 @@ void ShowPublishDialog()
             var view = factory.CreateView<IRepositoryPublishViewModel>();
             view.DataContext = viewModel;
 
-            SectionContent = view;
-
-            /*
-
-            var view = factory.CreateView<IRepositoryPublishViewModel>();
-            view.DataContext = viewModel;
-            SectionContent = view;
-
             Observable.FromEventPattern<RoutedEventHandler, RoutedEventArgs>(
                     x => view.Unloaded += x,
                     x => view.Unloaded -= x)
@@ -125,7 +118,7 @@ void ShowPublishDialog()
                     completed.Dispose();
                 });
 
-            */
+            SectionContent = view;
         }
 
         ExportProvider GetExportProvider()

From fe9b3f2fc850099edcca05eff0039ee25eae6c4a Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Fri, 31 May 2019 13:34:08 +0100
Subject: [PATCH 10/31] Remove redundant ShowNotification

The view already handles this, showing: "Repository created successfully".
---
 .../Sync/PublishSection.cs                    | 70 +++----------------
 1 file changed, 8 insertions(+), 62 deletions(-)

diff --git a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
index d7deb3e21e..9b52092721 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
+++ b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
@@ -1,26 +1,17 @@
-/*
-* Copyright (c) Microsoft Corporation. All rights reserved. This code released
-* under the terms of the Microsoft Limited Public License (MS-LPL).
-*/
-using System;
+using System;
 using System.ComponentModel;
-using System.Globalization;
+using System.ComponentModel.Composition.Hosting;
+using System.Linq;
 using System.Reactive.Linq;
+using System.Windows;
 using System.Windows.Input;
 using GitHub.Factories;
-using GitHub.Models;
 using GitHub.Primitives;
 using GitHub.ViewModels.TeamExplorer;
+using GitHub.VisualStudio;
 using Microsoft.TeamFoundation.Controls;
 using Microsoft.VisualStudio.ComponentModelHost;
-using GitHub.VisualStudio;
-using GitHub.VisualStudio.UI;
-using Microsoft.VisualStudio.Threading;
 using ReactiveUI;
-using Task = System.Threading.Tasks.Task;
-using Microsoft.VisualStudio.Shell;
-using System.ComponentModel.Composition.Hosting;
-using System.Windows;
 
 namespace Microsoft.TeamExplorerSample.Sync
 {
@@ -88,21 +79,18 @@ public override void Initialize(object sender, SectionInitializeEventArgs e)
 
         void ShowPublishDialog()
         {
-            var exportProvide = GetExportProvider();
+            var exportProvider = GetExportProvider();
 
-            var factory = exportProvide.GetExportedValue<IViewViewModelFactory>();
-            var viewModel = exportProvide.GetExportedValue<IRepositoryPublishViewModel>();
+            var factory = exportProvider.GetExportedValue<IViewViewModelFactory>();
+            var viewModel = exportProvider.GetExportedValue<IRepositoryPublishViewModel>();
 
             var busy = viewModel.WhenAnyValue(x => x.IsBusy).Subscribe(x => IsBusy = x);
-
             var completed = viewModel.PublishRepository
                 .Where(x => x == ProgressState.Success)
                 .Subscribe(_ =>
                 {
                     var teamExplorer = ServiceProvider.GetService(typeof(ITeamExplorer)) as ITeamExplorer;
                     teamExplorer?.NavigateToPage(new Guid(TeamExplorerPageIds.Home), null);
-
-                    // HandleCreatedRepo(ActiveRepo);
                 });
 
             var view = factory.CreateView<IRepositoryPublishViewModel>();
@@ -130,48 +118,6 @@ ExportProvider GetExportProvider()
             return compositionContainer;
         }
 
-        void HandleCreatedRepo(LocalRepositoryModel newrepo)
-        {
-            var msg = String.Format(CultureInfo.CurrentCulture, Constants.Notification_RepoCreated, newrepo.Name, newrepo.CloneUrl);
-            msg += " " + String.Format(CultureInfo.CurrentCulture, Constants.Notification_CreateNewProject, newrepo.LocalPath);
-            ShowNotification(newrepo, msg);
-        }
-
-        private void ShowNotification(LocalRepositoryModel newrepo, string msg)
-        {
-//            var teServices = ServiceProvider.TryGetService<ITeamExplorerServices>();
-//
-//            teServices.ClearNotifications();
-//            teServices.ShowMessage(
-//                msg,
-//                new RelayCommand(o =>
-//                {
-//                    var str = o.ToString();
-//                    /* the prefix is the action to perform:
-//                     * u: launch browser with url
-//                     * c: launch create new project dialog
-//                     * o: launch open existing project dialog 
-//                    */
-//                    var prefix = str.Substring(0, 2);
-//                    if (prefix == "u:")
-//                        OpenInBrowser(ServiceProvider.TryGetService<IVisualStudioBrowser>(), new Uri(str.Substring(2)));
-//                    else if (prefix == "o:")
-//                    {
-//                        if (ErrorHandler.Succeeded(ServiceProvider.GetSolution().OpenSolutionViaDlg(str.Substring(2), 1)))
-//                            ServiceProvider.TryGetService<ITeamExplorer>()?.NavigateToPage(new Guid(TeamExplorerPageIds.Home), null);
-//                    }
-//                    else if (prefix == "c:")
-//                    {
-//                        var vsGitServices = ServiceProvider.TryGetService<IVSGitServices>();
-//                        vsGitServices.SetDefaultProjectPath(newrepo.LocalPath);
-//                        if (ErrorHandler.Succeeded(ServiceProvider.GetSolution().CreateNewProjectViaDlg(null, null, 0)))
-//                            ServiceProvider.TryGetService<ITeamExplorer>()?.NavigateToPage(new Guid(TeamExplorerPageIds.Home), null);
-//                    }
-//                })
-//            );
-        }
-
-
         void Section_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             switch (e.PropertyName)

From b4e809defdf6dc2d95e73b8f83944ed4d849e343 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Fri, 31 May 2019 14:31:04 +0100
Subject: [PATCH 11/31] Locate the DefaultExportProvider using MEF

---
 .../Sync/PublishSection.cs                    | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
index 9b52092721..020ef61e90 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
+++ b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
@@ -1,6 +1,6 @@
 using System;
 using System.ComponentModel;
-using System.ComponentModel.Composition.Hosting;
+using System.ComponentModel.Composition;
 using System.Linq;
 using System.Reactive.Linq;
 using System.Windows;
@@ -10,8 +10,10 @@
 using GitHub.ViewModels.TeamExplorer;
 using GitHub.VisualStudio;
 using Microsoft.TeamFoundation.Controls;
-using Microsoft.VisualStudio.ComponentModelHost;
+using Microsoft.VisualStudio.Composition;
 using ReactiveUI;
+using ExportProvider = System.ComponentModel.Composition.Hosting.ExportProvider;
+
 
 namespace Microsoft.TeamExplorerSample.Sync
 {
@@ -21,18 +23,19 @@ namespace Microsoft.TeamExplorerSample.Sync
     [TeamExplorerSection(SectionId, TeamExplorerPageIds.GitCommits, Priority)]
     public class PublishSection : TeamExplorerBaseSection
     {
+        readonly ExportProvider defaultExportProvider;
+
         public const string SectionId = "35B18474-005D-4A2A-9CCF-FFFFEB60F1F5";
         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");
-        
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        public PublishSection()
-            : base()
+
+        [ImportingConstructor]
+        public PublishSection(VisualStudio.Composition.ExportProvider defaultExportProvider)
         {
+            this.defaultExportProvider = defaultExportProvider.AsExportProvider();
+
             this.Title = "Publish to GitHub";
             this.IsExpanded = true;
             this.IsBusy = false;
@@ -111,10 +114,8 @@ void ShowPublishDialog()
 
         ExportProvider GetExportProvider()
         {
-            var componentModel = ServiceProvider.GetService(typeof(SComponentModel)) as IComponentModel;
-            Assumes.Present(componentModel);
             var compositionServices = new CompositionServices();
-            var compositionContainer = compositionServices.CreateVisualStudioCompositionContainer(componentModel.DefaultExportProvider);
+            var compositionContainer = compositionServices.CreateVisualStudioCompositionContainer(defaultExportProvider);
             return compositionContainer;
         }
 

From 9544e81901f3deec558d396577dc013b1467bdfd Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Fri, 31 May 2019 15:57:57 +0100
Subject: [PATCH 12/31] Expose singleton GitHub ExportProvider via MEF

---
 .../CompositionServices.cs                    | 35 +++++++++++++++++--
 .../InBoxExtensionServices.cs                 |  8 ++---
 .../Sync/PublishSection.cs                    | 17 +++------
 .../MainWindow.xaml.cs                        |  6 ++--
 4 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/src/GitHub.VisualStudio.16/CompositionServices.cs b/src/GitHub.VisualStudio.16/CompositionServices.cs
index 44cec8b4e6..21a9459634 100644
--- a/src/GitHub.VisualStudio.16/CompositionServices.cs
+++ b/src/GitHub.VisualStudio.16/CompositionServices.cs
@@ -17,12 +17,43 @@
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Threading;
 using Rothko;
+using static Microsoft.VisualStudio.Composition.NetFxAdapters;
+using ExportProvider = System.ComponentModel.Composition.Hosting.ExportProvider;
 
 namespace GitHub.VisualStudio
 {
+    [Export]
     public class CompositionServices
     {
-        public CompositionContainer CreateVisualStudioCompositionContainer(ExportProvider defaultExportProvider)
+        readonly ExportProvider defaultExportProvider;
+        ExportProvider exportProvider;
+
+        public CompositionServices()
+        {
+        }
+
+        [ImportingConstructor]
+        public CompositionServices(Microsoft.VisualStudio.Composition.ExportProvider defaultExportProvider)
+        {
+            this.defaultExportProvider = defaultExportProvider.AsExportProvider();
+        }
+
+        public ExportProvider GetExportProvider()
+        {
+            return exportProvider = exportProvider ?? CreateCompositionContainer();
+        }
+
+        CompositionContainer CreateCompositionContainer()
+        {
+            if (defaultExportProvider is ExportProvider exportProvider)
+            {
+                return CreateVisualStudioCompositionContainer(exportProvider);
+            }
+
+            return CreateOutOfProcCompositionContainer();
+        }
+
+        static CompositionContainer CreateVisualStudioCompositionContainer(ExportProvider defaultExportProvider)
         {
             var compositionContainer = CreateCompositionContainer(defaultExportProvider);
 
@@ -34,7 +65,7 @@ public CompositionContainer CreateVisualStudioCompositionContainer(ExportProvide
             return compositionContainer;
         }
 
-        public CompositionContainer CreateOutOfProcCompositionContainer()
+        static CompositionContainer CreateOutOfProcCompositionContainer()
         {
             var compositionContainer = CreateCompositionContainer(CreateOutOfProcExports());
 
diff --git a/src/GitHub.VisualStudio.16/InBoxExtensionServices.cs b/src/GitHub.VisualStudio.16/InBoxExtensionServices.cs
index 24e3449b69..28dcea3cfa 100644
--- a/src/GitHub.VisualStudio.16/InBoxExtensionServices.cs
+++ b/src/GitHub.VisualStudio.16/InBoxExtensionServices.cs
@@ -72,14 +72,14 @@ async Task<CodeContainer> RunAcquisitionAsync(IProgress<ServiceProgressData> dow
         static async Task<CloneDialogResult> ShowCloneDialogAsync(IComponentModel componentModel,
             IProgress<ServiceProgressData> downloadProgress, CancellationToken cancellationToken, string url = null)
         {
-            var compositionServices = new CompositionServices();
-            var compositionContainer = compositionServices.CreateVisualStudioCompositionContainer(componentModel.DefaultExportProvider);
+            var compositionServices = componentModel.DefaultExportProvider.GetExportedValue<CompositionServices>();
+            var exportProvider = compositionServices.GetExportProvider();
 
-            var dialogService = compositionContainer.GetExportedValue<IDialogService>();
+            var dialogService = exportProvider.GetExportedValue<IDialogService>();
             var cloneDialogResult = await dialogService.ShowCloneDialog(null, url);
             if (cloneDialogResult != null)
             {
-                var repositoryCloneService = compositionContainer.GetExportedValue<IRepositoryCloneService>();
+                var repositoryCloneService = exportProvider.GetExportedValue<IRepositoryCloneService>();
                 await repositoryCloneService.CloneOrOpenRepository(cloneDialogResult, downloadProgress, cancellationToken);
                 return cloneDialogResult;
             }
diff --git a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
index 020ef61e90..e0864c8f67 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
+++ b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
@@ -10,9 +10,7 @@
 using GitHub.ViewModels.TeamExplorer;
 using GitHub.VisualStudio;
 using Microsoft.TeamFoundation.Controls;
-using Microsoft.VisualStudio.Composition;
 using ReactiveUI;
-using ExportProvider = System.ComponentModel.Composition.Hosting.ExportProvider;
 
 
 namespace Microsoft.TeamExplorerSample.Sync
@@ -23,7 +21,7 @@ namespace Microsoft.TeamExplorerSample.Sync
     [TeamExplorerSection(SectionId, TeamExplorerPageIds.GitCommits, Priority)]
     public class PublishSection : TeamExplorerBaseSection
     {
-        readonly ExportProvider defaultExportProvider;
+        readonly CompositionServices compositionServices;
 
         public const string SectionId = "35B18474-005D-4A2A-9CCF-FFFFEB60F1F5";
         public const int Priority = 4;
@@ -32,9 +30,9 @@ public class PublishSection : TeamExplorerBaseSection
         readonly Guid GitHubPublishSectionId = new Guid("92655B52-360D-4BF5-95C5-D9E9E596AC76");
 
         [ImportingConstructor]
-        public PublishSection(VisualStudio.Composition.ExportProvider defaultExportProvider)
+        public PublishSection(CompositionServices compositionServices)
         {
-            this.defaultExportProvider = defaultExportProvider.AsExportProvider();
+            this.compositionServices = compositionServices;
 
             this.Title = "Publish to GitHub";
             this.IsExpanded = true;
@@ -82,7 +80,7 @@ public override void Initialize(object sender, SectionInitializeEventArgs e)
 
         void ShowPublishDialog()
         {
-            var exportProvider = GetExportProvider();
+            var exportProvider = compositionServices.GetExportProvider();
 
             var factory = exportProvider.GetExportedValue<IViewViewModelFactory>();
             var viewModel = exportProvider.GetExportedValue<IRepositoryPublishViewModel>();
@@ -112,13 +110,6 @@ void ShowPublishDialog()
             SectionContent = view;
         }
 
-        ExportProvider GetExportProvider()
-        {
-            var compositionServices = new CompositionServices();
-            var compositionContainer = compositionServices.CreateVisualStudioCompositionContainer(defaultExportProvider);
-            return compositionContainer;
-        }
-
         void Section_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             switch (e.PropertyName)
diff --git a/src/GitHub.VisualStudio.TestApp/MainWindow.xaml.cs b/src/GitHub.VisualStudio.TestApp/MainWindow.xaml.cs
index 58b0acbdaf..9fa6ee9898 100644
--- a/src/GitHub.VisualStudio.TestApp/MainWindow.xaml.cs
+++ b/src/GitHub.VisualStudio.TestApp/MainWindow.xaml.cs
@@ -71,11 +71,13 @@ async Task CloneOrOpenRepositoryAsync()
         CompositionContainer CreateCompositionContainer()
         {
             var compositionServices = new CompositionServices();
-            var compositionContainer = compositionServices.CreateOutOfProcCompositionContainer();
+            var exportProvider = compositionServices.GetExportProvider();
 
-            var gitHubServiceProvider = compositionContainer.GetExportedValue<IGitHubServiceProvider>();
+            var compositionContainer = new CompositionContainer(exportProvider);
+            var gitHubServiceProvider = exportProvider.GetExportedValue<IGitHubServiceProvider>();
             var externalShowDialogService = new ExternalShowDialogService(gitHubServiceProvider, this);
             compositionContainer.ComposeExportedValue<IShowDialogService>(externalShowDialogService);
+
             return compositionContainer;
         }
     }

From e4355cd77f76bf60e23e84b64e300ecbbedde3c9 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Fri, 31 May 2019 17:33:28 +0100
Subject: [PATCH 13/31] Factor knowledge of full extension into
 FullExtensionUtilities

---
 .../ExtensionServicesFactory.cs               | 42 ----------------
 .../FullExtensionUtilities.cs                 | 48 +++++++++++++++++++
 .../GitHub.VisualStudio.16.csproj             |  8 +++-
 ...ces.cs => InBoxGitHubContainerProvider.cs} | 23 +++------
 .../InstalledExtensionServices.cs             | 27 -----------
 .../StartPagePackage.cs                       | 10 ++--
 .../Sync/PublishSection.cs                    | 38 ++++++++-------
 7 files changed, 89 insertions(+), 107 deletions(-)
 delete mode 100644 src/GitHub.VisualStudio.16/ExtensionServicesFactory.cs
 create mode 100644 src/GitHub.VisualStudio.16/FullExtensionUtilities.cs
 rename src/GitHub.VisualStudio.16/{InBoxExtensionServices.cs => InBoxGitHubContainerProvider.cs} (87%)
 delete mode 100644 src/GitHub.VisualStudio.16/InstalledExtensionServices.cs

diff --git a/src/GitHub.VisualStudio.16/ExtensionServicesFactory.cs b/src/GitHub.VisualStudio.16/ExtensionServicesFactory.cs
deleted file mode 100644
index 35d13e534a..0000000000
--- a/src/GitHub.VisualStudio.16/ExtensionServicesFactory.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using Microsoft;
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
-
-namespace GitHub.VisualStudio
-{
-    public class ExtensionServicesFactory
-    {
-        readonly IServiceProvider serviceProvider;
-
-        public ExtensionServicesFactory(IServiceProvider serviceProvider)
-        {
-            this.serviceProvider = serviceProvider;
-        }
-
-        public IExtensionServices Create()
-        {
-            ThreadHelper.ThrowIfNotOnUIThread();
-
-            var package = FindGitHubPackage();
-            if(package != null)
-            {
-                return new InstalledExtensionServices(package);
-            }
-            else
-            {
-                return new InBoxExtensionServices();
-            }
-        }
-
-        IVsPackage FindGitHubPackage()
-        {
-            ThreadHelper.ThrowIfNotOnUIThread();
-
-            var shell = serviceProvider.GetService(typeof(SVsShell)) as IVsShell;
-            Assumes.Present(shell);
-            shell.LoadPackage(new Guid(Guids.PackageId), out var package);
-            return package;
-        }
-    }
-}
diff --git a/src/GitHub.VisualStudio.16/FullExtensionUtilities.cs b/src/GitHub.VisualStudio.16/FullExtensionUtilities.cs
new file mode 100644
index 0000000000..91302abc05
--- /dev/null
+++ b/src/GitHub.VisualStudio.16/FullExtensionUtilities.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;
+        }
+    }
+}
diff --git a/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj b/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj
index c62752bd67..467ae5dbbd 100644
--- a/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj
+++ b/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj
@@ -67,10 +67,14 @@
     <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>
diff --git a/src/GitHub.VisualStudio.16/InBoxExtensionServices.cs b/src/GitHub.VisualStudio.16/InBoxGitHubContainerProvider.cs
similarity index 87%
rename from src/GitHub.VisualStudio.16/InBoxExtensionServices.cs
rename to src/GitHub.VisualStudio.16/InBoxGitHubContainerProvider.cs
index 28dcea3cfa..18811141e5 100644
--- a/src/GitHub.VisualStudio.16/InBoxExtensionServices.cs
+++ b/src/GitHub.VisualStudio.16/InBoxGitHubContainerProvider.cs
@@ -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();
 
diff --git a/src/GitHub.VisualStudio.16/InstalledExtensionServices.cs b/src/GitHub.VisualStudio.16/InstalledExtensionServices.cs
deleted file mode 100644
index c77831346b..0000000000
--- a/src/GitHub.VisualStudio.16/InstalledExtensionServices.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.IO;
-using System.Reflection;
-using Microsoft.VisualStudio.Shell.Interop;
-using ICodeContainerProvider = Microsoft.VisualStudio.Shell.CodeContainerManagement.ICodeContainerProvider;
-
-namespace GitHub.VisualStudio
-{
-    public class InstalledExtensionServices : IExtensionServices
-    {
-        readonly IVsPackage package;
-
-        public InstalledExtensionServices(IVsPackage package)
-        {
-            this.package = package;
-        }
-
-        public ICodeContainerProvider GetGitHubContainerProvider()
-        {
-            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);
-        }
-    }
-}
diff --git a/src/GitHub.VisualStudio.16/StartPagePackage.cs b/src/GitHub.VisualStudio.16/StartPagePackage.cs
index bb04159d05..c7ea953e65 100644
--- a/src/GitHub.VisualStudio.16/StartPagePackage.cs
+++ b/src/GitHub.VisualStudio.16/StartPagePackage.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();
         }
     }
 }
diff --git a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
index e0864c8f67..51e9598c4c 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
+++ b/src/GitHub.VisualStudio.16/Sync/PublishSection.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,21 +127,11 @@ 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)
@@ -145,5 +139,15 @@ bool IsSectionVisible(ITeamExplorerPage teamExplorerPage, Guid sectionId)
                 IsVisible = visible;
             }
         }
+
+        bool IsSectionVisible(ITeamExplorerPage teamExplorerPage, Guid sectionId)
+        {
+            if (teamExplorerPage.GetSection(sectionId) is ITeamExplorerSection pushToRemoteSection)
+            {
+                return pushToRemoteSection.SectionContent != null && pushToRemoteSection.IsVisible;
+            }
+
+            return false;
+        }
     }
 }

From 46c217479ac601a2fa4dbd707dfbbb02b8ea033e Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Mon, 3 Jun 2019 12:53:15 +0100
Subject: [PATCH 14/31] Avoid putting GitHub.Resources.dll on BindingPath

This would causes issues when the full extension is also installed.
It wouldn't know which version of GitHub.Resources.dl to use.
---
 .../CompositionServices.cs                    |   8 ++++
 .../GitHub.VisualStudio.16.csproj             |   6 +--
 .../UI/GitHub.Resources.dll                   | Bin 60928 -> 0 bytes
 .../source.extension.vsixmanifest             |  41 +++++++++---------
 4 files changed, 29 insertions(+), 26 deletions(-)
 delete mode 100644 src/GitHub.VisualStudio.16/UI/GitHub.Resources.dll

diff --git a/src/GitHub.VisualStudio.16/CompositionServices.cs b/src/GitHub.VisualStudio.16/CompositionServices.cs
index 21a9459634..3e2eb1c334 100644
--- a/src/GitHub.VisualStudio.16/CompositionServices.cs
+++ b/src/GitHub.VisualStudio.16/CompositionServices.cs
@@ -123,6 +123,9 @@ static CompositionContainer CreateCompositionContainer(ExportProvider defaultExp
             // HACK: Stop ViewLocator from attempting to fetch a global service
             var viewViewModelFactory = compositionContainer.GetExportedValue<IViewViewModelFactory>();
             InitializeViewLocator(viewViewModelFactory);
+            
+            // Ensure GitHub.Resources.dll has been loaded and it visible to XAML
+            EnsureLoaded(typeof(GitHub.Resources));
 
             return compositionContainer;
         }
@@ -133,6 +136,11 @@ static void InitializeViewLocator(IViewViewModelFactory viewViewModelFactory)
             factoryProviderFiled.SetValue(null, viewViewModelFactory);
         }
 
+        static void EnsureLoaded(Type type)
+        {
+            // Ensure the containing assembly has been loaded
+        }
+
         static LoginManager CreateLoginManager(CompositionContainer compositionContainer)
         {
             var keychain = compositionContainer.GetExportedValue<IKeychain>();
diff --git a/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj b/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj
index 467ae5dbbd..6abcbfdd08 100644
--- a/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj
+++ b/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj
@@ -92,10 +92,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="UI\GitHub.Resources.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
@@ -137,7 +133,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\build\Content\GitHub.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="GitHub.Resources, Version=2.9.0.0, Culture=neutral, PublicKeyToken=bc1bd09f2901c82e, processorArchitecture=MSIL">
+    <Reference Include="GitHub.Resources, Version=2.10.2.0, Culture=neutral, PublicKeyToken=bc1bd09f2901c82e, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\build\Content\GitHub.Resources.dll</HintPath>
     </Reference>
diff --git a/src/GitHub.VisualStudio.16/UI/GitHub.Resources.dll b/src/GitHub.VisualStudio.16/UI/GitHub.Resources.dll
deleted file mode 100644
index 60a88c28061abc8eda2e2042f004ce3b0b3072b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 60928
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
T4+n^=CbvrT|7ZSxR0IDHLm4%$

diff --git a/src/GitHub.VisualStudio.16/source.extension.vsixmanifest b/src/GitHub.VisualStudio.16/source.extension.vsixmanifest
index cc0a34a4a8..11a5537ced 100644
--- a/src/GitHub.VisualStudio.16/source.extension.vsixmanifest
+++ b/src/GitHub.VisualStudio.16/source.extension.vsixmanifest
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
-  <Metadata>
-    <Identity Id="f4fbb70d-dee2-4dee-b322-bd74e3010e8f" Version="2.10.2.0" Language="en-US" Publisher="GitHub, Inc" />
-    <DisplayName>Clone from GitHub</DisplayName>
-    <Description>Clone or checkout code from GitHub</Description>
-    <PackageId>GitHub.VisualStudio.16</PackageId>
-  </Metadata>
-  <Installation AllUsers="true">
-    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0, 17.0)" />
-  </Installation>
-  <Dependencies>
-    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
-  </Dependencies>
-  <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,17.0)" DisplayName="Visual Studio core editor" />
-  </Prerequisites>
-  <Assets>
-    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
-    <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="GitHub.VisualStudio.UI.16" d:VsixSubPath="UI" Path="|GitHub.VisualStudio.UI.16|" AssemblyName="|GitHub.VisualStudio.UI.16;AssemblyName|" />
-    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
-    <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="UI\GitHub.Resources.dll" AssemblyName="GitHub.Resources, Version=2.10.2.0, Culture=neutral, PublicKeyToken=bc1bd09f2901c82e" d:VsixSubPath="UI" />
-  </Assets>
+    <Metadata>
+        <Identity Id="f4fbb70d-dee2-4dee-b322-bd74e3010e8f" Version="2.10.2.0" Language="en-US" Publisher="GitHub, Inc" />
+        <DisplayName>Clone from GitHub</DisplayName>
+        <Description>Clone or checkout code from GitHub</Description>
+        <PackageId>GitHub.VisualStudio.16</PackageId>
+    </Metadata>
+    <Installation AllUsers="true">
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0, 17.0)" />
+    </Installation>
+    <Dependencies>
+        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+    </Dependencies>
+    <Prerequisites>
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,17.0)" DisplayName="Visual Studio core editor" />
+    </Prerequisites>
+    <Assets>
+        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
+        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="GitHub.VisualStudio.UI.16" d:VsixSubPath="UI" Path="|GitHub.VisualStudio.UI.16|" AssemblyName="|GitHub.VisualStudio.UI.16;AssemblyName|" />
+        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
+    </Assets>
 </PackageManifest>
\ No newline at end of file

From 25878e087818ed117d99827a9ecef585e4c103b7 Mon Sep 17 00:00:00 2001
From: Stanley Goldman <Stanley.Goldman@gmail.com>
Date: Mon, 3 Jun 2019 11:25:15 -0400
Subject: [PATCH 15/31] Making sure the `EnsureLoad` method is not optimized
 away

co-authored-by: Jamie Cansdale <jcansdale@gmail.com>
---
 src/GitHub.VisualStudio.16/CompositionServices.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/GitHub.VisualStudio.16/CompositionServices.cs b/src/GitHub.VisualStudio.16/CompositionServices.cs
index 3e2eb1c334..903e97f118 100644
--- a/src/GitHub.VisualStudio.16/CompositionServices.cs
+++ b/src/GitHub.VisualStudio.16/CompositionServices.cs
@@ -14,6 +14,7 @@
 using GitHub.VisualStudio.Settings;
 using GitHub.VisualStudio.Views;
 using GitHub.VisualStudio.Views.Dialog.Clone;
+using Microsoft;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Threading;
 using Rothko;
@@ -139,6 +140,7 @@ static void InitializeViewLocator(IViewViewModelFactory viewViewModelFactory)
         static void EnsureLoaded(Type type)
         {
             // Ensure the containing assembly has been loaded
+            Assumes.NotNull(type);
         }
 
         static LoginManager CreateLoginManager(CompositionContainer compositionContainer)

From 2aa088171225df56fbf34b6649f9881a4ad8bd6a Mon Sep 17 00:00:00 2001
From: Stanley Goldman <Stanley.Goldman@gmail.com>
Date: Mon, 3 Jun 2019 11:25:15 -0400
Subject: [PATCH 16/31] Authenticating the user before showing the publish
 section view

co-authored-by: Jamie Cansdale <jcansdale@gmail.com>
---
 .../Sync/PublishSection.cs                    | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
index 51e9598c4c..7cf7d27e6b 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
+++ b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
@@ -5,13 +5,17 @@
 using System.Reactive.Linq;
 using System.Windows;
 using System.Windows.Input;
+using GitHub.Extensions;
 using GitHub.Factories;
 using GitHub.Primitives;
+using GitHub.Services;
 using GitHub.ViewModels.TeamExplorer;
 using GitHub.VisualStudio;
 using Microsoft.TeamFoundation.Controls;
 using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Threading;
 using ReactiveUI;
+using Task = System.Threading.Tasks.Task;
 
 
 namespace Microsoft.TeamExplorerSample.Sync
@@ -79,16 +83,29 @@ public override void Initialize(object sender, SectionInitializeEventArgs e)
                 }
             }
 
-            PublishToGitHub = new RelayCommand(o => ShowPublishDialog());
+            PublishToGitHub = new RelayCommand(o => ShowPublishDialog().Forget());
         }
 
-        void ShowPublishDialog()
+        async Task ShowPublishDialog()
         {
             var exportProvider = compositionServices.GetExportProvider();
 
+            var connectionManager = exportProvider.GetExportedValue<IConnectionManager>();
+            var loggedIn = await connectionManager.IsLoggedIn();
+            if (!loggedIn)
+            {
+                var dialogService = exportProvider.GetExportedValue<IDialogService>();
+                var connection = await dialogService.ShowLoginDialog();
+
+                if (connection == null)
+                {
+                    return;
+                }
+            }
+
             var factory = exportProvider.GetExportedValue<IViewViewModelFactory>();
             var viewModel = exportProvider.GetExportedValue<IRepositoryPublishViewModel>();
-
+            
             var busy = viewModel.WhenAnyValue(x => x.IsBusy).Subscribe(x => IsBusy = x);
             var completed = viewModel.PublishRepository
                 .Where(x => x == ProgressState.Success)

From e550bad93916d9bd427116ba3ed80b25c7e6dc29 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Wed, 5 Jun 2019 11:35:52 +0100
Subject: [PATCH 17/31] Add option to add/change accounts from publish view

---
 src/GitHub.App/SampleData/SampleViewModels.cs    |  6 ++++++
 .../TeamExplorer/RepositoryPublishViewModel.cs   | 16 +++++++++++++++-
 .../TeamExplorer/IRepositoryPublishViewModel.cs  |  5 +++++
 .../TeamExplorer/RepositoryPublishView.xaml      |  6 ++++++
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/GitHub.App/SampleData/SampleViewModels.cs b/src/GitHub.App/SampleData/SampleViewModels.cs
index 91be7fe6c1..77b36dc9c0 100644
--- a/src/GitHub.App/SampleData/SampleViewModels.cs
+++ b/src/GitHub.App/SampleData/SampleViewModels.cs
@@ -214,6 +214,12 @@ public ReactiveCommand<Unit, ProgressState> PublishRepository
             private set;
         }
 
+        public ReactiveCommand<Unit, Unit> LoginAsDifferentUser
+        {
+            get;
+            private set;
+        }
+
         public IReadOnlyObservableCollection<IConnection> Connections
         {
             get;
diff --git a/src/GitHub.App/ViewModels/TeamExplorer/RepositoryPublishViewModel.cs b/src/GitHub.App/ViewModels/TeamExplorer/RepositoryPublishViewModel.cs
index 5ad8f941e2..d24c4ae7da 100644
--- a/src/GitHub.App/ViewModels/TeamExplorer/RepositoryPublishViewModel.cs
+++ b/src/GitHub.App/ViewModels/TeamExplorer/RepositoryPublishViewModel.cs
@@ -6,7 +6,7 @@
 using System.Linq;
 using System.Reactive;
 using System.Reactive.Linq;
-using GitHub.App;
+using System.Threading.Tasks;
 using GitHub.Extensions;
 using GitHub.Extensions.Reactive;
 using GitHub.Factories;
@@ -29,6 +29,7 @@ public class RepositoryPublishViewModel : RepositoryFormViewModel, IRepositoryPu
         readonly IRepositoryPublishService repositoryPublishService;
         readonly INotificationService notificationService;
         readonly IModelServiceFactory modelServiceFactory;
+        readonly IDialogService dialogService;
         readonly ObservableAsPropertyHelper<IReadOnlyList<IAccount>> accounts;
         readonly ObservableAsPropertyHelper<bool> isHostComboBoxVisible;
         readonly IUsageTracker usageTracker;
@@ -39,6 +40,7 @@ public RepositoryPublishViewModel(
             INotificationService notificationService,
             IConnectionManager connectionManager,
             IModelServiceFactory modelServiceFactory,
+            IDialogService dialogService,
             IUsageTracker usageTracker)
         {
             Guard.ArgumentNotNull(repositoryPublishService, nameof(repositoryPublishService));
@@ -46,10 +48,12 @@ public RepositoryPublishViewModel(
             Guard.ArgumentNotNull(connectionManager, nameof(connectionManager));
             Guard.ArgumentNotNull(usageTracker, nameof(usageTracker));
             Guard.ArgumentNotNull(modelServiceFactory, nameof(modelServiceFactory));
+            Guard.ArgumentNotNull(dialogService, nameof(dialogService));
 
             this.notificationService = notificationService;
             this.usageTracker = usageTracker;
             this.modelServiceFactory = modelServiceFactory;
+            this.dialogService = dialogService;
 
             Connections = connectionManager.Connections;
             this.repositoryPublishService = repositoryPublishService;
@@ -83,6 +87,8 @@ public RepositoryPublishViewModel(
             PublishRepository = InitializePublishRepositoryCommand();
             PublishRepository.IsExecuting.Subscribe(x => IsBusy = x);
 
+            LoginAsDifferentUser = ReactiveCommand.CreateFromTask(LoginAsDifferentUserAsync);
+
             var defaultRepositoryName = repositoryPublishService.LocalRepositoryName;
             if (!string.IsNullOrEmpty(defaultRepositoryName))
                 RepositoryName = defaultRepositoryName;
@@ -101,6 +107,9 @@ public RepositoryPublishViewModel(
         }
 
         public ReactiveCommand<Unit, ProgressState> PublishRepository { get; private set; }
+
+        public ReactiveCommand<Unit, Unit> LoginAsDifferentUser { get; private set; }
+
         public IReadOnlyObservableCollection<IConnection> Connections { get; private set; }
 
         bool isBusy;
@@ -127,6 +136,11 @@ public bool IsHostComboBoxVisible
             get { return isHostComboBoxVisible.Value; }
         }
 
+        Task LoginAsDifferentUserAsync()
+        {
+            return dialogService.ShowLoginDialog();
+        }
+
         ReactiveCommand<Unit, ProgressState> InitializePublishRepositoryCommand()
         {
             var canCreate = this.WhenAny(x => x.RepositoryNameValidator.ValidationResult.IsValid, x => x.Value);
diff --git a/src/GitHub.Exports.Reactive/ViewModels/TeamExplorer/IRepositoryPublishViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/TeamExplorer/IRepositoryPublishViewModel.cs
index ff1d028e98..efd0ef6e9b 100644
--- a/src/GitHub.Exports.Reactive/ViewModels/TeamExplorer/IRepositoryPublishViewModel.cs
+++ b/src/GitHub.Exports.Reactive/ViewModels/TeamExplorer/IRepositoryPublishViewModel.cs
@@ -19,6 +19,11 @@ public interface IRepositoryPublishViewModel : IViewModel, IRepositoryForm
         /// </summary>
         ReactiveCommand<Unit, ProgressState> PublishRepository { get; }
 
+        /// <summary>
+        /// Command that shows login dialog.
+        /// </summary>
+        ReactiveCommand<Unit, Unit> LoginAsDifferentUser { get; }
+
         /// <summary>
         /// Determines whether the host combo box is visible. Only true if the user is logged into more than one host.
         /// </summary>
diff --git a/src/GitHub.VisualStudio.UI/Views/TeamExplorer/RepositoryPublishView.xaml b/src/GitHub.VisualStudio.UI/Views/TeamExplorer/RepositoryPublishView.xaml
index 22ea4a0409..fe9ae25fdb 100644
--- a/src/GitHub.VisualStudio.UI/Views/TeamExplorer/RepositoryPublishView.xaml
+++ b/src/GitHub.VisualStudio.UI/Views/TeamExplorer/RepositoryPublishView.xaml
@@ -47,6 +47,12 @@
               Orientation="Vertical"
               Style="{DynamicResource DialogContainerStackPanel}">
 
+    <TextBlock TextAlignment="Right">
+        <Hyperlink Command="{Binding LoginAsDifferentUser}">
+            <Run Text="{x:Static ghfvs:Resources.AddChangeAccounts}" />
+        </Hyperlink>
+    </TextBlock>
+      
     <DockPanel Margin="0,0,0,13" VerticalAlignment="Top">
       <ghfvs:OcticonImage x:Name="octokit"
                        Width="32"

From c5ce8f40ea394a24feb0588e9d283fe46429fc39 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Wed, 5 Jun 2019 12:03:21 +0100
Subject: [PATCH 18/31] Fix style of Add/Change Accounts button

---
 .../Views/TeamExplorer/RepositoryPublishView.xaml              | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/GitHub.VisualStudio.UI/Views/TeamExplorer/RepositoryPublishView.xaml b/src/GitHub.VisualStudio.UI/Views/TeamExplorer/RepositoryPublishView.xaml
index fe9ae25fdb..e03be2317a 100644
--- a/src/GitHub.VisualStudio.UI/Views/TeamExplorer/RepositoryPublishView.xaml
+++ b/src/GitHub.VisualStudio.UI/Views/TeamExplorer/RepositoryPublishView.xaml
@@ -5,6 +5,7 @@
                                        xmlns:ghfvs="https://github.com/github/VisualStudio"
                                        xmlns:local="clr-namespace:GitHub.VisualStudio.Views.TeamExplorer"
                                        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                                       xmlns:vsfx="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.14.0"
                                        Margin="0"
                                        d:DesignHeight="440"
                                        d:DesignWidth="414"
@@ -40,6 +41,8 @@
             <Setter Property="HorizontalAlignment" Value="Stretch" />
             <Setter Property="Height" Value="23" />
         </Style>
+        
+        <Style TargetType="Hyperlink" BasedOn="{StaticResource {x:Static vsfx:VsResourceKeys.ThemedDialogHyperlinkStyleKey}}" />
     </ResourceDictionary>
   </Control.Resources>
 

From 9137b4854f74fa48b93488e519f6fcabd5a1b13e Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Wed, 5 Jun 2019 16:19:24 +0100
Subject: [PATCH 19/31] Remove deleted files from .csproj

---
 src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj b/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj
index 6abcbfdd08..c1a53e5075 100644
--- a/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj
+++ b/src/GitHub.VisualStudio.16/GitHub.VisualStudio.16.csproj
@@ -66,12 +66,7 @@
     <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="InBoxGitHubContainerProvider.cs" />

From edf7220cb257338f0cbec4d597a79b971e44afcc Mon Sep 17 00:00:00 2001
From: Stanley Goldman <Stanley.Goldman@gmail.com>
Date: Wed, 5 Jun 2019 13:16:00 -0400
Subject: [PATCH 20/31] Fixing unit test

---
 .../ViewModels/TeamExplorer/RepositoryPublishViewModelTests.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/GitHub.App.UnitTests/ViewModels/TeamExplorer/RepositoryPublishViewModelTests.cs b/test/GitHub.App.UnitTests/ViewModels/TeamExplorer/RepositoryPublishViewModelTests.cs
index 8ac4a3aabd..4f748711fc 100644
--- a/test/GitHub.App.UnitTests/ViewModels/TeamExplorer/RepositoryPublishViewModelTests.cs
+++ b/test/GitHub.App.UnitTests/ViewModels/TeamExplorer/RepositoryPublishViewModelTests.cs
@@ -36,7 +36,7 @@ public static IRepositoryPublishViewModel GetViewModel(
             factory = factory ?? Substitute.For<IModelServiceFactory>();
 
             return new RepositoryPublishViewModel(service, notificationService, connectionManager,
-                factory, Substitute.For<IUsageTracker>());
+                factory, Substitute.For<IDialogService>(), Substitute.For<IUsageTracker>());
         }
 
         public static void SetupConnections(List<HostAddress> adds, List<IConnection> conns, string uri)

From d24aab8a1cc8618ef6de6ab043d21d461afa609b Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Tue, 25 Jun 2019 09:45:29 +0100
Subject: [PATCH 21/31] Theme the publish view with Team Explorer colors

Couldn't get CrispImage to work for automatic coloring of the Blue theme.
---
 .../Sync/PublishView.xaml                     | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/GitHub.VisualStudio.16/Sync/PublishView.xaml b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml
index f9141cac44..80483ec5d5 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishView.xaml
+++ b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml
@@ -3,9 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
              xmlns:mtcw="clr-namespace:Microsoft.TeamFoundation.Controls.WPF;assembly=Microsoft.TeamFoundation.Controls"
-             xmlns:local="clr-namespace:GitHub.VisualStudio;assembly="
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
 
@@ -13,6 +11,9 @@
         <SolidColorBrush
             x:Key="SubduedTextBrushKey" 
             Color="{Binding Source={x:Static mtcw:TeamFoundationColors.Instance}, Path=SubduedTextColor, Mode=OneWay}" />
+        <SolidColorBrush
+            x:Key="SectionTitleTextColorKey" 
+            Color="{Binding Source={x:Static mtcw:TeamFoundationColors.Instance}, Path=SectionTitleTextColor, Mode=OneWay}" />
     </UserControl.Resources>
 
     <StackPanel Margin="6,0,0,0">
@@ -24,23 +25,31 @@
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
 
-            <!--Icon -->
-            <imaging:CrispImage
-            Width="32"
-            Height="32"
-            Grid.Column="0"
-            HorizontalAlignment="Center" 
-            VerticalAlignment="Top" 
-            Margin="0,2,8,2"
-            SnapsToDevicePixels="True"
-            Visibility="Visible"
-            Moniker="{x:Static local:Images.Logo}" />
+            <!-- Icon -->
+            <Viewbox
+                Width="32"
+                Height="32"                
+                Grid.Column="0"
+                HorizontalAlignment="Center" 
+                VerticalAlignment="Top" 
+                Margin="0,2,8,2"
+                SnapsToDevicePixels="True">
+
+                <Border BorderBrush="Transparent" BorderThickness="1">
+                    <Canvas xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Width="16" Height="16">
+                        <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              Fill="{StaticResource SectionTitleTextColorKey}"
+                              Data="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"/>
+                    </Canvas>
+                </Border>
+            </Viewbox>
 
-            <!--Service name, provider -->
+            <!-- Service name, provider -->
             <StackPanel Orientation="Vertical"
                 VerticalAlignment="Center"
                 Grid.Column="1">
-                <TextBlock x:Name="Name"     Text="GitHub"  TextTrimming="CharacterEllipsis" FontWeight="SemiBold" />
+                <TextBlock x:Name="Name" Text="GitHub" TextTrimming="CharacterEllipsis" FontWeight="SemiBold"
+                           Foreground="{StaticResource SectionTitleTextColorKey}" />
                 <TextBlock x:Name="Provider" Text="GitHub, Inc" TextTrimming="CharacterEllipsis"
                            Foreground="{StaticResource SubduedTextBrushKey}" />
             </StackPanel>
@@ -62,7 +71,8 @@
                               Text="Powerful collaboration, code review, and code management for open source and private projects."
                               MaxHeight="100"
                               TextWrapping="Wrap" 
-                              TextTrimming="WordEllipsis" />
+                              TextTrimming="WordEllipsis"
+                              Foreground="{StaticResource SectionTitleTextColorKey}" />
             </WrapPanel>
             <WrapPanel Grid.Row="1" Grid.Column="1" HorizontalAlignment="Right" Margin="0,0,14,0">
                 <Button x:Uid="publishARepoButton" x:Name="publishARepoButton"

From b08edb5cea02be0c53d1fa274eca709fb1d3022d Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Tue, 25 Jun 2019 10:06:07 +0100
Subject: [PATCH 22/31] Automatically change the host drop-down

When a user Add/Changes Account, automatically change the host drop-down.
---
 .../ViewModels/TeamExplorer/RepositoryPublishViewModel.cs  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/GitHub.App/ViewModels/TeamExplorer/RepositoryPublishViewModel.cs b/src/GitHub.App/ViewModels/TeamExplorer/RepositoryPublishViewModel.cs
index d24c4ae7da..3ad6d48e30 100644
--- a/src/GitHub.App/ViewModels/TeamExplorer/RepositoryPublishViewModel.cs
+++ b/src/GitHub.App/ViewModels/TeamExplorer/RepositoryPublishViewModel.cs
@@ -136,9 +136,12 @@ public bool IsHostComboBoxVisible
             get { return isHostComboBoxVisible.Value; }
         }
 
-        Task LoginAsDifferentUserAsync()
+        async Task LoginAsDifferentUserAsync()
         {
-            return dialogService.ShowLoginDialog();
+            if (await dialogService.ShowLoginDialog() is IConnection connection)
+            {
+                SelectedConnection = connection;
+            }
         }
 
         ReactiveCommand<Unit, ProgressState> InitializePublishRepositoryCommand()

From 6e798c6057f92d43112ccf7aa77c42ad7573203d Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Tue, 25 Jun 2019 14:22:34 +0100
Subject: [PATCH 23/31] Use GitHub.Resources for publish BlurbText

---
 src/GitHub.VisualStudio.16/Sync/PublishView.xaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/GitHub.VisualStudio.16/Sync/PublishView.xaml b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml
index 80483ec5d5..c3d6e72de2 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishView.xaml
+++ b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:mtcw="clr-namespace:Microsoft.TeamFoundation.Controls.WPF;assembly=Microsoft.TeamFoundation.Controls"
+             xmlns:ghfvs="https://github.com/github/VisualStudio"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
 
@@ -68,7 +69,7 @@
                 <!-- Description text -->
                 <TextBlock    x:Name="Description"
                               x:Uid="Description"
-                              Text="Powerful collaboration, code review, and code management for open source and private projects."
+                              Text="{x:Static ghfvs:Resources.BlurbText}"
                               MaxHeight="100"
                               TextWrapping="Wrap" 
                               TextTrimming="WordEllipsis"

From ac41d5b266ddf1030e59f8ea4b94223e5ac58c4b Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Wed, 26 Jun 2019 09:46:41 +0100
Subject: [PATCH 24/31] Don't load the publish view until is becomes visible

---
 .../Sync/PublishSection.cs                    | 36 +++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
index 7cf7d27e6b..3ad0f8bdfd 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
+++ b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
@@ -37,14 +37,6 @@ public class PublishSection : TeamExplorerBaseSection
         public PublishSection(CompositionServices compositionServices)
         {
             this.compositionServices = compositionServices;
-
-            this.Title = "Publish to GitHub";
-            this.IsExpanded = true;
-            this.IsBusy = false;
-            this.SectionContent = new PublishView(){
-                DataContext = this
-            };
-            this.View.ParentSection = this;
         }
 
         /// <summary>
@@ -83,10 +75,10 @@ public override void Initialize(object sender, SectionInitializeEventArgs e)
                 }
             }
 
-            PublishToGitHub = new RelayCommand(o => ShowPublishDialog().Forget());
+            PublishToGitHub = new RelayCommand(o => ShowPublishDialogAsync().Forget());
         }
 
-        async Task ShowPublishDialog()
+        async Task ShowPublishDialogAsync()
         {
             var exportProvider = compositionServices.GetExportProvider();
 
@@ -153,10 +145,34 @@ void RefreshVisibility()
 
             if (IsVisible != visible)
             {
+                if (visible)
+                {
+                    // Don't initialize the view until it becomes visible
+                    EnsureSectionInitialized();
+                }
+
                 IsVisible = visible;
             }
         }
 
+        void EnsureSectionInitialized()
+        {
+            if (SectionContent == null)
+            {
+                Title = "Publish to GitHub";
+                IsExpanded = true;
+                IsBusy = false;
+
+                Assumes.NotNull(GitHub.Resources.BlurbText); // Ensure GitHub.Resourcess has been loaded before we use it from XAML
+                SectionContent = new PublishView()
+                {
+                    DataContext = this
+                };
+
+                View.ParentSection = this;
+            }
+        }
+
         bool IsSectionVisible(ITeamExplorerPage teamExplorerPage, Guid sectionId)
         {
             if (teamExplorerPage.GetSection(sectionId) is ITeamExplorerSection pushToRemoteSection)

From 18bd0273f02f2669b86aad8b17607451315e95a4 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Wed, 26 Jun 2019 09:56:33 +0100
Subject: [PATCH 25/31] Localize the publish section title

---
 src/GitHub.VisualStudio.16/Sync/PublishSection.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
index 3ad0f8bdfd..87eda3e268 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
+++ b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
@@ -159,11 +159,11 @@ void EnsureSectionInitialized()
         {
             if (SectionContent == null)
             {
-                Title = "Publish to GitHub";
+                // This line also ensures that the GitHub.Resourcess assembly has been loaded before we use it from XAML
+                Title = GitHub.Resources.GitHubPublishSectionTitle;
                 IsExpanded = true;
                 IsBusy = false;
 
-                Assumes.NotNull(GitHub.Resources.BlurbText); // Ensure GitHub.Resourcess has been loaded before we use it from XAML
                 SectionContent = new PublishView()
                 {
                     DataContext = this

From 543bf7b0344f69b00c65f4e4076495032f78d317 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Wed, 26 Jun 2019 10:12:40 +0100
Subject: [PATCH 26/31] Move to GitHub.VisualStudio namespace

---
 .../Base/TeamExplorerBase.cs                  |  2 +-
 .../Base/TeamExplorerBaseNavigationItem.cs    |  2 +-
 .../Base/TeamExplorerBaseNavigationLink.cs    |  2 +-
 .../Base/TeamExplorerBasePage.cs              |  2 +-
 .../Base/TeamExplorerBaseSection.cs           |  2 +-
 .../Sync/PublishSection.cs                    |  3 +--
 .../Sync/PublishView.xaml                     |  2 +-
 .../Sync/PublishView.xaml.cs                  | 26 ++-----------------
 8 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/src/GitHub.VisualStudio.16/Base/TeamExplorerBase.cs b/src/GitHub.VisualStudio.16/Base/TeamExplorerBase.cs
index 93f0714e11..5b5d865cc5 100644
--- a/src/GitHub.VisualStudio.16/Base/TeamExplorerBase.cs
+++ b/src/GitHub.VisualStudio.16/Base/TeamExplorerBase.cs
@@ -8,7 +8,7 @@
 using Microsoft.TeamFoundation.Client;
 using Microsoft.TeamFoundation.Controls;
 
-namespace Microsoft.TeamExplorerSample
+namespace GitHub.VisualStudio
 {
     /// <summary>
     /// Team Explorer plugin common base class.
diff --git a/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseNavigationItem.cs b/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseNavigationItem.cs
index b9fe4c8622..ebea58e372 100644
--- a/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseNavigationItem.cs
+++ b/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseNavigationItem.cs
@@ -7,7 +7,7 @@
 using Microsoft.TeamFoundation.Controls;
 using Microsoft.VisualStudio.Shell;
 
-namespace Microsoft.TeamExplorerSample
+namespace GitHub.VisualStudio
 {
     /// <summary>
     /// Team Explorer base navigation item class.
diff --git a/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseNavigationLink.cs b/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseNavigationLink.cs
index 960a67f80d..027a9313c4 100644
--- a/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseNavigationLink.cs
+++ b/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseNavigationLink.cs
@@ -7,7 +7,7 @@
 using Microsoft.TeamFoundation.Controls;
 using Microsoft.VisualStudio.Shell;
 
-namespace Microsoft.TeamExplorerSample
+namespace GitHub.VisualStudio
 {
     /// <summary>
     /// Team Explorer base navigation link class.
diff --git a/src/GitHub.VisualStudio.16/Base/TeamExplorerBasePage.cs b/src/GitHub.VisualStudio.16/Base/TeamExplorerBasePage.cs
index 98f5a60ffc..8f5bd4f6e2 100644
--- a/src/GitHub.VisualStudio.16/Base/TeamExplorerBasePage.cs
+++ b/src/GitHub.VisualStudio.16/Base/TeamExplorerBasePage.cs
@@ -6,7 +6,7 @@
 using System.ComponentModel;
 using Microsoft.TeamFoundation.Controls;
 
-namespace Microsoft.TeamExplorerSample
+namespace GitHub.VisualStudio
 {
     /// <summary>
     /// Team Explorer page base class.
diff --git a/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseSection.cs b/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseSection.cs
index 2eb2677106..1c142b7b5d 100644
--- a/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseSection.cs
+++ b/src/GitHub.VisualStudio.16/Base/TeamExplorerBaseSection.cs
@@ -6,7 +6,7 @@
 using System.ComponentModel;
 using Microsoft.TeamFoundation.Controls;
 
-namespace Microsoft.TeamExplorerSample
+namespace GitHub.VisualStudio
 {
     /// <summary>
     /// Team Explorer base section class.
diff --git a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
index 87eda3e268..b00936cc93 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
+++ b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
@@ -10,7 +10,6 @@
 using GitHub.Primitives;
 using GitHub.Services;
 using GitHub.ViewModels.TeamExplorer;
-using GitHub.VisualStudio;
 using Microsoft.TeamFoundation.Controls;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Threading;
@@ -18,7 +17,7 @@
 using Task = System.Threading.Tasks.Task;
 
 
-namespace Microsoft.TeamExplorerSample.Sync
+namespace GitHub.VisualStudio.Sync
 {
     /// <summary>
     /// Publish section.
diff --git a/src/GitHub.VisualStudio.16/Sync/PublishView.xaml b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml
index c3d6e72de2..ffabc0009c 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishView.xaml
+++ b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Microsoft.TeamExplorerSample.Sync.PublishView"
+<UserControl x:Class="GitHub.VisualStudio.Sync.PublishView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/src/GitHub.VisualStudio.16/Sync/PublishView.xaml.cs b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml.cs
index b24b60bf5f..e559ce2b37 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishView.xaml.cs
+++ b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml.cs
@@ -1,27 +1,8 @@
-/*
-* Copyright (c) Microsoft Corporation. All rights reserved. This code released
-* under the terms of the Microsoft Limited Public License (MS-LPL).
-*/
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
+using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
-namespace Microsoft.TeamExplorerSample.Sync
+namespace GitHub.VisualStudio.Sync
 {
-    /// <summary>
-    /// Interaction logic for SelectedFileInfoView.xaml
-    /// </summary>
     public partial class PublishView : UserControl
     {
         public PublishView()
@@ -29,9 +10,6 @@ public PublishView()
             InitializeComponent();
         }
 
-        /// <summary>
-        /// Parent section.
-        /// </summary>
         public PublishSection ParentSection
         {
             get { return (PublishSection)GetValue(ParentSectionProperty); }

From 8b197bc7886faa1d05229b6000d0248bf8e9ae94 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Wed, 26 Jun 2019 10:17:04 +0100
Subject: [PATCH 27/31] Remove unused ParentSection and View properties

---
 src/GitHub.VisualStudio.16/Sync/PublishSection.cs   | 10 ----------
 src/GitHub.VisualStudio.16/Sync/PublishView.xaml.cs |  8 --------
 2 files changed, 18 deletions(-)

diff --git a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
index b00936cc93..3c7c74122a 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
+++ b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
@@ -38,14 +38,6 @@ public PublishSection(CompositionServices compositionServices)
             this.compositionServices = compositionServices;
         }
 
-        /// <summary>
-        /// Get the view.
-        /// </summary>
-        protected PublishView View
-        {
-            get { return this.SectionContent as PublishView; }
-        }
-
         public ICommand PublishToGitHub { get; set; }
 
         /// <summary>
@@ -167,8 +159,6 @@ void EnsureSectionInitialized()
                 {
                     DataContext = this
                 };
-
-                View.ParentSection = this;
             }
         }
 
diff --git a/src/GitHub.VisualStudio.16/Sync/PublishView.xaml.cs b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml.cs
index e559ce2b37..5be5763554 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishView.xaml.cs
+++ b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml.cs
@@ -9,13 +9,5 @@ public PublishView()
         {
             InitializeComponent();
         }
-
-        public PublishSection ParentSection
-        {
-            get { return (PublishSection)GetValue(ParentSectionProperty); }
-            set { SetValue(ParentSectionProperty, value); }
-        }
-        public static readonly DependencyProperty ParentSectionProperty =
-            DependencyProperty.Register("ParentSection", typeof(PublishSection), typeof(PublishView));
     }
 }

From e640b8aa6d14500a5de759fa6887e9c87bcd7c8d Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Thu, 27 Jun 2019 10:55:19 +0100
Subject: [PATCH 28/31] Localize the publish button text

---
 src/GitHub.VisualStudio.16/Sync/PublishView.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitHub.VisualStudio.16/Sync/PublishView.xaml b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml
index ffabc0009c..37d8e51b13 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishView.xaml
+++ b/src/GitHub.VisualStudio.16/Sync/PublishView.xaml
@@ -77,7 +77,7 @@
             </WrapPanel>
             <WrapPanel Grid.Row="1" Grid.Column="1" HorizontalAlignment="Right" Margin="0,0,14,0">
                 <Button x:Uid="publishARepoButton" x:Name="publishARepoButton"
-                            Grid.Column="0" Content="Publish to GitHub" Command="{Binding PublishToGitHub}" />
+                            Grid.Column="0" Content="{x:Static ghfvs:Resources.PublishToGitHubButton}" Command="{Binding PublishToGitHub}" />
             </WrapPanel>
         </Grid>
         

From b99cda3a1b83ed6859620992df3225df9399fcb1 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Thu, 27 Jun 2019 11:37:35 +0100
Subject: [PATCH 29/31] Stop CompositionServices from loading GitHub.Exports

Only load GitHub.Exports when composition container is created.
---
 .../CompositionServices.cs                    | 58 ++++++++++---------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/GitHub.VisualStudio.16/CompositionServices.cs b/src/GitHub.VisualStudio.16/CompositionServices.cs
index 00f2dfb8d4..30366f7cec 100644
--- a/src/GitHub.VisualStudio.16/CompositionServices.cs
+++ b/src/GitHub.VisualStudio.16/CompositionServices.cs
@@ -58,8 +58,8 @@ static CompositionContainer CreateVisualStudioCompositionContainer(ExportProvide
 
             var gitHubServiceProvider = compositionContainer.GetExportedValue<IGitHubServiceProvider>();
             var packageSettings = new PackageSettings(gitHubServiceProvider);
-            var usageTracker = CreateUsageTracker(compositionContainer, packageSettings);
-            compositionContainer.ComposeExportedValue<IUsageTracker>(usageTracker);
+            var usageTracker = UsageTrackerFactory.CreateUsageTracker(compositionContainer, packageSettings);
+            compositionContainer.ComposeExportedValue(usageTracker);
 
             return compositionContainer;
         }
@@ -69,18 +69,21 @@ static CompositionContainer CreateOutOfProcCompositionContainer()
             var compositionContainer = CreateCompositionContainer(CreateOutOfProcExports());
 
             var packageSettings = new OutOfProcPackageSettings();
-            var usageTracker = CreateUsageTracker(compositionContainer, packageSettings);
-            compositionContainer.ComposeExportedValue<IUsageTracker>(usageTracker);
+            var usageTracker = UsageTrackerFactory.CreateUsageTracker(compositionContainer, packageSettings);
+            compositionContainer.ComposeExportedValue(usageTracker);
 
             return compositionContainer;
         }
 
-        static UsageTracker CreateUsageTracker(CompositionContainer compositionContainer, IPackageSettings packageSettings)
+        class UsageTrackerFactory
         {
-            var gitHubServiceProvider = compositionContainer.GetExportedValue<IGitHubServiceProvider>();
-            var usageService = compositionContainer.GetExportedValue<IUsageService>();
-            var joinableTaskContext = compositionContainer.GetExportedValue<JoinableTaskContext>();
-            return new UsageTracker(gitHubServiceProvider, usageService, packageSettings, joinableTaskContext);
+            internal static IUsageTracker CreateUsageTracker(CompositionContainer compositionContainer, IPackageSettings packageSettings)
+            {
+                var gitHubServiceProvider = compositionContainer.GetExportedValue<IGitHubServiceProvider>();
+                var usageService = compositionContainer.GetExportedValue<IUsageService>();
+                var joinableTaskContext = compositionContainer.GetExportedValue<JoinableTaskContext>();
+                return new UsageTracker(gitHubServiceProvider, usageService, packageSettings, joinableTaskContext);
+            }
         }
 
         static CompositionContainer CreateOutOfProcExports()
@@ -117,8 +120,8 @@ static CompositionContainer CreateCompositionContainer(ExportProvider defaultExp
             compositionContainer.ComposeExportedValue<IGitHubServiceProvider>(gitHubServiceProvider);
             Services.UnitTestServiceProvider = gitHubServiceProvider; // Use gitHubServiceProvider as global provider 
 
-            var loginManager = CreateLoginManager(compositionContainer);
-            compositionContainer.ComposeExportedValue<ILoginManager>(loginManager);
+            var loginManager = LoginManagerFactory.CreateLoginManager(compositionContainer);
+            compositionContainer.ComposeExportedValue(loginManager);
 
             // Ensure GitHub.Resources.dll has been loaded and it visible to XAML
             EnsureLoaded(typeof(GitHub.Resources));
@@ -132,22 +135,25 @@ static void EnsureLoaded(Type type)
             Assumes.NotNull(type);
         }
 
-        static LoginManager CreateLoginManager(CompositionContainer compositionContainer)
+        class LoginManagerFactory
         {
-            var keychain = compositionContainer.GetExportedValue<IKeychain>();
-            var lazy2Fa = new Lazy<ITwoFactorChallengeHandler>(() => compositionContainer.GetExportedValue<ITwoFactorChallengeHandler>());
-            var oauthListener = compositionContainer.GetExportedValue<IOAuthCallbackListener>();
-            var loginManager = new LoginManager(
-                    keychain,
-                    lazy2Fa,
-                    oauthListener,
-                    ApiClientConfiguration.ClientId,
-                    ApiClientConfiguration.ClientSecret,
-                    ApiClientConfiguration.MinimumScopes,
-                    ApiClientConfiguration.RequestedScopes,
-                    ApiClientConfiguration.AuthorizationNote,
-                    ApiClientConfiguration.MachineFingerprint);
-            return loginManager;
+            internal static ILoginManager CreateLoginManager(CompositionContainer compositionContainer)
+            {
+                var keychain = compositionContainer.GetExportedValue<IKeychain>();
+                var lazy2Fa = new Lazy<ITwoFactorChallengeHandler>(() => compositionContainer.GetExportedValue<ITwoFactorChallengeHandler>());
+                var oauthListener = compositionContainer.GetExportedValue<IOAuthCallbackListener>();
+                var loginManager = new LoginManager(
+                        keychain,
+                        lazy2Fa,
+                        oauthListener,
+                        ApiClientConfiguration.ClientId,
+                        ApiClientConfiguration.ClientSecret,
+                        ApiClientConfiguration.MinimumScopes,
+                        ApiClientConfiguration.RequestedScopes,
+                        ApiClientConfiguration.AuthorizationNote,
+                        ApiClientConfiguration.MachineFingerprint);
+                return loginManager;
+            }
         }
 
         static TypeCatalog GetCatalog(Assembly assembly)

From 5690b6fcf2a65d3d372146b76ed94e0a996c1889 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Thu, 27 Jun 2019 12:01:04 +0100
Subject: [PATCH 30/31] Use RelayCommand from TeamFoundation assembly

This avoids loading the GitHub.Extensions and GitHub.Exports assemblies.
---
 src/GitHub.VisualStudio.16/Sync/PublishSection.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
index 3c7c74122a..ff4aab4428 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
+++ b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
@@ -7,7 +7,6 @@
 using System.Windows.Input;
 using GitHub.Extensions;
 using GitHub.Factories;
-using GitHub.Primitives;
 using GitHub.Services;
 using GitHub.ViewModels.TeamExplorer;
 using Microsoft.TeamFoundation.Controls;
@@ -15,6 +14,7 @@
 using Microsoft.VisualStudio.Threading;
 using ReactiveUI;
 using Task = System.Threading.Tasks.Task;
+using RelayCommand = Microsoft.TeamFoundation.MVVM.RelayCommand;
 
 
 namespace GitHub.VisualStudio.Sync

From 9e4d1e2d36bbbc99a15b978ce26ebff570dd852a Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Thu, 27 Jun 2019 12:28:41 +0100
Subject: [PATCH 31/31] Simplify the IsSectionVisible code

---
 .../Sync/PublishSection.cs                    | 30 +++++++------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
index ff4aab4428..5c45d2b07c 100644
--- a/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
+++ b/src/GitHub.VisualStudio.16/Sync/PublishSection.cs
@@ -127,22 +127,16 @@ void Section_PropertyChanged(object sender, PropertyChangedEventArgs e)
 
         void RefreshVisibility()
         {
-            var visible = false;
-
-            if (ServiceProvider.GetService(typeof(ITeamExplorerPage)) is ITeamExplorerPage page)
-            {
-                visible = IsSectionVisible(page, PushToRemoteSectionId);
-            }
-
-            if (IsVisible != visible)
+            var isVisible = IsSectionVisible(PushToRemoteSectionId);
+            if (IsVisible != isVisible)
             {
-                if (visible)
+                if (isVisible)
                 {
-                    // Don't initialize the view until it becomes visible
+                    // Initialize the view when it becomes visible
                     EnsureSectionInitialized();
                 }
 
-                IsVisible = visible;
+                IsVisible = isVisible;
             }
         }
 
@@ -162,14 +156,10 @@ void EnsureSectionInitialized()
             }
         }
 
-        bool IsSectionVisible(ITeamExplorerPage teamExplorerPage, Guid sectionId)
-        {
-            if (teamExplorerPage.GetSection(sectionId) is ITeamExplorerSection pushToRemoteSection)
-            {
-                return pushToRemoteSection.SectionContent != null && pushToRemoteSection.IsVisible;
-            }
-
-            return false;
-        }
+        bool IsSectionVisible(Guid sectionId) =>
+            ServiceProvider.GetService(typeof(ITeamExplorerPage)) is ITeamExplorerPage page &&
+            page.GetSection(sectionId) is ITeamExplorerSection section &&
+            section.SectionContent != null &&
+            section.IsVisible;
     }
 }