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.

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

OSOE-751: Upgrade to Orchard Core 1.8 #673

Merged
merged 191 commits into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from 186 commits
Commits
Show all changes
191 commits
Select commit Hold shift + click to select a range
984ef43
Upgrading to .NET 8 and OC 1.8.2.
Psichorex Jan 18, 2024
ae1c27f
Upgrading all submodules to NET 8 and OC 1.8.2
Psichorex Jan 18, 2024
d212ec0
Updating DataTables to 1.8.2 and NET 8
Psichorex Jan 18, 2024
05feea1
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Jan 18, 2024
7d40e48
Upgrading Lombiq.Walkthroughs to NET 8 and OC 1.8.2
Psichorex Jan 18, 2024
dceaac4
Updating Lombiq.Walkthroughs
Psichorex Jan 18, 2024
21aaaab
Upgrading Analyzers.
Psichorex Jan 18, 2024
3a97d16
Updating .NET versions in GHA.
Psichorex Jan 18, 2024
5128e62
Using modified GHA branch reference.
Psichorex Jan 18, 2024
395cea7
Removing ISystemCLock from SetupExtensions.
Psichorex Jan 18, 2024
46f3c71
Updating Analyzers.
Psichorex Jan 18, 2024
5745d78
Updating submodules.
Psichorex Jan 18, 2024
6c8dfd5
Updating submodules.
Psichorex Jan 18, 2024
ba4582e
Addressing submodule warnings.
Psichorex Jan 18, 2024
5633bf3
Resolving merge conflict.
Psichorex Jan 19, 2024
e93c5cf
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Jan 19, 2024
7f08e1d
Updating submodules.
Psichorex Jan 19, 2024
59c7d89
Consolidating packages.
Psichorex Jan 19, 2024
752c82e
Updating submodules.
Psichorex Jan 19, 2024
4fae1e1
Updating Analyzers
Psichorex Jan 19, 2024
fe873bb
Addressing warnings.
Psichorex Jan 20, 2024
888a511
Addressing warnings.
Psichorex Jan 20, 2024
11b04a4
Resolving merge conflict.
Psichorex Jan 20, 2024
b9ca246
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Jan 20, 2024
d9fd548
Addressing warnings.
Psichorex Jan 20, 2024
e038557
Addressing warnings.
Psichorex Jan 20, 2024
83608af
Addressing warnings.
Psichorex Jan 20, 2024
e29265f
Addressing warnings.
Psichorex Jan 20, 2024
c6c6f0b
Addressing warnings.
Psichorex Jan 20, 2024
28068bc
Addressing warnings.
Psichorex Jan 20, 2024
70bb6ee
Commenting out temporarily.
Psichorex Jan 23, 2024
ecd4d6a
Updating submodules.
Psichorex Jan 27, 2024
2647ddd
Updating submodules.
Psichorex Jan 27, 2024
39bd261
Updating submodules.
Psichorex Jan 27, 2024
8d5a52e
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Jan 27, 2024
9b58886
Post merge fix.
Psichorex Jan 27, 2024
4285d83
REmoving using.
Psichorex Jan 27, 2024
56a3930
Resolving jQuery not being registered prior to its user script.
Psichorex Jan 27, 2024
528059e
Updating submodules.
Psichorex Jan 27, 2024
9d1f657
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Jan 27, 2024
85035a7
Fixing Tests.
Psichorex Jan 28, 2024
c7b184c
Updating submodule.
Psichorex Jan 28, 2024
72c20ac
Updating submodule.
Psichorex Jan 28, 2024
404b692
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Jan 28, 2024
776561e
Updating submodule.
Psichorex Jan 28, 2024
4f91b37
Updating submodule.
Psichorex Jan 28, 2024
dff739e
Updating submodule.
Psichorex Jan 28, 2024
ea10460
Ignoring errors.
Psichorex Jan 28, 2024
3cba2a1
Updating submodule.
Psichorex Jan 29, 2024
7d72d42
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Jan 29, 2024
2e65947
Fixing test.
Psichorex Jan 29, 2024
1d6778e
Updating submodule.
Psichorex Jan 29, 2024
05a35da
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Jan 29, 2024
f3c5291
Updating submodule.
Psichorex Jan 29, 2024
1fded8c
Updating submodule.
Psichorex Jan 29, 2024
8397e6a
Updating submodule.
Psichorex Jan 29, 2024
6ea94ef
Updating submodule.
Psichorex Jan 29, 2024
d6cac27
Updating submodule.
Psichorex Jan 29, 2024
0f8b2e8
Updating submodule.
Psichorex Jan 29, 2024
7f314b5
Keeping T.
Psichorex Jan 29, 2024
b5825c3
Updating submodule.
Psichorex Jan 29, 2024
15ff88b
Updating submodule.
Psichorex Jan 29, 2024
6400b10
Adding comment.
Psichorex Jan 29, 2024
910094a
Adding comment.
Psichorex Jan 29, 2024
dbfecb2
Adding comment.
Psichorex Jan 29, 2024
7a45d66
Updating submodules.
Psichorex Jan 29, 2024
5449d5c
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Jan 29, 2024
8972ca0
Better comment.
Psichorex Jan 29, 2024
45de0e8
Using better OS determination.
Psichorex Jan 29, 2024
e023962
Removing directives.
Psichorex Jan 29, 2024
db640d0
Updating submodules.
Psichorex Jan 29, 2024
7acf486
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Jan 29, 2024
b04d5c9
Updating submodules.
Psichorex Jan 30, 2024
565f04b
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Jan 30, 2024
995fd20
Updating submodules.
Psichorex Jan 30, 2024
dd293e6
Updating submodules.
Psichorex Jan 30, 2024
a1295ac
Updating submodules.
Psichorex Jan 30, 2024
fe1f58d
Updating submodules.
Psichorex Jan 30, 2024
b744b77
Removing workaround.
Psichorex Jan 30, 2024
291cfef
Updating submodules.
Psichorex Jan 30, 2024
30ee4de
Fix.
Psichorex Jan 30, 2024
06b3694
Updating submodules.
Psichorex Jan 30, 2024
a05b415
Minor fixes.
Psichorex Jan 31, 2024
4830b54
Updating submodules.
Psichorex Jan 31, 2024
65129e3
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Jan 31, 2024
2cfc89a
Revert PC
Psichorex Jan 31, 2024
194e214
Removing PCs.
Psichorex Jan 31, 2024
437364a
Removing PCs.
Psichorex Jan 31, 2024
c2d394d
Removing PCs.
Psichorex Jan 31, 2024
3bb64e6
Removing PCs.
Psichorex Jan 31, 2024
263bba8
Removing PCs.
Psichorex Jan 31, 2024
172eb53
Some cleanup
Piedone Feb 1, 2024
ec64202
Removing leftover code
Piedone Feb 1, 2024
8af3aca
Punctuation
Piedone Feb 1, 2024
a5ac9d3
Updating left-out dotnet versions.
Psichorex Feb 1, 2024
885ad52
Merge branch 'issue/OSOE-751' of https://github.com/Lombiq/Open-Sourc…
Psichorex Feb 1, 2024
d5aebec
Updating UITT.
Psichorex Feb 1, 2024
dcff7e5
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Feb 1, 2024
a03111e
Updating submodules.
Psichorex Feb 1, 2024
ed11485
Updating submodules.
Psichorex Feb 1, 2024
954fb0f
Updating submodules.
Psichorex Feb 1, 2024
64a811e
Updating submodules.
Psichorex Feb 1, 2024
88a40f3
Updating submodules.
Psichorex Feb 1, 2024
a81a14d
Removing comment.
Psichorex Feb 1, 2024
f718515
Updating submodules.
Psichorex Feb 1, 2024
266eea2
Updating submodules.
Psichorex Feb 1, 2024
5ae7fdf
Adjusting tests.
Psichorex Feb 1, 2024
9db8e17
Updating submodules.
Psichorex Feb 1, 2024
a8feef5
Updating submodules.
Psichorex Feb 1, 2024
86ba347
Back to false.
Psichorex Feb 1, 2024
2fd4968
Updating submodules.
Psichorex Feb 2, 2024
82c2b0f
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Feb 2, 2024
d22d318
Updating submodules.
Psichorex Feb 5, 2024
55241ef
Updating submodules.
Psichorex Feb 5, 2024
c29ed13
Updating submodules.
Psichorex Feb 5, 2024
d22c37f
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Feb 5, 2024
6ee1dc7
Indenting.
Psichorex Feb 5, 2024
33dce21
Upgrading packages.
Psichorex Feb 5, 2024
7048cd6
Updating submodules.
Psichorex Feb 5, 2024
b72c775
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Piedone Feb 5, 2024
dc3852d
Code styling
Piedone Feb 5, 2024
e9c9dea
Upgrading MS package.
Psichorex Feb 6, 2024
8eea79a
Merge branch 'issue/OSOE-751' of https://github.com/Lombiq/Open-Sourc…
Psichorex Feb 6, 2024
3637344
Upgrading MS package.
Psichorex Feb 6, 2024
e768b07
Resolving merge conflict.
Psichorex Feb 7, 2024
f79b0a8
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Feb 7, 2024
ad806bb
Upgrading submodule.
Psichorex Feb 7, 2024
05f7b5b
Addressing warning.
Psichorex Feb 7, 2024
b996910
Resolving merge conflict.
Psichorex Feb 7, 2024
4665188
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Feb 7, 2024
0afa6af
Resolving merge conflict.
Psichorex Feb 13, 2024
debd661
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Feb 13, 2024
25914d2
Post merge fix.
Psichorex Feb 13, 2024
01d71b9
Using LangVersion 7.3 in NetStandard2.0 NodeJsExtensions.
Psichorex Feb 14, 2024
5ff8f84
Resolving merge conflict.
Psichorex Feb 14, 2024
0a108c3
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Feb 14, 2024
a437f53
Updating submodules.
Psichorex Feb 14, 2024
96c5df4
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Feb 14, 2024
1dfd519
Updating submodule.
Psichorex Feb 14, 2024
4da56e1
Increasing timeout.
Psichorex Feb 14, 2024
8753b70
Fixing test.
Psichorex Feb 14, 2024
3e7bc6f
Reverting timeout.
Psichorex Feb 14, 2024
dd48ce4
Updating reference.
Psichorex Feb 14, 2024
85fa05a
Updating reference.
Psichorex Feb 14, 2024
96e4b7e
Resolving merge conflict.
Psichorex Feb 15, 2024
ae19af4
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Feb 15, 2024
6fcb248
Updating timeout.
Psichorex Feb 15, 2024
483320d
Revert "Fixing test."
Psichorex Feb 15, 2024
f629854
Adding more filtering.
Psichorex Feb 15, 2024
c337873
Re-writing filter.
Psichorex Feb 15, 2024
06f51c2
Testing why test is failing with higher timeout.
Psichorex Feb 15, 2024
4ef9a91
Testing Walkthroughs.
Psichorex Feb 16, 2024
8b7f84e
Updating submodules.
Psichorex Feb 17, 2024
55dcb18
Updating submodules.
Psichorex Feb 17, 2024
06d40b5
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Feb 17, 2024
9b79067
Updating Nuget Solution.
Psichorex Feb 17, 2024
ec1a58e
Fixing warnings.
Psichorex Feb 17, 2024
305569b
Upgrading packages.
Psichorex Feb 17, 2024
adbff5b
Fixing tests.
Psichorex Feb 17, 2024
dc3639a
Fix.
Psichorex Feb 17, 2024
fac2b6d
Fixing tests.
Psichorex Feb 17, 2024
2efd309
Revert "Fixing tests."
Psichorex Feb 17, 2024
cd7385d
Fix.
Psichorex Feb 17, 2024
ceb1a95
FIxing tests.
Psichorex Feb 18, 2024
4c81de6
Test fix.
Psichorex Feb 18, 2024
d89590b
Removing warnings.
Psichorex Feb 18, 2024
dcf4773
Updating UITT.
Psichorex Feb 18, 2024
d874981
Updating submodules.
Psichorex Feb 18, 2024
0ad14da
Updating submodules.
Psichorex Feb 18, 2024
7ea161e
Updating alphas in Nuget.
Psichorex Feb 18, 2024
c9da3f8
Revert "Updating alphas in Nuget."
Psichorex Feb 19, 2024
665c5fa
Updating submodules.
Psichorex Feb 19, 2024
df490f3
REverting NET.Test and xunit.runner to the same version as parent.
Psichorex Feb 20, 2024
381602e
Updating nuget references.
Psichorex Feb 20, 2024
abc4a5d
Updating submodule.
Psichorex Feb 20, 2024
a56be21
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Feb 20, 2024
7a03dca
Updating NuGet and submodules.
Psichorex Feb 20, 2024
38fe283
Formatting, small fixes
Piedone Feb 20, 2024
7a4df3f
Adding analyzer upgrade into Directory.Build.props.
Psichorex Feb 20, 2024
0b8a0dc
Merge branch 'issue/OSOE-751' of https://github.com/Lombiq/Open-Sourc…
Psichorex Feb 20, 2024
49761b6
Using more descriptive names.
Psichorex Feb 20, 2024
0ad176a
REverting formatting changes.
Psichorex Feb 20, 2024
07a0a6f
Fixing typo.
Psichorex Feb 20, 2024
e675fb5
Merge conflict.
Psichorex Feb 21, 2024
c6c9ab8
Updating nuget and submodules.
Psichorex Feb 21, 2024
408ef46
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Feb 21, 2024
42125ee
After merge dev checkout in submodules.
Psichorex Feb 21, 2024
75102c8
Dev reference.
Psichorex Feb 21, 2024
fa10eef
Updating submodules with latest majors.
Psichorex Feb 21, 2024
c639b3c
Using 5.0.0 analyzers in NuGet.
Psichorex Feb 21, 2024
c93007e
Updating Nuget solution with latest majors.
Psichorex Feb 21, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/build-and-test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
if: github.ref_name != github.event.repository.default_branch &&
(github.event_name == 'workflow_dispatch' || github.event.label.name == 'run-windows-build')
name: Build and Test Windows - root solution (larger runners)
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-751
with:
parent-job-name: "root-solution-larger-runners"
machine-types: "['windows-2022-8core']"
Expand All @@ -51,7 +51,7 @@ jobs:
# Since dev builds are not awaited by anyone, they can run on the slower free runners.
if: github.ref_name == github.event.repository.default_branch
name: Build and Test Windows - root solution (standard runners)
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-751
with:
parent-job-name: "root-solution-standard-runners"
machine-types: "['windows-2022']"
Expand All @@ -69,7 +69,7 @@ jobs:
github.event_name == 'workflow_dispatch' ||
github.event.label.name == 'run-windows-build'
name: Build and Test Windows - NuGetTest solution
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-751
with:
parent-job-name: "nuget-solution"
machine-types: "['windows-2022']"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
build-and-test-larger-runners:
if: github.ref_name != github.event.repository.default_branch
name: Build and Test - root solution (larger runners)
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-751
with:
parent-job-name: "root-solution-larger-runners"
machine-types: "['buildjet-4vcpu-ubuntu-2204']"
Expand All @@ -28,7 +28,7 @@ jobs:
# Since dev builds are not awaited by anyone, they can run on the slower free runners.
if: github.ref_name == github.event.repository.default_branch
name: Build and Test - root solution (standard runners)
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-751
with:
parent-job-name: "root-solution-standard-runners"
timeout-minutes: 50
Expand All @@ -39,7 +39,7 @@ jobs:

