Use new language features.

Author: prochnowc

DependencyInjection/src/AppCore.Extensions.DependencyInjection.Abstractions/Activator/ActivatorExtensions.cs

@@ -4,24 +4,23 @@
 using System;
 using AppCore.Diagnostics;
 
-namespace AppCore.Extensions.DependencyInjection.Activator
+namespace AppCore.Extensions.DependencyInjection.Activator;
+
+/// <summary>
+/// Provides extension methods for the <see cref="IActivator"/> interface.
+/// </summary>
+public static class ActivatorExtensions
 {
     /// <summary>
-    /// Provides extension methods for the <see cref="IActivator"/> interface.
+    /// Instantiate a type with constructor arguments provided directly and/or from the <see cref="IServiceProvider"/>.
     /// </summary>
-    public static class ActivatorExtensions
+    /// <typeparam name="T">The type to activate.</typeparam>
+    /// <param name="activator">The <see cref="IActivator"/>.</param>
+    /// <param name="parameters">Constructor arguments not provided by the <see cref="IServiceProvider"/>.</param>
+    /// <returns>An activated object of type instanceType</returns>
+    public static T CreateInstance<T>(this IActivator activator, params object[] parameters)
     {
-        /// <summary>
-        /// Instantiate a type with constructor arguments provided directly and/or from the <see cref="IServiceProvider"/>.
-        /// </summary>
-        /// <typeparam name="T">The type to activate.</typeparam>
-        /// <param name="activator">The <see cref="IActivator"/>.</param>
-        /// <param name="parameters">Constructor arguments not provided by the <see cref="IServiceProvider"/>.</param>
-        /// <returns>An activated object of type instanceType</returns>
-        public static T CreateInstance<T>(this IActivator activator, params object[] parameters)
-        {
-            Ensure.Arg.NotNull(activator, nameof(activator));
-            return (T) activator.CreateInstance(typeof(T), parameters);
-        }
+        Ensure.Arg.NotNull(activator);
+        return (T) activator.CreateInstance(typeof(T), parameters);
     }
 }

DependencyInjection/src/AppCore.Extensions.DependencyInjection.Abstractions/Activator/DefaultActivator.cs

@@ -4,23 +4,22 @@
 using System;
 using AppCore.Diagnostics;
 
