From ee9624ffdfe16f62dc1757ae2b7e898831c33e7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Wed, 22 Jan 2025 20:05:03 +0100
Subject: [PATCH 01/14] Update OC and Lombiq versions.

---
 Directory.Packages.props | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index b826ef82d..fb3b58a35 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -6,10 +6,10 @@
     <!-- The Orchard Core version should always be x.y.0 of the latest minor version for maximum compatibility when
          distributed as NuGet packages. On the other hand, the consuming projects (including OrchardCore.Commerce.Web)
          should use Orchard Core references for the latest patch version to pull all versions up in the final app. -->
-    <OrchardCoreVersion>2.0.0</OrchardCoreVersion>
+    <OrchardCoreVersion>2.1.0</OrchardCoreVersion>
 
-    <LombiqHelpfulLibrariesVersion>11.0.1-alpha.0.offi-126</LombiqHelpfulLibrariesVersion>
-    <LombiqTestsUIVersion>11.0.0</LombiqTestsUIVersion>
+    <LombiqHelpfulLibrariesVersion>12.0.1-alpha.0.osoe-815</LombiqHelpfulLibrariesVersion>
+    <LombiqTestsUIVersion>12.0.1-alpha.5.osoe-935</LombiqTestsUIVersion>
   </PropertyGroup>
 
   <ItemGroup>

From 75a09f176eeae11400c35f7de843eb4528f967d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Wed, 22 Jan 2025 21:06:33 +0100
Subject: [PATCH 02/14] Remove obsolete usings.

---
 .../Services/StripePaymentService.cs                         | 5 +++--
 .../Settings/CurrencySettingsDisplayDriver.cs                | 1 -
 .../Tests/BasicTests/BasicOrchardFeaturesTests.cs            | 1 -
 .../Tests/BasicTests/SecurityScanningTests.cs                | 3 ---
 .../Tests/CheckoutTests/BehaviorCheckoutTests.cs             | 2 +-
 .../Tests/ExactlyTests/BehaviorExactlyTests.cs               | 1 -
 .../Tests/InventoryTests/InventoryBehaviorTests.cs           | 2 +-
 .../LocalizedProductTests/LocalizedProductBehaviorTests.cs   | 1 -
 .../Tests/OrderTests/BehaviorOrderTests.cs                   | 2 +-
 .../Tests/OrderTests/OrderSuccessTests.cs                    | 2 +-
 .../PriceVariantsPartTests/PersistencePriceVariantsTests.cs  | 1 -
 .../PriceVariantsPartTests/ValidationPriceVariantsTests.cs   | 1 -
 .../Tests/ProductListTests/BehaviorProductListTests.cs       | 1 -
 .../Tests/ProductTests/ProductBehaviorTests.cs               | 1 -
 .../Tests/ProductTests/RetrievalProductTests.cs              | 1 -
 .../Tests/PromotionTests/PromotionBehaviorTests.cs           | 1 -
 .../Tests/RegionTests/PersistenceRegionSettingsTests.cs      | 2 +-
 .../Tests/TaxTests/TaxBehaviorTests.cs                       | 2 +-
 .../TieredPricePartTests/PersistenceTieredPriceTests.cs      | 1 -
 .../Tests/UserTests/UserPersistenceTests.cs                  | 1 -
 .../Tests/WorkflowTests/WorkflowBehaviorTests.cs             | 1 -
 test/OrchardCore.Commerce.Tests.UI/UITestBase.cs             | 2 +-
 22 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/src/Modules/OrchardCore.Commerce.Payment.Stripe/Services/StripePaymentService.cs b/src/Modules/OrchardCore.Commerce.Payment.Stripe/Services/StripePaymentService.cs
index 019189ce8..de9585e87 100644
--- a/src/Modules/OrchardCore.Commerce.Payment.Stripe/Services/StripePaymentService.cs
+++ b/src/Modules/OrchardCore.Commerce.Payment.Stripe/Services/StripePaymentService.cs
@@ -25,6 +25,7 @@
 using System.Threading.Tasks;
 using YesSql;
 using Address = OrchardCore.Commerce.AddressDataType.Address;
+using ISession = YesSql.ISession;
 
 namespace OrchardCore.Commerce.Payment.Stripe.Services;
 
@@ -34,7 +35,7 @@ public class StripePaymentService : IStripePaymentService
     private readonly IContentManager _contentManager;
     private readonly ISiteService _siteService;
     private readonly IStringLocalizer T;
-    private readonly YesSql.ISession _session;
+    private readonly ISession _session;
     private readonly IPaymentIntentPersistence _paymentIntentPersistence;
     private readonly IPaymentService _paymentService;
     private readonly IHtmlLocalizer<StripePaymentService> H;
