diff --git a/.github/workflows/azure-webapps-dotnet-core.yml b/.github/workflows/azure-webapps-dotnet-core.yml index 4a605e4..f4541d8 100644 --- a/.github/workflows/azure-webapps-dotnet-core.yml +++ b/.github/workflows/azure-webapps-dotnet-core.yml @@ -22,7 +22,7 @@ name: Build and deploy ASP.Net Core app to an Azure Web App env: AZURE_WEBAPP_NAME: services-dashboard-dev-win # set this to the name of your Azure Web App AZURE_WEBAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root - DOTNET_VERSION: '8.0.x' # set this to the .NET version to use + DOTNET_VERSION: '9.0.x' # set this to the .NET version to use on: push: diff --git a/Directory.Build.props b/Directory.Build.props index 807e0da..eb17ee0 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,6 +3,6 @@ Simple Services Dashboard [Company Name] Copyright (c) [Company Name] 2024 - 1.0.0 + 1.1.0 diff --git a/Directory.Packages.props b/Directory.Packages.props index e5ff3f8..b27f594 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,42 +7,43 @@ - - - + + + - - + + - - - - - - - - - + + + + + + + + + + - - - - + + + + - - + + - - - - - + + + + + \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 53e78a2..f215a93 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base WORKDIR /app EXPOSE 80 EXPOSE 443 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["src/SimpleServicesDashboard.Api/SimpleServicesDashboard.Api.csproj", "src/SimpleServicesDashboard.Api/"] RUN dotnet restore "src/SimpleServicesDashboard.Api/SimpleServicesDashboard.Api.csproj" diff --git a/src/SimpleServicesDashboard.Api/Controllers/BaseApiController.cs b/src/SimpleServicesDashboard.Api/Controllers/BaseApiController.cs index 1d3efc8..c3511dc 100644 --- a/src/SimpleServicesDashboard.Api/Controllers/BaseApiController.cs +++ b/src/SimpleServicesDashboard.Api/Controllers/BaseApiController.cs @@ -1,7 +1,6 @@ using AutoMapper; using MediatR; using Microsoft.AspNetCore.Mvc; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Api.Controllers; diff --git a/src/SimpleServicesDashboard.Api/Controllers/ServiceStatusController.cs b/src/SimpleServicesDashboard.Api/Controllers/ServiceStatusController.cs index 0bc16f1..4db8f6d 100644 --- a/src/SimpleServicesDashboard.Api/Controllers/ServiceStatusController.cs +++ b/src/SimpleServicesDashboard.Api/Controllers/ServiceStatusController.cs @@ -1,12 +1,10 @@ using Asp.Versioning; using AutoMapper; using MediatR; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using SimpleServicesDashboard.Application.DTOs; using SimpleServicesDashboard.Application.Modules.ServiceStatus.Queries; using Swashbuckle.AspNetCore.Annotations; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Api.Controllers; diff --git a/src/SimpleServicesDashboard.Api/Controllers/StatusController.cs b/src/SimpleServicesDashboard.Api/Controllers/StatusController.cs index b734c92..f7039c1 100644 --- a/src/SimpleServicesDashboard.Api/Controllers/StatusController.cs +++ b/src/SimpleServicesDashboard.Api/Controllers/StatusController.cs @@ -1,12 +1,10 @@ using Asp.Versioning; using AutoMapper; using MediatR; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using SimpleServicesDashboard.Application.DTOs; using SimpleServicesDashboard.Application.Modules.Status.Queries; using Swashbuckle.AspNetCore.Annotations; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Api.Controllers; diff --git a/src/SimpleServicesDashboard.Api/Infrastructure/Configuration/ConfigureSwaggerOptions.cs b/src/SimpleServicesDashboard.Api/Infrastructure/Configuration/ConfigureSwaggerOptions.cs index 0c0a620..cba86a9 100644 --- a/src/SimpleServicesDashboard.Api/Infrastructure/Configuration/ConfigureSwaggerOptions.cs +++ b/src/SimpleServicesDashboard.Api/Infrastructure/Configuration/ConfigureSwaggerOptions.cs @@ -1,9 +1,7 @@ using Asp.Versioning.ApiExplorer; -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.SwaggerGen; -using System; namespace SimpleServicesDashboard.Api.Infrastructure.Configuration; diff --git a/src/SimpleServicesDashboard.Api/Infrastructure/Constants.cs b/src/SimpleServicesDashboard.Api/Infrastructure/Constants.cs index 8156c4b..af887d8 100644 --- a/src/SimpleServicesDashboard.Api/Infrastructure/Constants.cs +++ b/src/SimpleServicesDashboard.Api/Infrastructure/Constants.cs @@ -1,5 +1,3 @@ -using System; - namespace SimpleServicesDashboard.Api.Infrastructure; /// diff --git a/src/SimpleServicesDashboard.Api/Infrastructure/Extensions/ApplicationBuilderExtensions.cs b/src/SimpleServicesDashboard.Api/Infrastructure/Extensions/ApplicationBuilderExtensions.cs index 26bd91b..3e4cef9 100644 --- a/src/SimpleServicesDashboard.Api/Infrastructure/Extensions/ApplicationBuilderExtensions.cs +++ b/src/SimpleServicesDashboard.Api/Infrastructure/Extensions/ApplicationBuilderExtensions.cs @@ -1,5 +1,4 @@ using Asp.Versioning.ApiExplorer; -using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.HttpOverrides; using Serilog; using SimpleServicesDashboard.Api.Infrastructure.Helpers; diff --git a/src/SimpleServicesDashboard.Api/Infrastructure/Extensions/EndpointRouteBuilderExtensions.cs b/src/SimpleServicesDashboard.Api/Infrastructure/Extensions/EndpointRouteBuilderExtensions.cs index 988ea71..f672426 100644 --- a/src/SimpleServicesDashboard.Api/Infrastructure/Extensions/EndpointRouteBuilderExtensions.cs +++ b/src/SimpleServicesDashboard.Api/Infrastructure/Extensions/EndpointRouteBuilderExtensions.cs @@ -1,8 +1,5 @@ using HealthChecks.UI.Client; -using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Diagnostics.HealthChecks; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Diagnostics.HealthChecks; namespace SimpleServicesDashboard.Api.Infrastructure.Extensions; diff --git a/src/SimpleServicesDashboard.Api/Infrastructure/Extensions/ServiceCollectionExtensions.cs b/src/SimpleServicesDashboard.Api/Infrastructure/Extensions/ServiceCollectionExtensions.cs index 1d18b10..a7b21c1 100644 --- a/src/SimpleServicesDashboard.Api/Infrastructure/Extensions/ServiceCollectionExtensions.cs +++ b/src/SimpleServicesDashboard.Api/Infrastructure/Extensions/ServiceCollectionExtensions.cs @@ -1,12 +1,7 @@ using Asp.Versioning; using Hellang.Middleware.ProblemDetails; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Diagnostics.HealthChecks; -using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; using SimpleServicesDashboard.Api.Infrastructure.Configuration; using SimpleServicesDashboard.Api.Infrastructure.HealthCheck; @@ -16,10 +11,6 @@ using SimpleServicesDashboard.Common.Extensions; using SimpleServicesDashboard.Infrastructure; using Swashbuckle.AspNetCore.SwaggerGen; -using System; -using System.IO; -using System.Linq; -using System.Net.Http; using System.Text.Json.Serialization; using System.Text.RegularExpressions; using ProblemDetailsOptions = Hellang.Middleware.ProblemDetails.ProblemDetailsOptions; diff --git a/src/SimpleServicesDashboard.Api/Infrastructure/HealthCheck/HealthCheckExtensions.cs b/src/SimpleServicesDashboard.Api/Infrastructure/HealthCheck/HealthCheckExtensions.cs index 1b44ce4..71c5679 100644 --- a/src/SimpleServicesDashboard.Api/Infrastructure/HealthCheck/HealthCheckExtensions.cs +++ b/src/SimpleServicesDashboard.Api/Infrastructure/HealthCheck/HealthCheckExtensions.cs @@ -1,7 +1,5 @@ -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Diagnostics.HealthChecks; using SimpleServicesDashboard.Common.Configuration; -using System.Collections.Generic; namespace SimpleServicesDashboard.Api.Infrastructure.HealthCheck; diff --git a/src/SimpleServicesDashboard.Api/Infrastructure/HealthCheck/MemoryHealthCheck.cs b/src/SimpleServicesDashboard.Api/Infrastructure/HealthCheck/MemoryHealthCheck.cs index c0e41f6..09de0d3 100644 --- a/src/SimpleServicesDashboard.Api/Infrastructure/HealthCheck/MemoryHealthCheck.cs +++ b/src/SimpleServicesDashboard.Api/Infrastructure/HealthCheck/MemoryHealthCheck.cs @@ -1,10 +1,6 @@ using Microsoft.Extensions.Diagnostics.HealthChecks; using Microsoft.Extensions.Options; using SimpleServicesDashboard.Common.Configuration; -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Api.Infrastructure.HealthCheck; diff --git a/src/SimpleServicesDashboard.Api/Infrastructure/Helpers/LogHelper.cs b/src/SimpleServicesDashboard.Api/Infrastructure/Helpers/LogHelper.cs index 1ebcde6..a6bfd38 100644 --- a/src/SimpleServicesDashboard.Api/Infrastructure/Helpers/LogHelper.cs +++ b/src/SimpleServicesDashboard.Api/Infrastructure/Helpers/LogHelper.cs @@ -1,4 +1,3 @@ -using Microsoft.AspNetCore.Http; using Serilog; namespace SimpleServicesDashboard.Api.Infrastructure.Helpers; diff --git a/src/SimpleServicesDashboard.Api/Infrastructure/Swagger/SwaggerDefaultValues.cs b/src/SimpleServicesDashboard.Api/Infrastructure/Swagger/SwaggerDefaultValues.cs index eef38d0..c3aaf72 100644 --- a/src/SimpleServicesDashboard.Api/Infrastructure/Swagger/SwaggerDefaultValues.cs +++ b/src/SimpleServicesDashboard.Api/Infrastructure/Swagger/SwaggerDefaultValues.cs @@ -2,7 +2,6 @@ using Microsoft.OpenApi.Any; using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.SwaggerGen; -using System.Linq; namespace SimpleServicesDashboard.Api.Infrastructure.Swagger; diff --git a/src/SimpleServicesDashboard.Api/Models/DashboardViewModel.cs b/src/SimpleServicesDashboard.Api/Models/DashboardViewModel.cs index 0ec32b7..ada34ef 100644 --- a/src/SimpleServicesDashboard.Api/Models/DashboardViewModel.cs +++ b/src/SimpleServicesDashboard.Api/Models/DashboardViewModel.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace SimpleServicesDashboard.Api.Models; public sealed class DashboardViewModel diff --git a/src/SimpleServicesDashboard.Api/Pages/Dashboard.cshtml.cs b/src/SimpleServicesDashboard.Api/Pages/Dashboard.cshtml.cs index fe5e9ed..26fc7d4 100644 --- a/src/SimpleServicesDashboard.Api/Pages/Dashboard.cshtml.cs +++ b/src/SimpleServicesDashboard.Api/Pages/Dashboard.cshtml.cs @@ -3,8 +3,6 @@ using SimpleServicesDashboard.Api.Models; using SimpleServicesDashboard.Application.Services.Interfaces; using SimpleServicesDashboard.Common.Configuration; -using System.Linq; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Api.Pages; diff --git a/src/SimpleServicesDashboard.Api/Pages/ServiceStatus.cshtml.cs b/src/SimpleServicesDashboard.Api/Pages/ServiceStatus.cshtml.cs index c404fda..d5677de 100644 --- a/src/SimpleServicesDashboard.Api/Pages/ServiceStatus.cshtml.cs +++ b/src/SimpleServicesDashboard.Api/Pages/ServiceStatus.cshtml.cs @@ -1,7 +1,6 @@ using Microsoft.AspNetCore.Mvc.RazorPages; using SimpleServicesDashboard.Api.Models; using SimpleServicesDashboard.Application.Services.Interfaces; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Api.Pages; diff --git a/src/SimpleServicesDashboard.Api/Program.cs b/src/SimpleServicesDashboard.Api/Program.cs index 51e0f15..64e9dea 100644 --- a/src/SimpleServicesDashboard.Api/Program.cs +++ b/src/SimpleServicesDashboard.Api/Program.cs @@ -1,9 +1,5 @@ using Asp.Versioning.ApiExplorer; using Hellang.Middleware.ProblemDetails; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; using Serilog; using SimpleServicesDashboard.Api.Infrastructure.Extensions; using SimpleServicesDashboard.Common.Extensions; diff --git a/src/SimpleServicesDashboard.Api/SimpleServicesDashboard.Api.csproj b/src/SimpleServicesDashboard.Api/SimpleServicesDashboard.Api.csproj index 02dfb8b..f418d5c 100644 --- a/src/SimpleServicesDashboard.Api/SimpleServicesDashboard.Api.csproj +++ b/src/SimpleServicesDashboard.Api/SimpleServicesDashboard.Api.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 7461de0d-8c30-4021-9056-befd272ecdd8 Linux ..\.. @@ -9,6 +9,7 @@ true $(NoWarn);1591 enable + enable diff --git a/src/SimpleServicesDashboard.Application/Common/Behaviours/LoggingBehaviour.cs b/src/SimpleServicesDashboard.Application/Common/Behaviours/LoggingBehaviour.cs index ed112dd..5e080ec 100644 --- a/src/SimpleServicesDashboard.Application/Common/Behaviours/LoggingBehaviour.cs +++ b/src/SimpleServicesDashboard.Application/Common/Behaviours/LoggingBehaviour.cs @@ -1,8 +1,6 @@ using MediatR; using Microsoft.Extensions.Logging; using System.Diagnostics; -using System.Threading; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Application.Common.Behaviours; diff --git a/src/SimpleServicesDashboard.Application/Common/Behaviours/UnhandledExceptionBehaviour.cs b/src/SimpleServicesDashboard.Application/Common/Behaviours/UnhandledExceptionBehaviour.cs index c8625ca..ceacca2 100644 --- a/src/SimpleServicesDashboard.Application/Common/Behaviours/UnhandledExceptionBehaviour.cs +++ b/src/SimpleServicesDashboard.Application/Common/Behaviours/UnhandledExceptionBehaviour.cs @@ -1,8 +1,5 @@ using MediatR; using Microsoft.Extensions.Logging; -using System; -using System.Threading; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Application.Common.Behaviours; diff --git a/src/SimpleServicesDashboard.Application/Common/Behaviours/ValidationBehaviour.cs b/src/SimpleServicesDashboard.Application/Common/Behaviours/ValidationBehaviour.cs index c0d18f0..80df4e2 100644 --- a/src/SimpleServicesDashboard.Application/Common/Behaviours/ValidationBehaviour.cs +++ b/src/SimpleServicesDashboard.Application/Common/Behaviours/ValidationBehaviour.cs @@ -1,9 +1,5 @@ using FluentValidation; using MediatR; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; using ValidationException = SimpleServicesDashboard.Application.Common.Exceptions.ValidationException; namespace SimpleServicesDashboard.Application.Common.Behaviours; diff --git a/src/SimpleServicesDashboard.Application/Common/Exceptions/ValidationException.cs b/src/SimpleServicesDashboard.Application/Common/Exceptions/ValidationException.cs index 21e3b81..ef64522 100644 --- a/src/SimpleServicesDashboard.Application/Common/Exceptions/ValidationException.cs +++ b/src/SimpleServicesDashboard.Application/Common/Exceptions/ValidationException.cs @@ -1,7 +1,4 @@ using FluentValidation.Results; -using System; -using System.Collections.Generic; -using System.Linq; namespace SimpleServicesDashboard.Application.Common.Exceptions; diff --git a/src/SimpleServicesDashboard.Application/Common/Interfaces/IBaseHttpClient.cs b/src/SimpleServicesDashboard.Application/Common/Interfaces/IBaseHttpClient.cs index 65ab419..500d663 100644 --- a/src/SimpleServicesDashboard.Application/Common/Interfaces/IBaseHttpClient.cs +++ b/src/SimpleServicesDashboard.Application/Common/Interfaces/IBaseHttpClient.cs @@ -1,6 +1,3 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - namespace SimpleServicesDashboard.Application.Common.Interfaces; public interface IBaseHttpClient diff --git a/src/SimpleServicesDashboard.Application/Common/Interfaces/IEmailServiceAccess.cs b/src/SimpleServicesDashboard.Application/Common/Interfaces/IEmailServiceAccess.cs index ffbe182..ac249a9 100644 --- a/src/SimpleServicesDashboard.Application/Common/Interfaces/IEmailServiceAccess.cs +++ b/src/SimpleServicesDashboard.Application/Common/Interfaces/IEmailServiceAccess.cs @@ -1,5 +1,3 @@ -using System.Threading.Tasks; - namespace SimpleServicesDashboard.Application.Common.Interfaces; public interface IEmailServiceAccess diff --git a/src/SimpleServicesDashboard.Application/Common/Interfaces/IServiceAccess.cs b/src/SimpleServicesDashboard.Application/Common/Interfaces/IServiceAccess.cs index 1aa89ac..4ad53fa 100644 --- a/src/SimpleServicesDashboard.Application/Common/Interfaces/IServiceAccess.cs +++ b/src/SimpleServicesDashboard.Application/Common/Interfaces/IServiceAccess.cs @@ -1,5 +1,3 @@ -using System.Threading.Tasks; - namespace SimpleServicesDashboard.Application.Common.Interfaces; public interface IServiceAccess diff --git a/src/SimpleServicesDashboard.Application/Common/Processors/RequestLogger.cs b/src/SimpleServicesDashboard.Application/Common/Processors/RequestLogger.cs index c0d5ab1..d2136f9 100644 --- a/src/SimpleServicesDashboard.Application/Common/Processors/RequestLogger.cs +++ b/src/SimpleServicesDashboard.Application/Common/Processors/RequestLogger.cs @@ -1,8 +1,5 @@ using MediatR.Pipeline; using Microsoft.Extensions.Logging; -using System; -using System.Threading; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Application.Common.Processors; diff --git a/src/SimpleServicesDashboard.Application/Common/Processors/ResponseLogger.cs b/src/SimpleServicesDashboard.Application/Common/Processors/ResponseLogger.cs index 1c21e72..f0c01c8 100644 --- a/src/SimpleServicesDashboard.Application/Common/Processors/ResponseLogger.cs +++ b/src/SimpleServicesDashboard.Application/Common/Processors/ResponseLogger.cs @@ -1,9 +1,6 @@ using MediatR; using MediatR.Pipeline; using Microsoft.Extensions.Logging; -using System; -using System.Threading; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Application.Common.Processors; diff --git a/src/SimpleServicesDashboard.Application/DTOs/ServiceDescriptionResponseDto.cs b/src/SimpleServicesDashboard.Application/DTOs/ServiceDescriptionResponseDto.cs index 5004c07..f8dfabb 100644 --- a/src/SimpleServicesDashboard.Application/DTOs/ServiceDescriptionResponseDto.cs +++ b/src/SimpleServicesDashboard.Application/DTOs/ServiceDescriptionResponseDto.cs @@ -1,5 +1,3 @@ -using System.Collections.Generic; - namespace SimpleServicesDashboard.Application.DTOs; public sealed class ServicesDescriptionResponseDto diff --git a/src/SimpleServicesDashboard.Application/DTOs/ServiceStatusResponseDto.cs b/src/SimpleServicesDashboard.Application/DTOs/ServiceStatusResponseDto.cs index 42481a8..90bb788 100644 --- a/src/SimpleServicesDashboard.Application/DTOs/ServiceStatusResponseDto.cs +++ b/src/SimpleServicesDashboard.Application/DTOs/ServiceStatusResponseDto.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace SimpleServicesDashboard.Application.DTOs; public sealed class ServicesStatusResponseDto diff --git a/src/SimpleServicesDashboard.Application/DTOs/StatusResponseDto.cs b/src/SimpleServicesDashboard.Application/DTOs/StatusResponseDto.cs index 82c622b..2f9eb2b 100644 --- a/src/SimpleServicesDashboard.Application/DTOs/StatusResponseDto.cs +++ b/src/SimpleServicesDashboard.Application/DTOs/StatusResponseDto.cs @@ -1,5 +1,3 @@ -using System; - namespace SimpleServicesDashboard.Application.DTOs; /// diff --git a/src/SimpleServicesDashboard.Application/Models/ServiceDescriptionResponse.cs b/src/SimpleServicesDashboard.Application/Models/ServiceDescriptionResponse.cs index 5565de5..2bf06ee 100644 --- a/src/SimpleServicesDashboard.Application/Models/ServiceDescriptionResponse.cs +++ b/src/SimpleServicesDashboard.Application/Models/ServiceDescriptionResponse.cs @@ -1,5 +1,3 @@ -using System.Collections.Generic; - namespace SimpleServicesDashboard.Application.Models; public sealed class ServicesDescriptionResponse diff --git a/src/SimpleServicesDashboard.Application/Models/ServiceStatusResponse.cs b/src/SimpleServicesDashboard.Application/Models/ServiceStatusResponse.cs index 3a3d0bf..fd46d97 100644 --- a/src/SimpleServicesDashboard.Application/Models/ServiceStatusResponse.cs +++ b/src/SimpleServicesDashboard.Application/Models/ServiceStatusResponse.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace SimpleServicesDashboard.Application.Models; public sealed class ServicesStatusResponse diff --git a/src/SimpleServicesDashboard.Application/Models/StatusResponse.cs b/src/SimpleServicesDashboard.Application/Models/StatusResponse.cs index d0a1353..d61de0e 100644 --- a/src/SimpleServicesDashboard.Application/Models/StatusResponse.cs +++ b/src/SimpleServicesDashboard.Application/Models/StatusResponse.cs @@ -1,5 +1,3 @@ -using System; - namespace SimpleServicesDashboard.Application.Models; /// diff --git a/src/SimpleServicesDashboard.Application/Modules/ServiceStatus/Queries/GetServiceStatusByCodeQuery.cs b/src/SimpleServicesDashboard.Application/Modules/ServiceStatus/Queries/GetServiceStatusByCodeQuery.cs index 2ea9d88..f29b367 100644 --- a/src/SimpleServicesDashboard.Application/Modules/ServiceStatus/Queries/GetServiceStatusByCodeQuery.cs +++ b/src/SimpleServicesDashboard.Application/Modules/ServiceStatus/Queries/GetServiceStatusByCodeQuery.cs @@ -3,8 +3,6 @@ using SimpleServicesDashboard.Application.Models; using SimpleServicesDashboard.Application.Services.Interfaces; using SimpleServicesDashboard.Common.Extensions; -using System.Threading; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Application.Modules.ServiceStatus.Queries; diff --git a/src/SimpleServicesDashboard.Application/Modules/ServiceStatus/Queries/GetServiceStatusQuery.cs b/src/SimpleServicesDashboard.Application/Modules/ServiceStatus/Queries/GetServiceStatusQuery.cs index a829ba2..321bf88 100644 --- a/src/SimpleServicesDashboard.Application/Modules/ServiceStatus/Queries/GetServiceStatusQuery.cs +++ b/src/SimpleServicesDashboard.Application/Modules/ServiceStatus/Queries/GetServiceStatusQuery.cs @@ -3,8 +3,6 @@ using SimpleServicesDashboard.Application.Models; using SimpleServicesDashboard.Application.Services.Interfaces; using SimpleServicesDashboard.Common.Extensions; -using System.Threading; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Application.Modules.ServiceStatus.Queries; diff --git a/src/SimpleServicesDashboard.Application/Modules/ServiceStatus/Queries/GetServicesCodeEnvInfoQuery.cs b/src/SimpleServicesDashboard.Application/Modules/ServiceStatus/Queries/GetServicesCodeEnvInfoQuery.cs index 921e1b5..23677c7 100644 --- a/src/SimpleServicesDashboard.Application/Modules/ServiceStatus/Queries/GetServicesCodeEnvInfoQuery.cs +++ b/src/SimpleServicesDashboard.Application/Modules/ServiceStatus/Queries/GetServicesCodeEnvInfoQuery.cs @@ -3,8 +3,6 @@ using SimpleServicesDashboard.Application.Models; using SimpleServicesDashboard.Application.Services.Interfaces; using SimpleServicesDashboard.Common.Extensions; -using System.Threading; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Application.Modules.ServiceStatus.Queries; diff --git a/src/SimpleServicesDashboard.Application/Modules/ServiceStatus/Queries/GetServicesStatusQuery.cs b/src/SimpleServicesDashboard.Application/Modules/ServiceStatus/Queries/GetServicesStatusQuery.cs index 3bba46f..d6c0ab5 100644 --- a/src/SimpleServicesDashboard.Application/Modules/ServiceStatus/Queries/GetServicesStatusQuery.cs +++ b/src/SimpleServicesDashboard.Application/Modules/ServiceStatus/Queries/GetServicesStatusQuery.cs @@ -3,8 +3,6 @@ using SimpleServicesDashboard.Application.Models; using SimpleServicesDashboard.Application.Services.Interfaces; using SimpleServicesDashboard.Common.Extensions; -using System.Threading; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Application.Modules.ServiceStatus.Queries; diff --git a/src/SimpleServicesDashboard.Application/Modules/Status/Queries/GetStatusQuery.cs b/src/SimpleServicesDashboard.Application/Modules/Status/Queries/GetStatusQuery.cs index 15565a8..2e4a820 100644 --- a/src/SimpleServicesDashboard.Application/Modules/Status/Queries/GetStatusQuery.cs +++ b/src/SimpleServicesDashboard.Application/Modules/Status/Queries/GetStatusQuery.cs @@ -3,8 +3,6 @@ using SimpleServicesDashboard.Application.Models; using SimpleServicesDashboard.Application.Services.Interfaces; using SimpleServicesDashboard.Common.Extensions; -using System.Threading; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Application.Modules.Status.Queries; diff --git a/src/SimpleServicesDashboard.Application/Services/ApplicationStatusService.cs b/src/SimpleServicesDashboard.Application/Services/ApplicationStatusService.cs index e850bf2..5b30ce1 100644 --- a/src/SimpleServicesDashboard.Application/Services/ApplicationStatusService.cs +++ b/src/SimpleServicesDashboard.Application/Services/ApplicationStatusService.cs @@ -1,9 +1,7 @@ using Microsoft.Extensions.Logging; using SimpleServicesDashboard.Application.Models; using SimpleServicesDashboard.Application.Services.Interfaces; -using System; using System.Reflection; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Application.Services; diff --git a/src/SimpleServicesDashboard.Application/Services/Interfaces/IApplicationStatusService.cs b/src/SimpleServicesDashboard.Application/Services/Interfaces/IApplicationStatusService.cs index 1e0b676..74e6596 100644 --- a/src/SimpleServicesDashboard.Application/Services/Interfaces/IApplicationStatusService.cs +++ b/src/SimpleServicesDashboard.Application/Services/Interfaces/IApplicationStatusService.cs @@ -1,5 +1,4 @@ using SimpleServicesDashboard.Application.Models; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Application.Services.Interfaces; diff --git a/src/SimpleServicesDashboard.Application/Services/Interfaces/IServicesStatusService.cs b/src/SimpleServicesDashboard.Application/Services/Interfaces/IServicesStatusService.cs index 8ce4e3f..61bbff4 100644 --- a/src/SimpleServicesDashboard.Application/Services/Interfaces/IServicesStatusService.cs +++ b/src/SimpleServicesDashboard.Application/Services/Interfaces/IServicesStatusService.cs @@ -1,5 +1,4 @@ using SimpleServicesDashboard.Application.Models; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Application.Services.Interfaces; diff --git a/src/SimpleServicesDashboard.Application/Services/ServicesStatusService.cs b/src/SimpleServicesDashboard.Application/Services/ServicesStatusService.cs index 2449e8d..ed1385c 100644 --- a/src/SimpleServicesDashboard.Application/Services/ServicesStatusService.cs +++ b/src/SimpleServicesDashboard.Application/Services/ServicesStatusService.cs @@ -4,11 +4,7 @@ using SimpleServicesDashboard.Application.Models; using SimpleServicesDashboard.Application.Services.Interfaces; using SimpleServicesDashboard.Common.Configuration; -using System; -using System.Collections.Generic; -using System.Linq; using System.Text.Json; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Application.Services; diff --git a/src/SimpleServicesDashboard.Application/SimpleServicesDashboard.Application.csproj b/src/SimpleServicesDashboard.Application/SimpleServicesDashboard.Application.csproj index 7e97c73..5297a39 100644 --- a/src/SimpleServicesDashboard.Application/SimpleServicesDashboard.Application.csproj +++ b/src/SimpleServicesDashboard.Application/SimpleServicesDashboard.Application.csproj @@ -1,10 +1,11 @@ - net8.0 + net9.0 true $(NoWarn);1591 enable + enable diff --git a/src/SimpleServicesDashboard.Common/Configuration/ServicesConfigurationOptions.cs b/src/SimpleServicesDashboard.Common/Configuration/ServicesConfigurationOptions.cs index 1315966..44ee6d3 100644 --- a/src/SimpleServicesDashboard.Common/Configuration/ServicesConfigurationOptions.cs +++ b/src/SimpleServicesDashboard.Common/Configuration/ServicesConfigurationOptions.cs @@ -1,5 +1,4 @@ using FluentValidation; -using System.Collections.Generic; namespace SimpleServicesDashboard.Common.Configuration; diff --git a/src/SimpleServicesDashboard.Common/Extensions/LoggerExtensions.cs b/src/SimpleServicesDashboard.Common/Extensions/LoggerExtensions.cs index 0542d00..56d3928 100644 --- a/src/SimpleServicesDashboard.Common/Extensions/LoggerExtensions.cs +++ b/src/SimpleServicesDashboard.Common/Extensions/LoggerExtensions.cs @@ -1,6 +1,4 @@ using Microsoft.Extensions.Logging; -using System; -using System.Linq; namespace SimpleServicesDashboard.Common.Extensions; diff --git a/src/SimpleServicesDashboard.Common/Extensions/ValidationOptionsExtensions.cs b/src/SimpleServicesDashboard.Common/Extensions/ValidationOptionsExtensions.cs index 8fafa88..80ecbfb 100644 --- a/src/SimpleServicesDashboard.Common/Extensions/ValidationOptionsExtensions.cs +++ b/src/SimpleServicesDashboard.Common/Extensions/ValidationOptionsExtensions.cs @@ -1,8 +1,6 @@ using FluentValidation; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using System; -using System.Collections.Generic; namespace SimpleServicesDashboard.Common.Extensions; diff --git a/src/SimpleServicesDashboard.Common/SimpleServicesDashboard.Common.csproj b/src/SimpleServicesDashboard.Common/SimpleServicesDashboard.Common.csproj index cd436c3..0f8a9cf 100644 --- a/src/SimpleServicesDashboard.Common/SimpleServicesDashboard.Common.csproj +++ b/src/SimpleServicesDashboard.Common/SimpleServicesDashboard.Common.csproj @@ -1,10 +1,11 @@ - net8.0 + net9.0 true $(NoWarn);1591 enable + enable diff --git a/src/SimpleServicesDashboard.Infrastructure.Models/CommonModels.cs b/src/SimpleServicesDashboard.Infrastructure.Models/CommonModels.cs index b050bc9..89d12ab 100644 --- a/src/SimpleServicesDashboard.Infrastructure.Models/CommonModels.cs +++ b/src/SimpleServicesDashboard.Infrastructure.Models/CommonModels.cs @@ -1,5 +1,3 @@ -using System; - namespace SimpleServicesDashboard.Infrastructure.Models; /// diff --git a/src/SimpleServicesDashboard.Infrastructure.Models/SimpleServicesDashboard.Infrastructure.Models.csproj b/src/SimpleServicesDashboard.Infrastructure.Models/SimpleServicesDashboard.Infrastructure.Models.csproj index b8bbd02..b888bf2 100644 --- a/src/SimpleServicesDashboard.Infrastructure.Models/SimpleServicesDashboard.Infrastructure.Models.csproj +++ b/src/SimpleServicesDashboard.Infrastructure.Models/SimpleServicesDashboard.Infrastructure.Models.csproj @@ -1,8 +1,9 @@ - net8.0 + net9.0 enable + enable diff --git a/src/SimpleServicesDashboard.Infrastructure/Clients/BaseHttpClient.cs b/src/SimpleServicesDashboard.Infrastructure/Clients/BaseHttpClient.cs index d652dcb..bdfaf17 100644 --- a/src/SimpleServicesDashboard.Infrastructure/Clients/BaseHttpClient.cs +++ b/src/SimpleServicesDashboard.Infrastructure/Clients/BaseHttpClient.cs @@ -1,16 +1,10 @@ using Microsoft.AspNetCore.WebUtilities; using SimpleServicesDashboard.Application.Common.Interfaces; using SimpleServicesDashboard.Infrastructure.Helpers; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Net; -using System.Net.Http; using System.Net.Http.Headers; using System.Text; using System.Text.Json; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Infrastructure.Clients; diff --git a/src/SimpleServicesDashboard.Infrastructure/Clients/EmailServiceClient.cs b/src/SimpleServicesDashboard.Infrastructure/Clients/EmailServiceClient.cs index 5c863ed..48f780f 100644 --- a/src/SimpleServicesDashboard.Infrastructure/Clients/EmailServiceClient.cs +++ b/src/SimpleServicesDashboard.Infrastructure/Clients/EmailServiceClient.cs @@ -1,5 +1,4 @@ using SimpleServicesDashboard.Application.Common.Interfaces; -using System.Net.Http; namespace SimpleServicesDashboard.Infrastructure.Clients; diff --git a/src/SimpleServicesDashboard.Infrastructure/Helpers/ObjectToDictionaryHelper.cs b/src/SimpleServicesDashboard.Infrastructure/Helpers/ObjectToDictionaryHelper.cs index b1c1acb..00ead80 100644 --- a/src/SimpleServicesDashboard.Infrastructure/Helpers/ObjectToDictionaryHelper.cs +++ b/src/SimpleServicesDashboard.Infrastructure/Helpers/ObjectToDictionaryHelper.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using System.ComponentModel; namespace SimpleServicesDashboard.Infrastructure.Helpers; diff --git a/src/SimpleServicesDashboard.Infrastructure/ServiceAccess/EmailServiceAccess.cs b/src/SimpleServicesDashboard.Infrastructure/ServiceAccess/EmailServiceAccess.cs index f12d957..50cd503 100644 --- a/src/SimpleServicesDashboard.Infrastructure/ServiceAccess/EmailServiceAccess.cs +++ b/src/SimpleServicesDashboard.Infrastructure/ServiceAccess/EmailServiceAccess.cs @@ -1,8 +1,6 @@ using Microsoft.Extensions.Logging; using SimpleServicesDashboard.Application.Common.Interfaces; using SimpleServicesDashboard.Infrastructure.Models; -using System; -using System.Threading.Tasks; namespace SimpleServicesDashboard.Infrastructure.ServiceAccess; diff --git a/src/SimpleServicesDashboard.Infrastructure/ServiceAccess/ServiceAccessFactory.cs b/src/SimpleServicesDashboard.Infrastructure/ServiceAccess/ServiceAccessFactory.cs index 32c509b..c4f7e7b 100644 --- a/src/SimpleServicesDashboard.Infrastructure/ServiceAccess/ServiceAccessFactory.cs +++ b/src/SimpleServicesDashboard.Infrastructure/ServiceAccess/ServiceAccessFactory.cs @@ -1,7 +1,5 @@ using Microsoft.Extensions.DependencyInjection; using SimpleServicesDashboard.Application.Common.Interfaces; -using System; -using System.Collections.Generic; namespace SimpleServicesDashboard.Infrastructure.ServiceAccess; diff --git a/src/SimpleServicesDashboard.Infrastructure/ServiceCollectionExtensions.cs b/src/SimpleServicesDashboard.Infrastructure/ServiceCollectionExtensions.cs index 19e2766..d1c4145 100644 --- a/src/SimpleServicesDashboard.Infrastructure/ServiceCollectionExtensions.cs +++ b/src/SimpleServicesDashboard.Infrastructure/ServiceCollectionExtensions.cs @@ -1,4 +1,3 @@ -using Dodo.HttpClientResiliencePolicies; using Microsoft.Extensions.DependencyInjection; using SimpleServicesDashboard.Application.Common.Interfaces; using SimpleServicesDashboard.Infrastructure.Clients; @@ -29,7 +28,7 @@ private static void RegisterApiClients(IServiceCollection services) { // register clients - API clients services.AddHttpClient("EmailServiceClient") - .AddResiliencePolicies(); // default settings from Dodo library! + .AddStandardResilienceHandler(); } private static void RegisterServiceAccess(IServiceCollection services) diff --git a/src/SimpleServicesDashboard.Infrastructure/SimpleServicesDashboard.Infrastructure.csproj b/src/SimpleServicesDashboard.Infrastructure/SimpleServicesDashboard.Infrastructure.csproj index dedcd5a..42fe546 100644 --- a/src/SimpleServicesDashboard.Infrastructure/SimpleServicesDashboard.Infrastructure.csproj +++ b/src/SimpleServicesDashboard.Infrastructure/SimpleServicesDashboard.Infrastructure.csproj @@ -1,8 +1,9 @@ - net8.0 + net9.0 enable + enable @@ -11,6 +12,7 @@ + diff --git a/tests/SimpleServicesDashboard.Application.Tests/SimpleServicesDashboard.Application.Tests.csproj b/tests/SimpleServicesDashboard.Application.Tests/SimpleServicesDashboard.Application.Tests.csproj index 5eebcef..4a65cec 100644 --- a/tests/SimpleServicesDashboard.Application.Tests/SimpleServicesDashboard.Application.Tests.csproj +++ b/tests/SimpleServicesDashboard.Application.Tests/SimpleServicesDashboard.Application.Tests.csproj @@ -1,9 +1,11 @@ - net8.0 + net9.0 false enable + enable + true