build-and-test-nuget-test:
name: Build and Test - NuGetTest solution
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-751
with:
parent-job-name: nuget-solution
build-directory: NuGetTest
Expand Down
2 changes: 1 addition & 1 deletion NuGetTest/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Lombiq.Analyzers.OrchardCore" Version="4.0.0"><!-- #spell-check-ignore-line -->
<PackageReference Include="Lombiq.Analyzers.OrchardCore" Version="4.0.1-alpha.0.osoe-751"><!-- #spell-check-ignore-line -->
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
80 changes: 40 additions & 40 deletions NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Lombiq.OSOCE.NuGet.Web.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
<RazorRuntimeCompilation>false</RazorRuntimeCompilation>
<!-- Test value for Lombiq.Hosting.BuildVersionDisplay. Intentionally different than the value in its props file. -->
Expand All @@ -19,48 +19,48 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Lombiq.AuditTrailExtensions" Version="5.0.0" />
<PackageReference Include="Lombiq.BaseTheme" Version="5.0.2-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.BaseTheme.Samples" Version="5.0.2-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.ChartJs" Version="6.0.2-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.ChartJs.Samples" Version="6.0.2-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.ContentEditors" Version="2.0.1-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.ContentEditors.Samples" Version="2.0.1-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.DataTables" Version="7.0.2-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.DataTables.Samples" Version="7.0.2-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.HelpfulExtensions" Version="7.0.2" />
<PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights" Version="7.0.2-alpha.1.osoe-733" />
<PackageReference Include="Lombiq.Hosting.BuildVersionDisplay" Version="4.0.1-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.Hosting.MediaTheme" Version="5.0.1-alpha.1.osoe-775" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge" Version="5.0.1-alpha.1.osoe-775" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Targets" Version="5.0.1-alpha.1.osoe-775" />
<PackageReference Include="Lombiq.Hosting.Tenants.Admin.Login" Version="6.3.0-alpha.2.lmbq-249" />
<PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots" Version="6.3.0-alpha.2.lmbq-249" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard" Version="6.3.0-alpha.2.lmbq-249" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement" Version="6.3.0-alpha.2.lmbq-249" />
<PackageReference Include="Lombiq.Hosting.Tenants.Maintenance" Version="6.3.0-alpha.2.lmbq-249" />
<PackageReference Include="Lombiq.Hosting.Tenants.Management" Version="6.3.0-alpha.2.lmbq-249" />
<PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement" Version="6.3.0-alpha.2.lmbq-249" />
<PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement" Version="6.3.0-alpha.2.lmbq-249" />
<PackageReference Include="Lombiq.JsonEditor" Version="6.0.1-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.JsonEditor.Tests.UI" Version="6.0.1-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.LoginAsAnybody" Version="1.0.0" />
<PackageReference Include="Lombiq.Privacy" Version="7.0.2-alpha.2.osoe-638" />
<PackageReference Include="Lombiq.Privacy.Samples" Version="7.0.2-alpha.2.osoe-638" />
<PackageReference Include="Lombiq.SetupExtensions" Version="5.0.0" />
<PackageReference Include="Lombiq.Tests.UI.AppExtensions" Version="8.2.1-alpha.21.osoe-817" />
<PackageReference Include="Lombiq.Tests.UI.Shortcuts" Version="8.2.1-alpha.21.osoe-817" />
<PackageReference Include="Lombiq.UIKit" Version="6.0.1-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.VueJs" Version="3.0.1-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.VueJs.Samples" Version="3.0.1-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.Walkthroughs" Version="1.0.0-alpha.4.osoe-771" />
<PackageReference Include="Lombiq.AuditTrailExtensions" Version="5.0.1-alpha.0.osoe-751" />
<PackageReference Include="Lombiq.BaseTheme" Version="5.0.3-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.BaseTheme.Samples" Version="5.0.3-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.ChartJs" Version="6.0.3-alpha.1.osoe-751" />
<PackageReference Include="Lombiq.ChartJs.Samples" Version="6.0.3-alpha.1.osoe-751" />
<PackageReference Include="Lombiq.ContentEditors" Version="2.0.2-alpha.1.osoe-751" />
<PackageReference Include="Lombiq.ContentEditors.Samples" Version="2.0.2-alpha.1.osoe-751" />
<PackageReference Include="Lombiq.DataTables" Version="7.0.3-alpha.6.osoe-751" />
<PackageReference Include="Lombiq.DataTables.Samples" Version="7.0.3-alpha.6.osoe-751" />
<PackageReference Include="Lombiq.HelpfulExtensions" Version="7.0.3-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights" Version="7.0.2-alpha.6.osoe-751" />
<PackageReference Include="Lombiq.Hosting.BuildVersionDisplay" Version="4.0.2-alpha.1.osoe-751" />
<PackageReference Include="Lombiq.Hosting.MediaTheme" Version="5.0.2-alpha.3.osoe-751" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge" Version="5.0.2-alpha.3.osoe-751" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Targets" Version="5.0.2-alpha.3.osoe-751" />
<PackageReference Include="Lombiq.Hosting.Tenants.Admin.Login" Version="6.3.1-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots" Version="6.3.1-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard" Version="6.3.1-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement" Version="6.3.1-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.Hosting.Tenants.Maintenance" Version="6.3.1-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.Hosting.Tenants.Management" Version="6.3.1-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement" Version="6.3.1-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement" Version="6.3.1-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.JsonEditor" Version="6.0.2-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.JsonEditor.Tests.UI" Version="6.0.2-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.LoginAsAnybody" Version="1.0.1-alpha.3.osoe-751" />
<PackageReference Include="Lombiq.Privacy" Version="7.0.3-alpha.1.osoe-751" />
<PackageReference Include="Lombiq.Privacy.Samples" Version="7.0.3-alpha.1.osoe-751" />
<PackageReference Include="Lombiq.SetupExtensions" Version="5.0.1-alpha.0.osoe-751" />
<PackageReference Include="Lombiq.Tests.UI.AppExtensions" Version="8.2.1-alpha.22.osoe-751" />
<PackageReference Include="Lombiq.Tests.UI.Shortcuts" Version="8.2.1-alpha.22.osoe-751" />
<PackageReference Include="Lombiq.UIKit" Version="6.0.2-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.VueJs" Version="3.0.2-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.VueJs.Samples" Version="3.0.2-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.Walkthroughs" Version="1.0.0-alpha.9.osoe-751" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="1.2.2" Condition="'$(RazorRuntimeCompilation)' == 'true'" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.0.1" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Logging.NLog" Version="1.7.0" />
<PackageReference Include="OrchardCore.Application.Cms.Targets" Version="1.7.0" />
<PackageReference Include="OrchardCore.Logging.NLog" Version="1.8.2" />
<PackageReference Include="OrchardCore.Application.Cms.Targets" Version="1.8.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
.ConfigureFeaturesGuard(
new Dictionary<string, IEnumerable<string>>
{
["OrchardCore.Twitter"] = new[] { "Lombiq.UIKit", "Lombiq.ChartJs" },
["OrchardCore.Twitter"] = ["Lombiq.UIKit", "Lombiq.ChartJs"],
})
.EnableAutoSetupIfNotUITesting(configuration));

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<DefaultItemExcludes>$(DefaultItemExcludes);.git*;node_modules\**;Tests\**</DefaultItemExcludes>
</PropertyGroup>
Expand All @@ -16,11 +16,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Lombiq.HelpfulLibraries" Version="8.1.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.7.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.7.0" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.7.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.7.0" />
<PackageReference Include="Lombiq.HelpfulLibraries" Version="8.1.1-alpha.7.osoe-751" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<DefaultItemExcludes>$(DefaultItemExcludes);.git*;node_modules\**;Tests\**</DefaultItemExcludes>
</PropertyGroup>
Expand All @@ -21,10 +21,10 @@

