Making sure that Wolverine.HTTP can flush cascading messages when usi…

…ng a non-Marten message storage. Closes GH-1184
JasperFx · Dec 28, 2024 · bac2472 · bac2472
1 parent 82277c0
commit bac2472
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/src/Http/Wolverine.Http/HttpChain.Codegen.cs b/src/Http/Wolverine.Http/HttpChain.Codegen.cs
@@ -146,7 +146,7 @@ internal IEnumerable<Frame> DetermineFrames(GenerationRules rules)
             .Select(x => x.ReturnAction(this)).SelectMany(x => x.Frames()).ToArray();
         foreach (var frame in actionsOnOtherReturnValues) yield return frame;
 
-        if (Postprocessors.Any(x => x.MaySendMessages()))
+        if (Postprocessors.Concat(actionsOnOtherReturnValues).Any(x => x.MaySendMessages()))
         {
             var flush = Postprocessors.OfType<FlushOutgoingMessages>().FirstOrDefault();
             if (flush != null)

diff --git a/src/Samples/EFCoreSample/ItemService.Tests/ItemService.Tests.csproj b/src/Samples/EFCoreSample/ItemService.Tests/ItemService.Tests.csproj
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+    <PropertyGroup>
+        <TargetFrameworks>net9.0</TargetFrameworks>
+    </PropertyGroup>
+
     <PropertyGroup>
         <IsPackable>false</IsPackable>
     </PropertyGroup>

diff --git a/src/Samples/EFCoreSample/ItemService.Tests/end_to_end.cs b/src/Samples/EFCoreSample/ItemService.Tests/end_to_end.cs
@@ -69,7 +69,7 @@ await host.Scenario(x =>
                 x.Post.Json(command).ToUrl("/items/create4");
                 x.StatusCodeShouldBe(204);
             });
-        });
+        }); 
 
         tracked.FindSingleTrackedMessageOfType<ItemCreated>()
             .ShouldNotBeNull();

diff --git a/src/Samples/EFCoreSample/ItemService/ItemService.csproj b/src/Samples/EFCoreSample/ItemService/ItemService.csproj
@@ -1,8 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-
+    <PropertyGroup>
+        <TargetFrameworks>net9.0</TargetFrameworks>
+    </PropertyGroup>
+
     <ItemGroup>
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0"/>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.1"/>
     </ItemGroup>
 
     <ItemGroup>
@@ -11,4 +13,16 @@
         <ProjectReference Include="..\..\..\Persistence\Wolverine.SqlServer\Wolverine.SqlServer.csproj"/>
     </ItemGroup>
 
+    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[7.0.1, 9.0.0)"/>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11"/>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0"/>
+    </ItemGroup>
+
 </Project>