From e85b1001c634e32243434e08627d3595ff2ec842 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Mon, 16 Feb 2026 15:20:46 -0500 Subject: [PATCH] remove assemblies.log logic --- .../Infrastructure/InstallationManager.cs | 115 +----------------- Oqtane.Server/Infrastructure/Jobs/PurgeJob.cs | 12 -- 2 files changed, 1 insertion(+), 126 deletions(-) diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs index 8da91ec6..4340db89 100644 --- a/Oqtane.Server/Infrastructure/InstallationManager.cs +++ b/Oqtane.Server/Infrastructure/InstallationManager.cs @@ -22,7 +22,6 @@ namespace Oqtane.Infrastructure { void InstallPackages(); bool UninstallPackage(string PackageName); - int RegisterAssemblies(); Task UpgradeFramework(bool backup); void RestartApplication(); } @@ -61,10 +60,6 @@ namespace Oqtane.Infrastructure Directory.CreateDirectory(sourceFolder); } - // read assembly log - var assemblyLogPath = Path.Combine(sourceFolder, "assemblies.log"); - var assemblies = GetAssemblyLog(assemblyLogPath); - // install Nuget packages in secure Packages folder var packages = Directory.GetFiles(sourceFolder, "*.nupkg"); foreach (string packagename in packages) @@ -162,27 +157,6 @@ namespace Oqtane.Infrastructure { manifest = true; } - - // register assembly - if (Path.GetExtension(filename) == ".dll") - { - // do not register licensing assemblies - if (!Path.GetFileName(filename).StartsWith("Oqtane.Licensing.")) - { - // if package version was not installed previously - if (!File.Exists(Path.Combine(sourceFolder, name + ".log"))) - { - if (assemblies.ContainsKey(Path.GetFileName(filename))) - { - assemblies[Path.GetFileName(filename)] += 1; - } - else - { - assemblies.Add(Path.GetFileName(filename), 1); - } - } - } - } } } @@ -212,12 +186,6 @@ namespace Oqtane.Infrastructure File.Delete(packagename); } - if (packages.Length != 0) - { - // save assembly log - SetAssemblyLog(assemblyLogPath, assemblies); - } - return errors; } @@ -270,10 +238,6 @@ namespace Oqtane.Infrastructure { if (!string.IsNullOrEmpty(PackageName)) { - // read assembly log - var assemblyLogPath = Path.Combine(Path.Combine(_environment.ContentRootPath, Constants.PackagesFolder), "assemblies.log"); - var assemblies = GetAssemblyLog(assemblyLogPath); - // get manifest with highest version string packagename = ""; string[] packages = Directory.GetFiles(Path.Combine(_environment.ContentRootPath, Constants.PackagesFolder), PackageName + "*.log"); @@ -298,23 +262,7 @@ namespace Oqtane.Infrastructure // do not remove licensing assemblies if (!Path.GetFileName(filepath).StartsWith("Oqtane.Licensing.")) { - // use assembly log to determine if assembly is used in other packages - if (assemblies.ContainsKey(Path.GetFileName(filepath))) - { - if (assemblies[Path.GetFileName(filepath)] == 1) - { - DeleteFile(filepath); - assemblies.Remove(Path.GetFileName(filepath)); - } - else - { - assemblies[Path.GetFileName(filepath)] -= 1; - } - } - else // does not exist in assembly log - { - DeleteFile(filepath); - } + DeleteFile(filepath); } } else // not an assembly @@ -329,9 +277,6 @@ namespace Oqtane.Infrastructure File.Delete(asset); } - // save assembly log - SetAssemblyLog(assemblyLogPath, assemblies); - return true; } } @@ -351,64 +296,6 @@ namespace Oqtane.Infrastructure } } - public int RegisterAssemblies() - { - var assemblyLogPath = GetAssemblyLogPath(); - var binFolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location); - - var assemblies = GetAssemblyLog(assemblyLogPath); - - // remove assemblies that no longer exist - foreach (var dll in assemblies) - { - if (!File.Exists(Path.Combine(binFolder, dll.Key))) - { - assemblies.Remove(dll.Key); - } - } - // add assemblies which are not registered - foreach (var dll in Directory.GetFiles(binFolder, "*.dll")) - { - if (!assemblies.ContainsKey(Path.GetFileName(dll))) - { - assemblies.Add(Path.GetFileName(dll), 1); - } - } - - SetAssemblyLog(assemblyLogPath, assemblies); - - return assemblies.Count; - } - - private string GetAssemblyLogPath() - { - string packagesFolder = Path.Combine(_environment.ContentRootPath, Constants.PackagesFolder); - if (!Directory.Exists(packagesFolder)) - { - Directory.CreateDirectory(packagesFolder); - } - return Path.Combine(packagesFolder, "assemblies.log"); - } - - private static Dictionary GetAssemblyLog(string assemblyLogPath) - { - Dictionary assemblies = new Dictionary(); - if (File.Exists(assemblyLogPath)) - { - assemblies = JsonSerializer.Deserialize>(File.ReadAllText(assemblyLogPath)); - } - return assemblies; - } - - private static void SetAssemblyLog(string assemblyLogPath, Dictionary assemblies) - { - if (File.Exists(assemblyLogPath)) - { - File.Delete(assemblyLogPath); - } - File.WriteAllText(assemblyLogPath, JsonSerializer.Serialize(assemblies, new JsonSerializerOptions { WriteIndented = true })); - } - public async Task UpgradeFramework(bool backup) { string folder = Path.Combine(_environment.ContentRootPath, Constants.PackagesFolder); diff --git a/Oqtane.Server/Infrastructure/Jobs/PurgeJob.cs b/Oqtane.Server/Infrastructure/Jobs/PurgeJob.cs index 89a2238d..3bcff41d 100644 --- a/Oqtane.Server/Infrastructure/Jobs/PurgeJob.cs +++ b/Oqtane.Server/Infrastructure/Jobs/PurgeJob.cs @@ -33,7 +33,6 @@ namespace Oqtane.Infrastructure var visitorRepository = provider.GetRequiredService(); var notificationRepository = provider.GetRequiredService(); var urlMappingRepository = provider.GetRequiredService(); - var installationManager = provider.GetRequiredService(); // iterate through sites for current tenant List sites = siteRepository.GetSites().ToList(); @@ -97,17 +96,6 @@ namespace Oqtane.Infrastructure } } - // register assemblies - try - { - var assemblies = installationManager.RegisterAssemblies(); - log += "
" + assemblies.ToString() + " Assemblies Registered
"; - } - catch (Exception ex) - { - log += $"
Error Registering Assemblies - {ex.Message}
"; - } - return log; } }