From 8ccfb99624583e3f7a0beff790855b7811608a9c Mon Sep 17 00:00:00 2001
From: Brice Lambson <bricelam@microsoft.com>
Date: Mon, 24 Aug 2015 10:41:56 -0700
Subject: [PATCH] React to aspnet/EntityFramework#2902

---
 .../DatabaseErrorPageMiddleware.cs                   |  4 ++--
 .../TestModels/BloggingContextWithMigrations.cs      | 12 ++----------
 .../BloggingContextWithPendingModelChanges.cs        |  6 +-----
 .../BloggingContextWithSnapshotThatThrows.cs         |  6 +-----
 4 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs
index de22582576..0bfabdcd28 100644
--- a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs
+++ b/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs
@@ -88,8 +88,8 @@ namespace Microsoft.AspNet.Diagnostics.Entity
                                 var pendingMigrations = (
                                         from m in migrationsAssembly.Migrations
                                         where !appliedMigrations.Any(
-                                            r => string.Equals(r.MigrationId, m.Id, StringComparison.OrdinalIgnoreCase))
-                                        select m.Id)
+                                            r => string.Equals(r.MigrationId, m.Key, StringComparison.OrdinalIgnoreCase))
+                                        select m.Key)
                                     .ToList();
 
                                 var pendingModelChanges = modelDiffer.HasDifferences(migrationsAssembly.ModelSnapshot?.Model, dbContext.Model);
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithMigrations.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithMigrations.cs
index 4b75c38b8b..018bbb3559 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithMigrations.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithMigrations.cs
@@ -41,13 +41,9 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         }
 
         [DbContext(typeof(BloggingContextWithMigrations))]
+        [Migration("111111111111111_MigrationOne")]
         public class MigrationOne : Migration
         {
-            public override string Id
-            {
-                get { return "111111111111111_MigrationOne"; }
-            }
-
             public override IModel TargetModel => new BloggingContextWithMigrationsModelSnapshot().Model;
 
             protected override void Up(MigrationBuilder migrationBuilder)
@@ -68,13 +64,9 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         }
 
         [DbContext(typeof(BloggingContextWithMigrations))]
+        [Migration("222222222222222_MigrationTwo")]
         public class MigrationTwo : Migration
         {
-            public override string Id
-            {
-                get { return "222222222222222_MigrationTwo"; }
-            }
-
             public override IModel TargetModel => new BloggingContextWithMigrationsModelSnapshot().Model;
 
             protected override void Up(MigrationBuilder migrationBuilder)
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs
index 0bf5a12244..70e955e8e9 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs
@@ -23,13 +23,9 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         }
 
         [DbContext(typeof(BloggingContextWithPendingModelChanges))]
+        [Migration("111111111111111_MigrationOne")]
         public partial class MigrationOne : Migration
         {
-            public override string Id
-            {
-                get { return "111111111111111_MigrationOne"; }
-            }
-
             protected override void Up(MigrationBuilder migrationBuilder)
             { }
         }
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs
index dea848d0fa..72a183f708 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs
@@ -25,13 +25,9 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         }
 
         [DbContext(typeof(BloggingContextWithSnapshotThatThrows))]
+        [Migration("111111111111111_MigrationOne")]
         public class MigrationOne : Migration
         {
-            public override string Id
-            {
-                get { return "111111111111111_MigrationOne"; }
-            }
-
             public override IModel TargetModel => new BloggingContextWithSnapshotThatThrowsModelSnapshot().Model;
 
             protected override void Up(MigrationBuilder migrationBuilder)