diff --git a/src/EntityFramework.SqlServer/project.json b/src/EntityFramework.SqlServer/project.json index 0ef46702627..b60e61e1ffa 100644 --- a/src/EntityFramework.SqlServer/project.json +++ b/src/EntityFramework.SqlServer/project.json @@ -1,6 +1,6 @@ { "version": "7.0.0-*", - "description": "SQLite data store for Entity Framework.", + "description": "Microsoft SQL Server data store for Entity Framework.", "compilationOptions": { "warningsAsErrors": true }, diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/Properties/Strings.Designer.cs b/src/Microsoft.AspNet.Diagnostics.Entity/Properties/Strings.Designer.cs index de24ff8717d..7f3ef127e19 100644 --- a/src/Microsoft.AspNet.Diagnostics.Entity/Properties/Strings.Designer.cs +++ b/src/Microsoft.AspNet.Diagnostics.Entity/Properties/Strings.Designer.cs @@ -154,6 +154,22 @@ internal static string FormatDatabaseErrorPage_ApplyMigrationsFailed() return GetString("DatabaseErrorPage_ApplyMigrationsFailed"); } + /// + /// To use migrations from a command prompt you will need to install K Version Manager (KVM). Once installed, you can run migration commands from a standard command prompt in the project directory. + /// + internal static string DatabaseErrorPage_EnableMigrationsCommandsInfo + { + get { return GetString("DatabaseErrorPage_EnableMigrationsCommandsInfo"); } + } + + /// + /// To use migrations from a command prompt you will need to install K Version Manager (KVM). Once installed, you can run migration commands from a standard command prompt in the project directory. + /// + internal static string FormatDatabaseErrorPage_EnableMigrationsCommandsInfo() + { + return GetString("DatabaseErrorPage_EnableMigrationsCommandsInfo"); + } + /// /// You can also apply migrations from the command line /// @@ -282,6 +298,22 @@ internal static string FormatDatabaseErrorPage_PendingMigrationsTitle(object p0) return string.Format(CultureInfo.CurrentCulture, GetString("DatabaseErrorPage_PendingMigrationsTitle"), p0); } + /// + /// A database operartion failed while processing the request. + /// + internal static string DatabaseErrorPage_Title + { + get { return GetString("DatabaseErrorPage_Title"); } + } + + /// + /// A database operartion failed while processing the request. + /// + internal static string FormatDatabaseErrorPage_Title() + { + return GetString("DatabaseErrorPage_Title"); + } + /// /// > k ef migration apply /// diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/Properties/Strings.resx b/src/Microsoft.AspNet.Diagnostics.Entity/Properties/Strings.resx index c034438b09f..12b4868cf52 100644 --- a/src/Microsoft.AspNet.Diagnostics.Entity/Properties/Strings.resx +++ b/src/Microsoft.AspNet.Diagnostics.Entity/Properties/Strings.resx @@ -127,7 +127,7 @@ The context type '{0}' was not found in services. This usually means the context was not registered in services during startup. You probably want to call AddScoped<{0}>() inside the UseServices(...) call in your application startup code. Skipping display of the database error page. - An exception occured while calculating the database error page content. Skipping display of the database error page. + An exception occurred while calculating the database error page content. Skipping display of the database error page. > k ef migration add [migration name] @@ -142,22 +142,22 @@ Applying Migrations... - An error occured applying migrations, try applying them from the command line + An error occurred applying migrations, try applying them from the command line - You can also apply migrations from the command line + You can also apply migrations from the command line: Try refreshing the page - From the command line, scaffold a new migration and apply it to the database + From the command line, scaffold a new migration and apply it to the database: Use migrations to create the database for {0} - Scaffold a new migration for these changes and apply them to the database from the command line + Scaffold a new migration for these changes and apply them to the database from the command line: There are pending model changes for {0} @@ -184,7 +184,7 @@ The context type '{0}' was not found in services. This usually means the context was not registered in services during startup. You probably want to call AddScoped<{0}>() inside the UseServices(...) call in your application startup code. - An error occured while applying the migrations for '{0}'. See InnerException for details. + An error occurred while applying the migrations for '{0}'. See InnerException for details. The context type '{0}' could not be loaded. Ensure this is the correct type name for the context you are trying to apply migrations for. @@ -195,4 +195,10 @@ Request path matched the path configured for this migrations endpoint ({0}). Attempting to process the migrations request. + + A database operation failed while processing the request. + + + To use migrations from a command prompt you will need to <a href='http://go.microsoft.com/fwlink/?LinkId=518242'>install K Version Manager (KVM)</a>. Once installed, you can run migration commands from a standard command prompt in the project directory. + \ No newline at end of file diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/Views/DatabaseErrorPage.cs b/src/Microsoft.AspNet.Diagnostics.Entity/Views/DatabaseErrorPage.cs index 49bf1459da8..2c14bd00113 100644 --- a/src/Microsoft.AspNet.Diagnostics.Entity/Views/DatabaseErrorPage.cs +++ b/src/Microsoft.AspNet.Diagnostics.Entity/Views/DatabaseErrorPage.cs @@ -83,8 +83,13 @@ public override async Task ExecuteAsync() #line default #line hidden - WriteLiteral("\r\n \r\n\r\n\r\n

