Skip to content

Updated to support finding .slnx solution file and allow DbContextFac… #24267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ejohnson-dotnet wants to merge 1 commit into
base: dev
Choose a base branch
from
+38 −6
Open

Updated to support finding .slnx solution file and allow DbContextFac… #24267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...et-core/MyCompanyName.MyProjectName.Blazor.Server/Data/MyProjectNameDbMigrationService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ private string GetEntityFrameworkCoreProjectFolderPath()
{
currentDirectory = Directory.GetParent(currentDirectory.FullName);

if (currentDirectory != null && Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln")) != null)
if (currentDirectory != null && Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln") || f.EndsWith(".slnx")) != null)
{
return currentDirectory.FullName;
}
Expand Down
2 changes: 1 addition & 1 deletion ...mpanyName.MyProjectName.Blazor.WebAssembly/Server/Data/MyProjectNameDbMigrationService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ private string GetEntityFrameworkCoreProjectFolderPath()
{
currentDirectory = Directory.GetParent(currentDirectory.FullName);

if (currentDirectory != null && Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln")) != null)
if (currentDirectory != null && Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln") || f.EndsWith(".slnx")) != null)
{
return currentDirectory.FullName;
}
Expand Down
2 changes: 1 addition & 1 deletion ...yers/aspnet-core/MyCompanyName.MyProjectName.Host/Data/MyProjectNameDbMigrationService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ private string GetEntityFrameworkCoreProjectFolderPath()
{
currentDirectory = Directory.GetParent(currentDirectory.FullName);

if (currentDirectory != null && Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln")) != null)
if (currentDirectory != null && Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln") || f.EndsWith(".slnx")) != null)
{
return currentDirectory.FullName;
}
Expand Down
2 changes: 1 addition & 1 deletion ...ayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Data/MyProjectNameDbMigrationService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ private string GetEntityFrameworkCoreProjectFolderPath()
{
currentDirectory = Directory.GetParent(currentDirectory.FullName);

if (currentDirectory != null && Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln")) != null)
if (currentDirectory != null && Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln") || f.EndsWith(".slnx")) != null)
{
return currentDirectory.FullName;
}
Expand Down
2 changes: 1 addition & 1 deletion ...spnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ private void AddInitialMigration()
{
currentDirectory = Directory.GetParent(currentDirectory.FullName);

if (currentDirectory != null && Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln")) != null)
if (currentDirectory != null && Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln") || f.EndsWith(".slnx")) != null)
{
return currentDirectory.FullName;
}
Expand Down
34 changes: 33 additions & 1 deletion ...me.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContextFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,41 @@ public MyProjectNameDbContext CreateDbContext(string[] args)
private static IConfigurationRoot BuildConfiguration()
{
var builder = new ConfigurationBuilder()
.SetBasePath(Path.Combine(Directory.GetCurrentDirectory(), "../MyCompanyName.MyProjectName.DbMigrator/"))
.SetBasePath(GetDbMigratorProjectFolderPath())
.AddJsonFile("appsettings.json", optional: false);

return builder.Build();
}

private static string GetDbMigratorProjectFolderPath()
{
var slnDirectoryPath = GetSolutionDirectoryPath();

if (string.IsNullOrEmpty(slnDirectoryPath))
{
throw new Exception("Solution folder not found!");
}

var srcDirectoryPath = Path.Combine(slnDirectoryPath, "src");

return Directory.GetDirectories(srcDirectoryPath)
.FirstOrDefault(d => d.EndsWith(".DbMigrator")) ?? string.Empty;
}

private static string GetSolutionDirectoryPath()
{
var currentDirectory = new DirectoryInfo(Directory.GetCurrentDirectory());

while (currentDirectory != null && Directory.GetParent(currentDirectory.FullName) != null)
{
currentDirectory = Directory.GetParent(currentDirectory.FullName);

if (currentDirectory != null && Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln") || f.EndsWith(".slnx")) != null)
{
return currentDirectory.FullName;
}
}

return string.Empty;
}
}
Loading