Merge pull request #4 from ForEvolve/v2.0

Carl-Hugo · web-flow · commit 24c3b5ef94d1 · 2021-11-21T17:41:21.000-05:00
v2.0
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -11,10 +11,9 @@ on:
         branches:
             - master
 
+    workflow_dispatch:
+
 env:
-#     DOTNET_2_VERSION: 2.1.808
-#     DOTNET_3_VERSION: 3.1.302
-#     DOTNET_5_VERSION: 5.0.100
     BUILD_CONFIGURATION: Release
     ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
@@ -24,8 +23,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                # dotnet: ['2.1.x', '3.1.x', '5.0.x']
-                dotnet: ['5.0.x']
+                dotnet: ['6.0.x']
 
         steps:
             - uses: actions/checkout@v1
@@ -40,15 +38,14 @@ jobs:
 
             - name: Unit Test
               if: github.event_name == 'impossible'
-              run: dotnet test --configuration ${{ env.BUILD_CONFIGURATION }}<
+              run: dotnet test --configuration ${{ env.BUILD_CONFIGURATION }}
 
     deploy:
         runs-on: ubuntu-latest
         needs: build-and-test
         strategy:
             matrix:
-                # dotnet: ['2.1.x', '3.1.x', '5.0.x']
-                dotnet: ['5.0.x']
+                dotnet: ['6.0.x']
         steps:
             - uses: actions/checkout@v1
 
diff --git a/README.md b/README.md
@@ -301,12 +301,17 @@ public void ConfigureServices(IServiceCollection services)
 
 # Release notes
 
-## 1.1.0
+## 2.0
+
+-   Drop .NET Core 3.1 support
+-   Add support for .NET 6.0
+
+## 1.1
 
 -   Add a handler that serializes exceptions to `ProblemDetails` (JSON)
 -   Add the `ForEvolve.ExceptionMapper.Serialization.Json` project
 
-## 1.0.0
+## 1.0
 
 -   Initial release (no yet released)
 
diff --git a/samples/WebApi.HttpMiddleware/WebApi.HttpMiddleware.csproj b/samples/WebApi.HttpMiddleware/WebApi.HttpMiddleware.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/WebApi.Mvc/WebApi.Mvc.csproj b/samples/WebApi.Mvc/WebApi.Mvc.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/WebApi.Shared/WebApi.Shared.csproj b/samples/WebApi.Shared/WebApi.Shared.csproj
@@ -1,14 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
     <IsPackable>False</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\ForEvolve.ExceptionMapper.CommonExceptions\ForEvolve.ExceptionMapper.CommonExceptions.csproj" />
   </ItemGroup>
diff --git a/src/ForEvolve.ExceptionMapper.Serialization.Json/ForEvolve.ExceptionMapper.Serialization.Json.csproj b/src/ForEvolve.ExceptionMapper.Serialization.Json/ForEvolve.ExceptionMapper.Serialization.Json.csproj
@@ -1,9 +1,9 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
diff --git a/src/ForEvolve.ExceptionMapper.Serialization.Json/SerializationJsonExtensions.cs b/src/ForEvolve.ExceptionMapper.Serialization.Json/SerializationJsonExtensions.cs
@@ -12,7 +12,7 @@ public static IExceptionMappingBuilder SerializeAsProblemDetails(this IException
         public static IExceptionMappingBuilder SerializeAsProblemDetails(this IExceptionMappingBuilder builder, ProblemDetailsSerializationOptions options)
         {
             builder.Services.AddSingleton(options);
-            return builder.AddExceptionHandler<ProblemDetailsSerializationHandler>();
+            return builder.SerializeAsProblemDetailsCore();
         }
 
         public static IExceptionMappingBuilder SerializeAsProblemDetails(this IExceptionMappingBuilder builder, IConfiguration configuration)
@@ -21,7 +21,14 @@ public static IExceptionMappingBuilder SerializeAsProblemDetails(this IException
                 .Configure<ProblemDetailsSerializationOptions>(configuration)
                 .AddSingleton(ctx => ctx.GetService<IOptionsMonitor<ProblemDetailsSerializationOptions>>().CurrentValue)
             ;
+            return builder.SerializeAsProblemDetailsCore();
+        }
+
+        private static IExceptionMappingBuilder SerializeAsProblemDetailsCore(this IExceptionMappingBuilder builder)
+        {
+            builder.Services.AddMvcCore(); // Workaround
             return builder.AddExceptionHandler<ProblemDetailsSerializationHandler>();
         }
+
     }
 }
