upgrade to overridable ef db mix

NetCoreTemplates · Mar 6, 2024 · 1b35305 · 1b35305
1 parent 5d5cc4b
commit 1b35305
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/MyApp/Configure.Db.cs b/MyApp/Configure.Db.cs
@@ -1,5 +1,7 @@
+using Microsoft.EntityFrameworkCore;
 using ServiceStack.Data;
 using ServiceStack.OrmLite;
+using MyApp.Data;
 
 [assembly: HostingStartup(typeof(MyApp.ConfigureDb))]
 
@@ -9,13 +11,18 @@ public class ConfigureDb : IHostingStartup
 {
     public void Configure(IWebHostBuilder builder) => builder
         .ConfigureServices((context, services) => {
+            var connectionString = context.Configuration.GetConnectionString("DefaultConnection")
+                ?? "DataSource=App_Data/app.db;Cache=Shared";
+
             services.AddSingleton<IDbConnectionFactory>(new OrmLiteConnectionFactory(
-                context.Configuration.GetConnectionString("DefaultConnection")
-                ?? ":memory:",
-                SqliteDialect.Provider));
-        })
-        .ConfigureAppHost(appHost => {
+                connectionString, SqliteDialect.Provider));
+
+            // $ dotnet ef migrations add CreateIdentitySchema
+            // $ dotnet ef database update
+            services.AddDbContext<ApplicationDbContext>(options =>
+                options.UseSqlite(connectionString, b => b.MigrationsAssembly(nameof(MyApp))));
+
             // Enable built-in Database Admin UI at /admin-ui/database
-            appHost.Plugins.Add(new AdminDatabaseFeature());
+            services.AddPlugin(new AdminDatabaseFeature());
         });
-}
+}
diff --git a/...19062137_CreateIdentitySchema.Designer.cs → ...01000000_CreateIdentitySchema.Designer.cs b/...19062137_CreateIdentitySchema.Designer.cs → ...01000000_CreateIdentitySchema.Designer.cs
diff --git a/...ns/20231019062137_CreateIdentitySchema.cs → ...ns/20240301000000_CreateIdentitySchema.cs b/...ns/20231019062137_CreateIdentitySchema.cs → ...ns/20240301000000_CreateIdentitySchema.cs
diff --git a/MyApp/Migrations/ApplicationDbContextModelSnapshot.cs b/MyApp/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -15,7 +15,7 @@ partial class ApplicationDbContextModelSnapshot : ModelSnapshot
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "8.0.0-rc.2.23480.1");
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.2");
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
                 {

diff --git a/MyApp/Program.cs b/MyApp/Program.cs
@@ -33,11 +33,6 @@
 services.AddDataProtection()
     .PersistKeysToFileSystem(new DirectoryInfo("App_Data"));
 
-// $ dotnet ef migrations add CreateIdentitySchema
-// $ dotnet ef database update
-var connectionString = config.GetConnectionString("DefaultConnection") ?? throw new InvalidOperationException("Connection string 'DefaultConnection' not found.");
-services.AddDbContext<ApplicationDbContext>(options =>
-    options.UseSqlite(connectionString, b => b.MigrationsAssembly(nameof(MyApp))));
 services.AddDatabaseDeveloperPageExceptionFilter();
 
 services.AddIdentityCore<ApplicationUser>(options => options.SignIn.RequireConfirmedAccount = true)