Merge pull request #3472 from sbwalker/dev

fix #3454 - do not remove Oqtane.lLicensing assemblies during package uninstall
This commit is contained in:
Shaun Walker 2023-11-13 13:16:56 -05:00 committed by GitHub
commit f845bf5b25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -251,10 +251,14 @@ namespace Oqtane.Infrastructure
string filepath = asset.StartsWith("\\") ? Path.Combine(_environment.ContentRootPath, asset.Substring(1)) : asset;
if (File.Exists(filepath))
{
File.Delete(filepath);
if (!Directory.EnumerateFiles(Path.GetDirectoryName(filepath)).Any())
// do not remove licensing assemblies - this is a temporary fix until a more robust dependency management solution is available
if (!filepath.Contains("Oqtane.Licensing."))
{
Directory.Delete(Path.GetDirectoryName(filepath), true);
File.Delete(filepath);
if (!Directory.EnumerateFiles(Path.GetDirectoryName(filepath)).Any())
{
Directory.Delete(Path.GetDirectoryName(filepath), true);
}
}
}
}