From 223381c4852b31254cb5a6fccb869f16fb22eaf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Sat, 16 Mar 2024 19:31:02 +0100
Subject: [PATCH 01/17] Update OC.

---
 .../Lombiq.Hosting.Tenants.Admin.Login.csproj    |  8 ++++----
 ...q.Hosting.Tenants.EmailQuotaManagement.csproj | 16 ++++++++--------
 ...mbiq.Hosting.Tenants.EnvironmentRobots.csproj |  6 +++---
 .../Lombiq.Hosting.Tenants.FeaturesGuard.csproj  | 10 +++++-----
 ...q.Hosting.Tenants.IdleTenantManagement.csproj |  6 +++---
 .../Lombiq.Hosting.Tenants.Maintenance.csproj    | 14 +++++++-------
 .../Lombiq.Hosting.Tenants.Management.csproj     |  6 +++---
 ...Hosting.Tenants.MediaStorageManagement.csproj |  8 ++++----
 8 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj b/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj
index c6963a43..d1a295e0 100644
--- a/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj
+++ b/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj
@@ -34,10 +34,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.Tenants" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.Users" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.Tenants" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.Users" Version="1.9.0-preview-18096" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
index 9f40a4b1..13a40cd9 100644
--- a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
+++ b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
@@ -34,14 +34,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Admin" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.Email.Core" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.AdminDashboard" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.Email.Abstractions" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Admin" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.Email.Core" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.AdminDashboard" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.Email.Abstractions" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.9.0-preview-18096" />
     <PackageReference Include="Scrutor" Version="4.2.2" />
     <PackageReference Include="YesSql.Abstractions" Version="4.0.0" />
   </ItemGroup>
diff --git a/Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj b/Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj
index d0c29dee..36f90a88 100644
--- a/Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj
+++ b/Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj
@@ -34,8 +34,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.9.0-preview-18096" />
   </ItemGroup>
 </Project>
diff --git a/Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj b/Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj
index 37418954..e0832b14 100644
--- a/Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj
+++ b/Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj
@@ -34,11 +34,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18096" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
diff --git a/Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj b/Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj
index 6bad9d1e..e704ea5e 100644
--- a/Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj
+++ b/Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj
@@ -24,9 +24,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />
-    <PackageReference Include="OrchardCore.Abstractions" Version="1.8.2" />
-    <PackageReference Include="OrchardCore" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Abstractions" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18096" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj b/Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj
index 80c66734..15709012 100644
--- a/Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj
+++ b/Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj
@@ -23,13 +23,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
-        <PackageReference Include="OrchardCore.ContentManagement" Version="1.8.2" />
-        <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.8.2" />
-        <PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
-        <PackageReference Include="OrchardCore.Settings" Version="1.8.2" />
-        <PackageReference Include="OrchardCore.Users.Abstractions" Version="1.8.2" />
-        <PackageReference Include="OrchardCore.Users.Core" Version="1.8.2" />
+        <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18096" />
+        <PackageReference Include="OrchardCore.ContentManagement" Version="1.9.0-preview-18096" />
+        <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.9.0-preview-18096" />
+        <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18096" />
+        <PackageReference Include="OrchardCore.Settings" Version="1.9.0-preview-18096" />
+        <PackageReference Include="OrchardCore.Users.Abstractions" Version="1.9.0-preview-18096" />
+        <PackageReference Include="OrchardCore.Users.Core" Version="1.9.0-preview-18096" />
         <PackageReference Include="RandomNameGeneratorLibrary" Version="1.2.2" />
     </ItemGroup>
 
diff --git a/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj b/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj
index 0bbd333a..5a46b6bc 100644
--- a/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj
+++ b/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj
@@ -34,9 +34,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.Tenants" Version="1.8.2" />
+    <PackageReference Include="OrchardCore" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.Tenants" Version="1.9.0-preview-18096" />
     <PackageReference Include="Scrutor" Version="4.2.2" />
   </ItemGroup>
 
diff --git a/Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj b/Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj
index fe221651..a3b38c7d 100644
--- a/Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj
+++ b/Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj
@@ -34,10 +34,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.Media" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.Media" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18096" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
 

From 0322d4310d91663166546b86796a35f40121e575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Sat, 16 Mar 2024 19:49:27 +0100
Subject: [PATCH 02/17] Remove redundant package reference.

---
 .../Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
index 13a40cd9..7d6d96ca 100644
--- a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
+++ b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
@@ -43,7 +43,6 @@
     <PackageReference Include="OrchardCore.Email.Abstractions" Version="1.9.0-preview-18096" />
     <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.9.0-preview-18096" />
     <PackageReference Include="Scrutor" Version="4.2.2" />
-    <PackageReference Include="YesSql.Abstractions" Version="4.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">

From 9b611657c6ad6dec3d1283e552b2104794d775cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Sat, 16 Mar 2024 19:49:46 +0100
Subject: [PATCH 03/17] Convert to STJ.

---
 .../Extensions/TestCaseUITestContextExtensions.cs        | 4 ++--
 .../Views/ShellSettingsEditor.cshtml                     | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Lombiq.Hosting.Tenants.Management.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs b/Lombiq.Hosting.Tenants.Management.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
