Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OFFI-200: Update OC and Lombiq versions. #514

Merged
merged 14 commits into from
Jan 28, 2025
Merged

OFFI-200: Update OC and Lombiq versions. #514

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ee9624f
Update OC and Lombiq versions.
sarahelsaig Jan 22, 2025
75a09f1
Remove obsolete usings.
sarahelsaig Jan 22, 2025
a0bdb28
Update FullSecurityScanShouldPass.
sarahelsaig Jan 22, 2025
682e23d
Update XUnit version.
sarahelsaig Jan 22, 2025
57d3b5b
Fix version override.
sarahelsaig Jan 22, 2025
a60d5ef
Update OC build version.
sarahelsaig Jan 22, 2025
e536435
UI test version
sarahelsaig Jan 22, 2025
a80958a
Revert "Remove obsolete usings."
sarahelsaig Jan 22, 2025
8159738
unusing
sarahelsaig Jan 22, 2025
c241d43
Simplify security scanning.
sarahelsaig Jan 23, 2025
4b1a191
Fix updated security scan permitted errors for real.
sarahelsaig Jan 23, 2025
34f1595
Don't break on ExceptionContextLoggingMiddleware either.
sarahelsaig Jan 23, 2025
35a2743
update UITT
sarahelsaig Jan 24, 2025
942d7b1
unusing
sarahelsaig Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.offi-200</LombiqTestsUIVersion>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -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>
4 changes: 2 additions & 2 deletions src/OrchardCore.Commerce.Web/OrchardCore.Commerce.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.4" />
<PackageReference Include="OrchardCore.Logging.NLog" VersionOverride="2.1.4" />
</ItemGroup>

<ItemGroup>
Expand Down
24 changes: 9 additions & 15 deletions test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Lombiq.Tests.UI.Extensions;
using Lombiq.Tests.UI.SecurityScanning;
using Shouldly;
using Lombiq.Tests.UI.Shortcuts.Middlewares;
using Xunit;
using Xunit.Abstractions;

Expand Down Expand Up @@ -41,19 +40,14 @@ public Task FullSecurityScanShouldPass() =>
@".*/\?.*products\..*");
},
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|"));
});
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),
BenedekFarkas marked this conversation as resolved.
Show resolved Hide resolved
]));
BenedekFarkas marked this conversation as resolved.
Show resolved Hide resolved

private static void FalsePositive(
SecurityScanConfiguration configuration,
Expand Down
Loading