diff --git a/src/ForEvolve.ExceptionMapper/ForEvolve.ExceptionMapper.csproj b/src/ForEvolve.ExceptionMapper/ForEvolve.ExceptionMapper.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net5.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/ForEvolve.ExceptionMapper.CommonExceptions.Tests/ForEvolve.ExceptionMapper.CommonExceptions.Tests.csproj b/test/ForEvolve.ExceptionMapper.CommonExceptions.Tests/ForEvolve.ExceptionMapper.CommonExceptions.Tests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/ForEvolve.ExceptionMapper.CommonHttpExceptionHandlers.Tests/ForEvolve.ExceptionMapper.CommonHttpExceptionHandlers.Tests.csproj b/test/ForEvolve.ExceptionMapper.CommonHttpExceptionHandlers.Tests/ForEvolve.ExceptionMapper.CommonHttpExceptionHandlers.Tests.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/ForEvolve.ExceptionMapper.Core.Tests/ForEvolve.ExceptionMapper.Core.Tests.csproj b/test/ForEvolve.ExceptionMapper.Core.Tests/ForEvolve.ExceptionMapper.Core.Tests.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/ForEvolve.ExceptionMapper.FluentMapper.Tests/ForEvolve.ExceptionMapper.FluentMapper.Tests.csproj b/test/ForEvolve.ExceptionMapper.FluentMapper.Tests/ForEvolve.ExceptionMapper.FluentMapper.Tests.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/ForEvolve.ExceptionMapper.HttpMiddleware.Tests/ForEvolve.ExceptionMapper.HttpMiddleware.Tests.csproj b/test/ForEvolve.ExceptionMapper.HttpMiddleware.Tests/ForEvolve.ExceptionMapper.HttpMiddleware.Tests.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/ForEvolve.ExceptionMapper.Mvc.Tests/ForEvolve.ExceptionMapper.Mvc.Tests.csproj b/test/ForEvolve.ExceptionMapper.Mvc.Tests/ForEvolve.ExceptionMapper.Mvc.Tests.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/ForEvolve.ExceptionMapper.Scrutor.Tests/ForEvolve.ExceptionMapper.Scrutor.Tests.csproj b/test/ForEvolve.ExceptionMapper.Scrutor.Tests/ForEvolve.ExceptionMapper.Scrutor.Tests.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/ForEvolve.ExceptionMapper.Serialization.Json.Tests/ForEvolve.ExceptionMapper.Serialization.Json.Tests.csproj b/test/ForEvolve.ExceptionMapper.Serialization.Json.Tests/ForEvolve.ExceptionMapper.Serialization.Json.Tests.csproj
@@ -4,8 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/ForEvolve.ExceptionMapper.Tests/ForEvolve.ExceptionMapper.Tests.csproj b/test/ForEvolve.ExceptionMapper.Tests/ForEvolve.ExceptionMapper.Tests.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/version.json b/version.json
@@ -1,7 +1,7 @@
 {
     "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "1.1",
-    "publicReleaseRefSpec": ["^refs/heads/master-disabled$"],
+    "version": "2.0",
+    "publicReleaseRefSpec": ["^refs/heads/master$"],
     "cloudBuild": {
         "buildNumber": {
             "enabled": true

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public static IExceptionMappingBuilder SerializeAsProblemDetails(this IException`
`12`	`12`	`public static IExceptionMappingBuilder SerializeAsProblemDetails(this IExceptionMappingBuilder builder, ProblemDetailsSerializationOptions options)`
`13`	`13`	`{`
`14`	`14`	`builder.Services.AddSingleton(options);`
`15`		`- return builder.AddExceptionHandler<ProblemDetailsSerializationHandler>();`
	`15`	`+ return builder.SerializeAsProblemDetailsCore();`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public static IExceptionMappingBuilder SerializeAsProblemDetails(this IExceptionMappingBuilder builder, IConfiguration configuration)`
`@@ -21,7 +21,14 @@ public static IExceptionMappingBuilder SerializeAsProblemDetails(this IException`
`21`	`21`	`.Configure<ProblemDetailsSerializationOptions>(configuration)`
`22`	`22`	`.AddSingleton(ctx => ctx.GetService<IOptionsMonitor<ProblemDetailsSerializationOptions>>().CurrentValue)`
`23`	`23`	`;`
	`24`	`+ return builder.SerializeAsProblemDetailsCore();`
	`25`	`+ }`
	`26`	`+`
	`27`	`+ private static IExceptionMappingBuilder SerializeAsProblemDetailsCore(this IExceptionMappingBuilder builder)`
	`28`	`+ {`
	`29`	`+ builder.Services.AddMvcCore(); // Workaround`
`24`	`30`	`return builder.AddExceptionHandler<ProblemDetailsSerializationHandler>();`
`25`	`31`	`}`
	`32`	`+`
`26`	`33`	`}`
`27`	`34`	`}`