index c4665351..b447d646 100644
--- a/Lombiq.Hosting.Tenants.Management.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
+++ b/Lombiq.Hosting.Tenants.Management.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
@@ -1,8 +1,8 @@
 using Lombiq.Tests.UI.Extensions;
 using Lombiq.Tests.UI.Services;
-using Newtonsoft.Json.Linq;
 using OpenQA.Selenium;
 using Shouldly;
+using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 
 namespace Lombiq.Hosting.Tenants.Management.Tests.UI.Extensions;
@@ -58,6 +58,6 @@ private static void CheckEditorValue(this UITestContext context, string keyToChe
         var editorJson = string.IsNullOrEmpty(editorText) ? "{}" : editorText;
 
         var editorValue = JObject.Parse(editorJson);
-        editorValue.SelectToken($"TestKey.TestSubKey.TestSubOptions.{keyToCheck}")?.ToString().ShouldBeAsString(expectedValue);
+        editorValue.SelectNode($"TestKey.TestSubKey.TestSubOptions.{keyToCheck}")?.ToString().ShouldBeAsString(expectedValue);
     }
 }
diff --git a/Lombiq.Hosting.Tenants.Management/Views/ShellSettingsEditor.cshtml b/Lombiq.Hosting.Tenants.Management/Views/ShellSettingsEditor.cshtml
index 0a20b765..1ee456f1 100644
--- a/Lombiq.Hosting.Tenants.Management/Views/ShellSettingsEditor.cshtml
+++ b/Lombiq.Hosting.Tenants.Management/Views/ShellSettingsEditor.cshtml
@@ -1,5 +1,4 @@
 @using Lombiq.Hosting.Tenants.Management.Controllers
-@using Newtonsoft.Json
 @using OrchardCore
 @using OrchardCore.Mvc.Core.Utilities
 @using static Lombiq.Hosting.Tenants.Management.Constants.FeatureNames
@@ -31,11 +30,11 @@
 <script at="Foot" depends-on="monaco">
     $(() => {
         require(['vs/editor/editor.main'], () => {
-            const settings = @Html.Raw(JsonConvert.SerializeObject(
+            const settings = @Json.Serialize(
                 new {
-                    automaticLayout = true,
-                    language = "json",
-                }));
+                    AutomaticLayout = true,
+                    Language = "json",
+                });
 
             const html = document.getElementsByTagName('html')[0];
             const mutationObserver = new MutationObserver(setTheme);

From ad90f10d6a1008bd13c513299c66b422050690f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Sat, 16 Mar 2024 19:57:11 +0100
Subject: [PATCH 04/17] Replace obsolete ISmtpService

---
 .../QuotaManagingSmtpServiceDecorator.cs      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Services/QuotaManagingSmtpServiceDecorator.cs b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Services/QuotaManagingSmtpServiceDecorator.cs
index 703472e8..c6bfc61d 100644
--- a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Services/QuotaManagingSmtpServiceDecorator.cs
+++ b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Services/QuotaManagingSmtpServiceDecorator.cs
@@ -10,24 +10,24 @@
 
 namespace Lombiq.Hosting.Tenants.EmailQuotaManagement.Services;
 
-public class QuotaManagingSmtpServiceDecorator : ISmtpService
+public class QuotaManagingSmtpServiceDecorator : IEmailService
 {
     private readonly IStringLocalizer<QuotaManagingSmtpServiceDecorator> T;
-    private readonly ISmtpService _smtpService;
+    private readonly IEmailService _emailService;
     private readonly IEmailQuotaService _emailQuotaService;
     private readonly ShellSettings _shellSettings;
     private readonly IEmailTemplateService _emailTemplateService;
     private readonly IEmailQuotaSubjectService _emailQuotaSubjectService;
 
     public QuotaManagingSmtpServiceDecorator(
-        ISmtpService smtpService,
+        IEmailService emailService,
         IStringLocalizer<QuotaManagingSmtpServiceDecorator> stringLocalizer,
         IEmailQuotaService emailQuotaService,
         ShellSettings shellSettings,
         IEmailTemplateService emailTemplateService,
         IEmailQuotaSubjectService emailQuotaSubjectService)
     {
-        _smtpService = smtpService;
+        _emailService = emailService;
         T = stringLocalizer;
         _emailQuotaService = emailQuotaService;
         _shellSettings = shellSettings;
@@ -35,11 +35,11 @@ public QuotaManagingSmtpServiceDecorator(
         _emailQuotaSubjectService = emailQuotaSubjectService;
     }
 
-    public async Task<SmtpResult> SendAsync(MailMessage message)
+    public async Task<EmailResult> SendAsync(MailMessage message, string providerName = null)
     {
         if (!_emailQuotaService.ShouldLimitEmails())
         {
-            return await _smtpService.SendAsync(message);
+            return await _emailService.SendAsync(message, providerName);
         }
 
         var isQuotaOverResult = await _emailQuotaService.IsQuotaOverTheLimitAsync();
@@ -48,11 +48,11 @@ public async Task<SmtpResult> SendAsync(MailMessage message)
         // Should send the email if the quota is not over the limit.
         if (isQuotaOverResult.IsOverQuota)
         {
-            return SmtpResult.Failed(T["The email quota for the site has been exceeded."]);
+            return EmailResult.FailedResult(T["The email quota for the site has been exceeded."]);
         }
 
-        var emailResult = await _smtpService.SendAsync(message);
-        if (emailResult == SmtpResult.Success)
+        var emailResult = await _emailService.SendAsync(message, providerName);
+        if (emailResult == EmailResult.SuccessResult)
         {
             await _emailQuotaService.IncreaseEmailUsageAsync(isQuotaOverResult.EmailQuota);
         }
@@ -109,7 +109,7 @@ private Task SendQuotaEmailAsync(
                 });
                 // ISmtpService must be used within this class otherwise it won't call the original ISmtpService
                 // implementation, but loop back to here.
-                await _smtpService.SendAsync(emailMessage);
+                await _emailService.SendAsync(emailMessage);
             });
         }
 

From d1d71b0790bbc2d3fb18b0fc60b0bb217ff55996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Sat, 16 Mar 2024 19:57:39 +0100
Subject: [PATCH 05/17] bug fix

---
 Lombiq.Hosting.Tenants.EmailQuotaManagement/Startup.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Startup.cs b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Startup.cs
index abeebcbf..1ff026d9 100644
--- a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Startup.cs
+++ b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Startup.cs
@@ -42,6 +42,6 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddScoped<IEmailQuotaService, EmailQuotaService>();
         services.AddScoped<IEmailQuotaSubjectService, EmailQuotaSubjectService>();
 
-        services.Decorate<ISmtpService, QuotaManagingSmtpServiceDecorator>();
+        services.Decorate<IEmailService, QuotaManagingSmtpServiceDecorator>();
     }
 }

