From ade0419bf63d3d70f9f1006aee911e8fce326002 Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Thu, 14 Dec 2023 14:32:19 -0500
Subject: [PATCH] eliminate database provider nuget packages

---
 Oqtane.Database.MySQL/MySQLDatabase.cs        |   2 --
 .../Oqtane.Database.MySQL.csproj              |  17 +++++++----
 .../Oqtane.Database.MySQL.nuspec              |  26 -----------------
 Oqtane.Database.MySQL/icon.png                | Bin 4895 -> 0 bytes
 .../Oqtane.Database.PostgreSQL.csproj         |  17 +++++++----
 .../Oqtane.Database.PostgreSQL.nuspec         |  27 ------------------
 .../OqtaneHistoryRepository.cs                |   2 --
 .../PostgreSQLDatabase.cs                     |   1 -
 Oqtane.Database.PostgreSQL/icon.png           | Bin 4895 -> 0 bytes
 .../Oqtane.Database.SqlServer.csproj          |  16 +++++++----
 .../Oqtane.Database.SqlServer.nuspec          |  25 ----------------
 .../OqtaneHistoryRepository.cs                |   4 ---
 .../SqlServerDatabase.cs                      |   1 -
 Oqtane.Database.SqlServer/icon.png            | Bin 4895 -> 0 bytes
 .../Oqtane.Database.Sqlite.csproj             |  16 +++++++----
 .../Oqtane.Database.Sqlite.nuspec             |  25 ----------------
 .../OqtaneHistoryRepository.cs                |   2 --
 Oqtane.Database.Sqlite/SqliteDatabase.cs      |   1 -
 Oqtane.Database.Sqlite/icon.png               | Bin 4895 -> 0 bytes
 .../Infrastructure/InstallationManager.cs     |  17 +----------
 Oqtane.Server/Program.cs                      |   2 --
 21 files changed, 43 insertions(+), 158 deletions(-)
 delete mode 100644 Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec
 delete mode 100644 Oqtane.Database.MySQL/icon.png
 delete mode 100644 Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec
 delete mode 100644 Oqtane.Database.PostgreSQL/icon.png
 delete mode 100644 Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec
 delete mode 100644 Oqtane.Database.SqlServer/icon.png
 delete mode 100644 Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec
 delete mode 100644 Oqtane.Database.Sqlite/icon.png

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 @@
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
-    <PackageName>$(MSBuildProjectName).$(Version).nupkg</PackageName>
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -37,7 +33,16 @@
     <ProjectReference Include="..\Oqtane.Server\Oqtane.Server.csproj" />
   </ItemGroup>
 
-  <Target Name="CopyPackage" AfterTargets="Pack">
-    <Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\wwwroot\Packages\$(MSBuildProjectName).nupkg" />
+  <ItemGroup>
+    <ProviderFiles
+      Include="$(OutputPath)Oqtane.Database.MySQL.dll;$(OutputPath)Oqtane.Database.MySQL.pdb;$(OutputPath)MySql.EntityFrameworkCore.dll;$(OutputPath)MySql.Data.dll"
+      Exclude=""
+      DestinationPath="..\Oqtane.Server\bin\$(Configuration)\net8.0\%(Filename)%(Extension)">
+    </ProviderFiles>
+  </ItemGroup>
+
+  <Target Name="PublishProvider" AfterTargets="PostBuildEvent" Inputs="@(ProviderFiles)" Outputs="@(ProviderFiles->'%(DestinationPath)')">
+    <Copy SourceFiles="@(ProviderFiles)" DestinationFiles="@(ProviderFiles->'%(DestinationPath)')" />
   </Target>
+  
 </Project>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata>
