Merge branch 'master' into fixes/2364-sign-in-with-browser-switch-window

Author: jcansdale

src/GitHub.VisualStudio.16/CompositionServices.cs

@@ -8,11 +8,9 @@
 using System.Linq;
 using System.Reflection;
 using GitHub.Api;
-using GitHub.Factories;
 using GitHub.Services;
 using GitHub.Settings;
 using GitHub.VisualStudio.Settings;
-using GitHub.VisualStudio.Views;
 using GitHub.VisualStudio.Views.Dialog.Clone;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Threading;
@@ -85,23 +83,14 @@ static CompositionContainer CreateCompositionContainer(ExportProvider defaultExp
 
             var gitHubServiceProvider = new MyGitHubServiceProvider(compositionContainer);
             compositionContainer.ComposeExportedValue<IGitHubServiceProvider>(gitHubServiceProvider);
+            Services.UnitTestServiceProvider = gitHubServiceProvider; // Use gitHubServiceProvider as global provider 
 
             var loginManager = CreateLoginManager(compositionContainer);
             compositionContainer.ComposeExportedValue<ILoginManager>(loginManager);
 
-            // HACK: Stop ViewLocator from attempting to fetch a global service
-            var viewViewModelFactory = compositionContainer.GetExportedValue<IViewViewModelFactory>();
-            InitializeViewLocator(viewViewModelFactory);
-
             return compositionContainer;
         }
 
-        static void InitializeViewLocator(IViewViewModelFactory viewViewModelFactory)
-        {
-            var factoryProviderFiled = typeof(ViewLocator).GetField("factoryProvider", BindingFlags.Static | BindingFlags.NonPublic);
-            factoryProviderFiled.SetValue(null, viewViewModelFactory);
-        }
-
         static LoginManager CreateLoginManager(CompositionContainer compositionContainer)
         {
             var keychain = compositionContainer.GetExportedValue<IKeychain>();
@@ -192,6 +181,11 @@ public TRet GetService<T, TRet>()
 
         public object GetService(Type serviceType)
         {
+            if (serviceType == typeof(IGitHubServiceProvider))
+            {
+                return this;
+            }
+
             return serviceProvider.GetService(serviceType);
         }
 

src/GitHub.VisualStudio.UI/Views/Documents/IssueishCommentView.xaml.cs

@@ -9,7 +9,6 @@
 using GitHub.ViewModels;
 using GitHub.ViewModels.Documents;
 using GitHub.VisualStudio.UI.Helpers;
-using Microsoft.VisualStudio.Shell;
 
 namespace GitHub.VisualStudio.Views.Documents
 {
@@ -28,8 +27,7 @@ public IssueishCommentView()
 
         static IVisualStudioBrowser GetBrowser()
         {
-            var serviceProvider = (IGitHubServiceProvider)Package.GetGlobalService(typeof(IGitHubServiceProvider));
-            return serviceProvider.GetService<IVisualStudioBrowser>();
+            return Services.GitHubServiceProvider.GetService<IVisualStudioBrowser>();
         }
 
         void DoOpenOnGitHub()

src/GitHub.VisualStudio.UI/Views/PullRequestReviewCommentView.xaml.cs

@@ -6,7 +6,6 @@
 using GitHub.UI;
 using GitHub.ViewModels;
 using GitHub.VisualStudio.UI.Helpers;
-using Microsoft.VisualStudio.Shell;
 using ReactiveUI;
 
 namespace GitHub.VisualStudio.Views
@@ -31,8 +30,7 @@ public PullRequestReviewCommentView()
 
         static IVisualStudioBrowser GetBrowser()
         {
-            var serviceProvider = (IGitHubServiceProvider)Package.GetGlobalService(typeof(IGitHubServiceProvider));
-            return serviceProvider.GetService<IVisualStudioBrowser>();
+            return Services.GitHubServiceProvider.GetService<IVisualStudioBrowser>();
         }
 
         void DoOpenOnGitHub()

src/GitHub.VisualStudio/Services/GitHubServiceProvider.cs

@@ -27,8 +27,6 @@ namespace GitHub.VisualStudio
     /// </summary>
     public class GitHubServiceProvider : IGitHubServiceProvider, IDisposable
     {
-        public static IGitHubServiceProvider Instance => Package.GetGlobalService(typeof(IGitHubServiceProvider)) as IGitHubServiceProvider;
-
         class OwnedComposablePart
         {
             public object Owner { get; set; }