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

Update to reflect changes in EF service registration

This commit is contained in:
Arthur Vickers 2016-03-10 15:41:47 -08:00
parent e57e177224
commit 1e80a9a85c
6 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
samples/DatabaseErrorPageSample/Startup.cs
View File

@ -11,9 +11,8 @@ namespace DatabaseErrorPageSample
{
public void ConfigureServices(IServiceCollection services)
{
services.AddEntityFramework()
.AddSqlServer()
.AddDbContext<MyContext>(options => options.UseSqlServer(@"Server=(localdb)\mssqllocaldb;Database=DatabaseErrorPageSample;Trusted_Connection=True;"));
services.AddDbContext<MyContext>(
options => options.UseSqlServer(@"Server=(localdb)\mssqllocaldb;Database=DatabaseErrorPageSample;Trusted_Connection=True;"));
}
public void Configure(IApplicationBuilder app)
@ -42,6 +41,11 @@ namespace DatabaseErrorPageSample
public class MyContext : DbContext
{
public MyContext(DbContextOptions options)
: base(options)
{
}
public DbSet<Blog> Blog { get; set; }
}

4
test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
View File

@ -267,7 +267,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
})
.ConfigureServices(services =>
{
services.AddEntityFramework().AddSqlServer();
services.AddAddEntityFrameworkSqlServer();
services.AddScoped<BloggingContextWithMigrations>();
var optionsBuilder = new DbContextOptionsBuilder();
@ -333,7 +333,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
public virtual Task Invoke(HttpContext context)
{
var options = context.RequestServices.GetService<DbContextOptions>();
var db = new BloggingContext(context.RequestServices, options);
var db = new BloggingContext(options);
db.Blogs.Add(new Blog());
db.SaveChanges();
throw new Exception("SaveChanges should have thrown");

6
test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContext.cs
View File

@ -9,14 +9,10 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
{
public class BloggingContext : DbContext
{
protected BloggingContext(DbContextOptions options)
public BloggingContext(DbContextOptions options)
: base(options)
{ }
public BloggingContext(IServiceProvider provider, DbContextOptions options)
: base(provider, options)
{ }
public DbSet<Blog> Blogs { get; set; }
}
}

6
test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithMigrations.cs
View File

@ -11,14 +11,10 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
{
public class BloggingContextWithMigrations : BloggingContext
{
protected BloggingContextWithMigrations(DbContextOptions options)
public BloggingContextWithMigrations(DbContextOptions options)
: base(options)
{ }
public BloggingContextWithMigrations(IServiceProvider provider, DbContextOptions options)
: base(provider, options)
{ }
// Providing a factory method so that the ctor is hidden from DI
public static BloggingContextWithMigrations CreateWithoutExternalServiceProvider(DbContextOptions options)
{

4
test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs
View File

@ -10,8 +10,8 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
{
public class BloggingContextWithPendingModelChanges : BloggingContext
{
public BloggingContextWithPendingModelChanges(IServiceProvider provider, DbContextOptions options)
: base(provider, options)
public BloggingContextWithPendingModelChanges(DbContextOptions options)
: base(options)
{ }
[DbContext(typeof(BloggingContextWithPendingModelChanges))]

4
test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs
View File

@ -11,8 +11,8 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
{
public class BloggingContextWithSnapshotThatThrows : BloggingContext
{
public BloggingContextWithSnapshotThatThrows(IServiceProvider provider, DbContextOptions options)
: base(provider, options)
public BloggingContextWithSnapshotThatThrows(DbContextOptions options)
: base(options)
{ }
[DbContext(typeof(BloggingContextWithSnapshotThatThrows))]