Skip to content

Commit

Permalink
Upgrade to 8.1.17
Browse files Browse the repository at this point in the history
  • Loading branch information
@Codespilot
Codespilot committed Jan 15, 2024
1 parent b11214e commit dca7542
Show file tree
Hide file tree
Showing 4 changed files with 105 additions and 102 deletions.
194 changes: 97 additions & 97 deletions Directory.Packages.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,144 +3,144 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<EnablePackageVersionOverride>true</EnablePackageVersionOverride>
<MicrosoftPackageVersion6>6.0.24</MicrosoftPackageVersion6>
<MicrosoftPackageVersion7>7.0.14</MicrosoftPackageVersion7>
<MicrosoftPackageVersion8>8.0.0</MicrosoftPackageVersion8>
<GrpcAspNetCoreVersion>2.59.0</GrpcAspNetCoreVersion>
<MicrosoftPackageVersion7>7.0.15</MicrosoftPackageVersion7>
<MicrosoftPackageVersion8>8.0.1</MicrosoftPackageVersion8>
<GrpcAspNetCoreVersion>2.60.0</GrpcAspNetCoreVersion>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Apache.NMS.ActiveMQ" Version="2.1.0"/>
<PackageVersion Include="Autofac" Version="7.1.0"/>
<PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="8.0.0"/>
<PackageVersion Include="Autofac.Extras.DynamicProxy" Version="7.1.0"/>
<PackageVersion Include="AutoMapper" Version="12.0.1"/>
<PackageVersion Include="Azure.Storage.Blobs" Version="12.19.1"/>
<PackageVersion Include="Castle.Core" Version="5.1.1"/>
<PackageVersion Include="Consul" Version="1.6.10.9"/>
<PackageVersion Include="FluentValidation" Version="11.8.1"/>
<PackageVersion Include="IdentityModel" Version="6.2.0"/>
<PackageVersion Include="IdentityModel.AspNetCore.OAuth2Introspection" Version="6.2.0"/>
<PackageVersion Include="Mapster" Version="7.4.0"/>
<PackageVersion Include="Mapster.DependencyInjection" Version="1.0.1"/>
<PackageVersion Include="MediatR" Version="12.1.1"/>
<PackageVersion Include="MediatR.Contracts" Version="2.0.1"/>
<PackageVersion Include="mongocsharpdriver" Version="2.22.0"/>
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3"/>
<PackageVersion Include="Polly" Version="8.2.0"/>
<PackageVersion Include="protobuf-net" Version="3.1.33"/>
<PackageVersion Include="Quartz" Version="3.8.0"/>
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.8.0"/>
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.8.0"/>
<PackageVersion Include="RabbitMQ.Client" Version="6.7.0"/>
<PackageVersion Include="Refit" Version="6.3.2"/>
<PackageVersion Include="Refit.HttpClientFactory" Version="6.3.2"/>
<PackageVersion Include="Refit.Newtonsoft.Json" Version="6.3.2"/>
<PackageVersion Include="Serilog" Version="3.1.1"/>
<PackageVersion Include="Serilog.AspNetCore" Version="8.0.0"/>
<PackageVersion Include="Serilog.Enrichers.Environment" Version="2.3.0"/>
<PackageVersion Include="Serilog.Sinks.Elasticsearch" Version="9.0.3"/>
<PackageVersion Include="Serilog.Sinks.Email" Version="2.4.0"/>
<PackageVersion Include="Serilog.Sinks.File" Version="5.0.0"/>
<PackageVersion Include="StackExchange.Redis" Version="2.7.4"/>
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0"/>
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0"/>
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="7.0.0"/>
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0"/>
<PackageVersion Include="System.Interactive" Version="6.0.1"/>
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="8.0.0"/>
<PackageVersion Include="System.Reactive" Version="6.0.0"/>
<PackageVersion Include="System.Runtime.Caching" Version="8.0.0"/>
<PackageVersion Include="System.Runtime.Loader" Version="4.3.0"/>
<PackageVersion Include="System.Text.Json" Version="8.0.0"/>
<PackageVersion Include="Winton.Extensions.Configuration.Consul" Version="3.2.0"/>
<PackageVersion Include="ZooKeeperNetEx" Version="3.4.12.4"/>
<PackageVersion Include="Apache.NMS.ActiveMQ" Version="2.1.0" />
<PackageVersion Include="Autofac" Version="7.1.0" />
<PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageVersion Include="Autofac.Extras.DynamicProxy" Version="7.1.0" />
<PackageVersion Include="AutoMapper" Version="12.0.1" />
<PackageVersion Include="Azure.Storage.Blobs" Version="12.19.1" />
<PackageVersion Include="Castle.Core" Version="5.1.1" />
<PackageVersion Include="Consul" Version="1.6.10.9" />
<PackageVersion Include="FluentValidation" Version="11.9.0" />
<PackageVersion Include="IdentityModel" Version="6.2.0" />
<PackageVersion Include="IdentityModel.AspNetCore.OAuth2Introspection" Version="6.2.0" />
<PackageVersion Include="Mapster" Version="7.4.0" />
<PackageVersion Include="Mapster.DependencyInjection" Version="1.0.1" />
<PackageVersion Include="MediatR" Version="12.1.1" />
<PackageVersion Include="MediatR.Contracts" Version="2.0.1" />
<PackageVersion Include="mongocsharpdriver" Version="2.23.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="Polly" Version="8.2.1" />
<PackageVersion Include="protobuf-net" Version="3.1.33" />
<PackageVersion Include="Quartz" Version="3.8.0" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.8.0" />
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.8.0" />
<PackageVersion Include="RabbitMQ.Client" Version="6.8.1" />
<PackageVersion Include="Refit" Version="6.3.2" />
<PackageVersion Include="Refit.HttpClientFactory" Version="6.3.2" />
<PackageVersion Include="Refit.Newtonsoft.Json" Version="6.3.2" />
<PackageVersion Include="Serilog" Version="3.1.1" />
<PackageVersion Include="Serilog.AspNetCore" Version="8.0.0" />
<PackageVersion Include="Serilog.Enrichers.Environment" Version="2.3.0" />
<PackageVersion Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
<PackageVersion Include="Serilog.Sinks.Email" Version="2.4.0" />
<PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageVersion Include="StackExchange.Redis" Version="2.7.10" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageVersion Include="System.Interactive" Version="6.0.1" />
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
<PackageVersion Include="System.Reactive" Version="6.0.0" />
<PackageVersion Include="System.Runtime.Caching" Version="8.0.0" />
<PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.1" />
<PackageVersion Include="Winton.Extensions.Configuration.Consul" Version="3.2.0" />
<PackageVersion Include="ZooKeeperNetEx" Version="3.4.12.4" />
</ItemGroup>
<!-- Microsoft.Extensions -->
<ItemGroup>
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0"/>
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0"/>
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
</ItemGroup>
<!-- Microsoft.EntityFrameworkCore -->
<ItemGroup Condition="'$(TargetFramework)'!='net8.0'">
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(MicrosoftPackageVersion7)"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftPackageVersion7)"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftPackageVersion7)"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(MicrosoftPackageVersion7)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftPackageVersion7)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftPackageVersion7)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="$(MicrosoftPackageVersion7)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftPackageVersion7)"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftPackageVersion7)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(MicrosoftPackageVersion8)"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftPackageVersion8)"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftPackageVersion8)"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(MicrosoftPackageVersion8)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftPackageVersion8)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftPackageVersion8)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="$(MicrosoftPackageVersion8)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftPackageVersion8)"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftPackageVersion8)" />
</ItemGroup>
<!-- Microsoft.AspNetCore -->
<ItemGroup>
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="$(MicrosoftPackageVersion8)"/>
<PackageVersion Include="Microsoft.AspNetCore.Connections.Abstractions" Version="$(MicrosoftPackageVersion8)"/>
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="$(MicrosoftPackageVersion8)" />
<PackageVersion Include="Microsoft.AspNetCore.Connections.Abstractions" Version="$(MicrosoftPackageVersion8)" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('netstandard'))">
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftPackageVersion6)"/>
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftPackageVersion6)"/>
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftPackageVersion6)" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftPackageVersion6)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(MicrosoftPackageVersion7)"/>
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftPackageVersion7)"/>
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftPackageVersion7)"/>
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(MicrosoftPackageVersion7)" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftPackageVersion7)" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftPackageVersion7)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(MicrosoftPackageVersion8)"/>
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftPackageVersion8)"/>
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftPackageVersion8)"/>
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(MicrosoftPackageVersion8)" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftPackageVersion8)" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftPackageVersion8)" />
</ItemGroup>
<!-- Grpc -->
<ItemGroup>
<PackageVersion Include="Google.Api.CommonProtos" Version="2.12.0"/>
<PackageVersion Include="Google.Protobuf" Version="3.25.1"/>
<PackageVersion Include="Grpc" Version="2.46.6"/>
<PackageVersion Include="Grpc.AspNetCore" Version="$(GrpcAspNetCoreVersion)"/>
<PackageVersion Include="Grpc.AspNetCore.HealthChecks" Version="$(GrpcAspNetCoreVersion)"/>
<PackageVersion Include="Grpc.AspNetCore.Server" Version="$(GrpcAspNetCoreVersion)"/>
<PackageVersion Include="Grpc.AspNetCore.Server.Reflection" Version="$(GrpcAspNetCoreVersion)"/>
<PackageVersion Include="Grpc.AspNetCore.Web" Version="$(GrpcAspNetCoreVersion)"/>
<PackageVersion Include="Grpc.Core" Version="2.46.6"/>
<PackageVersion Include="Grpc.HealthCheck" Version="$(GrpcAspNetCoreVersion)"/>
<PackageVersion Include="Grpc.Tools" Version="$(GrpcAspNetCoreVersion)"/>
<PackageVersion Include="Google.Api.CommonProtos" Version="2.12.0" />
<PackageVersion Include="Google.Protobuf" Version="3.25.2" />
<PackageVersion Include="Grpc" Version="2.46.6" />
<PackageVersion Include="Grpc.AspNetCore" Version="$(GrpcAspNetCoreVersion)" />
<PackageVersion Include="Grpc.AspNetCore.HealthChecks" Version="$(GrpcAspNetCoreVersion)" />
<PackageVersion Include="Grpc.AspNetCore.Server" Version="$(GrpcAspNetCoreVersion)" />
<PackageVersion Include="Grpc.AspNetCore.Server.Reflection" Version="$(GrpcAspNetCoreVersion)" />
<PackageVersion Include="Grpc.AspNetCore.Web" Version="$(GrpcAspNetCoreVersion)" />
<PackageVersion Include="Grpc.Core" Version="2.46.6" />
<PackageVersion Include="Grpc.HealthCheck" Version="$(GrpcAspNetCoreVersion)" />
<PackageVersion Include="Grpc.Tools" Version="$(GrpcAspNetCoreVersion)" />
</ItemGroup>
<!-- Tests -->
<ItemGroup>
<PackageVersion Include="BenchmarkDotNet" Version="0.13.4"/>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
<PackageVersion Include="xunit" Version="2.6.2"/>
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.4">
<PackageVersion Include="BenchmarkDotNet" Version="0.13.4" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="xunit" Version="2.6.5" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="coverlet.collector" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="Xunit.DependencyInjection" Version="8.9.0"/>
<PackageVersion Include="Xunit.DependencyInjection.Logging" Version="8.0.1"/>
<PackageVersion Include="Moq" Version="4.20.70"/>
<PackageVersion Include="Xunit.DependencyInjection" Version="8.9.1" />
<PackageVersion Include="Xunit.DependencyInjection.Logging" Version="8.0.1" />
<PackageVersion Include="Moq" Version="4.20.70" />
</ItemGroup>
</Project>
7 changes: 5 additions & 2 deletions Source/Euonia.Hosting/Middlewares/ExceptionHandlingMiddleware.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ private static int GetStatusCode(Exception exception)
HttpStatusException ex => (int)ex.StatusCode,
AuthenticationException => StatusCodes.Status401Unauthorized,
UnauthorizedAccessException => StatusCodes.Status403Forbidden,
ValidationException => StatusCodes.Status422UnprocessableEntity,
ValidationException => StatusCodes.Status400BadRequest,
NotImplementedException => StatusCodes.Status501NotImplemented,
AggregateException ex => GetStatusCode(ex.InnerException),
_ => (int)(exception.GetType().GetCustomAttribute<HttpStatusCodeAttribute>()?.StatusCode ?? HttpStatusCode.InternalServerError)
Expand All @@ -72,7 +72,10 @@ private static int GetStatusCode(Exception exception)

private static IReadOnlyDictionary<string, string[]> GetErrors(Exception exception)
{
//IReadOnlyDictionary<string, string[]> errors = null;
if (exception is AggregateException)
{
return GetErrors(exception.InnerException);
}

if (exception is not ValidationException ex)
{
Expand Down
Loading

0 comments on commit dca7542

Please sign in to comment.