diff --git a/src/OrchardCoreContrib.Tenants/HealthChecks/TenantsHealthCheck.cs b/src/OrchardCoreContrib.Tenants/HealthChecks/TenantsHealthCheck.cs index 34c7a109..279264bc 100644 --- a/src/OrchardCoreContrib.Tenants/HealthChecks/TenantsHealthCheck.cs +++ b/src/OrchardCoreContrib.Tenants/HealthChecks/TenantsHealthCheck.cs @@ -6,27 +6,18 @@ namespace OrchardCoreContrib.Tenants.HealthChecks; -public class TenantsHealthCheck : IHealthCheck +public class TenantsHealthCheck(IShellHost shellHost, IServiceProvider serviceProvider) : IHealthCheck { internal const string Name = "Tenants Health Check"; - private readonly IShellHost _shellHost; - private readonly IServiceProvider _serviceProvider; - - public TenantsHealthCheck(IShellHost shellHost, IServiceProvider serviceProvider) - { - _shellHost = shellHost; - _serviceProvider = serviceProvider; - } - public Task CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default) { - var nonRunningTenants = _shellHost.GetAllSettings() + var nonRunningTenants = shellHost.GetAllSettings() .Where(s => !s.IsDefaultShell() && s.State != TenantState.Running); if (nonRunningTenants.Any()) { var description = String.Empty; - var localizer = _serviceProvider.GetService>(); + var localizer = serviceProvider.GetService>(); if (nonRunningTenants.Count() == 1) { diff --git a/src/OrchardCoreContrib.Tenants/Manifest.cs b/src/OrchardCoreContrib.Tenants/Manifest.cs index c08e0147..53764756 100644 --- a/src/OrchardCoreContrib.Tenants/Manifest.cs +++ b/src/OrchardCoreContrib.Tenants/Manifest.cs @@ -5,7 +5,7 @@ Name = "Multitenancy", Author = ManifestConstants.Author, Website = ManifestConstants.Website, - Version = "1.2.1", + Version = "1.4.0", Description = "Provides a way to manage tenants from the admin.", Category = "Infrastructure", Dependencies = new [] { "OrchardCore.Tenants" }, diff --git a/src/OrchardCoreContrib.Tenants/OrchardCoreContrib.Tenants.csproj b/src/OrchardCoreContrib.Tenants/OrchardCoreContrib.Tenants.csproj index b3accf3d..348d0be9 100644 --- a/src/OrchardCoreContrib.Tenants/OrchardCoreContrib.Tenants.csproj +++ b/src/OrchardCoreContrib.Tenants/OrchardCoreContrib.Tenants.csproj @@ -1,10 +1,11 @@  - 1.3.0 + 1.4.0 The Orchard Core Contrib Team Provides features to manage tenants from the Admin UI. + README.md BSD-3-Clause https://github.com/OrchardCoreContrib/OrchardCoreContrib.Modules/tree/main/src/OrchardCoreContrib.Tenants/README.md https://github.com/OrchardCoreContrib/OrchardCoreContrib.Modules @@ -25,6 +26,7 @@ + diff --git a/src/OrchardCoreContrib.Tenants/README.md b/src/OrchardCoreContrib.Tenants/README.md index e3e65f9f..1bf7c0dd 100644 --- a/src/OrchardCoreContrib.Tenants/README.md +++ b/src/OrchardCoreContrib.Tenants/README.md @@ -4,7 +4,7 @@ This module provides features to manage tenants from the Admin UI. ## Version -1.2.1 +1.4.0 ## Category @@ -28,6 +28,7 @@ Infrastructure | Name | Version | |-------------------------------------------------------------------------------------------------|---------| +| [`OrchardCoreContrib.Tenants`](https://www.nuget.org/packages/OrchardCoreContrib.Tenants/1.4.0) | 1.4.0 | | [`OrchardCoreContrib.Tenants`](https://www.nuget.org/packages/OrchardCoreContrib.Tenants/1.3.0) | 1.3.0 | | [`OrchardCoreContrib.Tenants`](https://www.nuget.org/packages/OrchardCoreContrib.Tenants/1.2.1) | 1.2.1 | | [`OrchardCoreContrib.Tenants`](https://www.nuget.org/packages/OrchardCoreContrib.Tenants/1.2.0) | 1.2.0 | diff --git a/src/OrchardCoreContrib.Tenants/HealthChecks/Startup.cs b/src/OrchardCoreContrib.Tenants/Startup.cs similarity index 91% rename from src/OrchardCoreContrib.Tenants/HealthChecks/Startup.cs rename to src/OrchardCoreContrib.Tenants/Startup.cs index 01954276..fe1a0c59 100644 --- a/src/OrchardCoreContrib.Tenants/HealthChecks/Startup.cs +++ b/src/OrchardCoreContrib.Tenants/Startup.cs @@ -5,8 +5,9 @@ using Microsoft.Extensions.Options; using OrchardCore.Modules; using OrchardCoreContrib.HealthChecks; +using OrchardCoreContrib.Tenants.HealthChecks; -namespace OrchardCoreContrib.Tenants.HealthChecks; +namespace OrchardCoreContrib.Tenants; [RequireFeatures("OrchardCoreContrib.HealthChecks")] public class Startup : StartupBase