chore: update packages; fix breakages

BrighterCommand · Oct 31, 2024 · c244f7c · c244f7c
1 parent f27adfb
commit c244f7c
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 47 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,18 +4,18 @@
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="AWSSDK.DynamoDBv2" Version="3.7.400.11" />
+    <PackageVersion Include="AWSSDK.DynamoDBv2" Version="3.7.402.7" />
     <PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />
-    <PackageVersion Include="AWSSDK.S3" Version="3.7.402.2" />
-    <PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.400.11" />
-    <PackageVersion Include="AWSSDK.SimpleNotificationService" Version="3.7.400.11" />
-    <PackageVersion Include="AWSSDK.SQS" Version="3.7.400.11" />
-    <PackageVersion Include="Azure.Identity" Version="1.12.0" />
-    <PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.18.1" />
-    <PackageVersion Include="Azure.Storage.Blobs" Version="12.21.2" />
-    <PackageVersion Include="Confluent.Kafka" Version="2.3.0" />
-    <PackageVersion Include="Confluent.SchemaRegistry" Version="2.3.0" />
-    <PackageVersion Include="Confluent.SchemaRegistry.Serdes.Json" Version="2.3.0" />
+    <PackageVersion Include="AWSSDK.S3" Version="3.7.405.7" />
+    <PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.400.43" />
+    <PackageVersion Include="AWSSDK.SimpleNotificationService" Version="3.7.400.43" />
+    <PackageVersion Include="AWSSDK.SQS" Version="3.7.400.43" />
+    <PackageVersion Include="Azure.Identity" Version="1.13.1" />
+    <PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.18.2" />
+    <PackageVersion Include="Azure.Storage.Blobs" Version="12.22.2" />
+    <PackageVersion Include="Confluent.Kafka" Version="2.6.0" />
+    <PackageVersion Include="Confluent.SchemaRegistry" Version="2.6.0" />
+    <PackageVersion Include="Confluent.SchemaRegistry.Serdes.Json" Version="2.6.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -24,60 +24,61 @@
     <PackageVersion Include="Dapper.Contrib" Version="2.0.78" />
     <PackageVersion Include="DapperExtensions" Version="1.7.0" />
     <PackageVersion Include="EventStore.ClientAPI.NetCore" Version="4.1.0.23" />
-    <PackageVersion Include="FakeItEasy" Version="8.2.0" />
+    <PackageVersion Include="FakeItEasy" Version="8.3.0" />
     <PackageVersion Include="FakeItEasy.Analyzer.CSharp" Version="6.1.1" />
-    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
-    <PackageVersion Include="FluentMigrator" Version="5.2.0" />
-    <PackageVersion Include="FluentMigrator.Runner" Version="5.2.0" />
-    <PackageVersion Include="MessagePack" Version="2.5.140" />
-    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.0" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.1" />
+    <PackageVersion Include="FluentMigrator" Version="6.2.0" />
+    <PackageVersion Include="FluentMigrator.Runner" Version="6.2.0" />
+    <PackageVersion Include="MessagePack" Version="2.5.187" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
     <PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.8" />
-    <PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="8.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="8.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
     <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.8" />
-    <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" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.7.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.10.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageVersion Include="MySqlConnector" Version="2.3.6" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="NJsonSchema" Version="10.9.0" />
-    <PackageVersion Include="Npgsql" Version="8.0.2" />
-    <PackageVersion Include="NUnit" Version="4.1.0" />
-    <PackageVersion Include="NUnit.Analyzers" Version="4.1.0">
+    <PackageVersion Include="NJsonSchema" Version="11.0.2" />
+    <PackageVersion Include="NJsonSchema.NewtonsoftJson" Version="11.0.2" />
+    <PackageVersion Include="Npgsql" Version="8.0.5" />
+    <PackageVersion Include="NUnit" Version="4.2.2" />
+    <PackageVersion Include="NUnit.Analyzers" Version="4.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageVersion Include="OpenTelemetry" Version="1.8.0" />
-    <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.8.0" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageVersion Include="OpenTelemetry" Version="1.9.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.9.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.Jaeger" Version="1.5.1" />
-    <PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.8.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.9.0" />
     <PackageVersion Include="Paramore.Darker" Version="4.0.1" />
     <PackageVersion Include="Paramore.Darker.AspNetCore" Version="4.0.1" />
     <PackageVersion Include="Paramore.Darker.Policies" Version="4.0.1" />
     <PackageVersion Include="Paramore.Darker.QueryLogging" Version="4.0.1" />
-    <PackageVersion Include="Polly" Version="8.3.1" />
+    <PackageVersion Include="Polly" Version="8.4.2" />
     <PackageVersion Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
     <PackageVersion Include="Polly.Extensions.Http" Version="3.0.0" />
     <PackageVersion Include="RabbitMQ.Client" Version="6.8.1" />
