Upgrading OC to 2.1.0 and Lombiq packages to latest stable

OrchardCMS · Dec 10, 2024 · aa4699f · aa4699f
1 parent 79c19a6
commit aa4699f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -2,23 +2,21 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
-
     <!-- 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.0</LombiqHelpfulLibrariesVersion>
+    <LombiqTestsUIVersion>12.0.0</LombiqTestsUIVersion>
   </PropertyGroup>
-
   <ItemGroup>
     <PackageVersion Include="Lombiq.Analyzers.OrchardCore" Version="5.0.0" />
     <PackageVersion Include="Lombiq.HelpfulLibraries.OrchardCore" Version="$(LombiqHelpfulLibrariesVersion)" />
     <PackageVersion Include="Lombiq.HelpfulLibraries.AspNetCore" Version="$(LombiqHelpfulLibrariesVersion)" />
     <PackageVersion Include="Lombiq.HelpfulLibraries.Refit" Version="$(LombiqHelpfulLibrariesVersion)" />
     <PackageVersion Include="Lombiq.NodeJs.Extensions" Version="2.1.0" />
-    <PackageVersion Include="Lombiq.Tests" Version="3.0.0" />
+    <PackageVersion Include="Lombiq.Tests" Version="4.0.0" />
     <PackageVersion Include="Lombiq.Tests.UI" Version="$(LombiqTestsUIVersion)" />
     <PackageVersion Include="Lombiq.Tests.UI.AppExtensions" Version="$(LombiqTestsUIVersion)" />
     <PackageVersion Include="Lombiq.Tests.UI.Shortcuts" Version="$(LombiqTestsUIVersion)" />
@@ -44,7 +42,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" Version="2.9.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Modules/OrchardCore.Commerce.Payment.Stripe/OrchardCore.Commerce.Payment.Stripe.csproj b/src/Modules/OrchardCore.Commerce.Payment.Stripe/OrchardCore.Commerce.Payment.Stripe.csproj
@@ -33,7 +33,7 @@
     <PackageReference Include="Stripe.net" />
   </ItemGroup>
 
-  <!-- Newtonsoft.Json is a dependency if Stripe.net. While OC does not use it directly any more, this is needed to pull
+  <!-- Newtonsoft.Json is a dependency of Stripe.net. While OC does not use it directly any more, this is needed to pull
        the package up to a more up-to-date and secure version. -->
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" />

diff --git 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.0" />
+    <PackageReference Include="OrchardCore.Logging.NLog" VersionOverride="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs b/test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
@@ -44,7 +44,7 @@ public Task FullSecurityScanShouldPass() =>
                 maxRuleDurationInMinutes: 1),
             changeConfiguration: configuration => configuration.AssertAppLogsAsync = async webApplicationInstance =>
             {
-                var logsWithoutUnwantedExceptionMessages = (await webApplicationInstance.GetLogOutputAsync())
+                var logsWithoutUnwantedExceptionMessages = (await webApplicationInstance.GetLogContentsAsync())
                     .SplitByNewLines()
                     .Where(message =>
                         !message.ContainsOrdinalIgnoreCase("System.IO.DirectoryNotFoundException: Could not find a part of the path") &&