tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-06-19 14:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/492-log-500-status-code-as-error

Browse Source 
# Conflicts:
#	test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
This commit is contained in:
jlukawska
2019-11-11 22:23:19 +01:00
parent 90c5676887 f15e3a9acf
commit c82a613c16
63 changed files with 718 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/Ocelot.AcceptanceTests/Steps.cs
View File

@ -39,7 +39,7 @@
using System.Threading.Tasks;
using static Ocelot.AcceptanceTests.HttpDelegatingHandlersTests;
using ConfigurationBuilder = Microsoft.Extensions.Configuration.ConfigurationBuilder;
using CookieHeaderValue = System.Net.Http.Headers.CookieHeaderValue;
using CookieHeaderValue = Microsoft.Net.Http.Headers.CookieHeaderValue;
using MediaTypeHeaderValue = System.Net.Http.Headers.MediaTypeHeaderValue;
public class Steps : IDisposable
@ -340,7 +340,7 @@
{
x.WithMicrosoftLogging(log =>
{
log.AddConsole(LogLevel.Debug);
//log.AddConsole(LogLevel.Debug);
})
.WithJsonSerializer()
.WithHandle(typeof(InMemoryJsonHandle<>));
@ -426,7 +426,7 @@
{
x.WithMicrosoftLogging(log =>
{
log.AddConsole(LogLevel.Debug);
//log.AddConsole(LogLevel.Debug);
})
.WithJsonSerializer()
.WithHandle(typeof(InMemoryJsonHandle<>));