Skip to content

Commit 0e2218b

Browse files
committed
Merge remote-tracking branch 'origin/dev' into issue/OSOE-1185
2 parents 6dc0dae + 5d82ace commit 0e2218b

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
</PropertyGroup>-->
3030

3131
<!-- Uncomment this to run .NET static code analyzers during rebuilds. -->
32-
<!--<PropertyGroup>
32+
<PropertyGroup>
3333
<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
34-
</PropertyGroup>-->
34+
</PropertyGroup>
3535

3636
<Import Project="tools/Lombiq.Analyzers/Lombiq.Analyzers.OrchardCore/Build.props" />
3737

NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Lombiq.OSOCE.NuGet.Web.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<PackageReference Include="Lombiq.EmailClient" Version="1.0.0-alpha.8.osoe-1064" />
3434
<PackageReference Include="Lombiq.EmailClient.Samples" Version="1.0.0-alpha.8.osoe-1064" />
3535
<PackageReference Include="Lombiq.HelpfulExtensions" Version="11.0.1-alpha.1.olys-35" />
36-
<PackageReference Include="Lombiq.HelpfulLibraries" Version="12.3.1-alpha.2.osoe-1171" />
36+
<PackageReference Include="Lombiq.HelpfulLibraries" Version="12.4.0" />
3737
<PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights" Version="10.0.1-alpha.0.osoe-935" />
3838
<PackageReference Include="Lombiq.Hosting.BuildVersionDisplay" Version="7.0.1-alpha.2.nest-561" />
3939
<PackageReference Include="Lombiq.Hosting.MediaTheme" Version="8.0.1-alpha.7.olys-29" />

NuGetTest/src/Modules/Lombiq.OSOCE.NuGet.TestModule/Lombiq.OSOCE.NuGet.TestModule.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Lombiq.HelpfulLibraries" Version="12.3.1-alpha.2.osoe-1171" />
19+
<PackageReference Include="Lombiq.HelpfulLibraries" Version="12.4.0" />
2020
<PackageReference Include="OrchardCore.Module.Targets" Version="2.1.0" />
2121
<PackageReference Include="OrchardCore.ContentManagement" Version="2.1.0" />
2222
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.1.0" />

NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Lombiq.OSOCE.NuGet.Tests.UI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="12.3.1-alpha.2.osoe-1171" />
24+
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="12.4.0" />
2525
<PackageReference Include="Lombiq.BaseTheme.Tests.UI" Version="10.0.1" />
2626
<PackageReference Include="Lombiq.ChartJs.Tests.UI" Version="9.0.1-alpha.0.osoe-935" />
2727
<PackageReference Include="Lombiq.ContentEditors.Tests.UI" Version="6.0.0-alpha.4.osoe-1171" />

NuGetTest/test/Lombiq.OSOCE.NuGet.Tests/Lombiq.OSOCE.NuGet.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Lombiq.HelpfulLibraries" Version="12.3.1-alpha.2.osoe-1171" />
9+
<PackageReference Include="Lombiq.HelpfulLibraries" Version="12.4.0" />
1010
<PackageReference Include="Lombiq.Tests" Version="5.0.0" />
1111
<PackageReference Include="Lombiq.EInvoiceValidator" Version="1.0.0" />
1212
<PackageReference Include="Lombiq.EInvoiceValidator.Sample" Version="1.0.0" />

test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorPrivacyTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ await ExecuteTestAfterSetupAsync(
4141
configuration => configuration.HtmlValidationConfiguration.AssertHtmlValidationResultAsync =
4242
validationResult =>
4343
{
44-
// Error filtering due to https://github.com/OrchardCMS/OrchardCore/issues/15222,
45-
// can be removed once it is resolved.
44+
// Error filtering due to https://github.com/OrchardCMS/OrchardCore/issues/15222 and
45+
// https://github.com/OrchardCMS/OrchardCore/issues/18510. Can be removed once they are resolved.
4646
var errors = validationResult.GetParsedErrors()
47-
.Where(error => error.RuleId is not "prefer-native-element");
47+
.Where(error => error.RuleId is not "prefer-native-element" and not "aria-label-misuse");
4848
errors.ShouldBeEmpty(HtmlValidationResultExtensions.GetParsedErrorMessageString(errors));
4949
return Task.CompletedTask;
5050
});

0 commit comments

Comments
 (0)