From 6a45184f0675ee0082664a40bf202664eaf44ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Sat, 16 Mar 2024 20:18:04 +0100
Subject: [PATCH 06/17] Use the extension method.

---
 .../TestCaseUITestContextExtensions.cs        | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs b/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
index 48b3aafe..c6dc6242 100644
--- a/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
+++ b/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
@@ -96,23 +96,7 @@ private static void CheckEmailsSentWarningMessage(UITestContext context, bool ex
 
     private static async Task SendTestEmailAsync(UITestContext context, string subject)
     {
-        await context.GoToAdminRelativeUrlAsync("/Email/Index");
-        await context.FillInWithRetriesAsync(By.Id("To"), "recipient@example.com");
-        await context.FillInWithRetriesAsync(By.Id("Subject"), subject);
-        await context.FillInWithRetriesAsync(By.Id("Body"), "Hi, this is a test.");
-
-        await ReliabilityHelper.DoWithRetriesOrFailAsync(
-            async () =>
-            {
-                try
-                {
-                    await context.ClickReliablyOnAsync(By.Id("emailtestsend")); // #spell-check-ignore-line
-                    return true;
-                }
-                catch (WebDriverException ex) when (ex.Message.Contains("move target out of bounds"))
-                {
-                    return false;
-                }
-            });
+        await context.GoToEmailTestAsync();
+        await context.FillEmailTestFormAsync(subject);
     }
 }

From 806da087131c6faa2cf638e9b632c192026cfb52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Sat, 16 Mar 2024 20:44:23 +0100
Subject: [PATCH 07/17] Clean up
 EmailSettingsQuotaFilter.OnResultExecutionAsync.

---
 .../Filters/EmailSettingsQuotaFilter.cs                | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Filters/EmailSettingsQuotaFilter.cs b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Filters/EmailSettingsQuotaFilter.cs
index b4543ede..5d802ab1 100644
--- a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Filters/EmailSettingsQuotaFilter.cs
+++ b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Filters/EmailSettingsQuotaFilter.cs
@@ -5,6 +5,7 @@
 using OrchardCore.DisplayManagement.Layout;
 using OrchardCore.Mvc.Core.Utilities;
 using OrchardCore.Queries.Controllers;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Lombiq.Hosting.Tenants.EmailQuotaManagement.Filters;
@@ -37,12 +38,11 @@ public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultE
         var actionRouteArea = context.ActionDescriptor.RouteValues["Area"];
         var actionRouteValue = context.ActionDescriptor.RouteValues["Action"];
 
