diff --git a/Directory.Packages.props b/Directory.Packages.props index 96b6cc89664..3d462c2589f 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,83 +4,84 @@ - - - - + + + + - + - + - + - - + + - + - - + + - + - - + + - + - + - - + + - - + + - - - - + + + + - - + + + - + diff --git a/src/MassTransit.Abstractions/MassTransit.Abstractions.csproj b/src/MassTransit.Abstractions/MassTransit.Abstractions.csproj index 468615cba7a..beca52e7792 100644 --- a/src/MassTransit.Abstractions/MassTransit.Abstractions.csproj +++ b/src/MassTransit.Abstractions/MassTransit.Abstractions.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 @@ -19,7 +19,7 @@ $(Description) - + diff --git a/src/MassTransit.Analyzers/CancellationTokenOverloadMethodAnalyzer.cs b/src/MassTransit.Analyzers/CancellationTokenOverloadMethodAnalyzer.cs index 1141803b9e5..eafbfd937d0 100644 --- a/src/MassTransit.Analyzers/CancellationTokenOverloadMethodAnalyzer.cs +++ b/src/MassTransit.Analyzers/CancellationTokenOverloadMethodAnalyzer.cs @@ -163,8 +163,12 @@ static bool IsValid(IArgumentOperation arg, ISymbol cancellationTokenSymbol) foreach (var arg in invocationOperation.Arguments.Where(x => IsValid(x, cancellationTokenSymbol))) { + if (arg.Parameter == null) + continue; + parameterIndex = invocationOperation.TargetMethod.Parameters.IndexOf(arg.Parameter); parameterName = arg.Parameter.Name; + return true; } diff --git a/src/MassTransit.Interop.NServiceBus/MassTransit.Interop.NServiceBus.csproj b/src/MassTransit.Interop.NServiceBus/MassTransit.Interop.NServiceBus.csproj index 4be2f5141cc..ea2e3d0111b 100644 --- a/src/MassTransit.Interop.NServiceBus/MassTransit.Interop.NServiceBus.csproj +++ b/src/MassTransit.Interop.NServiceBus/MassTransit.Interop.NServiceBus.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/MassTransit.Newtonsoft/MassTransit.Newtonsoft.csproj b/src/MassTransit.Newtonsoft/MassTransit.Newtonsoft.csproj index afe4a5dcbea..c1bd40b426a 100644 --- a/src/MassTransit.Newtonsoft/MassTransit.Newtonsoft.csproj +++ b/src/MassTransit.Newtonsoft/MassTransit.Newtonsoft.csproj @@ -7,7 +7,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/MassTransit.SignalR/MassTransit.SignalR.csproj b/src/MassTransit.SignalR/MassTransit.SignalR.csproj index 061de0af35c..73649feae32 100644 --- a/src/MassTransit.SignalR/MassTransit.SignalR.csproj +++ b/src/MassTransit.SignalR/MassTransit.SignalR.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 @@ -14,11 +14,11 @@ MassTransit SignalR Backplane support; $(Description) - + - + diff --git a/src/MassTransit.StateMachineVisualizer/MassTransit.StateMachineVisualizer.csproj b/src/MassTransit.StateMachineVisualizer/MassTransit.StateMachineVisualizer.csproj index d7938ae4ff7..264fe7a5470 100644 --- a/src/MassTransit.StateMachineVisualizer/MassTransit.StateMachineVisualizer.csproj +++ b/src/MassTransit.StateMachineVisualizer/MassTransit.StateMachineVisualizer.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/MassTransit.TestFramework/MassTransit.TestFramework.csproj b/src/MassTransit.TestFramework/MassTransit.TestFramework.csproj index c49580a7c31..b00b0fedd57 100644 --- a/src/MassTransit.TestFramework/MassTransit.TestFramework.csproj +++ b/src/MassTransit.TestFramework/MassTransit.TestFramework.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/MassTransit/MassTransit.csproj b/src/MassTransit/MassTransit.csproj index c3fba66248a..4dcfbd82246 100644 --- a/src/MassTransit/MassTransit.csproj +++ b/src/MassTransit/MassTransit.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 @@ -14,13 +14,13 @@ $(Description) - + - + diff --git a/src/Persistence/MassTransit.Azure.Cosmos/MassTransit.Azure.Cosmos.csproj b/src/Persistence/MassTransit.Azure.Cosmos/MassTransit.Azure.Cosmos.csproj index df735d6ae92..2077a941104 100644 --- a/src/Persistence/MassTransit.Azure.Cosmos/MassTransit.Azure.Cosmos.csproj +++ b/src/Persistence/MassTransit.Azure.Cosmos/MassTransit.Azure.Cosmos.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/Persistence/MassTransit.Azure.Storage/MassTransit.Azure.Storage.csproj b/src/Persistence/MassTransit.Azure.Storage/MassTransit.Azure.Storage.csproj index eed8c93cf56..b30f79a2777 100644 --- a/src/Persistence/MassTransit.Azure.Storage/MassTransit.Azure.Storage.csproj +++ b/src/Persistence/MassTransit.Azure.Storage/MassTransit.Azure.Storage.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/Persistence/MassTransit.Azure.Table/MassTransit.Azure.Table.csproj b/src/Persistence/MassTransit.Azure.Table/MassTransit.Azure.Table.csproj index deab2acbbf5..777e8568587 100644 --- a/src/Persistence/MassTransit.Azure.Table/MassTransit.Azure.Table.csproj +++ b/src/Persistence/MassTransit.Azure.Table/MassTransit.Azure.Table.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/Persistence/MassTransit.DapperIntegration/MassTransit.DapperIntegration.csproj b/src/Persistence/MassTransit.DapperIntegration/MassTransit.DapperIntegration.csproj index aa0a7cdbc61..d4327b31899 100644 --- a/src/Persistence/MassTransit.DapperIntegration/MassTransit.DapperIntegration.csproj +++ b/src/Persistence/MassTransit.DapperIntegration/MassTransit.DapperIntegration.csproj @@ -5,7 +5,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/Persistence/MassTransit.DynamoDbIntegration/MassTransit.DynamoDbIntegration.csproj b/src/Persistence/MassTransit.DynamoDbIntegration/MassTransit.DynamoDbIntegration.csproj index 9f5d205e591..43dd63a3c44 100644 --- a/src/Persistence/MassTransit.DynamoDbIntegration/MassTransit.DynamoDbIntegration.csproj +++ b/src/Persistence/MassTransit.DynamoDbIntegration/MassTransit.DynamoDbIntegration.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/Persistence/MassTransit.EntityFrameworkIntegration/MassTransit.EntityFrameworkIntegration.csproj b/src/Persistence/MassTransit.EntityFrameworkIntegration/MassTransit.EntityFrameworkIntegration.csproj index 42e2ef1fb61..dc7ebe05db4 100644 --- a/src/Persistence/MassTransit.EntityFrameworkIntegration/MassTransit.EntityFrameworkIntegration.csproj +++ b/src/Persistence/MassTransit.EntityFrameworkIntegration/MassTransit.EntityFrameworkIntegration.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/Persistence/MassTransit.MartenIntegration/MassTransit.MartenIntegration.csproj b/src/Persistence/MassTransit.MartenIntegration/MassTransit.MartenIntegration.csproj index 45cdc07c5c4..484038b947d 100644 --- a/src/Persistence/MassTransit.MartenIntegration/MassTransit.MartenIntegration.csproj +++ b/src/Persistence/MassTransit.MartenIntegration/MassTransit.MartenIntegration.csproj @@ -5,7 +5,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/Persistence/MassTransit.MongoDbIntegration/MassTransit.MongoDbIntegration.csproj b/src/Persistence/MassTransit.MongoDbIntegration/MassTransit.MongoDbIntegration.csproj index c652224e966..45649329eb5 100644 --- a/src/Persistence/MassTransit.MongoDbIntegration/MassTransit.MongoDbIntegration.csproj +++ b/src/Persistence/MassTransit.MongoDbIntegration/MassTransit.MongoDbIntegration.csproj @@ -5,7 +5,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/Persistence/MassTransit.NHibernateIntegration/MassTransit.NHibernateIntegration.csproj b/src/Persistence/MassTransit.NHibernateIntegration/MassTransit.NHibernateIntegration.csproj index f1736da6795..055646cc5a8 100644 --- a/src/Persistence/MassTransit.NHibernateIntegration/MassTransit.NHibernateIntegration.csproj +++ b/src/Persistence/MassTransit.NHibernateIntegration/MassTransit.NHibernateIntegration.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/Persistence/MassTransit.RedisIntegration/MassTransit.RedisIntegration.csproj b/src/Persistence/MassTransit.RedisIntegration/MassTransit.RedisIntegration.csproj index 3b550f8e813..aae64a10690 100644 --- a/src/Persistence/MassTransit.RedisIntegration/MassTransit.RedisIntegration.csproj +++ b/src/Persistence/MassTransit.RedisIntegration/MassTransit.RedisIntegration.csproj @@ -5,7 +5,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/Scheduling/MassTransit.HangfireIntegration/MassTransit.HangfireIntegration.csproj b/src/Scheduling/MassTransit.HangfireIntegration/MassTransit.HangfireIntegration.csproj index 63432aca487..6b8ca5e4388 100644 --- a/src/Scheduling/MassTransit.HangfireIntegration/MassTransit.HangfireIntegration.csproj +++ b/src/Scheduling/MassTransit.HangfireIntegration/MassTransit.HangfireIntegration.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/Transports/MassTransit.ActiveMqTransport/MassTransit.ActiveMqTransport.csproj b/src/Transports/MassTransit.ActiveMqTransport/MassTransit.ActiveMqTransport.csproj index b2295077c34..c1a953047be 100644 --- a/src/Transports/MassTransit.ActiveMqTransport/MassTransit.ActiveMqTransport.csproj +++ b/src/Transports/MassTransit.ActiveMqTransport/MassTransit.ActiveMqTransport.csproj @@ -5,7 +5,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/Transports/MassTransit.AmazonSqsTransport/MassTransit.AmazonSqsTransport.csproj b/src/Transports/MassTransit.AmazonSqsTransport/MassTransit.AmazonSqsTransport.csproj index 3a36930a767..d4a73ee1b8f 100644 --- a/src/Transports/MassTransit.AmazonSqsTransport/MassTransit.AmazonSqsTransport.csproj +++ b/src/Transports/MassTransit.AmazonSqsTransport/MassTransit.AmazonSqsTransport.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/Transports/MassTransit.Azure.ServiceBus.Core/MassTransit.Azure.ServiceBus.Core.csproj b/src/Transports/MassTransit.Azure.ServiceBus.Core/MassTransit.Azure.ServiceBus.Core.csproj index fcd030870c6..15f7c33e4a8 100644 --- a/src/Transports/MassTransit.Azure.ServiceBus.Core/MassTransit.Azure.ServiceBus.Core.csproj +++ b/src/Transports/MassTransit.Azure.ServiceBus.Core/MassTransit.Azure.ServiceBus.Core.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/Transports/MassTransit.EventHubIntegration/MassTransit.EventHubIntegration.csproj b/src/Transports/MassTransit.EventHubIntegration/MassTransit.EventHubIntegration.csproj index 7e5c3abb36c..50e11bf54e5 100644 --- a/src/Transports/MassTransit.EventHubIntegration/MassTransit.EventHubIntegration.csproj +++ b/src/Transports/MassTransit.EventHubIntegration/MassTransit.EventHubIntegration.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/Transports/MassTransit.GrpcTransport/MassTransit.GrpcTransport.csproj b/src/Transports/MassTransit.GrpcTransport/MassTransit.GrpcTransport.csproj index 4b2a6a4ad56..7eb6543c835 100644 --- a/src/Transports/MassTransit.GrpcTransport/MassTransit.GrpcTransport.csproj +++ b/src/Transports/MassTransit.GrpcTransport/MassTransit.GrpcTransport.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/Transports/MassTransit.KafkaIntegration/MassTransit.KafkaIntegration.csproj b/src/Transports/MassTransit.KafkaIntegration/MassTransit.KafkaIntegration.csproj index f70fc1ff08b..698efe9ec4e 100644 --- a/src/Transports/MassTransit.KafkaIntegration/MassTransit.KafkaIntegration.csproj +++ b/src/Transports/MassTransit.KafkaIntegration/MassTransit.KafkaIntegration.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/Transports/MassTransit.RabbitMqTransport/MassTransit.RabbitMqTransport.csproj b/src/Transports/MassTransit.RabbitMqTransport/MassTransit.RabbitMqTransport.csproj index 2b595099c94..98baa49156b 100644 --- a/src/Transports/MassTransit.RabbitMqTransport/MassTransit.RabbitMqTransport.csproj +++ b/src/Transports/MassTransit.RabbitMqTransport/MassTransit.RabbitMqTransport.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 @@ -21,15 +21,19 @@ - - + + + + + + - + - + diff --git a/src/Transports/MassTransit.WebJobs.EventHubsIntegration/MassTransit.WebJobs.EventHubsIntegration.csproj b/src/Transports/MassTransit.WebJobs.EventHubsIntegration/MassTransit.WebJobs.EventHubsIntegration.csproj index e153132bed0..2c2e0c80c76 100644 --- a/src/Transports/MassTransit.WebJobs.EventHubsIntegration/MassTransit.WebJobs.EventHubsIntegration.csproj +++ b/src/Transports/MassTransit.WebJobs.EventHubsIntegration/MassTransit.WebJobs.EventHubsIntegration.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/src/Transports/MassTransit.WebJobs.ServiceBusIntegration/MassTransit.WebJobs.ServiceBusIntegration.csproj b/src/Transports/MassTransit.WebJobs.ServiceBusIntegration/MassTransit.WebJobs.ServiceBusIntegration.csproj index bed9c6cad8c..c7e172ca884 100644 --- a/src/Transports/MassTransit.WebJobs.ServiceBusIntegration/MassTransit.WebJobs.ServiceBusIntegration.csproj +++ b/src/Transports/MassTransit.WebJobs.ServiceBusIntegration/MassTransit.WebJobs.ServiceBusIntegration.csproj @@ -6,7 +6,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/tests/MassTransit.Abstractions.Tests/MassTransit.Abstractions.Tests.csproj b/tests/MassTransit.Abstractions.Tests/MassTransit.Abstractions.Tests.csproj index 4ffac2fc87f..d5546c2a95a 100644 --- a/tests/MassTransit.Abstractions.Tests/MassTransit.Abstractions.Tests.csproj +++ b/tests/MassTransit.Abstractions.Tests/MassTransit.Abstractions.Tests.csproj @@ -5,7 +5,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/tests/MassTransit.ActiveMqTransport.Tests/MassTransit.ActiveMqTransport.Tests.csproj b/tests/MassTransit.ActiveMqTransport.Tests/MassTransit.ActiveMqTransport.Tests.csproj index 1a25815cae0..784e7a222d7 100644 --- a/tests/MassTransit.ActiveMqTransport.Tests/MassTransit.ActiveMqTransport.Tests.csproj +++ b/tests/MassTransit.ActiveMqTransport.Tests/MassTransit.ActiveMqTransport.Tests.csproj @@ -5,7 +5,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/tests/MassTransit.AmazonSqsTransport.Tests/MassTransit.AmazonSqsTransport.Tests.csproj b/tests/MassTransit.AmazonSqsTransport.Tests/MassTransit.AmazonSqsTransport.Tests.csproj index 74400605171..aa46a802592 100644 --- a/tests/MassTransit.AmazonSqsTransport.Tests/MassTransit.AmazonSqsTransport.Tests.csproj +++ b/tests/MassTransit.AmazonSqsTransport.Tests/MassTransit.AmazonSqsTransport.Tests.csproj @@ -5,7 +5,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/tests/MassTransit.GrpcTransport.Tests/MassTransit.GrpcTransport.Tests.csproj b/tests/MassTransit.GrpcTransport.Tests/MassTransit.GrpcTransport.Tests.csproj index c396c04aaf0..9375a3e12ef 100644 --- a/tests/MassTransit.GrpcTransport.Tests/MassTransit.GrpcTransport.Tests.csproj +++ b/tests/MassTransit.GrpcTransport.Tests/MassTransit.GrpcTransport.Tests.csproj @@ -5,7 +5,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/tests/MassTransit.RabbitMqTransport.Tests/MassTransit.RabbitMqTransport.Tests.csproj b/tests/MassTransit.RabbitMqTransport.Tests/MassTransit.RabbitMqTransport.Tests.csproj index f48ed11a8db..8ae0d198781 100644 --- a/tests/MassTransit.RabbitMqTransport.Tests/MassTransit.RabbitMqTransport.Tests.csproj +++ b/tests/MassTransit.RabbitMqTransport.Tests/MassTransit.RabbitMqTransport.Tests.csproj @@ -5,7 +5,7 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 diff --git a/tests/MassTransit.Tests/MassTransit.Tests.csproj b/tests/MassTransit.Tests/MassTransit.Tests.csproj index db2c512f3ed..9bf4b600499 100644 --- a/tests/MassTransit.Tests/MassTransit.Tests.csproj +++ b/tests/MassTransit.Tests/MassTransit.Tests.csproj @@ -5,10 +5,10 @@ - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 - +