Update all whipstaff dependencies to v7.1.2 (#421)

* Update all whipstaff dependencies to v7.1.2 * Update WebApiServiceGeneratorProcessor.cs --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: David Vreony <dpvreony@users.noreply.github.com>
dpvreony · Dec 17, 2023 · e2ba452 · e2ba452
1 parent 75633be
commit e2ba452
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Dhgms.Nucleotide.GenerationTests/Dhgms.Nucleotide.SampleApp.csproj b/src/Dhgms.Nucleotide.GenerationTests/Dhgms.Nucleotide.SampleApp.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Whipstaff.AspNetCore" Version="7.0.5" />
-    <PackageReference Include="Whipstaff.Wpf" Version="7.0.5" />
-    <PackageReference Include="Whipstaff.Wpf.Mahapps" Version="7.0.5" />
+    <PackageReference Include="Whipstaff.AspNetCore" Version="7.1.2" />
+    <PackageReference Include="Whipstaff.Wpf" Version="7.1.2" />
+    <PackageReference Include="Whipstaff.Wpf.Mahapps" Version="7.1.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
   </ItemGroup>
 

diff --git a/src/Dhgms.Nucleotide.Generators/Features/WebApi/WebApiServiceGeneratorProcessor.cs b/src/Dhgms.Nucleotide.Generators/Features/WebApi/WebApiServiceGeneratorProcessor.cs
@@ -289,9 +289,10 @@ private MethodDeclarationSyntax GetOkActionResultDeclaration(string entityName,
                 returnStatement
             };
 
-            var parameters = GetParams(new []{ $"ResponseDtos.{camelAction}{entityName}ResponseDto {lowerAction}Response"});
+            var responseDtoType = $"ResponseDtos.{camelAction}{entityName}ResponseDto";
+            var parameters = GetParams(new []{ $"{responseDtoType} {lowerAction}Response"});
 
-            var returnType = SyntaxFactory.ParseTypeName("System.Threading.Tasks.Task<IActionResult>");
+            var returnType = SyntaxFactory.ParseTypeName($"System.Threading.Tasks.Task<ActionResult<{responseDtoType}>>");
             var declaration = SyntaxFactory.MethodDeclaration(returnType, methodName)
                 .WithParameterList(parameters)
                 .AddModifiers(SyntaxFactory.Token(SyntaxKind.ProtectedKeyword), SyntaxFactory.Token(SyntaxKind.AsyncKeyword), SyntaxFactory.Token(SyntaxKind.OverrideKeyword))