Merge branch 'main' of github.com:FoundatioFx/Foundatio.AzureServiceBus

FoundatioFx · Oct 14, 2024 · 9b3d13a · 9b3d13a
2 parents 7774c16 + 486d397
commit 9b3d13a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/build/common.props b/build/common.props
@@ -39,7 +39,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
     <PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" />
-    <PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="All" />
+    <PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Foundatio.AzureServiceBus/Foundatio.AzureServiceBus.csproj b/src/Foundatio.AzureServiceBus/Foundatio.AzureServiceBus.csproj
@@ -4,7 +4,7 @@
     <PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="5.0.0" />
     <PackageReference Include="Microsoft.Azure.ServiceBus" Version="5.2.0" />
 
-    <PackageReference Include="Foundatio" Version="11.0.2" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
+    <PackageReference Include="Foundatio" Version="11.0.5" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
 
     <!-- NOTE: Forcing minimum for security patch. Remove once SDK versions are updated -->
     <PackageReference Include="Microsoft.Rest.ClientRuntime" Condition="" Version="2.3.24" />

diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -6,13 +6,13 @@
     <NoWarn>$(NoWarn);CS1591;NU1701</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
-    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
 
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="All" />
 
-    <PackageReference Include="Foundatio.TestHarness" Version="11.0.2" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
+    <PackageReference Include="Foundatio.TestHarness" Version="11.0.5" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
     <ProjectReference Include="..\..\..\Foundatio\src\Foundatio.TestHarness\Foundatio.TestHarness.csproj" Condition="'$(ReferenceFoundatioSource)' == 'true'" />
   </ItemGroup>
 </Project>
diff --git a/tests/Foundatio.AzureServiceBus.Tests/Messaging/AzureServiceBusMessageBusTests.cs b/tests/Foundatio.AzureServiceBus.Tests/Messaging/AzureServiceBusMessageBusTests.cs
@@ -1,9 +1,8 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Foundatio.Messaging;
 using Foundatio.Tests.Messaging;
 using Foundatio.Tests.Utility;
-using Microsoft.Extensions.Logging;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -64,10 +63,15 @@ public override Task CanSendDerivedMessageAsync()
         return base.CanSendDerivedMessageAsync();
     }
 
+    [Fact]
+    public override Task CanSendMappedMessageAsync()
+    {
+        return base.CanSendMappedMessageAsync();
+    }
+
     [Fact]
     public override Task CanSendDelayedMessageAsync()
     {
-        Log.SetLogLevel<AzureServiceBusMessageBus>(LogLevel.Information);
         return base.CanSendDelayedMessageAsync();
     }
 
@@ -113,6 +117,12 @@ public override Task CanSubscribeToAllMessageTypesAsync()
         return base.CanSubscribeToAllMessageTypesAsync();
     }
 
+    [Fact]
+    public override Task CanSubscribeToRawMessagesAsync()
+    {
+        return base.CanSubscribeToRawMessagesAsync();
+    }
+
     [Fact]
     public override Task CanCancelSubscriptionAsync()
     {

diff --git a/tests/Foundatio.AzureServiceBus.Tests/Queues/AzureServiceBusQueueTests.cs b/tests/Foundatio.AzureServiceBus.Tests/Queues/AzureServiceBusQueueTests.cs
@@ -30,7 +30,7 @@ protected override IQueue<SimpleWorkItem> GetQueue(int retries = 1, TimeSpan? wo
             ? new RetryExponential(retryDelay.GetValueOrDefault(), retryDelay.GetValueOrDefault() + retryDelay.GetValueOrDefault(), retries + 1)
             : RetryPolicy.NoRetry;
 
-        _logger.LogDebug("Queue Id: {queueId}", _queueName);
+        _logger.LogDebug("Queue Id: {QueueId}", _queueName);
         return new AzureServiceBusQueue<SimpleWorkItem>(new AzureServiceBusQueueOptions<SimpleWorkItem>
         {
             ConnectionString = connectionString,