From 32e28a8fc862d13233a8681b1cc71989317a7fad Mon Sep 17 00:00:00 2001 From: mikary Date: Wed, 7 Jan 2015 14:51:05 -0800 Subject: [PATCH] Reacting to API changes in EntityFramework Migrations --- .../DatabaseErrorPageMiddleware.cs | 6 +++--- .../MigrationsEndPointMiddleware.cs | 2 +- src/Microsoft.AspNet.Diagnostics.Entity/project.json | 2 +- .../DatabaseErrorPageMiddlewareTest.cs | 4 ++-- .../MigrationsEndPointMiddlewareTest.cs | 6 +++--- .../TestModels/BloggingContext.cs | 2 +- .../TestModels/BloggingContextWithMigrations.cs | 6 +++--- .../TestModels/BloggingContextWithPendingModelChanges.cs | 6 +++--- .../TestModels/BloggingContextWithSnapshotThatThrows.cs | 6 +++--- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs index b4fb72d6d2..2919f6b5c0 100644 --- a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs +++ b/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs @@ -9,10 +9,10 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.RequestContainer; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Migrations; -using Microsoft.Data.Entity.Migrations.Infrastructure; -using Microsoft.Data.Entity.Migrations.Utilities; using Microsoft.Data.Entity.Relational; +using Microsoft.Data.Entity.Relational.Migrations; +using Microsoft.Data.Entity.Relational.Migrations.Infrastructure; +using Microsoft.Data.Entity.Relational.Migrations.Utilities; using Microsoft.Data.Entity.Utilities; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Logging; diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/MigrationsEndPointMiddleware.cs b/src/Microsoft.AspNet.Diagnostics.Entity/MigrationsEndPointMiddleware.cs index e381179d29..42a0cbb87f 100644 --- a/src/Microsoft.AspNet.Diagnostics.Entity/MigrationsEndPointMiddleware.cs +++ b/src/Microsoft.AspNet.Diagnostics.Entity/MigrationsEndPointMiddleware.cs @@ -8,7 +8,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Diagnostics.Entity.Utilities; using Microsoft.AspNet.Http; using Microsoft.Data.Entity; -using Microsoft.Data.Entity.Migrations.Infrastructure; +using Microsoft.Data.Entity.Relational.Migrations.Infrastructure; using Microsoft.Framework.DependencyInjection; using System.Net; using Microsoft.Framework.Logging; diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/project.json b/src/Microsoft.AspNet.Diagnostics.Entity/project.json index 4ffb158faa..6e0ee188dd 100644 --- a/src/Microsoft.AspNet.Diagnostics.Entity/project.json +++ b/src/Microsoft.AspNet.Diagnostics.Entity/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "Microsoft.AspNet.Diagnostics": "1.0.0-*", - "EntityFramework.Migrations": "7.0.0-*" + "EntityFramework.Relational": "7.0.0-*" }, "code": [ "**\\*.cs", "..\\Shared\\*.cs" ], "frameworks": { diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs index 336eb39834..4ff4d60d3d 100644 --- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs +++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs @@ -14,8 +14,8 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.TestHost; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Migrations; -using Microsoft.Data.Entity.Migrations.Infrastructure; +using Microsoft.Data.Entity.Relational.Migrations; +using Microsoft.Data.Entity.Relational.Migrations.Infrastructure; using Microsoft.Data.Entity.Utilities; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Logging; diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs index 711cd2955d..73db458229 100644 --- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs +++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs @@ -12,9 +12,9 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.TestHost; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Migrations; -using Microsoft.Data.Entity.Migrations.Infrastructure; -using Microsoft.Data.Entity.Migrations.Utilities; +using Microsoft.Data.Entity.Relational.Migrations; +using Microsoft.Data.Entity.Relational.Migrations.Infrastructure; +using Microsoft.Data.Entity.Relational.Migrations.Utilities; using Microsoft.Data.Entity.Utilities; using Microsoft.Framework.DependencyInjection; using Xunit; diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContext.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContext.cs index a8ecc378aa..5a322a7a5e 100644 --- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContext.cs +++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContext.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.Data.Entity; -using Microsoft.Data.Entity.Migrations.Infrastructure; +using Microsoft.Data.Entity.Relational.Migrations.Infrastructure; using System; using System.Linq; using System.Reflection; diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithMigrations.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithMigrations.cs index 5d59d57820..d2047fd0f4 100644 --- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithMigrations.cs +++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithMigrations.cs @@ -3,9 +3,9 @@ using Microsoft.Data.Entity; using Microsoft.Data.Entity.Metadata; -using Microsoft.Data.Entity.Migrations; -using Microsoft.Data.Entity.Migrations.Builders; -using Microsoft.Data.Entity.Migrations.Infrastructure; +using Microsoft.Data.Entity.Relational.Migrations; +using Microsoft.Data.Entity.Relational.Migrations.Builders; +using Microsoft.Data.Entity.Relational.Migrations.Infrastructure; using System; using System.Linq; using System.Reflection; diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs index cb98b4bcbf..e571d930ef 100644 --- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs +++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs @@ -3,9 +3,9 @@ using Microsoft.Data.Entity; using Microsoft.Data.Entity.Metadata; -using Microsoft.Data.Entity.Migrations; -using Microsoft.Data.Entity.Migrations.Builders; -using Microsoft.Data.Entity.Migrations.Infrastructure; +using Microsoft.Data.Entity.Relational.Migrations; +using Microsoft.Data.Entity.Relational.Migrations.Builders; +using Microsoft.Data.Entity.Relational.Migrations.Infrastructure; using System; namespace Microsoft.AspNet.Diagnostics.Entity.Tests diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs index f1c1fd1973..ff2b09354b 100644 --- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs +++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs @@ -3,9 +3,9 @@ using Microsoft.Data.Entity; using Microsoft.Data.Entity.Metadata; -using Microsoft.Data.Entity.Migrations; -using Microsoft.Data.Entity.Migrations.Builders; -using Microsoft.Data.Entity.Migrations.Infrastructure; +using Microsoft.Data.Entity.Relational.Migrations; +using Microsoft.Data.Entity.Relational.Migrations.Builders; +using Microsoft.Data.Entity.Relational.Migrations.Infrastructure; using System; using System.Linq; using System.Reflection;