huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'rel/2.0.0-preview1' into dev

This commit is contained in:
BrennanConroy 2017-05-02 15:24:21 -07:00
parent f92543dfd8 1018f41f15
commit 190f2d371d
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs
View File

@ -53,7 +53,9 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
_logger = loggerFactory.CreateLogger<DatabaseErrorPageMiddleware>(); _logger = loggerFactory.CreateLogger<DatabaseErrorPageMiddleware>();
_loggerProvider = new DataStoreErrorLoggerProvider(); _loggerProvider = new DataStoreErrorLoggerProvider();
#pragma warning disable CS0618 // Type or member is obsolete
loggerFactory.AddProvider(_loggerProvider); loggerFactory.AddProvider(_loggerProvider);
#pragma warning restore CS0618 // Type or member is obsolete
} }
/// <summary> /// <summary>

4
test/Diagnostics.EFCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
View File

@ -317,7 +317,9 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
{ {
app.UseDatabaseErrorPage(); app.UseDatabaseErrorPage();
app.UseMiddleware<ContextNotRegisteredInServicesMiddleware>(); app.UseMiddleware<ContextNotRegisteredInServicesMiddleware>();
#pragma warning disable CS0618 // Type or member is obsolete
app.ApplicationServices.GetService<ILoggerFactory>().AddProvider(logProvider); app.ApplicationServices.GetService<ILoggerFactory>().AddProvider(logProvider);
#pragma warning restore CS0618 // Type or member is obsolete
}); });
var server = new TestServer(builder); var server = new TestServer(builder);
@ -457,7 +459,9 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
if (logProvider != null) if (logProvider != null)
{ {
#pragma warning disable CS0618 // Type or member is obsolete
app.ApplicationServices.GetService<ILoggerFactory>().AddProvider(logProvider); app.ApplicationServices.GetService<ILoggerFactory>().AddProvider(logProvider);
#pragma warning restore CS0618 // Type or member is obsolete
} }
}) })
.ConfigureServices(services => .ConfigureServices(services =>