Fix Sqlite migrations.

immense · Oct 9, 2020 · 0bda9b0 · 0bda9b0
1 parent 28f9fcd
commit 0bda9b0
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 37 deletions.
diff --git a/Server/Migrations/Sqlite/20200305230311_Initial.Designer.cs b/Server/Migrations/Sqlite/20200305230311_Initial.Designer.cs
diff --git a/Server/Migrations/Sqlite/20200306013915_IsServerAdmin property.Designer.cs b/Server/Migrations/Sqlite/20200306013915_IsServerAdmin property.Designer.cs
diff --git a/Server/Migrations/Sqlite/20200306013915_IsServerAdmin property.cs b/Server/Migrations/Sqlite/20200306013915_IsServerAdmin property.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace Remotely.Server.Migrations
+namespace Remotely.Server.Migrations.Sqlite
 {
     public partial class IsServerAdminproperty : Migration
     {

diff --git a/Server/Migrations/Sqlite/20200325145606_Alerts.Designer.cs b/Server/Migrations/Sqlite/20200325145606_Alerts.Designer.cs
diff --git a/Server/Migrations/Sqlite/20200325145606_Alerts.cs b/Server/Migrations/Sqlite/20200325145606_Alerts.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace Remotely.Server.Migrations
+namespace Remotely.Server.Migrations.Sqlite
 {
     public partial class Alerts : Migration
     {

diff --git a/Server/Migrations/Sqlite/20200327034430_Device Notes.Designer.cs b/Server/Migrations/Sqlite/20200327034430_Device Notes.Designer.cs
diff --git a/Server/Migrations/Sqlite/20200327034430_Device Notes.cs b/Server/Migrations/Sqlite/20200327034430_Device Notes.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace Remotely.Server.Migrations
+namespace Remotely.Server.Migrations.Sqlite
 {
     public partial class DeviceNotes : Migration
     {

diff --git a/Server/Migrations/Sqlite/20200425052143_PublicIP.Designer.cs b/Server/Migrations/Sqlite/20200425052143_PublicIP.Designer.cs
diff --git a/Server/Migrations/Sqlite/20200425052143_PublicIP.cs b/Server/Migrations/Sqlite/20200425052143_PublicIP.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace Remotely.Server.Migrations
+namespace Remotely.Server.Migrations.Sqlite
 {
     public partial class PublicIP : Migration
     {

diff --git a/Server/Migrations/Sqlite/20200430222500_DisplayName.Designer.cs b/Server/Migrations/Sqlite/20200430222500_DisplayName.Designer.cs
diff --git a/Server/Migrations/Sqlite/20200430222500_DisplayName.cs b/Server/Migrations/Sqlite/20200430222500_DisplayName.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace Remotely.Server.Migrations
+namespace Remotely.Server.Migrations.Sqlite
 {
     public partial class DisplayName : Migration
     {

diff --git a/Server/Migrations/Sqlite/20200717143837_Temp password.Designer.cs b/Server/Migrations/Sqlite/20200717143837_Temp password.Designer.cs
diff --git a/Server/Migrations/Sqlite/20200717143837_Temp password.cs b/Server/Migrations/Sqlite/20200717143837_Temp password.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace Remotely.Server.Migrations
+namespace Remotely.Server.Migrations.Sqlite
 {
     public partial class Temppassword : Migration
     {

diff --git a/Server/Migrations/Sqlite/SqliteDbContextModelSnapshot.cs b/Server/Migrations/Sqlite/SqliteDbContextModelSnapshot.cs
@@ -5,7 +5,7 @@
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Remotely.Server.Data;
 
-namespace Remotely.Server.Migrations
+namespace Remotely.Server.Migrations.Sqlite
 {
     [DbContext(typeof(SqliteDbContext))]
     partial class SqliteDbContextModelSnapshot : ModelSnapshot
@@ -14,7 +14,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "3.1.5");
+                .HasAnnotation("ProductVersion", "3.1.7");
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
                 {

diff --git a/Server/Server.csproj b/Server/Server.csproj
@@ -87,6 +87,7 @@
 
   <ItemGroup>
     <Folder Include="Migrations\PostgreSql\" />
+    <Folder Include="Migrations\Sqlite\" />
     <Folder Include="Properties\" />
   </ItemGroup>
 

diff --git a/Server/Startup.cs b/Server/Startup.cs
@@ -45,22 +45,11 @@ public void ConfigureServices(IServiceCollection services)
             {
                 services.AddDbContext<ApplicationDbContext, SqliteDbContext>(options => 
                     options.UseSqlite(Configuration.GetConnectionString("SQLite")));
-
-                services.AddIdentity<RemotelyUser, IdentityRole>(options => options.Stores.MaxLengthForKeys = 128)
-                   .AddEntityFrameworkStores<ApplicationDbContext>()
-                   .AddDefaultUI()
-                   .AddDefaultTokenProviders();
             }
             else if (dbProvider == "sqlserver")
             {
                 services.AddDbContext<ApplicationDbContext, SqlServerDbContext>(options =>
                     options.UseSqlServer(Configuration.GetConnectionString("SQLServer")));
-
-
-                services.AddIdentity<RemotelyUser, IdentityRole>(options => options.Stores.MaxLengthForKeys = 128)
-                    .AddEntityFrameworkStores<ApplicationDbContext>()
-                    .AddDefaultUI()
-                    .AddDefaultTokenProviders();
             }
             else if (dbProvider == "postgresql")
             {
@@ -81,13 +70,13 @@ public void ConfigureServices(IServiceCollection services)
                         options.UseNpgsql(Configuration.GetConnectionString("PostgreSQL"));
                     }
                 });
-
-                services.AddIdentity<RemotelyUser, IdentityRole>(options => options.Stores.MaxLengthForKeys = 128)
-                    .AddEntityFrameworkStores<ApplicationDbContext>()
-                    .AddDefaultUI()
-                    .AddDefaultTokenProviders();
             }
 
+            services.AddIdentity<RemotelyUser, IdentityRole>(options => options.Stores.MaxLengthForKeys = 128)
+                .AddEntityFrameworkStores<ApplicationDbContext>()
+                .AddDefaultUI()
+                .AddDefaultTokenProviders();
+
             var trustedOrigins = Configuration.GetSection("ApplicationOptions:TrustedCorsOrigins").Get<string[]>();
 
             if (trustedOrigins != null)