Fixed framework upgrade issues.

Author: prochnowc

DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.Abstractions/ServiceCollectionServiceProvider.Net6.cs

@@ -12,7 +12,7 @@ namespace AppCoreNet.Extensions.DependencyInjection;
 /// <summary>
 /// Internal service provider which resolves services from an <see cref="IServiceCollection"/>.
 /// </summary>
-internal sealed partial class ServiceCollectionServiceProvider : IServiceProvider
+internal sealed partial class ServiceCollectionServiceProvider : IServiceProvider, IServiceProviderIsService
 {
     private readonly IServiceCollection _services;
     private readonly Dictionary<Type, object> _additionalServices = new();
@@ -27,6 +27,23 @@ public void AddService(Type serviceType, object instance)
         _additionalServices.Add(serviceType, instance);
     }
 
+    public bool IsService(Type serviceType)
+    {
+        if (serviceType == typeof(IServiceProvider) || serviceType == typeof(IServiceProviderIsService))
+            return true;
+
+        if (_additionalServices.TryGetValue(serviceType, out object? _))
+            return true;
+
+        if (serviceType.IsGenericType && serviceType.GetGenericTypeDefinition() == typeof(IEnumerable<>))
+            return true;
+
+        return _services.Any(
+            sd => sd.ServiceType == serviceType
+                  || (serviceType.IsGenericType
+                      && sd.ServiceType == serviceType.GetGenericTypeDefinition()));
+    }
+
     private IEnumerable<object> GetServices(Type serviceType)
     {
         object ServiceFactory(ServiceDescriptor serviceDescriptor)

DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.Abstractions/ServiceCollectionServiceProvider.cs

@@ -35,15 +35,11 @@ public void FiltersNonDerivableGenericTypes()
                         contractType,
                         typeof(ContractImpl2),
                         ServiceLifetime.Transient),
-#if !NET8_0_OR_GREATER
-                });
-#else
                 },
                 o =>
                     o.Excluding(sd => sd.KeyedImplementationFactory)
                      .Excluding(sd => sd.KeyedImplementationType)
                      .Excluding(sd => sd.KeyedImplementationInstance));
-#endif
     }
 
     [Fact]
@@ -81,15 +77,11 @@ public void ClosesOpenGenericInterfaceForClosedGenerics()
                         closedContractType,
                         typeof(ContractImpl2String),
                         ServiceLifetime.Transient),
-#if !NET8_0_OR_GREATER
-                });
-#else
                 },
                 o =>
                     o.Excluding(sd => sd.KeyedImplementationFactory)
                      .Excluding(sd => sd.KeyedImplementationType)
                      .Excluding(sd => sd.KeyedImplementationInstance));
-#endif
     }
 
     [Fact]

DependencyInjection/test/AppCoreNet.Extensions.DependencyInjection.AssemblyExtensions.Tests/AssemblyServicesDescriptorResolverTests.cs

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
     <Description>Plugin1 Description</Description>
     <Copyright>Plugin1 Copyright</Copyright>
     <IsTestProject>false</IsTestProject>

Hosting/test/AppCoreNet.Extensions.Hosting.Plugins.TestPlugin/AppCoreNet.Extensions.Hosting.Plugins.TestPlugin.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
     <Description>Plugin2 Description</Description>
     <Copyright>Plugin2 Copyright</Copyright>
     <IsTestProject>false</IsTestProject>