diff --git a/Oqtane.Database.MySQL/MySQLDatabase.cs b/Oqtane.Database.MySQL/MySQLDatabase.cs
index d47a6f6a..1b3344a2 100644
--- a/Oqtane.Database.MySQL/MySQLDatabase.cs
+++ b/Oqtane.Database.MySQL/MySQLDatabase.cs
@@ -1,12 +1,10 @@
using System.Data;
using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations.Operations;
using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
using MySql.Data.MySqlClient;
using MySql.EntityFrameworkCore.Metadata;
using Oqtane.Databases;
-using Oqtane.Shared;
namespace Oqtane.Database.MySQL
{
diff --git a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
index ae53aeb9..b41dcbd2 100644
--- a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
+++ b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
@@ -14,10 +14,6 @@
https://github.com/oqtane/oqtane.framework
Git
true
- true
- $(MSBuildProjectName).nuspec
- $(MSBuildProjectName).$(Version).nupkg
- true
@@ -37,7 +33,16 @@
-
-
+
+
+
+
+
+
+
+
diff --git a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec
deleted file mode 100644
index 728dbb32..00000000
--- a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
- Oqtane.Database.MySQL
- 5.0.0
- Shaun Walker
- .NET Foundation
- Oqtane MySQL Provider
- MySQL database support for the Oqtane Framework
- MySQL database support for the Oqtane Framework
- .NET Foundation
- false
- MIT
- https://github.com/oqtane/oqtane.framework
- https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0
- icon.png
- oqtane
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Oqtane.Database.MySQL/icon.png b/Oqtane.Database.MySQL/icon.png
deleted file mode 100644
index 3c43cce4..00000000
Binary files a/Oqtane.Database.MySQL/icon.png and /dev/null differ
diff --git a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
index dc45e393..ec89a3cb 100644
--- a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
+++ b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
@@ -14,10 +14,6 @@
https://github.com/oqtane/oqtane.framework
Git
true
- true
- $(MSBuildProjectName).nuspec
- $(MSBuildProjectName).$(Version).nupkg
- true
@@ -38,7 +34,16 @@
-
-
+
+
+
+
+
+
+
+
diff --git a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec
deleted file mode 100644
index b43d0d97..00000000
--- a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
- Oqtane.Database.PostgreSQL
- 5.0.0
- Shaun Walker
- .NET Foundation
- Oqtane PostgreSQL Provider
- PostgreSQL database support for the Oqtane Framework
- PostgreSQL database support for the Oqtane Framework
- .NET Foundation
- false
- MIT
- https://github.com/oqtane/oqtane.framework
- https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0
- icon.png
- oqtane
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Oqtane.Database.PostgreSQL/OqtaneHistoryRepository.cs b/Oqtane.Database.PostgreSQL/OqtaneHistoryRepository.cs
index 3172946e..cbc96246 100644
--- a/Oqtane.Database.PostgreSQL/OqtaneHistoryRepository.cs
+++ b/Oqtane.Database.PostgreSQL/OqtaneHistoryRepository.cs
@@ -1,11 +1,9 @@
using System;
-using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Migrations.Internal;
using Oqtane.Migrations.Framework;
using Oqtane.Models;
-using Oqtane.Shared;
// ReSharper disable ClassNeverInstantiated.Global
diff --git a/Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs b/Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs
index eba5aa82..f8806564 100644
--- a/Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs
+++ b/Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs
@@ -9,7 +9,6 @@ using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
using Npgsql;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Oqtane.Databases;
-using Oqtane.Shared;
namespace Oqtane.Database.PostgreSQL
{
diff --git a/Oqtane.Database.PostgreSQL/icon.png b/Oqtane.Database.PostgreSQL/icon.png
deleted file mode 100644
index 3c43cce4..00000000
Binary files a/Oqtane.Database.PostgreSQL/icon.png and /dev/null differ
diff --git a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
index a01664ae..e317974b 100644
--- a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
+++ b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
@@ -14,10 +14,6 @@
https://github.com/oqtane/oqtane.framework
Git
true
- true
- $(MSBuildProjectName).nuspec
- $(MSBuildProjectName).$(Version).nupkg
- true
@@ -36,8 +32,16 @@
-
-
+
+
+
+
+
+
+
diff --git a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec
deleted file mode 100644
index 9aed5043..00000000
--- a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- Oqtane.Database.SqlServer
- 5.0.0
- Shaun Walker
- .NET Foundation
- Oqtane SQL Server Provider
- SQL Server database support for the Oqtane Framework
- SQL Server database support for the Oqtane Framework
- .NET Foundation
- false
- MIT
- https://github.com/oqtane/oqtane.framework
- https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0
- icon.png
- oqtane
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Oqtane.Database.SqlServer/OqtaneHistoryRepository.cs b/Oqtane.Database.SqlServer/OqtaneHistoryRepository.cs
index 394aedb0..d3adacdf 100644
--- a/Oqtane.Database.SqlServer/OqtaneHistoryRepository.cs
+++ b/Oqtane.Database.SqlServer/OqtaneHistoryRepository.cs
@@ -1,13 +1,9 @@
using System;
-using System.Text;
-using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.SqlServer.Migrations.Internal;
-using Microsoft.EntityFrameworkCore.Storage;
using Oqtane.Migrations.Framework;
using Oqtane.Models;
-using Oqtane.Shared;
// ReSharper disable ClassNeverInstantiated.Global
diff --git a/Oqtane.Database.SqlServer/SqlServerDatabase.cs b/Oqtane.Database.SqlServer/SqlServerDatabase.cs
index 11384e17..a7d8f641 100644
--- a/Oqtane.Database.SqlServer/SqlServerDatabase.cs
+++ b/Oqtane.Database.SqlServer/SqlServerDatabase.cs
@@ -6,7 +6,6 @@ using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations.Operations;
using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
using Oqtane.Databases;
-using Oqtane.Shared;
namespace Oqtane.Database.SqlServer
{
diff --git a/Oqtane.Database.SqlServer/icon.png b/Oqtane.Database.SqlServer/icon.png
deleted file mode 100644
index 3c43cce4..00000000
Binary files a/Oqtane.Database.SqlServer/icon.png and /dev/null differ
diff --git a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
index 0b56a9ed..769ee425 100644
--- a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
+++ b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
@@ -14,10 +14,6 @@
https://github.com/oqtane/oqtane.framework
Git
true
- true
- $(MSBuildProjectName).nuspec
- $(MSBuildProjectName).$(Version).nupkg
- true
@@ -36,8 +32,16 @@
-
-
+
+
+
+
+
+
+
diff --git a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec
deleted file mode 100644
index 8dee352a..00000000
--- a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- Oqtane.Database.Sqlite
- 5.0.0
- Shaun Walker
- .NET Foundation
- Oqtane SQLite Provider
- SQLite database support for the Oqtane Framework
- SQLite database support for the Oqtane Framework
- .NET Foundation
- false
- MIT
- https://github.com/oqtane/oqtane.framework
- https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0
- icon.png
- oqtane
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Oqtane.Database.Sqlite/OqtaneHistoryRepository.cs b/Oqtane.Database.Sqlite/OqtaneHistoryRepository.cs
index 4703714a..e1961358 100644
--- a/Oqtane.Database.Sqlite/OqtaneHistoryRepository.cs
+++ b/Oqtane.Database.Sqlite/OqtaneHistoryRepository.cs
@@ -1,11 +1,9 @@
using System;
-using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Sqlite.Migrations.Internal;
using Oqtane.Migrations.Framework;
using Oqtane.Models;
-using Oqtane.Shared;
// ReSharper disable ClassNeverInstantiated.Global
diff --git a/Oqtane.Database.Sqlite/SqliteDatabase.cs b/Oqtane.Database.Sqlite/SqliteDatabase.cs
index df150c2c..39c6cfd3 100644
--- a/Oqtane.Database.Sqlite/SqliteDatabase.cs
+++ b/Oqtane.Database.Sqlite/SqliteDatabase.cs
@@ -6,7 +6,6 @@ using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations.Operations;
using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
using Oqtane.Databases;
-using Oqtane.Shared;
namespace Oqtane.Database.Sqlite
{
diff --git a/Oqtane.Database.Sqlite/icon.png b/Oqtane.Database.Sqlite/icon.png
deleted file mode 100644
index 3c43cce4..00000000
Binary files a/Oqtane.Database.Sqlite/icon.png and /dev/null differ
diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs
index b66a5a22..90d8ee97 100644
--- a/Oqtane.Server/Infrastructure/InstallationManager.cs
+++ b/Oqtane.Server/Infrastructure/InstallationManager.cs
@@ -46,27 +46,12 @@ namespace Oqtane.Infrastructure
string errors = "";
string binPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
- string sourceFolder = Path.Combine(contentRootPath, "Packages");
+ string sourceFolder = Path.Combine(contentRootPath, Constants.PackagesFolder);
if (!Directory.Exists(sourceFolder))
{
Directory.CreateDirectory(sourceFolder);
}
- // move core framework distribution packages to secure /Packages folder
- string folder = Path.Combine(webRootPath, "Packages");
- if (Directory.Exists(folder))
- {
- foreach (var file in Directory.GetFiles(folder, "*.nupkg"))
- {
- var destinationFile = Path.Combine(sourceFolder, Path.GetFileName(file));
- if (File.Exists(destinationFile))
- {
- File.Delete(destinationFile);
- }
- File.Move(file, destinationFile);
- }
- }
-
// install Nuget packages in secure Packages folder
foreach (string packagename in Directory.GetFiles(sourceFolder, "*.nupkg"))
{
diff --git a/Oqtane.Server/Program.cs b/Oqtane.Server/Program.cs
index 2d762efd..bd6a9471 100644
--- a/Oqtane.Server/Program.cs
+++ b/Oqtane.Server/Program.cs
@@ -4,9 +4,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.AspNetCore;
using Microsoft.Extensions.DependencyInjection;
using Oqtane.Infrastructure;
-using System.Diagnostics;
using Microsoft.Extensions.Logging;
-using Oqtane.Shared;
using Oqtane.Documentation;
namespace Oqtane.Server