-        if (actionRouteController == typeof(AdminController).ControllerName() &&
-            actionRouteArea == $"{nameof(OrchardCore)}.{nameof(OrchardCore.Settings)}" &&
-            actionRouteValue is nameof(AdminController.Index) &&
+        if (actionRouteArea == $"{nameof(OrchardCore)}.{nameof(OrchardCore.Settings)}" &&
+            actionRouteController == typeof(AdminController).ControllerName() &&
+            actionRouteValue == nameof(AdminController.Index) &&
             context.Result is ViewResult &&
-            context.RouteData.Values.TryGetValue("GroupId", out var groupId) &&
-            (string)groupId == "email" &&
+            context.RouteData.Values.GetMaybe("GroupId")?.ToString() == "email" &&
             _emailQuotaService.ShouldLimitEmails())
         {
             var layout = await _layoutAccessor.GetLayoutAsync();

From f2f259304785e37b6672618de0b97cb737ff0d6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Sat, 16 Mar 2024 21:45:18 +0100
Subject: [PATCH 08/17] Unwrap SendTestEmailAsync.

---
 .../Extensions/TestCaseUITestContextExtensions.cs  | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs b/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
index c6dc6242..2cc9b599 100644
--- a/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
+++ b/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
@@ -23,18 +23,18 @@ public static async Task TestEmailQuotaManagementBehaviorAsync(
         bool moduleShouldInterfere = true)
     {
         await context.SignInDirectlyAndGoToDashboardAsync();
-
         context.Missing(By.XPath(DashboardExceededMessage));
 
         await context.GoToAdminRelativeUrlAsync("/Settings/email");
-
         CheckEmailsSentWarningMessage(context, exists: moduleShouldInterfere, maximumEmailQuota, 0);
 
         var warningEmails = new List<int>();
         for (int i = 0; i < maximumEmailQuota; i++)
         {
-            await SendTestEmailAsync(context, SuccessfulSubject);
+            await context.GoToEmailTestAsync();
+            await context.FillEmailTestFormAsync(SuccessfulSubject);
             context.SuccessMessageExists();
+
             CheckEmailsSentWarningMessage(context, exists: moduleShouldInterfere, maximumEmailQuota, i + 1);
             var warningLevel = Convert.ToInt32(Math.Round((double)(i + 1) / maximumEmailQuota * 100, 0));
 
@@ -63,7 +63,8 @@ public static async Task TestEmailQuotaManagementBehaviorAsync(
             }
         }
 
-        await SendTestEmailAsync(context, UnSuccessfulSubject);
+        await context.GoToEmailTestAsync();
+        await context.FillEmailTestFormAsync(UnSuccessfulSubject);
         await context.GoToSmtpWebUIAsync();
         context.CheckExistence(ByHelper.SmtpInboxRow(SuccessfulSubject), exists: true);
         context.CheckExistence(
@@ -93,10 +94,5 @@ private static void CheckEmailsSentWarningMessage(UITestContext context, bool ex
             By.XPath($"//p[contains(@class,'alert-warning')][contains(.,'{currentEmailCount.ToTechnicalString()} emails" +
                 $" from the total of {maximumEmailQuota.ToTechnicalString()} this month.')]"),
             exists);
-
-    private static async Task SendTestEmailAsync(UITestContext context, string subject)
-    {
-        await context.GoToEmailTestAsync();
-        await context.FillEmailTestFormAsync(subject);
     }
 }

From dac8734284cf24a9b2f81056695199482525f362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Sat, 16 Mar 2024 21:45:46 +0100
Subject: [PATCH 09/17] Also show warining on the email testing page.

---
 .../Filters/EmailSettingsQuotaFilter.cs         | 17 ++++++-----------
 ....Hosting.Tenants.EmailQuotaManagement.csproj |  2 +-
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Filters/EmailSettingsQuotaFilter.cs b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Filters/EmailSettingsQuotaFilter.cs
index 5d802ab1..8b01a175 100644
--- a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Filters/EmailSettingsQuotaFilter.cs
+++ b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Filters/EmailSettingsQuotaFilter.cs
@@ -4,9 +4,8 @@
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.Layout;
 using OrchardCore.Mvc.Core.Utilities;
-using OrchardCore.Queries.Controllers;
-using System.Collections.Generic;
 using System.Threading.Tasks;
+using EmailAdminController = OrchardCore.Email.Controllers.AdminController;
 
 namespace Lombiq.Hosting.Tenants.EmailQuotaManagement.Filters;
 
@@ -34,16 +33,12 @@ public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultE
             return;
         }
 
-        var actionRouteController = context.ActionDescriptor.RouteValues["Controller"];
-        var actionRouteArea = context.ActionDescriptor.RouteValues["Area"];
-        var actionRouteValue = context.ActionDescriptor.RouteValues["Action"];
+        var isEmailTestPage = context.IsMvcRoute(
+            nameof(EmailAdminController.Test),
+            typeof(EmailAdminController).ControllerName(),
+            $"{nameof(OrchardCore)}.{nameof(OrchardCore.Email)}");
 
-        if (actionRouteArea == $"{nameof(OrchardCore)}.{nameof(OrchardCore.Settings)}" &&
-            actionRouteController == typeof(AdminController).ControllerName() &&
-            actionRouteValue == nameof(AdminController.Index) &&
-            context.Result is ViewResult &&
-            context.RouteData.Values.GetMaybe("GroupId")?.ToString() == "email" &&
-            _emailQuotaService.ShouldLimitEmails())
+        if ((isEmailTestPage || context.IsSiteSettingsPage("email")) && _emailQuotaService.ShouldLimitEmails())
         {
             var layout = await _layoutAccessor.GetLayoutAsync();
             var contentZone = layout.Zones["Content"];
diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
index 7d6d96ca..b74ced12 100644
--- a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
+++ b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
@@ -35,7 +35,7 @@
 
   <ItemGroup>
     <PackageReference Include="OrchardCore.Admin" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.Email.Core" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.Email" Version="1.9.0-preview-18096" />
     <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18096" />
     <PackageReference Include="OrchardCore.AdminDashboard" Version="1.9.0-preview-18096" />
     <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18096" />

From bafc0ef1787e1b28a78bf5c6b8ae546e8ce4c789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Sun, 17 Mar 2024 02:42:53 +0100
Subject: [PATCH 10/17] fix typo

---
 .../Extensions/TestCaseUITestContextExtensions.cs                | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs b/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
index 2cc9b599..21dd9f3b 100644
--- a/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
+++ b/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
@@ -94,5 +94,4 @@ private static void CheckEmailsSentWarningMessage(UITestContext context, bool ex
             By.XPath($"//p[contains(@class,'alert-warning')][contains(.,'{currentEmailCount.ToTechnicalString()} emails" +
                 $" from the total of {maximumEmailQuota.ToTechnicalString()} this month.')]"),
             exists);
-    }
 }

From b1df0c4814da6bee565ddaba5bb77524c2129b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Sun, 17 Mar 2024 04:28:45 +0100
Subject: [PATCH 11/17] Improve email quota test by comparing numeric values as
 HTML attributes instead of full text.

---
 .../TestCaseUITestContextExtensions.cs        | 23 +++++++++++++++----
 .../Views/EmailSettingsQuotaMessage.cshtml    | 15 ++++++++----
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs b/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
index 21dd9f3b..a217b663 100644
--- a/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
+++ b/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
@@ -5,6 +5,7 @@
 using Shouldly;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Threading.Tasks;
 
 namespace Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI.Extensions;
@@ -89,9 +90,21 @@ private static void CheckMessageExistence(UITestContext context, string warningL
                 $"[contains(.,'It seems that your site sent out {warningLevel}% of e-mail')]"),
             exists: true);
 
