From 5910e8b34a7cd09ca2499189eef27ffb2330059a Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Wed, 19 May 2021 11:55:29 +0100 Subject: [PATCH] Update all dependencies Note that the ASP.NET Core dependencies are slightly complicated - see #142. I'm also *somewhat* alarmed by the release notes of MQTTnet, which contain a lot of breaking changes within patch versions... Signed-off-by: Jon Skeet --- samples/HttpSend/HttpSend.csproj | 5 +---- .../CloudNative.CloudEvents.Amqp.csproj | 7 ++----- .../CloudNative.CloudEvents.AspNetCore.csproj | 7 ++----- .../CloudNative.CloudEvents.Avro.csproj | 10 +--------- .../CloudNative.CloudEvents.Kafka.csproj | 5 +---- .../CloudNative.CloudEvents.Mqtt.csproj | 5 +---- .../CloudNative.CloudEvents.NewtonsoftJson.csproj | 6 ++---- .../CloudNative.CloudEvents.SystemTextJson.csproj | 2 +- .../CloudNative.CloudEvents.UnitTests.csproj | 9 ++++----- .../CloudNative.CloudEvents.UnitTests/Mqtt/MqttTest.cs | 6 ++++-- 10 files changed, 19 insertions(+), 43 deletions(-) diff --git a/samples/HttpSend/HttpSend.csproj b/samples/HttpSend/HttpSend.csproj index 1172160..cdd4e08 100644 --- a/samples/HttpSend/HttpSend.csproj +++ b/samples/HttpSend/HttpSend.csproj @@ -6,10 +6,7 @@ - - - - + diff --git a/src/CloudNative.CloudEvents.Amqp/CloudNative.CloudEvents.Amqp.csproj b/src/CloudNative.CloudEvents.Amqp/CloudNative.CloudEvents.Amqp.csproj index 867e838..01cf84f 100644 --- a/src/CloudNative.CloudEvents.Amqp/CloudNative.CloudEvents.Amqp.csproj +++ b/src/CloudNative.CloudEvents.Amqp/CloudNative.CloudEvents.Amqp.csproj @@ -7,11 +7,8 @@ - - - - - + + diff --git a/src/CloudNative.CloudEvents.AspNetCore/CloudNative.CloudEvents.AspNetCore.csproj b/src/CloudNative.CloudEvents.AspNetCore/CloudNative.CloudEvents.AspNetCore.csproj index 31692ce..c0007ef 100644 --- a/src/CloudNative.CloudEvents.AspNetCore/CloudNative.CloudEvents.AspNetCore.csproj +++ b/src/CloudNative.CloudEvents.AspNetCore/CloudNative.CloudEvents.AspNetCore.csproj @@ -6,11 +6,8 @@ - - - - - + + diff --git a/src/CloudNative.CloudEvents.Avro/CloudNative.CloudEvents.Avro.csproj b/src/CloudNative.CloudEvents.Avro/CloudNative.CloudEvents.Avro.csproj index 7085393..a143f10 100644 --- a/src/CloudNative.CloudEvents.Avro/CloudNative.CloudEvents.Avro.csproj +++ b/src/CloudNative.CloudEvents.Avro/CloudNative.CloudEvents.Avro.csproj @@ -9,18 +9,10 @@ - - - - - + - - - - diff --git a/src/CloudNative.CloudEvents.Kafka/CloudNative.CloudEvents.Kafka.csproj b/src/CloudNative.CloudEvents.Kafka/CloudNative.CloudEvents.Kafka.csproj index 2805aa2..b2d4ed0 100644 --- a/src/CloudNative.CloudEvents.Kafka/CloudNative.CloudEvents.Kafka.csproj +++ b/src/CloudNative.CloudEvents.Kafka/CloudNative.CloudEvents.Kafka.csproj @@ -6,10 +6,7 @@ - - - - + diff --git a/src/CloudNative.CloudEvents.Mqtt/CloudNative.CloudEvents.Mqtt.csproj b/src/CloudNative.CloudEvents.Mqtt/CloudNative.CloudEvents.Mqtt.csproj index 00e82ba..b42dc29 100644 --- a/src/CloudNative.CloudEvents.Mqtt/CloudNative.CloudEvents.Mqtt.csproj +++ b/src/CloudNative.CloudEvents.Mqtt/CloudNative.CloudEvents.Mqtt.csproj @@ -6,10 +6,7 @@ - - - - + diff --git a/src/CloudNative.CloudEvents.NewtonsoftJson/CloudNative.CloudEvents.NewtonsoftJson.csproj b/src/CloudNative.CloudEvents.NewtonsoftJson/CloudNative.CloudEvents.NewtonsoftJson.csproj index e265bda..01d7446 100644 --- a/src/CloudNative.CloudEvents.NewtonsoftJson/CloudNative.CloudEvents.NewtonsoftJson.csproj +++ b/src/CloudNative.CloudEvents.NewtonsoftJson/CloudNative.CloudEvents.NewtonsoftJson.csproj @@ -7,10 +7,8 @@ - - - - + + diff --git a/src/CloudNative.CloudEvents.SystemTextJson/CloudNative.CloudEvents.SystemTextJson.csproj b/src/CloudNative.CloudEvents.SystemTextJson/CloudNative.CloudEvents.SystemTextJson.csproj index 21523f6..d60723a 100644 --- a/src/CloudNative.CloudEvents.SystemTextJson/CloudNative.CloudEvents.SystemTextJson.csproj +++ b/src/CloudNative.CloudEvents.SystemTextJson/CloudNative.CloudEvents.SystemTextJson.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/CloudNative.CloudEvents.UnitTests/CloudNative.CloudEvents.UnitTests.csproj b/test/CloudNative.CloudEvents.UnitTests/CloudNative.CloudEvents.UnitTests.csproj index 7507968..93f20b1 100644 --- a/test/CloudNative.CloudEvents.UnitTests/CloudNative.CloudEvents.UnitTests.csproj +++ b/test/CloudNative.CloudEvents.UnitTests/CloudNative.CloudEvents.UnitTests.csproj @@ -6,15 +6,14 @@ - - - - + + + all runtime; build; native; contentfiles; analyzers - + diff --git a/test/CloudNative.CloudEvents.UnitTests/Mqtt/MqttTest.cs b/test/CloudNative.CloudEvents.UnitTests/Mqtt/MqttTest.cs index 7c45760..c4a5043 100644 --- a/test/CloudNative.CloudEvents.UnitTests/Mqtt/MqttTest.cs +++ b/test/CloudNative.CloudEvents.UnitTests/Mqtt/MqttTest.cs @@ -5,6 +5,8 @@ using CloudNative.CloudEvents.NewtonsoftJson; using MQTTnet; using MQTTnet.Client; +using MQTTnet.Client.Options; +using MQTTnet.Client.Receiving; using MQTTnet.Server; using System; using System.Net.Mime; @@ -59,8 +61,8 @@ namespace CloudNative.CloudEvents.Mqtt.UnitTests TaskCompletionSource tcs = new TaskCompletionSource(); await client.ConnectAsync(options); - client.ApplicationMessageReceived += (sender, args) => - tcs.SetResult(args.ApplicationMessage.ToCloudEvent(jsonEventFormatter)); + client.ApplicationMessageReceivedHandler = new MqttApplicationMessageReceivedHandlerDelegate( + args => tcs.SetResult(args.ApplicationMessage.ToCloudEvent(jsonEventFormatter))); var result = await client.SubscribeAsync("abc"); await client.PublishAsync(cloudEvent.ToMqttApplicationMessage(ContentMode.Structured, new JsonEventFormatter(), topic: "abc"));