Skip to content

Commit

Permalink
Merge branch 'dev' into issue/NEST-537
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/Lombiq.OSOCE.Web/Lombiq.OSOCE.Web.csproj
  • Loading branch information
BenedekFarkas committed Feb 20, 2025
2 parents f8fdd2c + ecd6dea commit 553b900
Show file tree
Hide file tree
Showing 89 changed files with 109 additions and 307 deletions.
35 changes: 0 additions & 35 deletions .github/actions/spelling/allow.txt

This file was deleted.

9 changes: 0 additions & 9 deletions .github/actions/spelling/excludes.txt

This file was deleted.

77 changes: 0 additions & 77 deletions .github/actions/spelling/expect.txt

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/build-and-test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ jobs:
set-up-sql-server: 'true'
set-up-azurite: 'true'
build-create-binary-log: 'true'
blame-hang-timeout: 720000
# This way, we can see Node.js build issues in the build log.
build-verbosity: minimal
dotnet-test-process-timeout: 720000
# Running ZAP for security scans in Docker under GHA Windows runners won't work since such virtualization is not
# supported by GHA.
# The currently used Elasticsearch setup action (https://github.com/elastic/elastic-github-actions/tree/master/elasticsearch)
Expand Down
27 changes: 4 additions & 23 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
set-up-azurite: 'true'
set-up-elasticsearch: 'true'
build-create-binary-log: 'true'
blame-hang-timeout: 600000
build-enable-nuget-caching: 'true'
build-enable-npm-caching: 'true'
# This way, we can see Node.js build issues in the build log.
build-verbosity: minimal
dotnet-test-process-timeout: 600000

build-and-test-standard-runners:
if: github.ref_name == github.event.repository.default_branch
Expand All @@ -38,9 +38,9 @@ jobs:
set-up-azurite: 'true'
set-up-elasticsearch: 'true'
build-create-binary-log: 'true'
blame-hang-timeout: 780000
# This way, we can see Node.js build issues in the build log.
build-verbosity: minimal
dotnet-test-process-timeout: 780000

build-and-test-nuget-test:
name: Build and Test - NuGetTest solution
Expand All @@ -49,28 +49,9 @@ jobs:
parent-job-name: nuget-solution
build-directory: NuGetTest
timeout-minutes: 20
blame-hang-timeout: 480000
# This way, we can see Node.js build issues in the build log.
build-verbosity: minimal
dotnet-test-process-timeout: 480000


spelling:
name: Spelling
uses: Lombiq/GitHub-Actions/.github/workflows/spelling.yml@dev
with:
additional-dictionaries: |
cspell:csharp/csharp.txt
cspell:css/dict/css.txt
cspell:fullstack/dict/fullstack.txt
cspell:html-symbol-entities/entities.txt
cspell:html/dict/html.txt
cspell:html/src/svg.txt
cspell:node/dict/node.txt
cspell:npm/dict/npm.txt
lombiq-lgha:dictionaries/Liquid.txt
lombiq-lgha:dictionaries/Lombiq.people.txt
lombiq-lgha:dictionaries/Security.txt
lombiq-lgha:dictionaries/Xml.txt

codespell:
name: Codespell
Expand All @@ -91,7 +72,7 @@ jobs:

post-pull-request-checks-automation:
name: Post Pull Request Checks Automation
needs: [build-and-test-larger-runners, build-and-test-nuget-test, spelling, codespell, powershell-static-code-analysis]
needs: [build-and-test-larger-runners, build-and-test-nuget-test, codespell, powershell-static-code-analysis]
if: github.event.pull_request != ''
uses: Lombiq/GitHub-Actions/.github/workflows/post-pull-request-checks-automation.yml@dev
secrets:
Expand Down
11 changes: 0 additions & 11 deletions Lombiq.OSOCE.sln
Original file line number Diff line number Diff line change
Expand Up @@ -179,15 +179,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lombiq.Hosting.BuildVersion
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lombiq.Hosting.MediaTheme.Targets", "src\Themes\Lombiq.Hosting.MediaTheme\Lombiq.Hosting.MediaTheme.Targets\Lombiq.Hosting.MediaTheme.Targets.csproj", "{8C24107C-10AA-43EE-A85E-55173EB5B65F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "actions", "actions", "{A48B16D8-61C2-4EAD-978E-5DD77121CFA1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "spelling", "spelling", "{106B5DDD-D775-4D25-BE16-4569226620E0}"
ProjectSection(SolutionItems) = preProject
.github\actions\spelling\allow.txt = .github\actions\spelling\allow.txt
.github\actions\spelling\excludes.txt = .github\actions\spelling\excludes.txt
.github\actions\spelling\expect.txt = .github\actions\spelling\expect.txt
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lombiq.ContentEditors", "src\Modules\Lombiq.ContentEditors\Lombiq.ContentEditors\Lombiq.ContentEditors.csproj", "{1B7C5C5D-E20F-4707-A0B5-8602DF7DA78D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lombiq.ContentEditors.Samples", "src\Modules\Lombiq.ContentEditors\Lombiq.ContentEditors.Samples\Lombiq.ContentEditors.Samples.csproj", "{66571E77-70C3-4A1E-8C0F-9E15F933E771}"
Expand Down Expand Up @@ -1506,8 +1497,6 @@ Global
{8D054C07-A74B-4A37-B407-ED7BFE7C077B} = {11E06A11-1733-408D-BB2F-BFA07075F812}
{B261E437-D773-49A7-AA4B-72CFE7A8DE35} = {6ED7E28F-0556-471C-8AD1-5BB0941411DD}
{8C24107C-10AA-43EE-A85E-55173EB5B65F} = {11F2CB14-D92A-484F-9C1E-2836B1B04DB8}
{A48B16D8-61C2-4EAD-978E-5DD77121CFA1} = {719F19E1-0B20-490C-B325-74E5FD6C838C}
{106B5DDD-D775-4D25-BE16-4569226620E0} = {A48B16D8-61C2-4EAD-978E-5DD77121CFA1}
{1B7C5C5D-E20F-4707-A0B5-8602DF7DA78D} = {11E06A11-1733-408D-BB2F-BFA07075F812}
{66571E77-70C3-4A1E-8C0F-9E15F933E771} = {11E06A11-1733-408D-BB2F-BFA07075F812}
{C90E70CD-B792-4C1D-BE8A-FB47C1C33A36} = {6ED7E28F-0556-471C-8AD1-5BB0941411DD}
Expand Down
65 changes: 32 additions & 33 deletions NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Lombiq.OSOCE.NuGet.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,41 +21,40 @@

<ItemGroup>
<PackageReference Include="Lombiq.AuditTrailExtensions" Version="8.0.0" />
<PackageReference Include="Lombiq.BaseTheme" Version="9.0.0" />
<PackageReference Include="Lombiq.BaseTheme.Samples" Version="9.0.0" />
<PackageReference Include="Lombiq.ChartJs" Version="9.0.0" />
<PackageReference Include="Lombiq.ChartJs.Samples" Version="9.0.0" />
<PackageReference Include="Lombiq.ContentEditors" Version="5.0.0" />
<PackageReference Include="Lombiq.ContentEditors.Samples" Version="5.0.0" />
<PackageReference Include="Lombiq.DataTables" Version="10.0.0" />
<PackageReference Include="Lombiq.DataTables.Samples" Version="10.0.0" />
<PackageReference Include="Lombiq.HelpfulExtensions" Version="10.0.1-alpha.5.osoe-947" />
<PackageReference Include="Lombiq.BaseTheme" Version="9.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.BaseTheme.Samples" Version="9.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.ChartJs" Version="9.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.ChartJs.Samples" Version="9.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.ContentEditors" Version="5.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.ContentEditors.Samples" Version="5.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.DataTables" Version="10.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.DataTables.Samples" Version="10.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.HelpfulExtensions" Version="10.0.1-alpha.6.osoe-935" />
<PackageReference Include="Lombiq.HelpfulLibraries" Version="12.1.1-alpha.0.osoe-815" />
<PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights" Version="10.0.0" />
<PackageReference Include="Lombiq.Hosting.BuildVersionDisplay" Version="7.0.0" />
<PackageReference Include="Lombiq.Hosting.MediaTheme" Version="8.0.0" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge" Version="8.0.0" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Targets" Version="8.0.0" />
<PackageReference Include="Lombiq.Hosting.Tenants.Admin.Login" Version="9.0.1-alpha.1.osoe-815" />
<PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots" Version="9.0.1-alpha.1.osoe-815" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard" Version="9.0.1-alpha.1.osoe-815" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement" Version="9.0.1-alpha.1.osoe-815" />
<PackageReference Include="Lombiq.Hosting.Tenants.Maintenance" Version="9.0.1-alpha.1.osoe-815" />
<PackageReference Include="Lombiq.Hosting.Tenants.Management" Version="9.0.1-alpha.1.osoe-815" />
<PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement" Version="9.0.1-alpha.1.osoe-815" />
<PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement" Version="9.0.1-alpha.1.osoe-815" />
<PackageReference Include="Lombiq.JsonEditor" Version="9.0.0" />
<PackageReference Include="Lombiq.JsonEditor.Tests.UI" Version="9.0.0" />
<PackageReference Include="Lombiq.LoginAsAnybody" Version="5.0.0" />
<PackageReference Include="Lombiq.Privacy" Version="10.0.0" />
<PackageReference Include="Lombiq.Privacy.Samples" Version="10.0.0" />
<PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights" Version="10.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Hosting.BuildVersionDisplay" Version="7.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Hosting.MediaTheme" Version="8.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge" Version="8.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Targets" Version="8.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Hosting.Tenants.Admin.Login" Version="9.0.1-alpha.2.osoe-935" />
<PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots" Version="9.0.1-alpha.2.osoe-935" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard" Version="9.0.1-alpha.2.osoe-935" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement" Version="9.0.1-alpha.2.osoe-935" />
<PackageReference Include="Lombiq.Hosting.Tenants.Maintenance" Version="9.0.1-alpha.2.osoe-935" />
<PackageReference Include="Lombiq.Hosting.Tenants.Management" Version="9.0.1-alpha.2.osoe-935" />
<PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement" Version="9.0.1-alpha.2.osoe-935" />
<PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement" Version="9.0.1-alpha.2.osoe-935" />
<PackageReference Include="Lombiq.JsonEditor" Version="9.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.LoginAsAnybody" Version="5.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Privacy" Version="10.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Privacy.Samples" Version="10.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.SetupExtensions" Version="7.0.0" />
<PackageReference Include="Lombiq.Tests.UI.AppExtensions" Version="12.1.1-alpha.0.osoe-815" />
<PackageReference Include="Lombiq.Tests.UI.Shortcuts" Version="12.1.1-alpha.0.osoe-815" />
<PackageReference Include="Lombiq.UIKit" Version="9.0.0" />
<PackageReference Include="Lombiq.VueJs" Version="8.0.0" />
<PackageReference Include="Lombiq.VueJs.Samples" Version="8.0.0" />
<PackageReference Include="Lombiq.Walkthroughs" Version="3.0.0" />
<PackageReference Include="Lombiq.Tests.UI.AppExtensions" Version="12.1.1-alpha.5.osoe-935" />
<PackageReference Include="Lombiq.Tests.UI.Shortcuts" Version="12.1.1-alpha.5.osoe-935" />
<PackageReference Include="Lombiq.UIKit" Version="9.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.VueJs" Version="8.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.VueJs.Samples" Version="8.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Walkthroughs" Version="3.0.1-alpha.0.osoe-935" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="1.2.2" Condition="'$(RazorRuntimeCompilation)' == 'true'" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.3" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<OutputType>Exe</OutputType>
</PropertyGroup>

<ItemGroup>
Expand All @@ -21,31 +22,33 @@

<ItemGroup>
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="12.1.1-alpha.0.osoe-815" />
<PackageReference Include="Lombiq.BaseTheme.Tests.UI" Version="9.0.0" />
<PackageReference Include="Lombiq.ChartJs.Tests.UI" Version="9.0.0" />
<PackageReference Include="Lombiq.ContentEditors.Tests.UI" Version="5.0.0" />
<PackageReference Include="Lombiq.DataTables.Tests.UI" Version="10.0.0" />
<PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights.Tests.UI" Version="10.0.0" />
<PackageReference Include="Lombiq.Hosting.BuildVersionDisplay.Tests.UI" Version="7.0.0" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge.Tests.UI" Version="8.0.0" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Tests.UI" Version="8.0.0" />
<PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI" Version="9.0.1-alpha.1.osoe-815" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI" Version="9.0.1-alpha.1.osoe-815" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI" Version="9.0.1-alpha.1.osoe-815" />
<PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI" Version="9.0.1-alpha.1.osoe-815" />
<PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI" Version="9.0.1-alpha.1.osoe-815" />
<PackageReference Include="Lombiq.Hosting.Tenants.Maintenance.Tests.UI" Version="9.0.1-alpha.1.osoe-815" />
<PackageReference Include="Lombiq.Hosting.Tenants.Management.Tests.UI" Version="9.0.1-alpha.1.osoe-815" />
<PackageReference Include="Lombiq.JsonEditor.Tests.UI" Version="9.0.0" />
<PackageReference Include="Lombiq.LoginAsAnybody.Tests.UI" Version="5.0.0" />
<PackageReference Include="Lombiq.OrchardCoreApiClient.Tests.UI" Version="7.0.0" />
<PackageReference Include="Lombiq.Privacy.Tests.UI" Version="10.0.0" />
<PackageReference Include="Lombiq.HelpfulExtensions.Tests.UI" Version="10.0.1-alpha.5.osoe-947" />
<PackageReference Include="Lombiq.Tests.UI" Version="12.1.1-alpha.0.osoe-815" />
<PackageReference Include="Lombiq.VueJs.Tests.UI" Version="8.0.0" />
<PackageReference Include="Lombiq.Walkthroughs.Tests.UI" Version="3.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
<PackageReference Include="Lombiq.HelpfulExtensions" Version="10.0.1-alpha.6.osoe-935" />
<PackageReference Include="Lombiq.BaseTheme.Tests.UI" Version="9.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.ChartJs.Tests.UI" Version="9.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.ContentEditors.Tests.UI" Version="5.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.DataTables.Tests.UI" Version="10.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights.Tests.UI" Version="10.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Hosting.BuildVersionDisplay.Tests.UI" Version="7.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge.Tests.UI" Version="8.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Tests.UI" Version="8.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI" Version="9.0.1-alpha.2.osoe-935" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI" Version="9.0.1-alpha.2.osoe-935" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI" Version="9.0.1-alpha.2.osoe-935" />
<PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI" Version="9.0.1-alpha.2.osoe-935" />
<PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI" Version="9.0.1-alpha.2.osoe-935" />
<PackageReference Include="Lombiq.Hosting.Tenants.Maintenance.Tests.UI" Version="9.0.1-alpha.2.osoe-935" />
<PackageReference Include="Lombiq.Hosting.Tenants.Management.Tests.UI" Version="9.0.1-alpha.2.osoe-935" />
<PackageReference Include="Lombiq.JsonEditor.Tests.UI" Version="9.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.LoginAsAnybody.Tests.UI" Version="5.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.OrchardCoreApiClient.Tests.UI" Version="7.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Privacy.Tests.UI" Version="10.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.HelpfulExtensions.Tests.UI" Version="10.0.1-alpha.6.osoe-935" />
<PackageReference Include="Lombiq.Tests.UI" Version="12.1.2-alpha.1.offi-134" />
<PackageReference Include="Lombiq.VueJs.Tests.UI" Version="8.0.1-alpha.0.osoe-935" />
<PackageReference Include="Lombiq.Walkthroughs.Tests.UI" Version="3.0.1-alpha.0.osoe-935" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="xunit.v3" Version="1.1.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Lombiq.Tests.UI.BasicOrchardFeaturesTesting;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.NuGet.Tests.UI.Tests;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using Shouldly;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.NuGet.Tests.UI.Tests;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Lombiq.OrchardCoreApiClient.Tests.UI.Extensions;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.NuGet.Tests.UI.Tests.LibraryTests;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Lombiq.Hosting.Azure.ApplicationInsights.Tests.UI.TestCases;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.NuGet.Tests.UI.Tests.ModuleTests;

Expand Down
Loading

0 comments on commit 553b900

Please sign in to comment.