Update db context factory to use AppDomain.CurrentDomain.BaseDirectory

Kaioru · Aug 6, 2022 · 69536bf · 69536bf
1 parent 3f60d55
commit 69536bf
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git a/src/common/Edelstein.Common.Gameplay.Database/Edelstein.Common.Gameplay.Database.csproj b/src/common/Edelstein.Common.Gameplay.Database/Edelstein.Common.Gameplay.Database.csproj
@@ -6,6 +6,12 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Edelstein.Common.Gameplay\Edelstein.Common.Gameplay.csproj"/>
     <ProjectReference Include="..\Edelstein.Common.Util.Serializers\Edelstein.Common.Util.Serializers.csproj"/>

diff --git a/src/common/Edelstein.Common.Gameplay.Database/GameplayDbContextFactory.cs b/src/common/Edelstein.Common.Gameplay.Database/GameplayDbContextFactory.cs
@@ -9,7 +9,7 @@ public class GameplayDbContextFactory : IDesignTimeDbContextFactory<GameplayDbCo
     public GameplayDbContext CreateDbContext(string[] args)
     {
         var configuration = new ConfigurationBuilder()
-            .SetBasePath(Directory.GetCurrentDirectory())
+            .SetBasePath(AppDomain.CurrentDomain.BaseDirectory)
             .AddJsonFile("appsettings.json", true)
             .AddJsonFile("appsettings.Development.json", true)
             .Build();

diff --git a/src/common/Edelstein.Common.Services.Auth/AuthDbContextFactory.cs b/src/common/Edelstein.Common.Services.Auth/AuthDbContextFactory.cs
@@ -9,7 +9,7 @@ public class AuthDbContextFactory : IDesignTimeDbContextFactory<AuthDbContext>
     public AuthDbContext CreateDbContext(string[] args)
     {
         var configuration = new ConfigurationBuilder()
-            .SetBasePath(Directory.GetCurrentDirectory())
+            .SetBasePath(AppDomain.CurrentDomain.BaseDirectory)
             .AddJsonFile("appsettings.json", true)
             .AddJsonFile("appsettings.Development.json", true)
             .Build();

diff --git a/src/common/Edelstein.Common.Services.Auth/Edelstein.Common.Services.Auth.csproj b/src/common/Edelstein.Common.Services.Auth/Edelstein.Common.Services.Auth.csproj
@@ -1,10 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\Common.targets"/>
-  
+
   <PropertyGroup>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\protocol\Edelstein.Protocol.Services.Auth\Edelstein.Protocol.Services.Auth.csproj"/>

diff --git a/src/common/Edelstein.Common.Services.Server/Edelstein.Common.Services.Server.csproj b/src/common/Edelstein.Common.Services.Server/Edelstein.Common.Services.Server.csproj
@@ -1,11 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\Common.targets"/>
-  
+
   <PropertyGroup>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Mapster" Version="7.3.0"/>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.7"/>

diff --git a/src/common/Edelstein.Common.Services.Server/ServerDbContextFactory.cs b/src/common/Edelstein.Common.Services.Server/ServerDbContextFactory.cs
@@ -9,7 +9,7 @@ public class ServerDbContextFactory : IDesignTimeDbContextFactory<ServerDbContex
     public ServerDbContext CreateDbContext(string[] args)
     {
         var configuration = new ConfigurationBuilder()
-            .SetBasePath(Directory.GetCurrentDirectory())
+            .SetBasePath(AppDomain.CurrentDomain.BaseDirectory)
             .AddJsonFile("appsettings.json", true)
             .AddJsonFile("appsettings.Development.json", true)
             .Build();