@@ -45,7 +46,7 @@ public StripePaymentService(
         IContentManager contentManager,
         ISiteService siteService,
         IStringLocalizer<StripePaymentService> stringLocalizer,
-        YesSql.ISession session,
+        ISession session,
         IPaymentIntentPersistence paymentIntentPersistence,
         IPaymentService paymentService,
         IHtmlLocalizer<StripePaymentService> htmlLocalizer,
diff --git a/src/Modules/OrchardCore.Commerce/Settings/CurrencySettingsDisplayDriver.cs b/src/Modules/OrchardCore.Commerce/Settings/CurrencySettingsDisplayDriver.cs
index 5835b80f7..10f8abedf 100644
--- a/src/Modules/OrchardCore.Commerce/Settings/CurrencySettingsDisplayDriver.cs
+++ b/src/Modules/OrchardCore.Commerce/Settings/CurrencySettingsDisplayDriver.cs
@@ -9,7 +9,6 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Environment.Shell;
 using OrchardCore.Settings;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/BasicOrchardFeaturesTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/BasicOrchardFeaturesTests.cs
index fbe5bf8f8..263308612 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/BasicOrchardFeaturesTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/BasicOrchardFeaturesTests.cs
@@ -3,7 +3,6 @@
 using Lombiq.Tests.UI.Services;
 using OrchardCore.Commerce.Tests.UI.Helpers;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.BasicTests;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
index 9cbc91c1e..515390c39 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
@@ -1,8 +1,5 @@
-using Lombiq.Tests.UI.Extensions;
 using Lombiq.Tests.UI.SecurityScanning;
-using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.BasicTests;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/CheckoutTests/BehaviorCheckoutTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/CheckoutTests/BehaviorCheckoutTests.cs
index 0001397f0..1113d1838 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/CheckoutTests/BehaviorCheckoutTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/CheckoutTests/BehaviorCheckoutTests.cs
@@ -8,7 +8,7 @@
 using OrchardCore.ContentFields.Fields;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
+
 using static OrchardCore.Commerce.ContentFields.Constants.FeatureIds;
 using static OrchardCore.Commerce.Tests.UI.Constants.ContentItemIds;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/ExactlyTests/BehaviorExactlyTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/ExactlyTests/BehaviorExactlyTests.cs
index 722270b28..df35f196d 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/ExactlyTests/BehaviorExactlyTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/ExactlyTests/BehaviorExactlyTests.cs
@@ -6,7 +6,6 @@
 using OrchardCore.Commerce.Payment.Exactly.Drivers;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.ExactlyTests;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/InventoryTests/InventoryBehaviorTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/InventoryTests/InventoryBehaviorTests.cs
index 347817690..dd5e71f39 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/InventoryTests/InventoryBehaviorTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/InventoryTests/InventoryBehaviorTests.cs
@@ -4,7 +4,7 @@
 using OpenQA.Selenium;
 using System.Globalization;
 using Xunit;
-using Xunit.Abstractions;
+
 using static OrchardCore.Commerce.Tests.UI.Constants.ContentItemIds;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.PromotionTests;
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/LocalizedProductTests/LocalizedProductBehaviorTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/LocalizedProductTests/LocalizedProductBehaviorTests.cs
index 6b1d76ee8..0029d96c9 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/LocalizedProductTests/LocalizedProductBehaviorTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/LocalizedProductTests/LocalizedProductBehaviorTests.cs
@@ -5,7 +5,6 @@
 using OrchardCore.Commerce.MoneyDataType;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.LocalizedProductTests;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/OrderTests/BehaviorOrderTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/OrderTests/BehaviorOrderTests.cs
index 7537a642d..a6ad53000 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/OrderTests/BehaviorOrderTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/OrderTests/BehaviorOrderTests.cs
@@ -6,7 +6,7 @@
 using Shouldly;
 using System.Globalization;
 using Xunit;
-using Xunit.Abstractions;
+
 using static OrchardCore.Commerce.Tests.UI.Constants.ContentItemIds;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.OrderTests;
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/OrderTests/OrderSuccessTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/OrderTests/OrderSuccessTests.cs
index 6353e0928..2e0a51053 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/OrderTests/OrderSuccessTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/OrderTests/OrderSuccessTests.cs
@@ -7,7 +7,7 @@
 using Shouldly;
 using System.Globalization;
 using Xunit;
-using Xunit.Abstractions;
+
 using static OrchardCore.Commerce.Tests.UI.Constants.ContentItemIds;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.OrderTests;
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/PriceVariantsPartTests/PersistencePriceVariantsTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/PriceVariantsPartTests/PersistencePriceVariantsTests.cs
index 7d52ef2dc..ae762bd92 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/PriceVariantsPartTests/PersistencePriceVariantsTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/PriceVariantsPartTests/PersistencePriceVariantsTests.cs
@@ -6,7 +6,6 @@
 using OrchardCore.Commerce.MoneyDataType;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.PriceVariantsPartTests;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/PriceVariantsPartTests/ValidationPriceVariantsTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/PriceVariantsPartTests/ValidationPriceVariantsTests.cs
index 9acef73f8..b8fc3944b 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/PriceVariantsPartTests/ValidationPriceVariantsTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/PriceVariantsPartTests/ValidationPriceVariantsTests.cs
@@ -3,7 +3,6 @@
 using Lombiq.Tests.UI.Services;
 using OpenQA.Selenium;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.PriceVariantsPartTests;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/ProductListTests/BehaviorProductListTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/ProductListTests/BehaviorProductListTests.cs
index 1a98ce73d..9965c5c0e 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/ProductListTests/BehaviorProductListTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/ProductListTests/BehaviorProductListTests.cs
@@ -4,7 +4,6 @@
 using OpenQA.Selenium;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.ProductListTests;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/ProductTests/ProductBehaviorTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/ProductTests/ProductBehaviorTests.cs
index 999e6d0c4..c40c36fad 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/ProductTests/ProductBehaviorTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/ProductTests/ProductBehaviorTests.cs
@@ -5,7 +5,6 @@
 using OpenQA.Selenium;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 using static OrchardCore.Commerce.Tests.UI.Constants.ContentItemIds;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.ProductTests;
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/ProductTests/RetrievalProductTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/ProductTests/RetrievalProductTests.cs
index f1658157f..cdd80830c 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/ProductTests/RetrievalProductTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/ProductTests/RetrievalProductTests.cs
@@ -4,7 +4,6 @@
 using OpenQA.Selenium;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 using static OrchardCore.Commerce.Tests.UI.Constants.ContentItemIds;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.ProductTests;
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/PromotionTests/PromotionBehaviorTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/PromotionTests/PromotionBehaviorTests.cs
index d9af64398..31cae523e 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/PromotionTests/PromotionBehaviorTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/PromotionTests/PromotionBehaviorTests.cs
@@ -4,7 +4,6 @@
 using OpenQA.Selenium;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 using static OrchardCore.Commerce.Tests.UI.Constants.ContentItemIds;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.PromotionTests;
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/RegionTests/PersistenceRegionSettingsTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/RegionTests/PersistenceRegionSettingsTests.cs
index a891880e3..f2b6297ba 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/RegionTests/PersistenceRegionSettingsTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/RegionTests/PersistenceRegionSettingsTests.cs
@@ -4,7 +4,7 @@
 using OpenQA.Selenium;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
+
 using static OrchardCore.Commerce.Abstractions.Constants.ContentTypes;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.PersistenceRegionSettingsTests;
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/TaxTests/TaxBehaviorTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/TaxTests/TaxBehaviorTests.cs
index 712d3f0a7..97ebe643a 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/TaxTests/TaxBehaviorTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/TaxTests/TaxBehaviorTests.cs
@@ -6,7 +6,7 @@
 using Shouldly;
 using System.Globalization;
 using Xunit;
-using Xunit.Abstractions;
+
 using static OrchardCore.Commerce.Tests.UI.Constants.ContentItemIds;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.TaxTests;
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/TieredPricePartTests/PersistenceTieredPriceTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/TieredPricePartTests/PersistenceTieredPriceTests.cs
index deb2b85eb..c6a744869 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/TieredPricePartTests/PersistenceTieredPriceTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/TieredPricePartTests/PersistenceTieredPriceTests.cs
@@ -6,7 +6,6 @@
 using OrchardCore.Commerce.MoneyDataType;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.TieredPricePartTests;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/UserTests/UserPersistenceTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/UserTests/UserPersistenceTests.cs
index 59d61ed47..33d95d7ed 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/UserTests/UserPersistenceTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/UserTests/UserPersistenceTests.cs
@@ -7,7 +7,6 @@
 using Shouldly;
 using System.Text.Json;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.UserTests;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/WorkflowTests/WorkflowBehaviorTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/WorkflowTests/WorkflowBehaviorTests.cs
index e9b69bdbf..e9c406ef8 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/WorkflowTests/WorkflowBehaviorTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/WorkflowTests/WorkflowBehaviorTests.cs
@@ -5,7 +5,6 @@
 using OrchardCore.Commerce.Tests.UI.Constants;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.WorkflowTests;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/UITestBase.cs b/test/OrchardCore.Commerce.Tests.UI/UITestBase.cs
index 707e19272..f43db9515 100644
--- a/test/OrchardCore.Commerce.Tests.UI/UITestBase.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/UITestBase.cs
@@ -1,7 +1,7 @@
 using Lombiq.Tests.UI;
 using Lombiq.Tests.UI.Services;
 using OrchardCore.Commerce.Tests.UI.Helpers;
-using Xunit.Abstractions;
+using Xunit;
 
 namespace OrchardCore.Commerce.Tests.UI;
 

From a0bdb28ec90d28bf251d6765d05fc07c2287c6e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Wed, 22 Jan 2025 21:14:00 +0100
Subject: [PATCH 03/14] Update FullSecurityScanShouldPass.

---
 .../Tests/BasicTests/SecurityScanningTests.cs    | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
index 515390c39..3d2e1ca62 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
@@ -39,18 +39,10 @@ public Task FullSecurityScanShouldPass() =>
                 },
                 maxActiveScanDurationInMinutes: 5,
                 maxRuleDurationInMinutes: 1),
