diff --git a/.gitignore b/.gitignore
index 2d6b767b..bd2d7057 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,7 @@ _ReSharper.Caches
Oqtane.Server/appsettings.json
Oqtane.Server/Data
-/Oqtane.Server/Properties/PublishProfiles/FolderProfile.pubxml
+Oqtane.Server/Properties/PublishProfiles/FolderProfile.pubxml
Oqtane.Server/Content
Oqtane.Server/Packages
Oqtane.Server/wwwroot/Content
diff --git a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
index a3d94384..ae53aeb9 100644
--- a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
+++ b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
@@ -38,6 +38,6 @@
-
+
diff --git a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
index 3264cca9..8983ec05 100644
--- a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
+++ b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
@@ -39,6 +39,6 @@
-
+
diff --git a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
index f8dd5c68..a01664ae 100644
--- a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
+++ b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
@@ -37,7 +37,7 @@
-
+
diff --git a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
index 084eac98..0b56a9ed 100644
--- a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
+++ b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
@@ -37,7 +37,7 @@
-
+
diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs
index 66dd2cea..f1ca534b 100644
--- a/Oqtane.Server/Infrastructure/DatabaseManager.cs
+++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs
@@ -215,39 +215,14 @@ namespace Oqtane.Infrastructure
try
{
- bool installPackages = false;
-
- // iterate database packages in installation folder
- var packagesFolder = new DirectoryInfo(Path.Combine(_environment.ContentRootPath, Constants.PackagesFolder));
- foreach (var package in packagesFolder.GetFiles("*.nupkg.bak"))
- {
- // determine if package needs to be upgraded or installed
- bool upgrade = System.IO.File.Exists(package.FullName.Replace(".nupkg.bak",".log"));
- if (upgrade || package.Name.StartsWith(Utilities.GetAssemblyName(install.DatabaseType)))
- {
- var packageName = Path.Combine(package.DirectoryName, package.Name);
- packageName = packageName.Substring(0, packageName.IndexOf(".bak"));
- package.MoveTo(packageName, true);
- installPackages = true;
- }
- }
- if (installPackages)
- {
- using (var scope = _serviceScopeFactory.CreateScope())
- {
- var installationManager = scope.ServiceProvider.GetRequiredService();
- installationManager.InstallPackages();
- }
- }
-
// load the installation database type (if necessary)
- if (Type.GetType(install.DatabaseType) == null)
- {
- var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
- var assembliesFolder = new DirectoryInfo(assemblyPath);
- var assemblyFile = new FileInfo($"{assembliesFolder}/{Utilities.GetAssemblyName(install.DatabaseType)}.dll");
- AssemblyLoadContext.Default.LoadOqtaneAssembly(assemblyFile);
- }
+ //if (Type.GetType(install.DatabaseType) == null)
+ //{
+ // var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
+ // var assembliesFolder = new DirectoryInfo(assemblyPath);
+ // var assemblyFile = new FileInfo($"{assembliesFolder}/{Utilities.GetAssemblyName(install.DatabaseType)}.dll");
+ // AssemblyLoadContext.Default.LoadOqtaneAssembly(assemblyFile);
+ //}
result.Success = true;
}
diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs
index f29b3aba..b66a5a22 100644
--- a/Oqtane.Server/Infrastructure/InstallationManager.cs
+++ b/Oqtane.Server/Infrastructure/InstallationManager.cs
@@ -52,39 +52,22 @@ namespace Oqtane.Infrastructure
Directory.CreateDirectory(sourceFolder);
}
- // move packages to secure /Packages folder
- foreach (var folderName in "Modules,Themes,Packages".Split(","))
+ // move core framework distribution packages to secure /Packages folder
+ string folder = Path.Combine(webRootPath, "Packages");
+ if (Directory.Exists(folder))
{
- string folder = Path.Combine(webRootPath, folderName);
- if (Directory.Exists(folder))
+ foreach (var file in Directory.GetFiles(folder, "*.nupkg"))
{
- foreach (var file in Directory.GetFiles(folder, "*.nupkg*"))
+ var destinationFile = Path.Combine(sourceFolder, Path.GetFileName(file));
+ if (File.Exists(destinationFile))
{
- var destinationFile = Path.Combine(sourceFolder, Path.GetFileName(file));
- if (File.Exists(destinationFile))
- {
- File.Delete(destinationFile);
- }
-
- if (destinationFile.ToLower().EndsWith(".nupkg.bak"))
- {
- // leave a copy in the current folder as it is distributed with the core framework
- File.Copy(file, destinationFile);
- }
- else
- {
- // move to destination
- File.Move(file, destinationFile);
- }
+ File.Delete(destinationFile);
}
- }
- else
- {
- Directory.CreateDirectory(folder);
+ File.Move(file, destinationFile);
}
}
- // iterate through Nuget packages in source folder
+ // install Nuget packages in secure Packages folder
foreach (string packagename in Directory.GetFiles(sourceFolder, "*.nupkg"))
{
try
diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg.bak
deleted file mode 100644
index 63028fb6..00000000
Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg.bak and /dev/null differ
diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg.bak
deleted file mode 100644
index 2b6babc0..00000000
Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg.bak and /dev/null differ
diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg.bak
deleted file mode 100644
index dad4f9b6..00000000
Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg.bak and /dev/null differ
diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg.bak
deleted file mode 100644
index 77495a18..00000000
Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg.bak and /dev/null differ