Merge pull request #70 from marcominerva/develop

marcominerva · web-flow · commit a91cdf273cdc · 2025-01-15T17:06:12.000+01:00
Update services, middleware, and target frameworks
diff --git a/samples/Controllers/OperationResults.Sample/Program.cs b/samples/Controllers/OperationResults.Sample/Program.cs
@@ -41,10 +41,14 @@
 
 builder.Services.AddRequestLocalization("en", "it");
 
+builder.Services.AddDefaultProblemDetails();
+builder.Services.AddDefaultExceptionHandler();
+
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen(options =>
 {
     options.AddAcceptLanguageHeader();
+    options.AddDefaultResponse();
 });
 
 var app = builder.Build();
@@ -58,9 +62,10 @@
     app.UseSwaggerUI();
 }
 
-app.UseRequestLocalization();
+app.UseExceptionHandler();
+app.UseStatusCodePages();
 
-app.UseAuthorization();
+app.UseRequestLocalization();
 
 app.MapControllers();
 
diff --git a/samples/MinimalApis/OperationResults.Sample/OperationResults.Sample.csproj b/samples/MinimalApis/OperationResults.Sample/OperationResults.Sample.csproj
@@ -9,6 +9,8 @@
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.1" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.1" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
+        <PackageReference Include="TinyHelpers.AspNetCore" Version="4.0.15" />
+        <PackageReference Include="TinyHelpers.AspNetCore.Swashbuckle" Version="4.0.8" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/samples/MinimalApis/OperationResults.Sample/Program.cs b/samples/MinimalApis/OperationResults.Sample/Program.cs
@@ -7,6 +7,8 @@
 using OperationResults.Sample.BusinessLayer.Services.Interfaces;
 using OperationResults.Sample.DataAccessLayer;
 using OperationResults.Sample.Shared.Models;
+using TinyHelpers.AspNetCore.Extensions;
+using TinyHelpers.AspNetCore.Swagger;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -34,10 +36,17 @@
     //options.MapStatusCodes = false;
 });
 
-builder.Services.AddProblemDetails();
+builder.Services.AddRequestLocalization("en", "it");
+
+builder.Services.AddDefaultProblemDetails();
+builder.Services.AddDefaultExceptionHandler();
 
 builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
+builder.Services.AddSwaggerGen(options =>
+{
+    options.AddAcceptLanguageHeader();
+    options.AddDefaultResponse();
+});
 
 var app = builder.Build();
 
@@ -53,6 +62,8 @@
     app.UseSwaggerUI();
 }
 