A database operartion failed while proce" + -"ssing the request.

\r\n"); + WriteLiteral("\r\n \r\n\r\n\r\n

"); +#line 41 "DatabaseErrorPage.cshtml" + Write(Strings.DatabaseErrorPage_Title); + +#line default +#line hidden + WriteLiteral("

\r\n"); #line 42 "DatabaseErrorPage.cshtml" @@ -176,8 +181,14 @@ public override async Task ExecuteAsync() #line default #line hidden - WriteLiteral(" \r\n
\r\n"); -#line 62 "DatabaseErrorPage.cshtml" + WriteLiteral(" \r\n

"); +#line 61 "DatabaseErrorPage.cshtml" + WriteLiteral(Strings.DatabaseErrorPage_EnableMigrationsCommandsInfo); + +#line default +#line hidden + WriteLiteral("

\r\n
\r\n"); +#line 63 "DatabaseErrorPage.cshtml" } else if (Model.PendingMigrations.Any()) { @@ -186,25 +197,25 @@ public override async Task ExecuteAsync() #line hidden WriteLiteral("
\r\n

"); -#line 66 "DatabaseErrorPage.cshtml" +#line 67 "DatabaseErrorPage.cshtml" Write(Strings.FormatDatabaseErrorPage_PendingMigrationsTitle(Model.ContextType.Name)); #line default #line hidden WriteLiteral("

\r\n

"); -#line 67 "DatabaseErrorPage.cshtml" +#line 68 "DatabaseErrorPage.cshtml" Write(Strings.FormatDatabaseErrorPage_PendingMigrationsInfo(Model.ContextType.Name)); #line default #line hidden WriteLiteral("

\r\n\r\n"); -#line 69 "DatabaseErrorPage.cshtml" +#line 70 "DatabaseErrorPage.cshtml" #line default #line hidden -#line 69 "DatabaseErrorPage.cshtml" +#line 70 "DatabaseErrorPage.cshtml" if (Model.Options.ListMigrations) { @@ -212,13 +223,13 @@ public override async Task ExecuteAsync() #line hidden WriteLiteral(" \r\n"); -#line 77 "DatabaseErrorPage.cshtml" +#line 78 "DatabaseErrorPage.cshtml" } #line default #line hidden WriteLiteral("\r\n"); -#line 79 "DatabaseErrorPage.cshtml" +#line 80 "DatabaseErrorPage.cshtml" #line default #line hidden -#line 79 "DatabaseErrorPage.cshtml" +#line 80 "DatabaseErrorPage.cshtml" if (Model.Options.EnableMigrationCommands) { @@ -261,7 +272,7 @@ public override async Task ExecuteAsync() WriteLiteral("

\r\n

\r\n"); -#line 127 "DatabaseErrorPage.cshtml" + WriteLiteral("\r\n

"); +#line 126 "DatabaseErrorPage.cshtml" + WriteLiteral(Strings.DatabaseErrorPage_EnableMigrationsCommandsInfo); + +#line default +#line hidden + WriteLiteral("