-namespace AppCore.Extensions.DependencyInjection.Activator
+namespace AppCore.Extensions.DependencyInjection.Activator;
+
+/// <summary>
+/// Represents the default activator.
+/// </summary>
+public sealed class DefaultActivator : IActivator
 {
     /// <summary>
-    /// Represents the default activator.
+    /// Gets the static instance of the <see cref="DefaultActivator"/>.
     /// </summary>
-    public sealed class DefaultActivator : IActivator
-    {
-        /// <summary>
-        /// Gets the static instance of the <see cref="DefaultActivator"/>.
-        /// </summary>
-        public static DefaultActivator Instance { get; } = new();
+    public static DefaultActivator Instance { get; } = new();
 
-        /// <inheritdoc />
-        public object CreateInstance(Type instanceType, params object[] parameters)
-        {
-            Ensure.Arg.NotNull(instanceType, nameof(instanceType));
-            return System.Activator.CreateInstance(instanceType, parameters);
-        }
+    /// <inheritdoc />
+    public object CreateInstance(Type instanceType, params object[] parameters)
+    {
+        Ensure.Arg.NotNull(instanceType);
+        return System.Activator.CreateInstance(instanceType, parameters);
     }
 }

DependencyInjection/src/AppCore.Extensions.DependencyInjection.Abstractions/Activator/IActivator.cs

@@ -3,19 +3,18 @@
 
 using System;
 
-namespace AppCore.Extensions.DependencyInjection.Activator
+namespace AppCore.Extensions.DependencyInjection.Activator;
+
+/// <summary>
+/// Helper code for the various activator services.
+/// </summary>
+public interface IActivator
 {
     /// <summary>
-    /// Helper code for the various activator services.
+    /// Instantiate a type with constructor arguments provided directly and/or from the <see cref="IServiceProvider"/>.
     /// </summary>
-    public interface IActivator
-    {
-        /// <summary>
-        /// Instantiate a type with constructor arguments provided directly and/or from the <see cref="IServiceProvider"/>.
-        /// </summary>
-        /// <param name="instanceType">The type to activate.</param>
-        /// <param name="parameters">Constructor arguments not provided by the <see cref="IServiceProvider"/>.</param>
-        /// <returns>An activated object of type instanceType</returns>
-        object CreateInstance(Type instanceType, params object[] parameters);
-    }
+    /// <param name="instanceType">The type to activate.</param>
+    /// <param name="parameters">Constructor arguments not provided by the <see cref="IServiceProvider"/>.</param>
+    /// <returns>An activated object of type instanceType</returns>
+    object CreateInstance(Type instanceType, params object[] parameters);
 }

DependencyInjection/src/AppCore.Extensions.DependencyInjection.Abstractions/Activator/ServiceProviderActivator.cs

@@ -5,30 +5,29 @@
 using AppCore.Diagnostics;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace AppCore.Extensions.DependencyInjection.Activator
+namespace AppCore.Extensions.DependencyInjection.Activator;
+
+/// <summary>
+/// Provides an implementation of <see cref="IActivator"/> which uses <see cref="IServiceProvider"/> to
+/// resolve services.
+/// </summary>
+public class ServiceProviderActivator : IActivator
 {
+    private readonly IServiceProvider _serviceProvider;
+
     /// <summary>
-    /// Provides an implementation of <see cref="IActivator"/> which uses <see cref="IServiceProvider"/> to
-    /// resolve services.
+    /// Initializes a new instance of the <see cref="ServiceProviderActivator"/> class.
     /// </summary>
-    public class ServiceProviderActivator : IActivator
+    /// <param name="serviceProvider">The <see cref="IServiceProvider"/> used to resolve services.</param>
+    public ServiceProviderActivator(IServiceProvider serviceProvider)
     {
-        private readonly IServiceProvider _serviceProvider;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ServiceProviderActivator"/> class.
-        /// </summary>
-        /// <param name="serviceProvider">The <see cref="IServiceProvider"/> used to resolve services.</param>
-        public ServiceProviderActivator(IServiceProvider serviceProvider)
-        {
-            Ensure.Arg.NotNull(serviceProvider, nameof(serviceProvider));
-            _serviceProvider = serviceProvider;
-        }
+        Ensure.Arg.NotNull(serviceProvider);
+        _serviceProvider = serviceProvider;
+    }
 
-        /// <inheritdoc />
-        public object CreateInstance(Type instanceType, params object[] parameters)
-        {
-            return ActivatorUtilities.CreateInstance(_serviceProvider, instanceType, parameters);
-        }
+    /// <inheritdoc />
+    public object CreateInstance(Type instanceType, params object[] parameters)
+    {
+        return ActivatorUtilities.CreateInstance(_serviceProvider, instanceType, parameters);
     }
 }

DependencyInjection/src/AppCore.Extensions.DependencyInjection.Abstractions/AppCoreBuilder.cs

@@ -6,18 +6,17 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace AppCore.Extensions.DependencyInjection
+namespace AppCore.Extensions.DependencyInjection;
+
+internal class AppCoreBuilder : IAppCoreBuilder
 {
-    internal class AppCoreBuilder : IAppCoreBuilder
-    {
-        public IServiceCollection Services { get; }
+    public IServiceCollection Services { get; }
 
-        public AppCoreBuilder(IServiceCollection services)
-        {
-            Ensure.Arg.NotNull(services, nameof(services));
-            Services = services;
+    public AppCoreBuilder(IServiceCollection services)
+    {
+        Ensure.Arg.NotNull(services);
+        Services = services;
 
-            services.TryAddTransient<IActivator, ServiceProviderActivator>();
-        }
+        services.TryAddTransient<IActivator, ServiceProviderActivator>();
     }
 }

DependencyInjection/src/AppCore.Extensions.DependencyInjection.Abstractions/AppCoreServiceCollectionExtensions.cs

@@ -3,21 +3,20 @@
 
 using Microsoft.Extensions.DependencyInjection;
 
-namespace AppCore.Extensions.DependencyInjection
+namespace AppCore.Extensions.DependencyInjection;
+
+/// <summary>
+/// Provides extension methods for the <see cref="IServiceCollection"/> interface.
+/// </summary>
+public static class AppCoreServiceCollectionExtensions
 {
     /// <summary>
-    /// Provides extension methods for the <see cref="IServiceCollection"/> interface.
+    /// Adds AppCore services.
     /// </summary>
-    public static class AppCoreServiceCollectionExtensions
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <returns>The <see cref="IAppCoreBuilder"/>.</returns>
+    public static IAppCoreBuilder AddAppCore(this IServiceCollection services)
     {
-        /// <summary>
-        /// Adds AppCore services.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IAppCoreBuilder"/>.</returns>
-        public static IAppCoreBuilder AddAppCore(this IServiceCollection services)
-        {
-            return new AppCoreBuilder(services);
-        }
+        return new AppCoreBuilder(services);
     }
 }