-        <id>Oqtane.Database.MySQL</id>
-        <version>5.0.0</version>
-        <authors>Shaun Walker</authors>
-        <owners>.NET Foundation</owners>
-        <title>Oqtane MySQL Provider</title>
-        <summary>MySQL database support for the Oqtane Framework</summary>
-        <description>MySQL database support for the Oqtane Framework</description>
-        <copyright>.NET Foundation</copyright>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <license type="expression">MIT</license>
-        <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</releaseNotes>
-        <icon>icon.png</icon>
-        <tags>oqtane</tags>
-    </metadata>
-    <files>
-        <file src="bin\net8.0\Oqtane.Database.MySQL.dll" target="lib\net8.0" />
-        <file src="bin\net8.0\Oqtane.Database.MySQL.pdb" target="lib\net8.0" />
-        <file src="bin\net8.0\MySql.EntityFrameworkCore.dll" target="lib\net8.0" />
-        <file src="bin\net8.0\MySql.Data.dll" target="lib\net8.0" />
-        <file src="icon.png" target="" />
-    </files>
-</package>
\ 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 3c43cce4c6604107eab529207edd44c386768ca1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4895
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
R-3I^w002ovPDHLkV1nKx-0T1V

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 @@
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
-    <PackageName>$(MSBuildProjectName).$(Version).nupkg</PackageName>
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -38,7 +34,16 @@
     <ProjectReference Include="..\Oqtane.Server\Oqtane.Server.csproj" />
   </ItemGroup>
 
-  <Target Name="CopyPackage" AfterTargets="Pack">
-    <Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\wwwroot\Packages\$(MSBuildProjectName).nupkg" />
+  <ItemGroup>
+    <ProviderFiles
+      Include="$(OutputPath)Oqtane.Database.PostgreSQL.dll;$(OutputPath)Oqtane.Database.PostgreSQL.pdb;$(OutputPath)EFCore.NamingConventions.dll;$(OutputPath)Npgsql.EntityFrameworkCore.PostgreSQL.dll;$(OutputPath)Npgsql.dll"
+      Exclude=""
+      DestinationPath="..\Oqtane.Server\bin\$(Configuration)\net8.0\%(Filename)%(Extension)">
+    </ProviderFiles>
+  </ItemGroup>
+
+  <Target Name="PublishProvider" AfterTargets="PostBuildEvent" Inputs="@(ProviderFiles)" Outputs="@(ProviderFiles->'%(DestinationPath)')">
+    <Copy SourceFiles="@(ProviderFiles)" DestinationFiles="@(ProviderFiles->'%(DestinationPath)')" />
   </Target>
+  
 </Project>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata>
-        <id>Oqtane.Database.PostgreSQL</id>
-        <version>5.0.0</version>
-        <authors>Shaun Walker</authors>
-        <owners>.NET Foundation</owners>
-        <title>Oqtane PostgreSQL Provider</title>
-        <summary>PostgreSQL database support for the Oqtane Framework</summary>
-        <description>PostgreSQL database support for the Oqtane Framework</description>
-        <copyright>.NET Foundation</copyright>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <license type="expression">MIT</license>
-        <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</releaseNotes>
-        <icon>icon.png</icon>
-        <tags>oqtane</tags>
-    </metadata>
-    <files>
-        <file src="bin\net8.0\Oqtane.Database.PostgreSQL.dll" target="lib\net8.0" />
-        <file src="bin\net8.0\Oqtane.Database.PostgreSQL.pdb" target="lib\net8.0" />
-        <file src="bin\net8.0\EFCore.NamingConventions.dll" target="lib\net8.0" />
-        <file src="bin\net8.0\Npgsql.EntityFrameworkCore.PostgreSQL.dll" target="lib\net8.0" />
-        <file src="bin\net8.0\Npgsql.dll" target="lib\net8.0" />
-        <file src="icon.png" target="" />
-    </files>
-</package>
\ 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 3c43cce4c6604107eab529207edd44c386768ca1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4895
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
R-3I^w002ovPDHLkV1nKx-0T1V

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 @@
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
-    <PackageName>$(MSBuildProjectName).$(Version).nupkg</PackageName>
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -36,8 +32,16 @@
     <ProjectReference Include="..\Oqtane.Server\Oqtane.Server.csproj" />
   </ItemGroup>
 