\r\n
\r\n \r\n"); +#line 129 "DatabaseErrorPage.cshtml" } else if (Model.PendingModelChanges) { @@ -370,31 +386,37 @@ function ErrorApplyingMigrations() { #line hidden WriteLiteral("
\r\n

"); -#line 131 "DatabaseErrorPage.cshtml" +#line 133 "DatabaseErrorPage.cshtml" Write(Strings.FormatDatabaseErrorPage_PendingChangesTitle(Model.ContextType.Name)); #line default #line hidden WriteLiteral("

\r\n

"); -#line 132 "DatabaseErrorPage.cshtml" +#line 134 "DatabaseErrorPage.cshtml" Write(Strings.DatabaseErrorPage_PendingChangesInfo); #line default #line hidden WriteLiteral("

\r\n "); -#line 133 "DatabaseErrorPage.cshtml" +#line 135 "DatabaseErrorPage.cshtml" Write(Strings.DatabaseErrorPage_AddMigrationCommand); #line default #line hidden WriteLiteral("\r\n
\r\n "); -#line 135 "DatabaseErrorPage.cshtml" +#line 137 "DatabaseErrorPage.cshtml" Write(Strings.DatabaseErrorPage_ApplyMigrationsCommand); #line default #line hidden - WriteLiteral("\r\n
\r\n
\r\n"); + WriteLiteral("\r\n

"); #line 138 "DatabaseErrorPage.cshtml" + WriteLiteral(Strings.DatabaseErrorPage_EnableMigrationsCommandsInfo); + +#line default +#line hidden + WriteLiteral("

\r\n
\r\n \r\n"); +#line 141 "DatabaseErrorPage.cshtml" } #line default diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/Views/DatabaseErrorPage.cshtml b/src/Microsoft.AspNet.Diagnostics.Entity/Views/DatabaseErrorPage.cshtml index 4d6e0f89eff..9f32ce799b9 100644 --- a/src/Microsoft.AspNet.Diagnostics.Entity/Views/DatabaseErrorPage.cshtml +++ b/src/Microsoft.AspNet.Diagnostics.Entity/Views/DatabaseErrorPage.cshtml @@ -38,7 +38,7 @@ -

A database operartion failed while processing the request.

+

@Strings.DatabaseErrorPage_Title

@if (Model.Options.ShowExceptionDetails) {

@@ -57,7 +57,8 @@

@Strings.DatabaseErrorPage_NoDbOrMigrationsInfo

@Strings.DatabaseErrorPage_AddMigrationCommand
- @Strings.DatabaseErrorPage_UpdateDatabaseCommand + @Strings.DatabaseErrorPage_ApplyMigrationsCommand +

@Strings.DatabaseErrorPage_EnableMigrationsCommandsInfo


} else if (Model.PendingMigrations.Any()) @@ -99,7 +100,7 @@ req.onload = function (e) { if (req.status == 204) { applyMigrations.innerHTML = "@Strings.DatabaseErrorPage_ApplyMigrationsButtonDone"; - applyMigrationsSuccess.innerHTML = "@Strings.DatabaseErrorPage_MigrationsAppliedRefresh"; + applyMigrationsSuccess.innerHTML = "@Strings.DatabaseErrorPage_MigrationsAppliedRefresh"; } else { ErrorApplyingMigrations(); } @@ -121,7 +122,8 @@ }

@Strings.DatabaseErrorPage_HowToApplyFromCmd

- @Strings.DatabaseErrorPage_UpdateDatabaseCommand + @Strings.DatabaseErrorPage_ApplyMigrationsCommand +

@Strings.DatabaseErrorPage_EnableMigrationsCommandsInfo


} @@ -132,7 +134,8 @@

@Strings.DatabaseErrorPage_PendingChangesInfo

@Strings.DatabaseErrorPage_AddMigrationCommand
- @Strings.DatabaseErrorPage_UpdateDatabaseCommand + @Strings.DatabaseErrorPage_ApplyMigrationsCommand +

@Strings.DatabaseErrorPage_EnableMigrationsCommandsInfo


}