Merge pull request #3 from IharYakimush/develop

IharYakimush · web-flow · commit d72bb0337917 · 2018-08-03T12:47:27.000+03:00
v2.0.3
diff --git a/Community.AspNetCore.ExceptionHandling.Integration/Community.AspNetCore.ExceptionHandling.Integration.csproj b/Community.AspNetCore.ExceptionHandling.Integration/Community.AspNetCore.ExceptionHandling.Integration.csproj
@@ -1,16 +1,18 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <Folder Include="wwwroot\" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.Buffering" Version="0.2.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.1.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Community.AspNetCore.ExceptionHandling.Integration/Controllers/ValuesController.cs b/Community.AspNetCore.ExceptionHandling.Integration/Controllers/ValuesController.cs
@@ -6,7 +6,7 @@
 namespace Community.AspNetCore.ExceptionHandling.Integration.Controllers
 {
     [Route("api/[controller]")]
-    public class ValuesController : Controller
+    public class ValuesController : ControllerBase
     {
         // GET api/values
         [HttpGet]
diff --git a/Community.AspNetCore.ExceptionHandling.Integration/Startup.cs b/Community.AspNetCore.ExceptionHandling.Integration/Startup.cs
@@ -21,7 +21,7 @@ public Startup(IConfiguration configuration)
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc();
+            services.AddMvcCore().AddJsonFormatters();
 
             services.AddExceptionHandlingPolicies(options =>
             {
@@ -55,7 +55,7 @@ public void ConfigureServices(IServiceCollection services)
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
             //app.UseResponseBuffering();
-            app.UseDeveloperExceptionPage().UseExceptionHandlingPolicies();
+            app.UseExceptionHandlingPolicies();
             app.UseMvc();
         }
     }
diff --git a/Community.AspNetCore.ExceptionHandling.Mvc/Community.AspNetCore.ExceptionHandling.Mvc.csproj b/Community.AspNetCore.ExceptionHandling.Mvc/Community.AspNetCore.ExceptionHandling.Mvc.csproj
@@ -1,27 +1,29 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <Description>Extension methods to configure exception handler which write MVC action result to responce body. Userfull for writing objects</Description>
     <PackageProjectUrl>https://github.com/IharYakimush/asp-net-core-exception-handling</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/IharYakimush/asp-net-core-exception-handling/blob/develop/LICENSE</PackageLicenseUrl>
     <Copyright>IharYakimush</Copyright>
     <PackageTags>aspnetcore exception handling policy mvc action result</PackageTags>
-    <AssemblyVersion>2.0.2.0</AssemblyVersion>
+    <AssemblyVersion>2.0.3.0</AssemblyVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <FileVersion>2.0.2.0</FileVersion>
+    <FileVersion>2.0.3.0</FileVersion>
     <Company />
     <Authors>IharYakimush</Authors>
-    <Version>2.0.2</Version>
+    <Version>2.0.3</Version>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\sgn.snk</AssemblyOriginatorKeyFile>
     <ApplicationIcon />
     <OutputType>Library</OutputType>
     <StartupObject />
+    <PackageReleaseNotes>target netstandard2.0 only</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="2.1.1" />
diff --git a/Community.AspNetCore.ExceptionHandling.NewtonsoftJson/Community.AspNetCore.ExceptionHandling.NewtonsoftJson.csproj b/Community.AspNetCore.ExceptionHandling.NewtonsoftJson/Community.AspNetCore.ExceptionHandling.NewtonsoftJson.csproj
@@ -8,11 +8,13 @@
     <PackageLicenseUrl>https://github.com/IharYakimush/asp-net-core-exception-handling/blob/develop/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/IharYakimush/asp-net-core-exception-handling</PackageProjectUrl>
     <PackageTags>aspnetcore exception handling policy json response</PackageTags>
-    <AssemblyVersion>2.0.2.0</AssemblyVersion>
-    <Version>2.0.2</Version>
+    <AssemblyVersion>2.0.3.0</AssemblyVersion>
+    <Version>2.0.3</Version>
     <Company />
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <PackageReleaseNotes>target netstandard2.0 only</PackageReleaseNotes>
+    <FileVersion>2.0.3.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Community.AspNetCore.ExceptionHandling/Community.AspNetCore.ExceptionHandling.csproj b/Community.AspNetCore.ExceptionHandling/Community.AspNetCore.ExceptionHandling.csproj
@@ -1,25 +1,25 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp2.1</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <Description>Middleware to configure exception handling policies. Configure chain of handlers per exception type. OOTB handlers: log, retry, set responce headers and body</Description>
     <PackageProjectUrl>https://github.com/IharYakimush/asp-net-core-exception-handling</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/IharYakimush/asp-net-core-exception-handling/blob/develop/LICENSE</PackageLicenseUrl>
     <Copyright>IharYakimush</Copyright>
     <PackageTags>aspnetcore exception handling policy</PackageTags>
-    <AssemblyVersion>2.0.2.0</AssemblyVersion>
+    <AssemblyVersion>2.0.3.0</AssemblyVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <FileVersion>2.0.2.0</FileVersion>
+    <FileVersion>2.0.3.0</FileVersion>
     <Company />
     <Authors>IharYakimush</Authors>
-    <Version>2.0.2</Version>
+    <Version>2.0.3</Version>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\sgn.snk</AssemblyOriginatorKeyFile>
     <ApplicationIcon />
     <OutputType>Library</OutputType>
     <StartupObject />
-    <PackageReleaseNotes>WithBody method changed to use Stream instead of StreamWriter to unify behaviour in case of buffered and chunked responses</PackageReleaseNotes>
+    <PackageReleaseNotes>target netstandard2.0 only</PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ public void ConfigureServices(IServiceCollection services)
                     lo.EventIdFactory = (c, e) => new EventId(123, "UnhandlerException");
                     lo.Category = (context, exception) => "MyCategory";
                 })