-            changeConfiguration: configuration => configuration.AssertAppLogsAsync = async webApplicationInstance =>
-            {
-                var logsWithoutUnwantedExceptionMessages = (await webApplicationInstance.GetLogOutputAsync())
-                    .SplitByNewLines()
-                    .Where(message =>
-                        !message.ContainsOrdinalIgnoreCase("System.IO.DirectoryNotFoundException: Could not find a part of the path") &&
-                        !message.ContainsOrdinalIgnoreCase(
-                            "System.IO.IOException: The filename, directory name, or volume label syntax is incorrect") &&
-                        !message.ContainsOrdinalIgnoreCase("System.InvalidOperationException: This action intentionally causes an exception!"));
-
-                logsWithoutUnwantedExceptionMessages.ShouldNotContain(item => item.Contains("|ERROR|"));
-            });
+            changeConfiguration: configuration => configuration.UseAssertAppLogsForSecurityScan(
+                "System.IO.DirectoryNotFoundException: Could not find a part of the path",
+                "System.IO.IOException: The filename, directory name, or volume label syntax is incorrect",
+                "System.InvalidOperationException: This action intentionally causes an exception!"));
 
     private static void FalsePositive(
         SecurityScanConfiguration configuration,

From 682e23de4ac29bf1c65bde2d0cd361718dd08e8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Wed, 22 Jan 2025 21:29:09 +0100
Subject: [PATCH 04/14] Update XUnit version.

---
 Directory.Packages.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index fb3b58a35..6a3634b5f 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -44,7 +44,7 @@
     <PackageVersion Include="Shouldly" Version="4.2.1" />
     <PackageVersion Include="Stripe.net" Version="44.13.0" />
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
-    <PackageVersion Include="xunit" Version="2.8.0" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>
 </Project>

From 57d3b5b1433015e08f14e50a501fed12fb6d62d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Wed, 22 Jan 2025 23:20:37 +0100
Subject: [PATCH 05/14] Fix version override.

---
 src/OrchardCore.Commerce.Web/OrchardCore.Commerce.Web.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/OrchardCore.Commerce.Web/OrchardCore.Commerce.Web.csproj b/src/OrchardCore.Commerce.Web/OrchardCore.Commerce.Web.csproj
index 613b81359..5c0455e96 100644
--- a/src/OrchardCore.Commerce.Web/OrchardCore.Commerce.Web.csproj
+++ b/src/OrchardCore.Commerce.Web/OrchardCore.Commerce.Web.csproj
@@ -18,8 +18,8 @@
 
     <!-- The Orchard Core packages must override the version to target the latest patch version in this project. See the
          Directory.Packages.props file for more details. -->
-    <PackageReference Include="OrchardCore.Application.Cms.Targets" VersionOverride="2.0.2" />
-    <PackageReference Include="OrchardCore.Logging.NLog" VersionOverride="2.0.2" />
+    <PackageReference Include="OrchardCore.Application.Cms.Targets" VersionOverride="2.1.2" />
+    <PackageReference Include="OrchardCore.Logging.NLog" VersionOverride="2.1.2" />
   </ItemGroup>
 
   <ItemGroup>

From a60d5efbe4545232f464db17bd7c840ae2c61412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Wed, 22 Jan 2025 23:27:43 +0100
Subject: [PATCH 06/14] Update OC build version.

---
 src/OrchardCore.Commerce.Web/OrchardCore.Commerce.Web.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/OrchardCore.Commerce.Web/OrchardCore.Commerce.Web.csproj b/src/OrchardCore.Commerce.Web/OrchardCore.Commerce.Web.csproj
index 5c0455e96..20c2b7710 100644
--- a/src/OrchardCore.Commerce.Web/OrchardCore.Commerce.Web.csproj
+++ b/src/OrchardCore.Commerce.Web/OrchardCore.Commerce.Web.csproj
@@ -18,8 +18,8 @@
 
     <!-- The Orchard Core packages must override the version to target the latest patch version in this project. See the
          Directory.Packages.props file for more details. -->
-    <PackageReference Include="OrchardCore.Application.Cms.Targets" VersionOverride="2.1.2" />
-    <PackageReference Include="OrchardCore.Logging.NLog" VersionOverride="2.1.2" />
+    <PackageReference Include="OrchardCore.Application.Cms.Targets" VersionOverride="2.1.4" />
+    <PackageReference Include="OrchardCore.Logging.NLog" VersionOverride="2.1.4" />
   </ItemGroup>
 
   <ItemGroup>

From e536435b04dfbfbcffe4d4d232ee885d3b18b662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Wed, 22 Jan 2025 23:37:26 +0100
Subject: [PATCH 07/14] UI test version

---
 Directory.Packages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 6a3634b5f..e483f5ece 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -9,7 +9,7 @@
     <OrchardCoreVersion>2.1.0</OrchardCoreVersion>
 
     <LombiqHelpfulLibrariesVersion>12.0.1-alpha.0.osoe-815</LombiqHelpfulLibrariesVersion>
-    <LombiqTestsUIVersion>12.0.1-alpha.5.osoe-935</LombiqTestsUIVersion>
+    <LombiqTestsUIVersion>12.0.1-alpha.6.offi-200</LombiqTestsUIVersion>
   </PropertyGroup>
 
   <ItemGroup>

From a80958a3872c186381d2a7973c2a6eedb1ec7a72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Wed, 22 Jan 2025 23:52:15 +0100
Subject: [PATCH 08/14] Revert "Remove obsolete usings."

This reverts commit 75a09f176eeae11400c35f7de843eb4528f967d5.
---
 .../Services/StripePaymentService.cs                         | 5 ++---
 .../Settings/CurrencySettingsDisplayDriver.cs                | 1 +
 .../Tests/BasicTests/BasicOrchardFeaturesTests.cs            | 1 +
 .../Tests/BasicTests/SecurityScanningTests.cs                | 3 +++
 .../Tests/CheckoutTests/BehaviorCheckoutTests.cs             | 2 +-
 .../Tests/ExactlyTests/BehaviorExactlyTests.cs               | 1 +
 .../Tests/InventoryTests/InventoryBehaviorTests.cs           | 2 +-
 .../LocalizedProductTests/LocalizedProductBehaviorTests.cs   | 1 +
 .../Tests/OrderTests/BehaviorOrderTests.cs                   | 2 +-
 .../Tests/OrderTests/OrderSuccessTests.cs                    | 2 +-
 .../PriceVariantsPartTests/PersistencePriceVariantsTests.cs  | 1 +
 .../PriceVariantsPartTests/ValidationPriceVariantsTests.cs   | 1 +
 .../Tests/ProductListTests/BehaviorProductListTests.cs       | 1 +
 .../Tests/ProductTests/ProductBehaviorTests.cs               | 1 +
 .../Tests/ProductTests/RetrievalProductTests.cs              | 1 +
 .../Tests/PromotionTests/PromotionBehaviorTests.cs           | 1 +
 .../Tests/RegionTests/PersistenceRegionSettingsTests.cs      | 2 +-
 .../Tests/TaxTests/TaxBehaviorTests.cs                       | 2 +-
 .../TieredPricePartTests/PersistenceTieredPriceTests.cs      | 1 +
 .../Tests/UserTests/UserPersistenceTests.cs                  | 1 +
 .../Tests/WorkflowTests/WorkflowBehaviorTests.cs             | 1 +
 test/OrchardCore.Commerce.Tests.UI/UITestBase.cs             | 2 +-
 22 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/Modules/OrchardCore.Commerce.Payment.Stripe/Services/StripePaymentService.cs b/src/Modules/OrchardCore.Commerce.Payment.Stripe/Services/StripePaymentService.cs
index de9585e87..019189ce8 100644
--- a/src/Modules/OrchardCore.Commerce.Payment.Stripe/Services/StripePaymentService.cs
+++ b/src/Modules/OrchardCore.Commerce.Payment.Stripe/Services/StripePaymentService.cs
@@ -25,7 +25,6 @@
 using System.Threading.Tasks;
 using YesSql;
 using Address = OrchardCore.Commerce.AddressDataType.Address;
-using ISession = YesSql.ISession;
 
 namespace OrchardCore.Commerce.Payment.Stripe.Services;
 
@@ -35,7 +34,7 @@ public class StripePaymentService : IStripePaymentService
     private readonly IContentManager _contentManager;
     private readonly ISiteService _siteService;
     private readonly IStringLocalizer T;
-    private readonly ISession _session;
+    private readonly YesSql.ISession _session;
     private readonly IPaymentIntentPersistence _paymentIntentPersistence;
     private readonly IPaymentService _paymentService;
     private readonly IHtmlLocalizer<StripePaymentService> H;
@@ -46,7 +45,7 @@ public StripePaymentService(
         IContentManager contentManager,
         ISiteService siteService,
         IStringLocalizer<StripePaymentService> stringLocalizer,
-        ISession session,
+        YesSql.ISession session,
         IPaymentIntentPersistence paymentIntentPersistence,
         IPaymentService paymentService,
         IHtmlLocalizer<StripePaymentService> htmlLocalizer,
diff --git a/src/Modules/OrchardCore.Commerce/Settings/CurrencySettingsDisplayDriver.cs b/src/Modules/OrchardCore.Commerce/Settings/CurrencySettingsDisplayDriver.cs
index 10f8abedf..5835b80f7 100644
--- a/src/Modules/OrchardCore.Commerce/Settings/CurrencySettingsDisplayDriver.cs
+++ b/src/Modules/OrchardCore.Commerce/Settings/CurrencySettingsDisplayDriver.cs
@@ -9,6 +9,7 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Environment.Shell;
 using OrchardCore.Settings;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/BasicOrchardFeaturesTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/BasicOrchardFeaturesTests.cs
index 263308612..fbe5bf8f8 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/BasicOrchardFeaturesTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/BasicOrchardFeaturesTests.cs
@@ -3,6 +3,7 @@
 using Lombiq.Tests.UI.Services;
 using OrchardCore.Commerce.Tests.UI.Helpers;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.BasicTests;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
index 3d2e1ca62..e179bae88 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
@@ -1,5 +1,8 @@
+using Lombiq.Tests.UI.Extensions;
 using Lombiq.Tests.UI.SecurityScanning;
+using Shouldly;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.BasicTests;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/CheckoutTests/BehaviorCheckoutTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/CheckoutTests/BehaviorCheckoutTests.cs
index 1113d1838..0001397f0 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/CheckoutTests/BehaviorCheckoutTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/CheckoutTests/BehaviorCheckoutTests.cs
@@ -8,7 +8,7 @@
 using OrchardCore.ContentFields.Fields;
 using Shouldly;
 using Xunit;
-
+using Xunit.Abstractions;
 using static OrchardCore.Commerce.ContentFields.Constants.FeatureIds;
 using static OrchardCore.Commerce.Tests.UI.Constants.ContentItemIds;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/ExactlyTests/BehaviorExactlyTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/ExactlyTests/BehaviorExactlyTests.cs
index df35f196d..722270b28 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/ExactlyTests/BehaviorExactlyTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/ExactlyTests/BehaviorExactlyTests.cs
@@ -6,6 +6,7 @@
 using OrchardCore.Commerce.Payment.Exactly.Drivers;
 using Shouldly;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.ExactlyTests;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/InventoryTests/InventoryBehaviorTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/InventoryTests/InventoryBehaviorTests.cs
index dd5e71f39..347817690 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/InventoryTests/InventoryBehaviorTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/InventoryTests/InventoryBehaviorTests.cs
@@ -4,7 +4,7 @@
 using OpenQA.Selenium;
 using System.Globalization;
 using Xunit;
-
+using Xunit.Abstractions;
 using static OrchardCore.Commerce.Tests.UI.Constants.ContentItemIds;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.PromotionTests;
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/LocalizedProductTests/LocalizedProductBehaviorTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/LocalizedProductTests/LocalizedProductBehaviorTests.cs
index 0029d96c9..6b1d76ee8 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/LocalizedProductTests/LocalizedProductBehaviorTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/LocalizedProductTests/LocalizedProductBehaviorTests.cs
@@ -5,6 +5,7 @@
 using OrchardCore.Commerce.MoneyDataType;
 using Shouldly;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.LocalizedProductTests;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/OrderTests/BehaviorOrderTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/OrderTests/BehaviorOrderTests.cs
index a6ad53000..7537a642d 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/OrderTests/BehaviorOrderTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/OrderTests/BehaviorOrderTests.cs
@@ -6,7 +6,7 @@
 using Shouldly;
 using System.Globalization;
 using Xunit;
-
+using Xunit.Abstractions;
 using static OrchardCore.Commerce.Tests.UI.Constants.ContentItemIds;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.OrderTests;
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/OrderTests/OrderSuccessTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/OrderTests/OrderSuccessTests.cs
index 2e0a51053..6353e0928 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/OrderTests/OrderSuccessTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/OrderTests/OrderSuccessTests.cs
@@ -7,7 +7,7 @@
 using Shouldly;
 using System.Globalization;
 using Xunit;
-
+using Xunit.Abstractions;
 using static OrchardCore.Commerce.Tests.UI.Constants.ContentItemIds;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.OrderTests;
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/PriceVariantsPartTests/PersistencePriceVariantsTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/PriceVariantsPartTests/PersistencePriceVariantsTests.cs
index ae762bd92..7d52ef2dc 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/PriceVariantsPartTests/PersistencePriceVariantsTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/PriceVariantsPartTests/PersistencePriceVariantsTests.cs
@@ -6,6 +6,7 @@
 using OrchardCore.Commerce.MoneyDataType;
 using Shouldly;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.PriceVariantsPartTests;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/PriceVariantsPartTests/ValidationPriceVariantsTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/PriceVariantsPartTests/ValidationPriceVariantsTests.cs
index b8fc3944b..9acef73f8 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/PriceVariantsPartTests/ValidationPriceVariantsTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/PriceVariantsPartTests/ValidationPriceVariantsTests.cs
@@ -3,6 +3,7 @@
 using Lombiq.Tests.UI.Services;
 using OpenQA.Selenium;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.PriceVariantsPartTests;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/ProductListTests/BehaviorProductListTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/ProductListTests/BehaviorProductListTests.cs
index 9965c5c0e..1a98ce73d 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/ProductListTests/BehaviorProductListTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/ProductListTests/BehaviorProductListTests.cs
@@ -4,6 +4,7 @@
 using OpenQA.Selenium;
 using Shouldly;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.ProductListTests;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/ProductTests/ProductBehaviorTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/ProductTests/ProductBehaviorTests.cs
index c40c36fad..999e6d0c4 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/ProductTests/ProductBehaviorTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/ProductTests/ProductBehaviorTests.cs
@@ -5,6 +5,7 @@
 using OpenQA.Selenium;
 using Shouldly;
 using Xunit;
+using Xunit.Abstractions;
 using static OrchardCore.Commerce.Tests.UI.Constants.ContentItemIds;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.ProductTests;
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/ProductTests/RetrievalProductTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/ProductTests/RetrievalProductTests.cs
index cdd80830c..f1658157f 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/ProductTests/RetrievalProductTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/ProductTests/RetrievalProductTests.cs
@@ -4,6 +4,7 @@
 using OpenQA.Selenium;
 using Shouldly;
 using Xunit;
+using Xunit.Abstractions;
 using static OrchardCore.Commerce.Tests.UI.Constants.ContentItemIds;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.ProductTests;
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/PromotionTests/PromotionBehaviorTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/PromotionTests/PromotionBehaviorTests.cs
index 31cae523e..d9af64398 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/PromotionTests/PromotionBehaviorTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/PromotionTests/PromotionBehaviorTests.cs
@@ -4,6 +4,7 @@
 using OpenQA.Selenium;
 using Shouldly;
 using Xunit;
+using Xunit.Abstractions;
 using static OrchardCore.Commerce.Tests.UI.Constants.ContentItemIds;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.PromotionTests;
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/RegionTests/PersistenceRegionSettingsTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/RegionTests/PersistenceRegionSettingsTests.cs
index f2b6297ba..a891880e3 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/RegionTests/PersistenceRegionSettingsTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/RegionTests/PersistenceRegionSettingsTests.cs
@@ -4,7 +4,7 @@
 using OpenQA.Selenium;
 using Shouldly;
 using Xunit;
-
+using Xunit.Abstractions;
 using static OrchardCore.Commerce.Abstractions.Constants.ContentTypes;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.PersistenceRegionSettingsTests;
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/TaxTests/TaxBehaviorTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/TaxTests/TaxBehaviorTests.cs
index 97ebe643a..712d3f0a7 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/TaxTests/TaxBehaviorTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/TaxTests/TaxBehaviorTests.cs
@@ -6,7 +6,7 @@
 using Shouldly;
 using System.Globalization;
 using Xunit;
-
+using Xunit.Abstractions;
 using static OrchardCore.Commerce.Tests.UI.Constants.ContentItemIds;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.TaxTests;
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/TieredPricePartTests/PersistenceTieredPriceTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/TieredPricePartTests/PersistenceTieredPriceTests.cs
index c6a744869..deb2b85eb 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/TieredPricePartTests/PersistenceTieredPriceTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/TieredPricePartTests/PersistenceTieredPriceTests.cs
@@ -6,6 +6,7 @@
 using OrchardCore.Commerce.MoneyDataType;
 using Shouldly;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.TieredPricePartTests;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/UserTests/UserPersistenceTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/UserTests/UserPersistenceTests.cs
index 33d95d7ed..59d61ed47 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/UserTests/UserPersistenceTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/UserTests/UserPersistenceTests.cs
@@ -7,6 +7,7 @@
 using Shouldly;
 using System.Text.Json;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.UserTests;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/WorkflowTests/WorkflowBehaviorTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/WorkflowTests/WorkflowBehaviorTests.cs
index e9c406ef8..e9b69bdbf 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/WorkflowTests/WorkflowBehaviorTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/WorkflowTests/WorkflowBehaviorTests.cs
@@ -5,6 +5,7 @@
 using OrchardCore.Commerce.Tests.UI.Constants;
 using Shouldly;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.WorkflowTests;
 
diff --git a/test/OrchardCore.Commerce.Tests.UI/UITestBase.cs b/test/OrchardCore.Commerce.Tests.UI/UITestBase.cs
index f43db9515..707e19272 100644
--- a/test/OrchardCore.Commerce.Tests.UI/UITestBase.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/UITestBase.cs
@@ -1,7 +1,7 @@
 using Lombiq.Tests.UI;
 using Lombiq.Tests.UI.Services;
 using OrchardCore.Commerce.Tests.UI.Helpers;
-using Xunit;
+using Xunit.Abstractions;
 
 namespace OrchardCore.Commerce.Tests.UI;
 

From 8159738aa45cd7707b81b02cd70cb38115681ee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Wed, 22 Jan 2025 23:58:19 +0100
Subject: [PATCH 09/14] unusing

---
 .../Tests/BasicTests/SecurityScanningTests.cs                   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
index e179bae88..a3108e71f 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
@@ -1,6 +1,4 @@
-using Lombiq.Tests.UI.Extensions;
 using Lombiq.Tests.UI.SecurityScanning;
-using Shouldly;
 using Xunit;
 using Xunit.Abstractions;
 

From c241d4369e7aa066b3fa10fad9a83a59747f5399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Thu, 23 Jan 2025 04:02:07 +0100
Subject: [PATCH 10/14] Simplify security scanning.

---
 .../Tests/BasicTests/SecurityScanningTests.cs               | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
index a3108e71f..20570e5ba 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
@@ -17,6 +17,9 @@ public Task FullSecurityScanShouldPass() =>
             context => context.RunAndConfigureAndAssertFullSecurityScanForContinuousIntegrationAsync(
                 configuration =>
                 {
+                    // Not relevant for OrchardCore.Commerce, sites using it should implement their own custom error pages.
+                    configuration.DontScanErrorPage = true;
+
                     configuration.DisableActiveScanRule(
                         6,
                         "Path Traversal (all paths are virtual so it's not a real concern, also creates too many errors)");
@@ -42,8 +45,7 @@ public Task FullSecurityScanShouldPass() =>
                 maxRuleDurationInMinutes: 1),
             changeConfiguration: configuration => configuration.UseAssertAppLogsForSecurityScan(
                 "System.IO.DirectoryNotFoundException: Could not find a part of the path",
-                "System.IO.IOException: The filename, directory name, or volume label syntax is incorrect",
-                "System.InvalidOperationException: This action intentionally causes an exception!"));
+                "System.IO.IOException: The filename, directory name, or volume label syntax is incorrect"));
 
     private static void FalsePositive(
         SecurityScanConfiguration configuration,

From 4b1a191f7eee66d8b58381a812f95e1a75cde7b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Thu, 23 Jan 2025 05:24:08 +0100
Subject: [PATCH 11/14] Fix updated security scan permitted errors for real.

---
 .../Tests/BasicTests/SecurityScanningTests.cs      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
index 20570e5ba..91cee68f4 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
@@ -17,9 +17,6 @@ public Task FullSecurityScanShouldPass() =>
             context => context.RunAndConfigureAndAssertFullSecurityScanForContinuousIntegrationAsync(
                 configuration =>
                 {
-                    // Not relevant for OrchardCore.Commerce, sites using it should implement their own custom error pages.
-                    configuration.DontScanErrorPage = true;
-
                     configuration.DisableActiveScanRule(
                         6,
                         "Path Traversal (all paths are virtual so it's not a real concern, also creates too many errors)");
@@ -42,10 +39,13 @@ public Task FullSecurityScanShouldPass() =>
                         @".*/\?.*products\..*");
                 },
                 maxActiveScanDurationInMinutes: 5,
-                maxRuleDurationInMinutes: 1),
-            changeConfiguration: configuration => configuration.UseAssertAppLogsForSecurityScan(
-                "System.IO.DirectoryNotFoundException: Could not find a part of the path",
-                "System.IO.IOException: The filename, directory name, or volume label syntax is incorrect"));
+                maxRuleDurationInMinutes: 1,
+                additionalPermittedErrorLinePatterns:
+                [
+                    "System.IO.DirectoryNotFoundException: Could not find a part of the path",
+                    "System.IO.IOException: The filename, directory name, or volume label syntax is incorrect",
+                    "System.InvalidOperationException: This action intentionally causes an exception!",
+                ]));
 
     private static void FalsePositive(
         SecurityScanConfiguration configuration,

From 34f1595ed6c6847bfdded11636a9ce12982ec48c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Thu, 23 Jan 2025 05:39:36 +0100
Subject: [PATCH 12/14] Don't break on ExceptionContextLoggingMiddleware
 either.

---
 .../Tests/BasicTests/SecurityScanningTests.cs                   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
index 91cee68f4..62143d928 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
@@ -1,4 +1,5 @@
 using Lombiq.Tests.UI.SecurityScanning;
+using Lombiq.Tests.UI.Shortcuts.Middlewares;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -45,6 +46,7 @@ public Task FullSecurityScanShouldPass() =>
                     "System.IO.DirectoryNotFoundException: Could not find a part of the path",
                     "System.IO.IOException: The filename, directory name, or volume label syntax is incorrect",
                     "System.InvalidOperationException: This action intentionally causes an exception!",
+                    nameof(ExceptionContextLoggingMiddleware),
                 ]));
 
     private static void FalsePositive(

From 35a274320548bdfdb578bd46e0ddf07b7110ada1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Fri, 24 Jan 2025 04:36:35 +0100
Subject: [PATCH 13/14] update UITT

---
 Directory.Packages.props                                 | 2 +-
 .../Tests/BasicTests/SecurityScanningTests.cs            | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index e483f5ece..2e1858dec 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -9,7 +9,7 @@
     <OrchardCoreVersion>2.1.0</OrchardCoreVersion>
 
     <LombiqHelpfulLibrariesVersion>12.0.1-alpha.0.osoe-815</LombiqHelpfulLibrariesVersion>
-    <LombiqTestsUIVersion>12.0.1-alpha.6.offi-200</LombiqTestsUIVersion>
+    <LombiqTestsUIVersion>12.0.1-alpha.7.offi-200</LombiqTestsUIVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
index 62143d928..2a6dc3c15 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
@@ -40,14 +40,7 @@ public Task FullSecurityScanShouldPass() =>
                         @".*/\?.*products\..*");
                 },
                 maxActiveScanDurationInMinutes: 5,
-                maxRuleDurationInMinutes: 1,
-                additionalPermittedErrorLinePatterns:
-                [
-                    "System.IO.DirectoryNotFoundException: Could not find a part of the path",
-                    "System.IO.IOException: The filename, directory name, or volume label syntax is incorrect",
-                    "System.InvalidOperationException: This action intentionally causes an exception!",
-                    nameof(ExceptionContextLoggingMiddleware),
-                ]));
+                maxRuleDurationInMinutes: 1));
 
     private static void FalsePositive(
         SecurityScanConfiguration configuration,

From 942d7b14df8cdeaa9b84c5e70c1734371a0b4a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Fri, 24 Jan 2025 04:40:41 +0100
Subject: [PATCH 14/14] unusing

---
 .../Tests/BasicTests/SecurityScanningTests.cs                    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
index 2a6dc3c15..f14120edf 100644
--- a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
+++ b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
@@ -1,5 +1,4 @@
 using Lombiq.Tests.UI.SecurityScanning;
-using Lombiq.Tests.UI.Shortcuts.Middlewares;
 using Xunit;
 using Xunit.Abstractions;