Skip to content

Commit

Permalink
Merge pull request #954 from sitkoru/update/june-2024
Browse files Browse the repository at this point in the history 
Update/june 2024
  • Loading branch information
@SonicGD
SonicGD authored Jun 24, 2024
2 parents dec43ec + bcff127 commit 7377887
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 67 deletions.
4 changes: 2 additions & 2 deletions apps/Blazor/Sitko.Core.Apps.Blazor/Sitko.Core.Apps.Blazor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<ProjectReference Include="..\..\..\src\Sitko.Core.Storage.Metadata.Postgres\Sitko.Core.Storage.Metadata.Postgres.csproj" />
<ProjectReference Include="..\..\..\src\Sitko.Core.Storage.Remote.Server\Sitko.Core.Storage.Remote.Server.csproj" />
<ProjectReference Include="..\Sitko.Core.Apps.Blazor.Client\Sitko.Core.Apps.Blazor.Client.csproj" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
128 changes: 64 additions & 64 deletions src/Directory.Packages.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,32 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Cronos" Version="0.7.1" />
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.0" />
<PackageVersion Include="Cronos" Version="0.8.4" />
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.2" />
<PackageVersion Include="IL.FluentValidation.Extensions.Options" Version="11.0.2" />
<PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
<PackageVersion Include="PeanutButter.DuckTyping" Version="3.0.264" />
<PackageVersion Include="PeanutButter.DuckTyping" Version="3.0.305" />
<PackageVersion Include="Tempus" Version="1.0.0" />
<PackageVersion Include="Scrutor" Version="4.2.2" />
<PackageVersion Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
<PackageVersion Include="VaultSharp" Version="1.13.0.1" />
<PackageVersion Include="Consul" Version="1.7.14.2" />
<PackageVersion Include="Consul" Version="1.7.14.3" />
<PackageVersion Include="TeamsHook.NET" Version="0.1.0.18" />
<PackageVersion Include="Telegram.Bot" Version="19.0.0" />
<PackageVersion Include="ImgProxy" Version="2.3.0" />
<PackageVersion Include="ImgProxy" Version="2.3.2" />
<PackageVersion Include="Nito.AsyncEx" Version="5.1.2" />
<PackageVersion Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.1.0" />
<PackageVersion Include="PuppeteerSharp" Version="13.0.1" />
<PackageVersion Include="NATS.Client" Version="1.1.0" />
<PackageVersion Include="STAN.Client" Version="0.3.0" />
<PackageVersion Include="System.Linq.Dynamic.Core" Version="1.3.7" />
<PackageVersion Include="System.Linq.Dynamic.Core" Version="1.4.1" />
<PackageVersion Include="CompareNETObjects" Version="4.83.0" />
<PackageVersion Include="Serialize.Linq" Version="2.0.0" />
<PackageVersion Include="MimeMapping" Version="2.0.0" />
<PackageVersion Include="AWSSDK.S3" Version="3.7.304.1" />
<PackageVersion Include="Remote.Linq.Newtonsoft.Json" Version="7.1.0" />
<PackageVersion Include="MimeMapping" Version="3.0.1" />
<PackageVersion Include="AWSSDK.S3" Version="3.7.309.7" />
<PackageVersion Include="Remote.Linq.Newtonsoft.Json" Version="7.2.0" />
</ItemGroup>
<!--Sitko libraries-->
<ItemGroup>
Expand All @@ -39,68 +39,68 @@
<ItemGroup>
<PackageVersion Include="idunno.Authentication.Basic" Version="2.3.1" />
<PackageVersion Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
<PackageVersion Include="Duende.AccessTokenManagement.OpenIdConnect" Version="2.0.3" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.6.2" />
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="6.6.2" />
<PackageVersion Include="Duende.AccessTokenManagement.OpenIdConnect" Version="2.1.2" />
<PackageVersion Include="Sentry.AspNetCore" Version="3.41.3" />
</ItemGroup>
<!--Email libraries-->
<ItemGroup>
<PackageVersion Include="FluentEmail.Core" Version="3.0.2" />
<PackageVersion Include="FluentEmail.Mailgun" Version="3.0.2" />
<PackageVersion Include="FluentEmail.Smtp" Version="3.0.2" />
<PackageVersion Include="HtmlAgilityPack" Version="1.11.58" />
<PackageVersion Include="HtmlAgilityPack" Version="1.11.61" />
<PackageVersion Include="Razor.Templating.Core" Version="1.9.0" />
</ItemGroup>
<!--Blazor libraries-->
<ItemGroup>
<PackageVersion Include="AntDesign" Version="0.16.2" />
<PackageVersion Include="Tewr.Blazor.FileReader" Version="3.3.2.23201" />
<PackageVersion Include="MudBlazor" Version="6.15.0" />
<PackageVersion Include="MudBlazor" Version="6.20.0" />
</ItemGroup>
<!--Tests libraries-->
<ItemGroup>
<PackageVersion Include="AutoBogus" Version="2.13.1" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="Serilog.Sinks.XUnit" Version="3.0.5" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.4" />
<PackageVersion Include="xunit" Version="2.6.2" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
<PackageVersion Include="xunit" Version="2.8.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
</ItemGroup>
<!--Hangfire libraries-->
<ItemGroup>
<PackageVersion Include="Hangfire.Core" Version="1.8.9" />
<PackageVersion Include="Hangfire.AspNetCore" Version="1.8.9" />
<PackageVersion Include="Hangfire.PostgreSql" Version="1.20.4" />
<PackageVersion Include="Hangfire.Core" Version="1.8.14" />
<PackageVersion Include="Hangfire.AspNetCore" Version="1.8.14" />
<PackageVersion Include="Hangfire.PostgreSql" Version="1.20.8" />
</ItemGroup>
<!--MS libraries-->
<ItemGroup>
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.8.14" />
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.10.48" />
</ItemGroup>
<!--EF Core libraries-->
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.1" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.6" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.6" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
</ItemGroup>
<!--Kafka libraries-->
<ItemGroup>
<PackageVersion Include="KafkaFlow" Version="3.0.3" />
<PackageVersion Include="KafkaFlow.LogHandler.Microsoft" Version="3.0.0" />
<PackageVersion Include="KafkaFlow.Microsoft.DependencyInjection" Version="3.0.0" />
<PackageVersion Include="KafkaFlow.Serializer.JsonCore" Version="3.0.3" />
<PackageVersion Include="KafkaFlow.Extensions.Hosting" Version="3.0.0" />
<PackageVersion Include="KafkaFlow" Version="3.0.8" />
<PackageVersion Include="KafkaFlow.LogHandler.Microsoft" Version="3.0.8" />
<PackageVersion Include="KafkaFlow.Microsoft.DependencyInjection" Version="3.0.8" />
<PackageVersion Include="KafkaFlow.Serializer.JsonCore" Version="3.0.8" />
<PackageVersion Include="KafkaFlow.Extensions.Hosting" Version="3.0.8" />
</ItemGroup>
<!--OpenSearch libraries-->
<ItemGroup>
<PackageVersion Include="Serilog.Sinks.OpenSearch" Version="1.0.0" />
<PackageVersion Include="Serilog.Sinks.OpenSearch" Version="1.2.0" />
</ItemGroup>
<!--Elastic libraries-->
<ItemGroup>
<PackageVersion Include="Elastic.Apm.NetCoreAll" Version="1.25.3" />
<PackageVersion Include="Elastic.Apm.NetCoreAll" Version="1.27.3" />
<PackageVersion Include="Elastic.Apm.SerilogEnricher" Version="8.6.1" />
<PackageVersion Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
<PackageVersion Include="NEST" Version="7.17.5" />
Expand All @@ -109,54 +109,54 @@
<ItemGroup>
<PackageVersion Include="Serilog.Exceptions" Version="8.4.0" />
<PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.0" />
<PackageVersion Include="Serilog.Sinks.Console" Version="5.0.1" />
<PackageVersion Include="Serilog.Enrichers.Environment" Version="2.3.0" />
<PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.1" />
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageVersion Include="Serilog.Enrichers.Environment" Version="3.0.1" />
<PackageVersion Include="Serilog.Sinks.BrowserConsole" Version="2.0.0" />
<PackageVersion Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
<PackageVersion Include="Serilog.Sinks.Graylog" Version="3.1.1" />
<PackageVersion Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageVersion Include="Serilog.Sinks.Async" Version="2.0.0" />
<PackageVersion Include="NewRelic.LogEnrichers.Serilog" Version="1.2.0" />
<PackageVersion Include="Serilog.Sinks.NewRelic.Logs" Version="1.2.0" />
</ItemGroup>
<!--Grpc and protobuf libraries-->
<ItemGroup>
<PackageVersion Include="Grpc.Core.Api" Version="2.60.0" />
<PackageVersion Include="Grpc.Tools" Version="2.60.0" />
<PackageVersion Include="Google.Protobuf" Version="3.25.2" />
<PackageVersion Include="Grpc.Net.ClientFactory" Version="2.60.0" />
<PackageVersion Include="Grpc.Net.Client.Web" Version="2.60.0" />
<PackageVersion Include="Grpc.AspNetCore" Version="2.60.0" />
<PackageVersion Include="Grpc.AspNetCore.Web" Version="2.60.0" />
<PackageVersion Include="Grpc.AspNetCore.Server.Reflection" Version="2.60.0" />
<PackageVersion Include="Grpc.Core.Api" Version="2.63.0" />
<PackageVersion Include="Grpc.Tools" Version="2.64.0" />
<PackageVersion Include="Google.Protobuf" Version="3.27.1" />
<PackageVersion Include="Grpc.Net.ClientFactory" Version="2.63.0" />
<PackageVersion Include="Grpc.Net.Client.Web" Version="2.63.0" />
<PackageVersion Include="Grpc.AspNetCore" Version="2.63.0" />
<PackageVersion Include="Grpc.AspNetCore.Web" Version="2.63.0" />
<PackageVersion Include="Grpc.AspNetCore.Server.Reflection" Version="2.63.0" />
</ItemGroup>
<!--.NET 8 specific libraries-->
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageVersion Include="System.Threading.Channels" 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.Localization.Abstractions" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Localization" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.6" />
<PackageVersion Include="Microsoft.Extensions.Localization" Version="8.0.6" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.6" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="8.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.Aws.S3" Version="7.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.OpenIdConnectServer" Version="7.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.Hangfire" Version="8.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.6" />
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.6" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.6" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.6" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.6" />
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="8.0.6" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.6" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.6" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.6" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.6" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.6" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.6" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.6" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.6" />
<PackageVersion Include="AspNetCore.HealthChecks.Aws.S3" Version="8.0.1" />
<PackageVersion Include="AspNetCore.HealthChecks.OpenIdConnectServer" Version="8.0.1" />
<PackageVersion Include="AspNetCore.HealthChecks.Hangfire" Version="8.0.1" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Sitko.Core.OpenSearch/OpenSearchLoggingModule.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public LoggerConfiguration ConfigureLogging(IApplicationContext context, OpenSea
var sinkOptions = new OpenSearchSinkOptions(new Uri(options.Url))
{
AutoRegisterTemplate = true,
AutoRegisterTemplateVersion = options.LoggingTemplateVersion ?? AutoRegisterTemplateVersion.OSv2,
AutoRegisterTemplateVersion = options.LoggingTemplateVersion ?? AutoRegisterTemplateVersion.OSv1,
NumberOfReplicas = options.LoggingNumberOfReplicas,
IndexFormat =
options.LoggingIndexFormat ??
Expand Down

0 comments on commit 7377887

Please sign in to comment.