From e8ebab2ce3991c3abb9942ce48a026a2169df01e Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sun, 14 Mar 2021 11:20:54 -0700
Subject: Remove use of removed IWixToolsetServiceProvider

---
 src/WixToolset.Core/WixToolsetServiceProvider.cs | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

(limited to 'src/WixToolset.Core/WixToolsetServiceProvider.cs')

diff --git a/src/WixToolset.Core/WixToolsetServiceProvider.cs b/src/WixToolset.Core/WixToolsetServiceProvider.cs
index 87a6f76b..5d700ba0 100644
--- a/src/WixToolset.Core/WixToolsetServiceProvider.cs
+++ b/src/WixToolset.Core/WixToolsetServiceProvider.cs
@@ -73,14 +73,14 @@ namespace WixToolset.Core
 
         private Dictionary<Type, object> Singletons { get; }
 
-        public bool TryGetService(Type serviceType, out object service)
+        public object GetService(Type serviceType)
         {
             if (serviceType == null)
             {
                 throw new ArgumentNullException(nameof(serviceType));
             }
 
-            if (!this.Singletons.TryGetValue(serviceType, out service))
+            if (!this.Singletons.TryGetValue(serviceType, out var service))
             {
                 if (this.CreationFunctions.TryGetValue(serviceType, out var creationFunction))
                 {
@@ -95,24 +95,7 @@ namespace WixToolset.Core
                 }
             }
 
-            return service != null;
-        }
-
-        public bool TryGetService<T>(out T service) where T : class
-        {
-            var success = this.TryGetService(typeof(T), out var untypedService);
-            service = (T)untypedService;
-            return success;
-        }
-
-        public object GetService(Type serviceType)
-        {
-            return this.TryGetService(serviceType, out var service) ? service : throw new ArgumentException($"Unknown service type: {serviceType.Name}", nameof(serviceType));
-        }
-
-        public T GetService<T>() where T : class
-        {
-            return (T)this.GetService(typeof(T));
+            return service;
         }
 
         public void AddService(Type serviceType, Func<IWixToolsetCoreServiceProvider, Dictionary<Type, object>, object> creationFunction)
-- 
cgit v1.2.3-55-g6feb