-  <Target Name="CopyPackage" AfterTargets="Pack">
-    <Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\wwwroot\Packages\$(MSBuildProjectName).nupkg" />
+  <ItemGroup>
+    <ProviderFiles
+      Include="$(OutputPath)Oqtane.Database.SqlServer.dll;$(OutputPath)Oqtane.Database.SqlServer.pdb;$(OutputPath)Microsoft.EntityFrameworkCore.SqlServer.dll"
+      Exclude=""
+      DestinationPath="..\Oqtane.Server\bin\$(Configuration)\net8.0\%(Filename)%(Extension)">
+    </ProviderFiles>
+  </ItemGroup>
+
+  <Target Name="PublishProvider" AfterTargets="PostBuildEvent" Inputs="@(ProviderFiles)" Outputs="@(ProviderFiles->'%(DestinationPath)')">
+    <Copy SourceFiles="@(ProviderFiles)" DestinationFiles="@(ProviderFiles->'%(DestinationPath)')" />
   </Target>
 
 </Project>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata>
-        <id>Oqtane.Database.SqlServer</id>
-        <version>5.0.0</version>
-        <authors>Shaun Walker</authors>
-        <owners>.NET Foundation</owners>
-        <title>Oqtane SQL Server Provider</title>
-        <summary>SQL Server database support for the Oqtane Framework</summary>
-        <description>SQL Server database support for the Oqtane Framework</description>
-        <copyright>.NET Foundation</copyright>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <license type="expression">MIT</license>
-        <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</releaseNotes>
-        <icon>icon.png</icon>
-        <tags>oqtane</tags>
-    </metadata>
-    <files>
-        <file src="bin\net8.0\Oqtane.Database.SqlServer.dll" target="lib\net8.0" />
-        <file src="bin\net8.0\Oqtane.Database.SqlServer.pdb" target="lib\net8.0" />
-        <file src="bin\net8.0\Microsoft.EntityFrameworkCore.SqlServer.dll" target="lib\net8.0" />
-        <file src="icon.png" target="" />
-    </files>
-</package>
\ 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 3c43cce4c6604107eab529207edd44c386768ca1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4895
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
R-3I^w002ovPDHLkV1nKx-0T1V

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 @@
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
-    <PackageName>$(MSBuildProjectName).$(Version).nupkg</PackageName>
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -36,8 +32,16 @@
     <ProjectReference Include="..\Oqtane.Server\Oqtane.Server.csproj" />
   </ItemGroup>
 
-  <Target Name="CopyPackage" AfterTargets="Pack">
-    <Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\wwwroot\Packages\$(MSBuildProjectName).nupkg" />
+  <ItemGroup>
+    <ProviderFiles
+      Include="$(OutputPath)Oqtane.Database.Sqlite.dll;$(OutputPath)Oqtane.Database.Sqlite.pdb;$(OutputPath)Microsoft.EntityFrameworkCore.Sqlite.dll"
+      Exclude=""
+      DestinationPath="..\Oqtane.Server\bin\$(Configuration)\net8.0\%(Filename)%(Extension)">
+    </ProviderFiles>
+  </ItemGroup>
+
+  <Target Name="PublishProvider" AfterTargets="PostBuildEvent" Inputs="@(ProviderFiles)" Outputs="@(ProviderFiles->'%(DestinationPath)')">
+    <Copy SourceFiles="@(ProviderFiles)" DestinationFiles="@(ProviderFiles->'%(DestinationPath)')" />
   </Target>
 
 </Project>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata>
-        <id>Oqtane.Database.Sqlite</id>
-        <version>5.0.0</version>
-        <authors>Shaun Walker</authors>
-        <owners>.NET Foundation</owners>
-        <title>Oqtane SQLite Provider</title>
-        <summary>SQLite database support for the Oqtane Framework</summary>
-        <description>SQLite database support for the Oqtane Framework</description>
-        <copyright>.NET Foundation</copyright>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <license type="expression">MIT</license>
-        <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</releaseNotes>
-        <icon>icon.png</icon>
-        <tags>oqtane</tags>
-    </metadata>
-    <files>
-        <file src="bin\net8.0\Oqtane.Database.Sqlite.dll" target="lib\net8.0" />
-        <file src="bin\net8.0\Oqtane.Database.Sqlite.pdb" target="lib\net8.0" />
-        <file src="bin\net8.0\Microsoft.EntityFrameworkCore.Sqlite.dll" target="lib\net8.0" />
-        <file src="icon.png" target="" />
-    </files>
-</package>
\ 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 3c43cce4c6604107eab529207edd44c386768ca1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4895
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
R-3I^w002ovPDHLkV1nKx-0T1V

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