Do not export IServiceProvider

Fixes #137

Author: shana

src/GitHub.App/Models/ConnectionRepositoryHostMap.cs

@@ -1,7 +1,6 @@
-using System;
-using System.ComponentModel.Composition;
-using GitHub.Extensions;
+using System.ComponentModel.Composition;
 using GitHub.Models;
+using GitHub.Services;
 
 namespace GitHub.ViewModels
 {
@@ -10,7 +9,7 @@ namespace GitHub.ViewModels
     public class ConnectionRepositoryHostMap : IConnectionRepositoryHostMap
     {
         [ImportingConstructor]
-        public ConnectionRepositoryHostMap(IServiceProvider provider, IRepositoryHosts hosts)
+        public ConnectionRepositoryHostMap(IUIProvider provider, IRepositoryHosts hosts)
             : this(provider.GetService<IConnection>(), hosts)
         {
         }

src/GitHub.App/ViewModels/LoginControlViewModel.cs

@@ -14,7 +14,6 @@ public class LoginControlViewModel : BaseViewModel, ILoginControlViewModel
     {
         [ImportingConstructor]
         public LoginControlViewModel(
-            IServiceProvider serviceProvider,
             IRepositoryHosts hosts,
             ILoginToGitHubViewModel loginToGitHubViewModel,
             ILoginToGitHubForEnterpriseViewModel loginToGitHubEnterpriseViewModel)

src/GitHub.Exports/Services/IUIProvider.cs

@@ -6,11 +6,10 @@
 
 namespace GitHub.Services
 {
-    public interface IUIProvider
+    public interface IUIProvider : IServiceProvider
     {
         ExportProvider ExportProvider { get; }
         IServiceProvider GitServiceProvider { get; set; }
-        object GetService(Type t);
         T GetService<T>();
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter")]
         Ret GetService<T, Ret>() where Ret : class;

src/GitHub.Exports/Services/VSServices.cs

@@ -43,7 +43,7 @@ public class VSServices : IVSServices
         readonly IServiceProvider serviceProvider;
 
         [ImportingConstructor]
-        public VSServices(IServiceProvider serviceProvider)
+        public VSServices(IUIProvider serviceProvider)
         {
             this.serviceProvider = serviceProvider;
         }

src/GitHub.UI.Reactive/Validation/ReactiveValidatableObject.cs

@@ -9,6 +9,7 @@
 using System.Reflection;
 using ReactiveUI;
 using NullGuard;
+using GitHub.Services;
 
 namespace GitHub.Validation
 {
@@ -22,7 +23,7 @@ public class ReactiveValidatableObject : ReactiveObject, IDataErrorInfo
         readonly Dictionary<string, bool> enabledProperties = new Dictionary<string, bool>();
         bool validationEnabled = true;
 
-        public ReactiveValidatableObject([AllowNull]IServiceProvider serviceProvider)
+        public ReactiveValidatableObject([AllowNull]IUIProvider serviceProvider)
         {
             validatedProperties = typeValidatorsMap.GetOrAdd(GetType(), GetValidatedProperties);
             this.serviceProvider = serviceProvider; // This is allowed to be null.

src/GitHub.VisualStudio/Services/UIProvider.cs

@@ -22,9 +22,8 @@
 namespace GitHub.VisualStudio
 {
     [Export(typeof(IUIProvider))]
-    [Export(typeof(IServiceProvider))]
     [PartCreationPolicy(CreationPolicy.Shared)]
-    public class UIProvider : IServiceProvider, IUIProvider, IDisposable
+    public class UIProvider : IUIProvider, IDisposable
     {
         static readonly Logger log = LogManager.GetCurrentClassLogger();
         CompositeDisposable disposables = new CompositeDisposable();

src/UnitTests/GitHub.Exports/VSServicesTests.cs

@@ -13,7 +13,7 @@ public class TheCloneMethod : TestBaseClass
         [InlineData(false, CloneOptions.None)]
         public void CallsCloneOnVsProvidedCloneService(bool recurseSubmodules, CloneOptions expectedCloneOptions)
         {
-            var provider = Substitute.For<IServiceProvider>();
+            var provider = Substitute.For<IUIProvider>();
             var gitRepositoriesExt = Substitute.For<IGitRepositoriesExt>();
             provider.GetService(typeof(IGitRepositoriesExt)).Returns(gitRepositoriesExt);
             var vsServices = new VSServices(provider);