-    <PackageVersion Include="Serilog" Version="3.1.1" />
+    <PackageVersion Include="Serilog" Version="4.1.0" />
     <PackageVersion Include="Serilog.Extensions.Hosting" Version="8.0.0" />
     <PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
-    <PackageVersion Include="Serilog.Sinks.Console" Version="5.0.1" />
-    <PackageVersion Include="Serilog.Sinks.TestCorrelator" Version="3.2.0" />
-    <PackageVersion Include="ServiceStack.Redis.Core" Version="8.2.2" />
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageVersion Include="Serilog.Sinks.TestCorrelator" Version="4.0.0" />
+    <PackageVersion Include="ServiceStack.Redis.Core" Version="8.4.0" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
     <PackageVersion Include="System.Reflection.TypeExtensions" Version="4.7.0" />
     <PackageVersion Include="System.Text.Json" Version="8.0.4" />
-    <PackageVersion Include="xunit" Version="2.7.1" />
+    <PackageVersion Include="xunit" Version="2.9.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/Paramore.Brighter.MessagingGateway.Kafka/ConfluentJsonSerializationConfig.cs b/src/Paramore.Brighter.MessagingGateway.Kafka/ConfluentJsonSerializationConfig.cs
@@ -27,6 +27,7 @@ THE SOFTWARE. */
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using NJsonSchema.Generation;
+using NJsonSchema.NewtonsoftJson.Generation;
 
 namespace Paramore.Brighter.MessagingGateway.Kafka
 {
@@ -43,11 +44,11 @@ public static JsonSerializerConfig SerdesJsonSerializerConfig()
             };
         }
 
-        public static JsonSchemaGeneratorSettings NJsonSchemaGeneratorSettings()
+        public static NewtonsoftJsonSchemaGeneratorSettings NJsonSchemaGeneratorSettings()
         {
             var resolver = new DefaultContractResolver { NamingStrategy = new CamelCaseNamingStrategy() };
 
-            return new JsonSchemaGeneratorSettings
+            return new NewtonsoftJsonSchemaGeneratorSettings()
             {
                 FlattenInheritanceHierarchy = true,
                 SerializerSettings = new JsonSerializerSettings

diff --git a/src/Paramore.Brighter.MessagingGateway.Kafka/Paramore.Brighter.MessagingGateway.Kafka.csproj b/src/Paramore.Brighter.MessagingGateway.Kafka/Paramore.Brighter.MessagingGateway.Kafka.csproj
@@ -12,5 +12,6 @@
   <ItemGroup>
     <PackageReference Include="Confluent.Kafka" />
     <PackageReference Include="Confluent.SchemaRegistry.Serdes.Json" />
+    <PackageReference Include="NJsonSchema.NewtonsoftJson" />
   </ItemGroup>
 </Project>
diff --git a/tests/Paramore.Brighter.Core.Tests/Logging/When_A_Request_Logger_Is_In_The_Pipeline.cs b/tests/Paramore.Brighter.Core.Tests/Logging/When_A_Request_Logger_Is_In_The_Pipeline.cs
@@ -52,7 +52,7 @@ public void When_A_Request_Logger_Is_In_The_Pipeline()
                 //_should_log_the_type_of_handler_in_the_call
 
                 //TestCorrelator.GetLogEventsFromCurrentContext().Should().HaveCount(3);
-                TestCorrelator.GetLogEventsFromContextGuid(context.Guid)
+                TestCorrelator.GetLogEventsFromContextId(context.Id)
                     .Should().Contain(x => x.MessageTemplate.Text.StartsWith("Logging handler pipeline call"))
                     .Which.Properties["1"].ToString().Should().Be($"\"{typeof(MyCommand)}\"");
 

diff --git a/tests/Paramore.Brighter.Core.Tests/Logging/When_A_Request_Logger_Is_In_The_Pipeline_Async.cs b/tests/Paramore.Brighter.Core.Tests/Logging/When_A_Request_Logger_Is_In_The_Pipeline_Async.cs
@@ -50,7 +50,7 @@ public async Task When_A_Request_Logger_Is_In_The_Pipeline_Async()
 
                 //_should_log_the_request_handler_call
                 //_should_log_the_type_of_handler_in_the_call
-                TestCorrelator.GetLogEventsFromContextGuid(context.Guid)
+                TestCorrelator.GetLogEventsFromContextId(context.Id)
                     .Should().Contain(x => x.MessageTemplate.Text.StartsWith("Logging handler pipeline call"))
                     .Which.Properties["1"].ToString().Should().Be($"\"{typeof(MyCommand)}\"");