Merge remote-tracking branch 'origin/main' into BenedekFarkas/#16888

src/OrchardCore.Modules/OrchardCore.Email/Manifest.cs

@@ -5,6 +5,6 @@
     Author = ManifestConstants.OrchardCoreTeam,
     Website = ManifestConstants.OrchardCoreWebsite,
     Version = ManifestConstants.OrchardCoreVersion,
-    Description = "Provides the necessary infrastructure for configuring email settings and offers a default SMTP provider.",
+    Description = "Provides the necessary infrastructure for configuring email settings.",
     Category = "Messaging"
 )]

src/OrchardCore/OrchardCore.Data.YesSql/DbConnectionValidator.cs

@@ -82,6 +82,7 @@ public async Task<DbConnectionValidatorResult> ValidateAsync(DbConnectionValidat
             connection is SqliteConnection sqliteConnection &&
             !File.Exists(sqliteConnection.DataSource))
         {
+            SqliteConnection.ClearPool(sqliteConnection);
             return DbConnectionValidatorResult.DocumentTableNotFound;
         }
 

src/OrchardCore/OrchardCore.Data.YesSql/OrchardCoreBuilderExtensions.cs

@@ -83,7 +83,6 @@ public static OrchardCoreBuilder AddDataAccess(this OrchardCoreBuilder builder)
                         var databaseFolder = SqliteHelper.GetDatabaseFolder(shellOptions, shellSettings.Name);
                         Directory.CreateDirectory(databaseFolder);
 
-                        // Only allow creating a file DB when a tenant is in the Initializing state
                         var connectionString = SqliteHelper.GetConnectionString(sqliteOptions, databaseFolder, shellSettings);
 
                         storeConfiguration

src/OrchardCore/OrchardCore.Data.YesSql/SqliteHelper.cs

@@ -26,6 +26,7 @@ public static string GetConnectionString(SqliteOptions sqliteOptions, string dat
             databaseName = "yessql.db";
         }
 
+        // Only allow creating a file DB when a tenant is in the Initializing state.
         var sqliteOpenMode = shellSettings.IsInitializing() ? SqliteOpenMode.ReadWriteCreate : SqliteOpenMode.ReadWrite;
 
         return GetSqliteConnectionStringBuilder(sqliteOptions, databaseFolder, databaseName, sqliteOpenMode).ToString();

src/OrchardCore/OrchardCore.Setup.Core/OrchardCore.Setup.Core.csproj

@@ -19,4 +19,8 @@
     <ProjectReference Include="..\OrchardCore.Recipes.Abstractions\OrchardCore.Recipes.Abstractions.csproj" />
     <ProjectReference Include="..\OrchardCore.Setup.Abstractions\OrchardCore.Setup.Abstractions.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="YesSql" />
+  </ItemGroup>
 </Project>

src/OrchardCore/OrchardCore.Setup.Core/SetupService.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Http;
+using Microsoft.Data.Sqlite;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Localization;
@@ -13,6 +14,7 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 using OrchardCore.Setup.Events;
+using YesSql;
 
 namespace OrchardCore.Setup.Services;
 
@@ -260,6 +262,19 @@ await scope.ServiceProvider.GetService<IShellDescriptorManager>()
             return executionId;
         }
 
+        // When using SQLite, clearing the connection pool with ReadWriteCreate SqliteOpenMode, used when the shell was
+        // still initializing, to unlock the database file (and thus also allow it to be deleted).
+        if (shellSettings["DatabaseProvider"] == DatabaseProviderValue.Sqlite)
+        {
+            await using var shellContext = await _shellContextFactory.CreateMinimumContextAsync(shellSettings);
+            var store = shellContext.ServiceProvider.GetRequiredService<IStore>();
+            await using var connection = store.Configuration.ConnectionFactory.CreateConnection();
+            if (connection is SqliteConnection sqliteConnection)
+            {
+                SqliteConnection.ClearPool(sqliteConnection);
+            }
+        }
+
         // Update the shell state.
         await _shellHost.UpdateShellSettingsAsync(shellSettings.AsRunning());