Merge branch 'release/3.3.0' into main

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.3.0] - 2023-08-21
+
+### Added
+
+- X10D.Hosting: Added support for service/implementation registration with `AddHostedSingleton`.
+
 ## [3.2.2] - 2023-06-05
 
 ### Added
@@ -577,7 +583,9 @@ please [open an issue](https://github.com/oliverbooth/X10D/issues)!
 
 Earlier versions of this package are undocumented and unlisted from package results.
 
-[unreleased]: https://github.com/oliverbooth/X10D/compare/v3.2.2...main
+[unreleased]: https://github.com/oliverbooth/X10D/compare/v3.3.0...main
+[3.3.0]: https://github.com/oliverbooth/X10D/releases/tag/v3.3.0
+[3.2.2]: https://github.com/oliverbooth/X10D/releases/tag/v3.2.2
 [3.2.0]: https://github.com/oliverbooth/X10D/releases/tag/v3.2.0
 [3.1.0]: https://github.com/oliverbooth/X10D/releases/tag/v3.1.0
 [3.0.0]: https://github.com/oliverbooth/X10D/releases/tag/v3.0.0

X10D.DSharpPlus/X10D.DSharpPlus.csproj

@@ -16,7 +16,7 @@
         <PackageTags>dotnet extension-methods</PackageTags>
         <PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/../CHANGELOG.md"))</PackageReleaseNotes>
         <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
-        <VersionPrefix>3.2.2</VersionPrefix>
+        <VersionPrefix>3.3.0</VersionPrefix>
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>

X10D.Hosting/X10D.Hosting.csproj

@@ -16,7 +16,7 @@
         <PackageTags>dotnet extension-methods</PackageTags>
         <PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/../CHANGELOG.md"))</PackageReleaseNotes>
         <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
-        <VersionPrefix>3.2.2</VersionPrefix>
+        <VersionPrefix>3.3.0</VersionPrefix>
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>

X10D.Hosting/src/DependencyInjection/ServiceCollectionExtensions.cs

@@ -21,6 +21,21 @@ public static IServiceCollection AddHostedSingleton<TService>(this IServiceColle
         return services.AddSingleton<IHostedService, TService>(provider => provider.GetRequiredService<TService>());
     }
 
+    /// <summary>
+    ///     Adds an <see cref="IHostedService" /> registration for the given type, while simultaneously adding it as a singleton.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection" /> to add the service to.</param>
+    /// <typeparam name="TService">The type of the service to add.</typeparam>
+    /// <typeparam name="TImplementation">The type of the implementation to use.</typeparam>
+    /// <returns>A reference to this instance after the operation has completed.</returns>
+    public static IServiceCollection AddHostedSingleton<TService, TImplementation>(this IServiceCollection services)
+        where TService : class, IHostedService
+        where TImplementation : class, TService
+    {
+        services.AddSingleton<TService, TImplementation>();
+        return services.AddSingleton<IHostedService, TService>(provider => provider.GetRequiredService<TService>());
+    }
+
     /// <summary>
     ///     Adds an <see cref="IHostedService" /> registration for the given type, while simultaneously adding it as a singleton.
     /// </summary>
@@ -32,4 +47,19 @@ public static IServiceCollection AddHostedSingleton(this IServiceCollection serv
         services.AddSingleton(type);
         return services.AddSingleton(provider => (IHostedService)provider.GetRequiredService(type));
     }
+
+    /// <summary>
+    ///     Adds an <see cref="IHostedService" /> registration for the given type, while simultaneously adding it as a singleton.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection" /> to add the service to.</param>
+    /// <param name="serviceType">The type of the service to register.</param>
+    /// <param name="implementationType">The type of the implementation to use.</param>
+    /// <returns>A reference to this instance after the operation has completed.</returns>
+    public static IServiceCollection AddHostedSingleton(this IServiceCollection services,
+        Type serviceType,
+        Type implementationType)
+    {
+        services.AddSingleton(serviceType, implementationType);
+        return services.AddSingleton(provider => (IHostedService)provider.GetRequiredService(serviceType));
+    }
 }

X10D.Unity/X10D.Unity.csproj

@@ -16,7 +16,7 @@
         <PackageTags>dotnet extension-methods</PackageTags>
         <PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/../CHANGELOG.md"))</PackageReleaseNotes>
         <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
-        <VersionPrefix>3.2.2</VersionPrefix>
+        <VersionPrefix>3.3.0</VersionPrefix>
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>

X10D/X10D.csproj

@@ -17,7 +17,7 @@
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/../CHANGELOG.md"))</PackageReleaseNotes>
         <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
-        <VersionPrefix>3.2.2</VersionPrefix>
+        <VersionPrefix>3.3.0</VersionPrefix>
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>