kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5088 from sbwalker/dev

Browse Source 
modify RemoveAssemblies method so that it only runs once - not for every tenant
This commit is contained in:
Shaun Walker 2025-02-10 16:27:24 -05:00 committed by GitHub
commit 14ad68bf69
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Oqtane.Server/Infrastructure/UpgradeManager.cs
View File

@ -482,7 +482,7 @@ namespace Oqtane.Infrastructure
"System.Text.Json.dll" "System.Text.Json.dll"
}; };
RemoveAssemblies(assemblies, "6.0.1"); RemoveAssemblies(tenant, assemblies, "6.0.1");
} }
private void Upgrade_6_1_0(Tenant tenant, IServiceScope scope) private void Upgrade_6_1_0(Tenant tenant, IServiceScope scope)
@ -492,7 +492,7 @@ namespace Oqtane.Infrastructure
"MySql.EntityFrameworkCore.dll" "MySql.EntityFrameworkCore.dll"
}; };
RemoveAssemblies(assemblies, "6.1.0"); RemoveAssemblies(tenant, assemblies, "6.1.0");
} }
private void AddPagesToSites(IServiceScope scope, Tenant tenant, List<PageTemplate> pageTemplates) private void AddPagesToSites(IServiceScope scope, Tenant tenant, List<PageTemplate> pageTemplates)
@ -506,10 +506,10 @@ namespace Oqtane.Infrastructure
} }
} }
private void RemoveAssemblies(string[] assemblies, string version) private void RemoveAssemblies(Tenant tenant, string[] assemblies, string version)
{ {
// in a development environment assemblies cannot be removed as the debugger runs fron /bin folder and locks the files // in a development environment assemblies cannot be removed as the debugger runs fron /bin folder and locks the files
if (!_environment.IsDevelopment()) if (tenant.Name == TenantNames.Master && !_environment.IsDevelopment())
{ {
foreach (var assembly in assemblies) foreach (var assembly in assemblies)
{ {