-            .Response(e => 500, ResponseAlreadyStartedBehaviour.GoToNextHandler)
+            .Response(null, ResponseAlreadyStartedBehaviour.GoToNextHandler)
                 .ClearCacheHeaders()
                 .WithObjectResult((r, e) => new { msg = e.Message, path = r.Path })
             .Handled();
@@ -62,8 +62,8 @@ Sample of transitions:
 ![alt text](/Transitions.png)
 
 ### Nuget
-| Package  | Target | Comments |
-| ---------| ------------- | ------------- |
-| Community.AspNetCore.ExceptionHandling | netstandard2.0 netcoreapp2.1 | Main functionality |
-| Community.AspNetCore.ExceptionHandling.Mvc | netcoreapp2.1 | Alllow to use MVC IActionResult (including ObjectResult) in 'Response' handler |
-| Community.AspNetCore.ExceptionHandling.NewtonsoftJson | netstandard2.0 | Allow to set Json serialized object as a response body in 'Response' handler. Use it only if 'Community.AspNetCore.ExceptionHandling.Mvc' usage not possible |
+| Package | Comments |
+| ---------| ------------- |
+| Community.AspNetCore.ExceptionHandling | Main functionality |
+| Community.AspNetCore.ExceptionHandling.Mvc | Allow to use MVC IActionResult (including ObjectResult) in 'Response' handler |
+| Community.AspNetCore.ExceptionHandling.NewtonsoftJson | Allow to set Json serialized object as a response body in 'Response' handler. Use it only if 'Community.AspNetCore.ExceptionHandling.Mvc' usage not possible |

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`namespace Community.AspNetCore.ExceptionHandling.Integration.Controllers`
`7`	`7`	`{`
`8`	`8`	`[Route("api/[controller]")]`
`9`		`- public class ValuesController : Controller`
	`9`	`+ public class ValuesController : ControllerBase`
`10`	`10`	`{`
`11`	`11`	`// GET api/values`
`12`	`12`	`[HttpGet]`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public Startup(IConfiguration configuration)`
`21`	`21`	`// This method gets called by the runtime. Use this method to add services to the container.`
`22`	`22`	`public void ConfigureServices(IServiceCollection services)`
`23`	`23`	`{`
`24`		`- services.AddMvc();`
	`24`	`+ services.AddMvcCore().AddJsonFormatters();`
`25`	`25`
`26`	`26`	`services.AddExceptionHandlingPolicies(options =>`
`27`	`27`	`{`
`@@ -55,7 +55,7 @@ public void ConfigureServices(IServiceCollection services)`
`55`	`55`	`public void Configure(IApplicationBuilder app, IHostingEnvironment env)`
`56`	`56`	`{`
`57`	`57`	`//app.UseResponseBuffering();`
`58`		`- app.UseDeveloperExceptionPage().UseExceptionHandlingPolicies();`
	`58`	`+ app.UseExceptionHandlingPolicies();`
`59`	`59`	`app.UseMvc();`
`60`	`60`	`}`
`61`	`61`	`}`