Enabling keyed services for .NET 6 & 7

JasperFx · Dec 14, 2023 · 8ef1d78 · 8ef1d78
1 parent 0516eac
commit 8ef1d78
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/src/Lamar.Testing/IoC/Acceptance/IKeyedServiceProvider_compliance.cs b/src/Lamar.Testing/IoC/Acceptance/IKeyedServiceProvider_compliance.cs
@@ -5,7 +5,7 @@
 
 namespace Lamar.Testing.IoC.Acceptance;
 
-#if NET8_0_OR_GREATER
+
 public class IKeyedServiceProvider_compliance
 {
     #region sample_adding_keyed_services
@@ -46,4 +46,3 @@ public void register_by_name_using_dot_net_core_syntax()
 
     #endregion
 }
-#endif
diff --git a/src/Lamar/IServiceContext.cs b/src/Lamar/IServiceContext.cs
@@ -8,12 +8,7 @@
 
 namespace Lamar;
 
-public interface IServiceContext : IServiceProvider, IDisposable, IAsyncDisposable
-
-#if NET8_0_OR_GREATER
-,IKeyedServiceProvider
-#endif
-
+public interface IServiceContext : IServiceProvider, IDisposable, IAsyncDisposable, IKeyedServiceProvider
 {
     /// <summary>
     ///     Provides queryable access to the configured serviceType's and Instances of this Container.

diff --git a/src/Lamar/IoC/Instances/Instance.cs b/src/Lamar/IoC/Instances/Instance.cs
@@ -106,7 +106,6 @@ internal IEnumerable<Assembly> ReferencedAssemblies()
 
     public static Instance For(ServiceDescriptor service)
     {
-#if NET8_0_OR_GREATER
         if (service.IsKeyedService)
         {
             var name = service.ServiceKey?.ToString();
@@ -140,7 +139,7 @@ public static Instance For(ServiceDescriptor service)
 
 
         }
-#endif
+
 
         if (service.ImplementationInstance is Instance i)
         {

diff --git a/src/Lamar/IoC/Scope.cs b/src/Lamar/IoC/Scope.cs
@@ -473,8 +473,7 @@ public Lazy<T> LazyFor<T>()
     {
         return new Lazy<T>(GetInstance<T>);
     }
-
-#if NET8_0_OR_GREATER
+
     public object GetKeyedService(Type serviceType, object serviceKey)
     {
         return TryGetInstance(serviceType, serviceKey.ToString());
@@ -484,5 +483,4 @@ public object GetRequiredKeyedService(Type serviceType, object serviceKey)
     {
         return GetInstance(serviceType, serviceKey.ToString());
     }
-#endif
 }