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

React to EF name changes

This commit is contained in:
Arthur Vickers 2015-06-23 16:00:32 -07:00
parent 4aa1d4b1b7
commit 33a673cd35
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs
View File

@ -50,7 +50,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
public virtual void Log(LogLevel logLevel, int eventId, [CanBeNull] object state, [CanBeNull] Exception exception, [CanBeNull] Func<object, Exception, string> formatter) public virtual void Log(LogLevel logLevel, int eventId, [CanBeNull] object state, [CanBeNull] Exception exception, [CanBeNull] Func<object, Exception, string> formatter)
{ {
var errorState = state as DataStoreErrorLogState; var errorState = state as DatabaseErrorLogState;
if (errorState != null && exception != null && LastError != null) if (errorState != null && exception != null && LastError != null)
{ {
LastError.SetError(errorState.ContextType, exception); LastError.SetError(errorState.ContextType, exception);

2
src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs
View File

@ -72,7 +72,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
} }
else else
{ {
var creator = dbContext.GetService<IDataStoreCreator>() as IRelationalDataStoreCreator; var creator = dbContext.GetService<IDatabaseCreator>() as IRelationalDatabaseCreator;
if (creator == null) if (creator == null)
{ {
_logger.LogVerbose(Strings.DatabaseErrorPage_NotRelationalDatabase); _logger.LogVerbose(Strings.DatabaseErrorPage_NotRelationalDatabase);

4
test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
View File

@ -194,7 +194,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
} }
else else
{ {
optionsBuilder.UseInMemoryStore(); optionsBuilder.UseInMemoryDatabase();
} }
services.AddInstance<DbContextOptions>(optionsBuilder.Options); services.AddInstance<DbContextOptions>(optionsBuilder.Options);
}); });
@ -322,7 +322,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
} }
else else
{ {
optionsBuilder.UseInMemoryStore(); optionsBuilder.UseInMemoryDatabase();
} }
services.AddInstance(optionsBuilder.Options); services.AddInstance(optionsBuilder.Options);
}); });

2
test/Microsoft.AspNet.Diagnostics.Entity.Tests/TestHelperExtensions.cs
View File

@ -10,7 +10,7 @@ namespace Microsoft.Data.Entity.Tests
{ {
public static EntityFrameworkServicesBuilder AddProviderServices(this EntityFrameworkServicesBuilder entityServicesBuilder) public static EntityFrameworkServicesBuilder AddProviderServices(this EntityFrameworkServicesBuilder entityServicesBuilder)
{ {
return entityServicesBuilder.AddInMemoryStore(); return entityServicesBuilder.AddInMemoryDatabase();
} }
public static DbContextOptions UseProviderOptions(this DbContextOptions options) public static DbContextOptions UseProviderOptions(this DbContextOptions options)