<ItemGroup>
<PackageReference Include="Lombiq.Npm.Targets" Version="1.4.0" />
<PackageReference Include="OrchardCore.Theme.Targets" Version="1.7.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.7.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.7.0" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="1.7.0" />
<PackageReference Include="OrchardCore.Theme.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="1.8.2" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using Atata.HtmlValidation;
using Lombiq.Tests.UI.Extensions;
using OpenQA.Selenium;
using Shouldly;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;

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

public static class AssertHtmlAndBrowserErrorsHelper
{
public static readonly Action<IEnumerable<LogEntry>> AssertNoNativeButtonUsageInBrowserLog =
logEntries => logEntries.Where(
logEntry => !logEntry.Message.ContainsOrdinalIgnoreCase("Prefer to use the native <button> element"));

public static readonly Func<HtmlValidationResult, Task> AssertNoNativeButtonUsageInHtmlValidation = async errors =>
{
var errorResult = (await errors.GetErrorsAsync())
.Where(error => !error.ContainsOrdinalIgnoreCase("Prefer to use the native <button> element"));

errorResult.ShouldBeEmpty();
};
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand All @@ -23,28 +23,28 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Lombiq.BaseTheme.Tests.UI" Version="5.0.2-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.ChartJs.Tests.UI" Version="6.0.2-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.ContentEditors.Tests.UI" Version="2.0.1-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.DataTables.Tests.UI" Version="7.0.2-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights.Tests.UI" Version="7.0.2-alpha.1.osoe-733" />
<PackageReference Include="Lombiq.Hosting.BuildVersionDisplay.Tests.UI" Version="4.0.1-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Tests.UI" Version="5.0.1-alpha.1.osoe-775" />
<PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI" Version="6.3.0-alpha.2.lmbq-249" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI" Version="6.3.0-alpha.2.lmbq-249" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI" Version="6.3.0-alpha.2.lmbq-249" />
<PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI" Version="6.3.0-alpha.2.lmbq-249" />
<PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI" Version="6.3.0-alpha.2.lmbq-249" />
<PackageReference Include="Lombiq.Hosting.Tenants.Maintenance.Tests.UI" Version="6.3.0-alpha.2.lmbq-249" />
<PackageReference Include="Lombiq.Hosting.Tenants.Management.Tests.UI" Version="6.3.0-alpha.2.lmbq-249" />
<PackageReference Include="Lombiq.JsonEditor.Tests.UI" Version="6.0.1-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.LoginAsAnybody.Tests.UI" Version="1.0.0" />
<PackageReference Include="Lombiq.OrchardCoreApiClient.Tests.UI" Version="4.0.1-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.Privacy.Tests.UI" Version="7.0.2-alpha.2.osoe-638" />
<PackageReference Include="Lombiq.HelpfulExtensions.Tests.UI" Version="7.0.2-alpha.2.osoe-683" />
<PackageReference Include="Lombiq.Tests.UI" Version="8.2.1-alpha.21.osoe-817" />
<PackageReference Include="Lombiq.VueJs.Tests.UI" Version="3.0.1-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.Walkthroughs.Tests.UI" Version="1.0.0-alpha.4.osoe-771" />
<PackageReference Include="Lombiq.BaseTheme.Tests.UI" Version="5.0.3-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.ChartJs.Tests.UI" Version="6.0.3-alpha.1.osoe-751" />
<PackageReference Include="Lombiq.ContentEditors.Tests.UI" Version="2.0.2-alpha.1.osoe-751" />
<PackageReference Include="Lombiq.DataTables.Tests.UI" Version="7.0.3-alpha.6.osoe-751" />
<PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights.Tests.UI" Version="7.0.2-alpha.6.osoe-751" />
<PackageReference Include="Lombiq.Hosting.BuildVersionDisplay.Tests.UI" Version="4.0.2-alpha.1.osoe-751" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Tests.UI" Version="5.0.2-alpha.3.osoe-751" />
<PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI" Version="6.3.1-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI" Version="6.3.1-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI" Version="6.3.1-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI" Version="6.3.1-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI" Version="6.3.1-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.Hosting.Tenants.Maintenance.Tests.UI" Version="6.3.1-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.Hosting.Tenants.Management.Tests.UI" Version="6.3.1-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.JsonEditor.Tests.UI" Version="6.0.2-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.LoginAsAnybody.Tests.UI" Version="1.0.1-alpha.3.osoe-751" />
<PackageReference Include="Lombiq.OrchardCoreApiClient.Tests.UI" Version="4.0.2-alpha.3.osoe-751" />
<PackageReference Include="Lombiq.Privacy.Tests.UI" Version="7.0.3-alpha.1.osoe-751" />
<PackageReference Include="Lombiq.HelpfulExtensions.Tests.UI" Version="7.0.3-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.Tests.UI" Version="8.2.1-alpha.22.osoe-751" />
<PackageReference Include="Lombiq.VueJs.Tests.UI" Version="3.0.2-alpha.4.osoe-751" />
<PackageReference Include="Lombiq.Walkthroughs.Tests.UI" Version="1.0.0-alpha.9.osoe-751" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Loading
Loading