-    private static void CheckEmailsSentWarningMessage(UITestContext context, bool exists, int maximumEmailQuota, int currentEmailCount) =>
-        context.CheckExistence(
-            By.XPath($"//p[contains(@class,'alert-warning')][contains(.,'{currentEmailCount.ToTechnicalString()} emails" +
-                $" from the total of {maximumEmailQuota.ToTechnicalString()} this month.')]"),
-            exists);
+    private static void CheckEmailsSentWarningMessage(UITestContext context, bool exists, int maximumEmailQuota, int currentEmailCount)
+    {
+        var by = By.CssSelector(".alert-warning[data-smtp-quota-max][data-smtp-quota-used]");
+
+        if (!exists)
+        {
+            context.Missing(by);
+            return;
+        }
+
+        var element = context.Get(by);
+        var max = int.Parse(element.GetAttribute("data-smtp-quota-max"), CultureInfo.InvariantCulture);
+        var used = int.Parse(element.GetAttribute("data-smtp-quota-used"), CultureInfo.InvariantCulture);
+
+        max.ShouldBe(maximumEmailQuota);
+        used.ShouldBe(currentEmailCount);
+    }
 }
diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Views/EmailSettingsQuotaMessage.cshtml b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Views/EmailSettingsQuotaMessage.cshtml
index e180df88..3453cf92 100644
--- a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Views/EmailSettingsQuotaMessage.cshtml
+++ b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Views/EmailSettingsQuotaMessage.cshtml
@@ -1,6 +1,11 @@
-<p class="alert alert-warning">
-    @T["Unless you use your own SMTP server you have limited e-mails to send. " +
-            "You've sent {0} emails from the total of {1} this month.",
-        Model.CurrentEmailUsageCount,
-        Model.EmailQuotaPerMonth]
+@{
+    int currentEmailUsageCount = Model.CurrentEmailUsageCount;
+    int emailQuotaPerMonth = Model.EmailQuotaPerMonth;
+}
+
+<p class="alert alert-warning"
+   data-smtp-quota-used="@currentEmailUsageCount.ToTechnicalString()"
+   data-smtp-quota-max=@emailQuotaPerMonth.ToTechnicalString()>
+    @T["Unless you use your own SMTP server you have limited e-mails to send."]
+    @T["You've sent {0} emails from the total of {1} this month.", currentEmailUsageCount, emailQuotaPerMonth]
 </p>

From 82e56b04ccddc4bb095d2adb4ca4cdefa72683f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Sun, 17 Mar 2024 04:41:38 +0100
Subject: [PATCH 12/17] Fix SuccessResult usage.

---
 .../Services/QuotaManagingSmtpServiceDecorator.cs            | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Services/QuotaManagingSmtpServiceDecorator.cs b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Services/QuotaManagingSmtpServiceDecorator.cs
index c6bfc61d..de6a0807 100644
--- a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Services/QuotaManagingSmtpServiceDecorator.cs
+++ b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Services/QuotaManagingSmtpServiceDecorator.cs
@@ -52,10 +52,7 @@ public async Task<EmailResult> SendAsync(MailMessage message, string providerNam
         }
 
         var emailResult = await _emailService.SendAsync(message, providerName);
-        if (emailResult == EmailResult.SuccessResult)
-        {
-            await _emailQuotaService.IncreaseEmailUsageAsync(isQuotaOverResult.EmailQuota);
-        }
+        if (emailResult.Succeeded) await _emailQuotaService.IncreaseEmailUsageAsync(isQuotaOverResult.EmailQuota);
 
         return emailResult;
     }

From a880c9a219ff328dc637d772080f22c30889b82b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Sun, 17 Mar 2024 04:52:16 +0100
Subject: [PATCH 13/17] Configure port settings also.

---
 .../Extensions/TestCaseUITestContextExtensions.cs              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs b/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