+app.UseRequestLocalization();
+
 var peopleApi = app.MapGroup("api/people");
 
 peopleApi.MapGet("/", async (IPeopleService peopleService, HttpContext httpContext) =>
diff --git a/src/OperationResults.AspNetCore.Http/OperationResultExtensions.cs b/src/OperationResults.AspNetCore.Http/OperationResultExtensions.cs
@@ -13,11 +13,7 @@ public static IResult ToResponse(this Result result, HttpContext httpContext, in
     {
         if (result.Success)
         {
-#if NET6_0
-            return Results.StatusCode(successStatusCode.GetValueOrDefault(StatusCodes.Status204NoContent));
-#else
             return TypedResults.StatusCode(successStatusCode.GetValueOrDefault(StatusCodes.Status204NoContent));
-#endif
         }
 
         return Problem(httpContext, result.FailureReason, null, result.ErrorMessage, result.ErrorDetail, result.ValidationErrors);
@@ -28,12 +24,7 @@ public static IResult ToResponse(this Result result, HttpContext httpContext, st
         if (result.Success)
         {
             var routeValueDictionary = new RouteValueDictionary(routeValues);
-
-#if NET6_0
-            return Results.CreatedAtRoute(routeName, routeValues);
-#else
             return TypedResults.CreatedAtRoute(routeName, routeValues);
-#endif
         }
 
         return Problem(httpContext, result.FailureReason, null, result.ErrorMessage, result.ErrorDetail, result.ValidationErrors);
@@ -51,42 +42,21 @@ public static IResult ToResponse<T>(this Result<T> result, HttpContext httpConte
                 if (!string.IsNullOrWhiteSpace(routeName))
                 {
                     var routeValueDictionary = new RouteValueDictionary(routeValues);
-
-#if NET6_0
-                    return Results.CreatedAtRoute(routeName, routeValues, result.Content);
-#else
                     return TypedResults.CreatedAtRoute(result.Content, routeName, routeValues);
-#endif
                 }
                 else if (result.Content is StreamFileContent streamFileContent)
                 {
-#if NET6_0
-                    return Results.Stream(streamFileContent.Content, streamFileContent.ContentType, streamFileContent.DownloadFileName);
-#else
                     return TypedResults.Stream(streamFileContent.Content, streamFileContent.ContentType, streamFileContent.DownloadFileName);
-#endif
                 }
                 else if (result.Content is ByteArrayFileContent byteArrayFileContent)
                 {
-#if NET6_0
-                    return Results.File(byteArrayFileContent.Content, byteArrayFileContent.ContentType, byteArrayFileContent.DownloadFileName);
-#else
                     return TypedResults.File(byteArrayFileContent.Content, byteArrayFileContent.ContentType, byteArrayFileContent.DownloadFileName);
-#endif
                 }
 
-#if NET6_0
-                return Results.Json(result.Content, statusCode: successStatusCode.GetValueOrDefault(StatusCodes.Status200OK));
-#else
                 return TypedResults.Json(result.Content, statusCode: successStatusCode.GetValueOrDefault(StatusCodes.Status200OK));
-#endif
             }
 
-#if NET6_0
-            return Results.StatusCode(successStatusCode.GetValueOrDefault(StatusCodes.Status204NoContent));
-#else
             return TypedResults.StatusCode(successStatusCode.GetValueOrDefault(StatusCodes.Status204NoContent));
-#endif
         }
 
         return Problem(httpContext, result.FailureReason, result.Content, result.ErrorMessage, result.ErrorDetail, result.ValidationErrors);
@@ -99,11 +69,7 @@ private static IResult Problem(HttpContext httpContext, int failureReason, objec
 
         if (content is not null)
         {
-#if NET6_0
-            return Results.Json(content, statusCode: statusCode);
-#else
             return TypedResults.Json(content, statusCode: statusCode);
-#endif
         }
 
         var problemDetails = new ProblemDetails
@@ -129,13 +95,9 @@ private static IResult Problem(HttpContext httpContext, int failureReason, objec
             }
         }
 
-#if NET6_0
-        return Results.Problem(problemDetails);
-#else
         var problemResult = TypedResults.Problem(problemDetails);
         problemResult.ProblemDetails.Type ??= $"https://httpstatuses.io/{statusCode}";
 
         return problemResult;
-#endif
     }
 }
diff --git a/src/OperationResults.AspNetCore.Http/OperationResults.AspNetCore.Http.csproj b/src/OperationResults.AspNetCore.Http/OperationResults.AspNetCore.Http.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Authors>Marco Minerva</Authors>
@@ -25,7 +25,7 @@
     </ItemGroup>
 
     <ItemGroup>        
-        <PackageReference Include="OperationResultTools" Version="1.0.29" />
+        <PackageReference Include="OperationResultTools" Version="1.0.30" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/OperationResults.AspNetCore/OperationResults.AspNetCore.csproj b/src/OperationResults.AspNetCore/OperationResults.AspNetCore.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Authors>Marco Minerva</Authors>
@@ -25,7 +25,7 @@
     </ItemGroup>
 
     <ItemGroup>        
-        <PackageReference Include="OperationResultTools" Version="1.0.29" />
+        <PackageReference Include="OperationResultTools" Version="1.0.30" />
     </ItemGroup>
 
     <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,7 @@ public static IResult ToResponse(this Result result, HttpContext httpContext, in`
`13`	`13`	`{`
`14`	`14`	`if (result.Success)`
`15`	`15`	`{`
`16`		`-#if NET6_0`
`17`		`- return Results.StatusCode(successStatusCode.GetValueOrDefault(StatusCodes.Status204NoContent));`
`18`		`-#else`
`19`	`16`	`return TypedResults.StatusCode(successStatusCode.GetValueOrDefault(StatusCodes.Status204NoContent));`
`20`		`-#endif`
`21`	`17`	`}`
`22`	`18`
`23`	`19`	`return Problem(httpContext, result.FailureReason, null, result.ErrorMessage, result.ErrorDetail, result.ValidationErrors);`
`@@ -28,12 +24,7 @@ public static IResult ToResponse(this Result result, HttpContext httpContext, st`
`28`	`24`	`if (result.Success)`
`29`	`25`	`{`
`30`	`26`	`var routeValueDictionary = new RouteValueDictionary(routeValues);`
`31`		`-`
`32`		`-#if NET6_0`
`33`		`- return Results.CreatedAtRoute(routeName, routeValues);`
`34`		`-#else`
`35`	`27`	`return TypedResults.CreatedAtRoute(routeName, routeValues);`
`36`		`-#endif`
`37`	`28`	`}`
`38`	`29`
`39`	`30`	`return Problem(httpContext, result.FailureReason, null, result.ErrorMessage, result.ErrorDetail, result.ValidationErrors);`
`@@ -51,42 +42,21 @@ public static IResult ToResponse<T>(this Result<T> result, HttpContext httpConte`
`51`	`42`	`if (!string.IsNullOrWhiteSpace(routeName))`
`52`	`43`	`{`
`53`	`44`	`var routeValueDictionary = new RouteValueDictionary(routeValues);`
`54`		`-`
`55`		`-#if NET6_0`
`56`		`- return Results.CreatedAtRoute(routeName, routeValues, result.Content);`
`57`		`-#else`
`58`	`45`	`return TypedResults.CreatedAtRoute(result.Content, routeName, routeValues);`
`59`		`-#endif`
`60`	`46`	`}`
`61`	`47`	`else if (result.Content is StreamFileContent streamFileContent)`
`62`	`48`	`{`
`63`		`-#if NET6_0`
`64`		`- return Results.Stream(streamFileContent.Content, streamFileContent.ContentType, streamFileContent.DownloadFileName);`
`65`		`-#else`
`66`	`49`	`return TypedResults.Stream(streamFileContent.Content, streamFileContent.ContentType, streamFileContent.DownloadFileName);`
`67`		`-#endif`
`68`	`50`	`}`
`69`	`51`	`else if (result.Content is ByteArrayFileContent byteArrayFileContent)`
`70`	`52`	`{`
`71`		`-#if NET6_0`
`72`		`- return Results.File(byteArrayFileContent.Content, byteArrayFileContent.ContentType, byteArrayFileContent.DownloadFileName);`
`73`		`-#else`
`74`	`53`	`return TypedResults.File(byteArrayFileContent.Content, byteArrayFileContent.ContentType, byteArrayFileContent.DownloadFileName);`
`75`		`-#endif`
`76`	`54`	`}`
`77`	`55`
`78`		`-#if NET6_0`
`79`		`- return Results.Json(result.Content, statusCode: successStatusCode.GetValueOrDefault(StatusCodes.Status200OK));`
`80`		`-#else`
`81`	`56`	`return TypedResults.Json(result.Content, statusCode: successStatusCode.GetValueOrDefault(StatusCodes.Status200OK));`
`82`		`-#endif`
`83`	`57`	`}`
`84`	`58`
`85`		`-#if NET6_0`
`86`		`- return Results.StatusCode(successStatusCode.GetValueOrDefault(StatusCodes.Status204NoContent));`
`87`		`-#else`
`88`	`59`	`return TypedResults.StatusCode(successStatusCode.GetValueOrDefault(StatusCodes.Status204NoContent));`
`89`		`-#endif`
`90`	`60`	`}`
`91`	`61`
`92`	`62`	`return Problem(httpContext, result.FailureReason, result.Content, result.ErrorMessage, result.ErrorDetail, result.ValidationErrors);`
`@@ -99,11 +69,7 @@ private static IResult Problem(HttpContext httpContext, int failureReason, objec`
`99`	`69`
`100`	`70`	`if (content is not null)`
`101`	`71`	`{`
`102`		`-#if NET6_0`
`103`		`- return Results.Json(content, statusCode: statusCode);`
`104`		`-#else`
`105`	`72`	`return TypedResults.Json(content, statusCode: statusCode);`
`106`		`-#endif`
`107`	`73`	`}`
`108`	`74`
`109`	`75`	`var problemDetails = new ProblemDetails`
`@@ -129,13 +95,9 @@ private static IResult Problem(HttpContext httpContext, int failureReason, objec`
`129`	`95`	`}`
`130`	`96`	`}`
`131`	`97`
`132`		`-#if NET6_0`
`133`		`- return Results.Problem(problemDetails);`
`134`		`-#else`
`135`	`98`	`var problemResult = TypedResults.Problem(problemDetails);`
`136`	`99`	`problemResult.ProblemDetails.Type ??= $"https://httpstatuses.io/{statusCode}";`
`137`	`100`
`138`	`101`	`return problemResult;`
`139`		`-#endif`
`140`	`102`	`}`
`141`	`103`	`}`