Renaming.

Author: prochnowc

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

@@ -10,6 +10,9 @@
 namespace AppCoreNet.Extensions.DependencyInjection;
 
 internal sealed class ServiceCollectionServiceProvider : IServiceProvider
+#if NET6_0_OR_GREATER
+, IServiceProviderIsService
+#endif
 {
     private readonly IServiceCollection _services;
     private readonly Dictionary<Type, object> _additionalServices = new ();
@@ -55,7 +58,7 @@ object ServiceFactory(ServiceDescriptor serviceDescriptor)
 
     public object? GetService(Type serviceType)
     {
-        if (serviceType == typeof(IServiceProvider))
+        if (serviceType == typeof(IServiceProvider) || serviceType == typeof(IServiceProviderIsService))
             return this;
 
         if (_additionalServices.TryGetValue(serviceType, out object? instance))
@@ -79,4 +82,21 @@ object ServiceFactory(ServiceDescriptor serviceDescriptor)
 
         return 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()));
+    }
 }

Hosting/src/AppCoreNet.Extensions.Hosting.Abstractions/HostedServiceServiceCollectionExtensions.cs

@@ -2,12 +2,11 @@
 // Copyright (c) The AppCore .NET project.
 
 using System;
-using AppCoreNet.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
 // ReSharper disable once CheckNamespace
-namespace AppCore.Extensions.DependencyInjection;
+namespace AppCoreNet.Extensions.DependencyInjection;
 
 /// <summary>
 /// Provides extensions methods to register hosted services with a <see cref="IServiceCollection"/>.

Hosting/src/AppCoreNet.Extensions.Hosting.Abstractions/IStartupTask.cs

@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AppCore.Extensions.Hosting;
+namespace AppCoreNet.Extensions.Hosting;
 
 /// <summary>
 /// Represents a task that is executed during application startup.
@@ -21,5 +21,5 @@ public interface IStartupTask
     /// </summary>
     /// <param name="cancellationToken">The token to monitor for cancellation requests.</param>
     /// <returns>A task that represents the asynchronous event operation.</returns>
-    Task ExecuteAsync(CancellationToken cancellationToken);
+    Task ExecuteAsync(CancellationToken cancellationToken = default);
 }

Hosting/src/AppCoreNet.Extensions.Hosting.Abstractions/StartupTaskServiceCollectionExtensions.cs

@@ -3,13 +3,12 @@
 
 using System;
 using AppCoreNet.Diagnostics;
-using AppCore.Extensions.Hosting;
-using AppCoreNet.Extensions.DependencyInjection;
+using AppCoreNet.Extensions.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 // ReSharper disable once CheckNamespace
-namespace AppCore.Extensions.DependencyInjection;
+namespace AppCoreNet.Extensions.DependencyInjection;
 
 /// <summary>
 /// Provides extensions methods to register startup tasks with a <see cref="IServiceCollection"/>.

Hosting/src/AppCoreNet.Extensions.Hosting.Plugins.Abstractions/IPlugin.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Reflection;
 
-namespace AppCore.Extensions.Hosting.Plugins;
+namespace AppCoreNet.Extensions.Hosting.Plugins;
 
 /// <summary>
 /// Represents a plugin.

Hosting/src/AppCoreNet.Extensions.Hosting.Plugins.Abstractions/IPluginManager.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace AppCore.Extensions.Hosting.Plugins;
+namespace AppCoreNet.Extensions.Hosting.Plugins;
 
 /// <summary>
 /// Represents the plugin manager.

Hosting/src/AppCoreNet.Extensions.Hosting.Plugins.Abstractions/IPluginService.cs

@@ -1,7 +1,7 @@
 // Licensed under the MIT license.
 // Copyright (c) The AppCore .NET project.
 
-namespace AppCore.Extensions.Hosting.Plugins;
+namespace AppCoreNet.Extensions.Hosting.Plugins;
 
 /// <summary>
 /// Represents a plugin service.

Hosting/src/AppCoreNet.Extensions.Hosting.Plugins.Abstractions/IPluginServiceCollection.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace AppCore.Extensions.Hosting.Plugins;
+namespace AppCoreNet.Extensions.Hosting.Plugins;
 
 /// <summary>
 /// Represents a collection of plugin services.

Hosting/src/AppCoreNet.Extensions.Hosting.Plugins.Abstractions/PluginInfo.cs

@@ -1,7 +1,7 @@
 // Licensed under the MIT license.
 // Copyright (c) The AppCore .NET project.
 
-namespace AppCore.Extensions.Hosting.Plugins;
+namespace AppCoreNet.Extensions.Hosting.Plugins;
 
 /// <summary>
 /// Provides information about a plugin.

Hosting/src/AppCoreNet.Extensions.Hosting.Plugins.Abstractions/PluginManagerExtensions.cs

@@ -3,7 +3,7 @@
 
 using AppCoreNet.Diagnostics;
 
-namespace AppCore.Extensions.Hosting.Plugins;
+namespace AppCoreNet.Extensions.Hosting.Plugins;
 
 /// <summary>
 /// Provides extensions methods for the <seealso cref="IPluginManager"/>.