index a217b663..30ee233a 100644
--- a/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
+++ b/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
@@ -26,8 +26,9 @@ public static async Task TestEmailQuotaManagementBehaviorAsync(
         await context.SignInDirectlyAndGoToDashboardAsync();
         context.Missing(By.XPath(DashboardExceededMessage));
 
-        await context.GoToAdminRelativeUrlAsync("/Settings/email");
+        await context.ConfigureSmtpPortAsync(publish: false);
         CheckEmailsSentWarningMessage(context, exists: moduleShouldInterfere, maximumEmailQuota, 0);
+        await context.ClickReliablyOnAsync(By.ClassName("save"));
 
         var warningEmails = new List<int>();
         for (int i = 0; i < maximumEmailQuota; i++)

From c9a73dd127ba22fcb21fd6bd3db88bd760a7fc59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Tue, 23 Apr 2024 17:17:29 +0200
Subject: [PATCH 14/17] Update OC preview version.

---
 .../Lombiq.Hosting.Tenants.Admin.Login.csproj    |  8 ++++----
 ...q.Hosting.Tenants.EmailQuotaManagement.csproj | 16 ++++++++--------
 ...mbiq.Hosting.Tenants.EnvironmentRobots.csproj |  6 +++---
 .../Lombiq.Hosting.Tenants.FeaturesGuard.csproj  | 10 +++++-----
 ...q.Hosting.Tenants.IdleTenantManagement.csproj |  6 +++---
 .../Lombiq.Hosting.Tenants.Maintenance.csproj    | 14 +++++++-------
 .../Lombiq.Hosting.Tenants.Management.csproj     |  6 +++---
 ...Hosting.Tenants.MediaStorageManagement.csproj |  8 ++++----
 8 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj b/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj
index d1a295e0..2af59320 100644
--- a/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj
+++ b/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj
@@ -34,10 +34,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.Tenants" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.Users" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.Tenants" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.Users" Version="1.9.0-preview-18186" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
index b74ced12..aeba50fc 100644
--- a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
+++ b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
@@ -34,14 +34,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Admin" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.Email" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.AdminDashboard" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.Email.Abstractions" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.Admin" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.Email" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.AdminDashboard" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.Email.Abstractions" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.9.0-preview-18186" />
     <PackageReference Include="Scrutor" Version="4.2.2" />
   </ItemGroup>
 
diff --git a/Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj b/Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj
index 36f90a88..d8872862 100644
--- a/Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj
+++ b/Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj
@@ -34,8 +34,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.9.0-preview-18186" />
   </ItemGroup>
 </Project>
diff --git a/Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj b/Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj
index e0832b14..79c0e29a 100644
--- a/Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj
+++ b/Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj
@@ -34,11 +34,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18186" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
diff --git a/Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj b/Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj
index e704ea5e..1dc48743 100644
--- a/Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj
+++ b/Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj
@@ -24,9 +24,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />
-    <PackageReference Include="OrchardCore.Abstractions" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.Abstractions" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18186" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj b/Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj
index 15709012..d6c31f2f 100644
--- a/Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj
+++ b/Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj
@@ -23,13 +23,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18096" />
-        <PackageReference Include="OrchardCore.ContentManagement" Version="1.9.0-preview-18096" />
-        <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.9.0-preview-18096" />
-        <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18096" />
-        <PackageReference Include="OrchardCore.Settings" Version="1.9.0-preview-18096" />
-        <PackageReference Include="OrchardCore.Users.Abstractions" Version="1.9.0-preview-18096" />
-        <PackageReference Include="OrchardCore.Users.Core" Version="1.9.0-preview-18096" />
+        <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18186" />
+        <PackageReference Include="OrchardCore.ContentManagement" Version="1.9.0-preview-18186" />
+        <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.9.0-preview-18186" />
+        <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18186" />
+        <PackageReference Include="OrchardCore.Settings" Version="1.9.0-preview-18186" />
+        <PackageReference Include="OrchardCore.Users.Abstractions" Version="1.9.0-preview-18186" />
+        <PackageReference Include="OrchardCore.Users.Core" Version="1.9.0-preview-18186" />
         <PackageReference Include="RandomNameGeneratorLibrary" Version="1.2.2" />
     </ItemGroup>
 
diff --git a/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj b/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj
index 5a46b6bc..b433f56a 100644
--- a/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj
+++ b/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj
@@ -34,9 +34,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.Tenants" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.Tenants" Version="1.9.0-preview-18186" />
     <PackageReference Include="Scrutor" Version="4.2.2" />
   </ItemGroup>
 
diff --git a/Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj b/Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj
index a3b38c7d..4d3e839d 100644
--- a/Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj
+++ b/Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj
@@ -34,10 +34,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.Media" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.9.0-preview-18096" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18096" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.Media" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18186" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
 

From d86a02b973bd154f7ae1097ef98436bbe74bd463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Sat, 27 Apr 2024 19:31:46 +0200
Subject: [PATCH 15/17] Update OC package version.

---
 .../Lombiq.Hosting.Tenants.Admin.Login.csproj    |  8 ++++----
 ...q.Hosting.Tenants.EmailQuotaManagement.csproj | 16 ++++++++--------
 ...mbiq.Hosting.Tenants.EnvironmentRobots.csproj |  6 +++---
 .../Lombiq.Hosting.Tenants.FeaturesGuard.csproj  | 10 +++++-----
 ...q.Hosting.Tenants.IdleTenantManagement.csproj |  6 +++---
 .../Lombiq.Hosting.Tenants.Maintenance.csproj    | 14 +++++++-------
 .../Lombiq.Hosting.Tenants.Management.csproj     |  6 +++---
 ...Hosting.Tenants.MediaStorageManagement.csproj |  8 ++++----
 8 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj b/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj
index 2af59320..3e12d87b 100644
--- a/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj
+++ b/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj
@@ -34,10 +34,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.Tenants" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.Users" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.Tenants" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.Users" Version="1.9.0-preview-18189" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
index aeba50fc..99d14c3c 100644
--- a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
+++ b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
@@ -34,14 +34,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Admin" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.Email" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.AdminDashboard" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.Email.Abstractions" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.Admin" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.Email" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.AdminDashboard" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.Email.Abstractions" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.9.0-preview-18189" />
     <PackageReference Include="Scrutor" Version="4.2.2" />
   </ItemGroup>
 
diff --git a/Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj b/Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj
index d8872862..296e0392 100644
--- a/Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj
+++ b/Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj
@@ -34,8 +34,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.9.0-preview-18189" />
   </ItemGroup>
 </Project>
diff --git a/Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj b/Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj
index 79c0e29a..20679fa8 100644
--- a/Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj
+++ b/Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj
@@ -34,11 +34,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18189" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
diff --git a/Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj b/Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj
index 1dc48743..77713e5f 100644
--- a/Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj
+++ b/Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj
@@ -24,9 +24,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />
-    <PackageReference Include="OrchardCore.Abstractions" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.Abstractions" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18189" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj b/Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj
index d6c31f2f..da0765bb 100644
--- a/Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj
+++ b/Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj
@@ -23,13 +23,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18186" />
-        <PackageReference Include="OrchardCore.ContentManagement" Version="1.9.0-preview-18186" />
-        <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.9.0-preview-18186" />
-        <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18186" />
-        <PackageReference Include="OrchardCore.Settings" Version="1.9.0-preview-18186" />
-        <PackageReference Include="OrchardCore.Users.Abstractions" Version="1.9.0-preview-18186" />
-        <PackageReference Include="OrchardCore.Users.Core" Version="1.9.0-preview-18186" />
+        <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18189" />
+        <PackageReference Include="OrchardCore.ContentManagement" Version="1.9.0-preview-18189" />
+        <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.9.0-preview-18189" />
+        <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18189" />
+        <PackageReference Include="OrchardCore.Settings" Version="1.9.0-preview-18189" />
+        <PackageReference Include="OrchardCore.Users.Abstractions" Version="1.9.0-preview-18189" />
+        <PackageReference Include="OrchardCore.Users.Core" Version="1.9.0-preview-18189" />
         <PackageReference Include="RandomNameGeneratorLibrary" Version="1.2.2" />
     </ItemGroup>
 
diff --git a/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj b/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj
index b433f56a..ed650802 100644
--- a/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj
+++ b/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj
@@ -34,9 +34,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.Tenants" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.Tenants" Version="1.9.0-preview-18189" />
     <PackageReference Include="Scrutor" Version="4.2.2" />
   </ItemGroup>
 
diff --git a/Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj b/Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj
index 4d3e839d..7cdddc1c 100644
--- a/Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj
+++ b/Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj
@@ -34,10 +34,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.Media" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.9.0-preview-18186" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18186" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.Media" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18189" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
 

From 97189ccb6be2aa67a1fbc34b02f258748adad751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Sat, 4 May 2024 12:57:04 +0200
Subject: [PATCH 16/17] Update OC versions

---
 .../Lombiq.Hosting.Tenants.Admin.Login.csproj    |  8 ++++----
 ...q.Hosting.Tenants.EmailQuotaManagement.csproj | 16 ++++++++--------
 ...mbiq.Hosting.Tenants.EnvironmentRobots.csproj |  6 +++---
 .../Lombiq.Hosting.Tenants.FeaturesGuard.csproj  | 10 +++++-----
 ...q.Hosting.Tenants.IdleTenantManagement.csproj |  6 +++---
 .../Lombiq.Hosting.Tenants.Maintenance.csproj    | 14 +++++++-------
 .../Lombiq.Hosting.Tenants.Management.csproj     |  6 +++---
 ...Hosting.Tenants.MediaStorageManagement.csproj |  8 ++++----
 8 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj b/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj
index 3e12d87b..1e6a33ae 100644
--- a/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj
+++ b/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj
@@ -34,10 +34,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.Tenants" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.Users" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.Tenants" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.Users" Version="2.0.0-preview-18197" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
index 99d14c3c..93defaea 100644
--- a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
+++ b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
@@ -34,14 +34,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Admin" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.Email" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.AdminDashboard" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.Email.Abstractions" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.Admin" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.Email" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.AdminDashboard" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.Email.Abstractions" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="2.0.0-preview-18197" />
     <PackageReference Include="Scrutor" Version="4.2.2" />
   </ItemGroup>
 
diff --git a/Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj b/Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj
index 296e0392..4a83c381 100644
--- a/Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj
+++ b/Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj
@@ -34,8 +34,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18197" />
   </ItemGroup>
 </Project>
diff --git a/Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj b/Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj
index 20679fa8..fe8f188c 100644
--- a/Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj
+++ b/Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj
@@ -34,11 +34,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18197" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
diff --git a/Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj b/Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj
index 77713e5f..828d6ac8 100644
--- a/Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj
+++ b/Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj
@@ -24,9 +24,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />
-    <PackageReference Include="OrchardCore.Abstractions" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.Abstractions" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18197" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj b/Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj
index da0765bb..ac7afbab 100644
--- a/Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj
+++ b/Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj
@@ -23,13 +23,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18189" />
-        <PackageReference Include="OrchardCore.ContentManagement" Version="1.9.0-preview-18189" />
-        <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.9.0-preview-18189" />
-        <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18189" />
-        <PackageReference Include="OrchardCore.Settings" Version="1.9.0-preview-18189" />
-        <PackageReference Include="OrchardCore.Users.Abstractions" Version="1.9.0-preview-18189" />
-        <PackageReference Include="OrchardCore.Users.Core" Version="1.9.0-preview-18189" />
+        <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18197" />
+        <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18197" />
+        <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18197" />
+        <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18197" />
+        <PackageReference Include="OrchardCore.Settings" Version="2.0.0-preview-18197" />
+        <PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18197" />
+        <PackageReference Include="OrchardCore.Users.Core" Version="2.0.0-preview-18197" />
         <PackageReference Include="RandomNameGeneratorLibrary" Version="1.2.2" />
     </ItemGroup>
 
diff --git a/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj b/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj
index ed650802..ed0e78bb 100644
--- a/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj
+++ b/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj
@@ -34,9 +34,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.Tenants" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.Tenants" Version="2.0.0-preview-18197" />
     <PackageReference Include="Scrutor" Version="4.2.2" />
   </ItemGroup>
 
diff --git a/Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj b/Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj
index 7cdddc1c..8c197107 100644
--- a/Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj
+++ b/Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj
@@ -34,10 +34,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.Media" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.9.0-preview-18189" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.9.0-preview-18189" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.Media" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18197" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
 

From 1f8174881834bf0a7c3a46f407129d3bb6662930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Tue, 7 May 2024 21:08:58 +0200
Subject: [PATCH 17/17] Update OC to the latest preview.

---
 .../Lombiq.Hosting.Tenants.Admin.Login.csproj    |  8 ++++----
 ...q.Hosting.Tenants.EmailQuotaManagement.csproj | 16 ++++++++--------
 ...mbiq.Hosting.Tenants.EnvironmentRobots.csproj |  6 +++---
 .../Lombiq.Hosting.Tenants.FeaturesGuard.csproj  | 10 +++++-----
 ...q.Hosting.Tenants.IdleTenantManagement.csproj |  6 +++---
 .../Lombiq.Hosting.Tenants.Maintenance.csproj    | 14 +++++++-------
 .../Lombiq.Hosting.Tenants.Management.csproj     |  6 +++---
 ...Hosting.Tenants.MediaStorageManagement.csproj |  8 ++++----
 8 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj b/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj
index 1e6a33ae..13d94f6f 100644
--- a/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj
+++ b/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj
@@ -34,10 +34,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.Tenants" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.Users" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.Tenants" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.Users" Version="2.0.0-preview-18200" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
index 93defaea..20095792 100644
--- a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
+++ b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
@@ -34,14 +34,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Admin" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.Email" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.AdminDashboard" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.Email.Abstractions" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.Admin" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.Email" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.AdminDashboard" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.Email.Abstractions" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="2.0.0-preview-18200" />
     <PackageReference Include="Scrutor" Version="4.2.2" />
   </ItemGroup>
 
diff --git a/Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj b/Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj
index 4a83c381..5674f178 100644
--- a/Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj
+++ b/Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj
@@ -34,8 +34,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18200" />
   </ItemGroup>
 </Project>
diff --git a/Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj b/Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj
index fe8f188c..3f19a458 100644
--- a/Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj
+++ b/Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj
@@ -34,11 +34,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18200" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
diff --git a/Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj b/Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj
index 828d6ac8..2584d554 100644
--- a/Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj
+++ b/Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj
@@ -24,9 +24,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />
-    <PackageReference Include="OrchardCore.Abstractions" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.Abstractions" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj b/Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj
index ac7afbab..d8aa29f5 100644
--- a/Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj
+++ b/Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj
@@ -23,13 +23,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18197" />
-        <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18197" />
-        <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18197" />
-        <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18197" />
-        <PackageReference Include="OrchardCore.Settings" Version="2.0.0-preview-18197" />
-        <PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18197" />
-        <PackageReference Include="OrchardCore.Users.Core" Version="2.0.0-preview-18197" />
+        <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
+        <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18200" />
+        <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18200" />
+        <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18200" />
+        <PackageReference Include="OrchardCore.Settings" Version="2.0.0-preview-18200" />
+        <PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18200" />
+        <PackageReference Include="OrchardCore.Users.Core" Version="2.0.0-preview-18200" />
         <PackageReference Include="RandomNameGeneratorLibrary" Version="1.2.2" />
     </ItemGroup>
 
diff --git a/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj b/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj
index ed0e78bb..8860c804 100644
--- a/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj
+++ b/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj
@@ -34,9 +34,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.Tenants" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.Tenants" Version="2.0.0-preview-18200" />
     <PackageReference Include="Scrutor" Version="4.2.2" />
   </ItemGroup>
 
diff --git a/Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj b/Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj
index 8c197107..f768a277 100644
--- a/Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj
+++ b/Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj
@@ -34,10 +34,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.Media" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18197" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18197" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.Media" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18200" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>