update changelog

Author: mookid8000

CHANGELOG.md

@@ -179,11 +179,16 @@ Changelog
 ## 10.4.1
 * Fix ability to "leave the topics along" - thanks [rafilsk0]
 
+## 10.5.0
+* Add cancellation support to individual messages for cancellation when lease renewal fails - thanks [hdrachmann]
+* Update to Rebus 8.9.0
+
 [benne]: https://github.com/benne
 [binick]: https://github.com/binick
 [eeskildsen]: https://github.com/eeskildsen
 [ehabelgindy]: https://github.com/ehabelgindy
 [georgechond94]: https://github.com/georgechond94
+[hdrachmann]: https://github.com/hdrachmann
 [hjalle]: https://github.com/hjalle
 [jorgenbosman]: https://github.com/jorgenbosman
 [jr01]: https://github.com/jr01

Rebus.AzureServiceBus.Tests/Rebus.AzureServiceBus.Tests.csproj

@@ -7,13 +7,13 @@
 		<ProjectReference Include="..\Rebus.AzureServiceBus\Rebus.AzureServiceBus.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="microsoft.net.test.sdk" Version="17.13.0" />
-		<PackageReference Include="nunit" Version="3.14.0" />
-		<PackageReference Include="NUnit3TestAdapter" Version="5.0.0">
+		<PackageReference Include="microsoft.net.test.sdk" Version="18.0.0" />
+		<PackageReference Include="nunit" Version="4.4.0" />
+		<PackageReference Include="NUnit3TestAdapter" Version="5.2.0">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="rebus.tests.contracts" Version="8.2.6" />
+		<PackageReference Include="rebus.tests.contracts" Version="8.9.1" />
 	</ItemGroup>
 	<ItemGroup>
 		<None Update="asb_connection_string.txt">

Rebus.AzureServiceBus/AzureServiceBus/AzureServiceBusTransport.cs

@@ -618,7 +618,11 @@ public async Task<TransportMessage> Receive(ITransactionContext context, Cancell
         var messageReceiver = receivedMessage.MessageReceiver;
 
         var renewFailedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, _cancellationToken);
-        _messageRenewerTokenSources.AddOrUpdate(message.MessageId, renewFailedTokenSource, (_, _) => renewFailedTokenSource);
+        if (!_messageRenewerTokenSources.TryAdd(message.MessageId, renewFailedTokenSource))
+        {
+            // should never happen though
+            renewFailedTokenSource.Dispose();
+        }
 
         var items = context.Items;
         // add the message and its receiver to the context
@@ -641,8 +645,10 @@ public async Task<TransportMessage> Receive(ITransactionContext context, Cancell
 
         context.OnAck(async ctx =>
         {
-            _messageRenewerTokenSources.TryRemove(messageId, out var tokenSource);
-            tokenSource?.Dispose();
+            if (_messageRenewerTokenSources.TryRemove(messageId, out var tokenSource))
+            {
+                tokenSource.Dispose();
+            }
             _messageLockRenewers.TryRemove(messageId, out _);
 
             // only ACK the message if it's still in the context - this way, carefully crafted
@@ -670,8 +676,10 @@ await messageReceiver
 
         context.OnNack(async ctx =>
         {
-            _messageRenewerTokenSources.TryRemove(messageId, out var tokenSource);
-            tokenSource?.Dispose();
+            if (_messageRenewerTokenSources.TryRemove(messageId, out var tokenSource))
+            {
+                tokenSource.Dispose();
+            }
             _messageLockRenewers.TryRemove(messageId, out _);
 
             // only NACK the message if it's still in the context - this way, carefully crafted
@@ -702,8 +710,10 @@ await messageReceiver.AbandonMessageAsync(
 
         context.OnDisposed(ctx =>
         {
-            _messageRenewerTokenSources.TryRemove(messageId, out var tokenSource);
-            tokenSource?.Dispose();
+            if (_messageRenewerTokenSources.TryRemove(messageId, out var tokenSource))
+            {
+                tokenSource.Dispose();
+            }
             _messageLockRenewers.TryRemove(messageId, out _);
         });
 

Rebus.AzureServiceBus/Rebus.AzureServiceBus.csproj

@@ -16,9 +16,9 @@
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="azure.identity" Version="1.13.2" />
-		<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.4" />
-		<PackageReference Include="Rebus" Version="8.8.0" />
+		<PackageReference Include="azure.identity" Version="1.17.0" />
+		<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.20.1" />
+		<PackageReference Include="Rebus" Version="8.9.0" />
 	</ItemGroup>
 	<ItemGroup>
 		<None Include="..\artwork\little_rebusbus2_copy-500x500.png">