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-392: Upgrade to Orchard Core 1.5 #264

Merged
merged 177 commits into from
Dec 6, 2022
Merged
Show file tree
Hide file tree
Changes from 173 commits
Commits
Show all changes
177 commits
Select commit Hold shift + click to select a range
2a3f147
Updating OrchardCore NuGet packages to latest and updating submodules
MZole Nov 5, 2022
37f916f
Updating submodules
MZole Nov 5, 2022
dccd1d9
Updating submodules to new DataMigration registration
MZole Nov 5, 2022
83dc3f6
Updating Lombiq.UITestingToolbox
MZole Nov 5, 2022
5065ae6
Updating Lombiq.UITestingToolbox
MZole Nov 5, 2022
95cc269
Updating Lombiq.UITestingToolbox
MZole Nov 5, 2022
2460b07
Updating Lombiq.UITestingToolbox
MZole Nov 5, 2022
364a83a
Re-adding images in Lombiq.UITestingToolbox
MZole Nov 5, 2022
b58a600
Updating HomePage images in Lombiq.UITestingToolbox
MZole Nov 5, 2022
3b1ac66
Extending connection string in Lombiq.GitHub.Actions and changing to …
MZole Nov 6, 2022
642e677
Changing back to dev branch
MZole Nov 6, 2022
49e4402
Chagning to issue branch and updating test-dotnet script
MZole Nov 6, 2022
266c1d3
Updating OrchardCore NuGet packages in NuGet solution
MZole Nov 6, 2022
a6c0423
Updating HomePage images visual verification tests in Lombiq.UITestin…
MZole Nov 6, 2022
6291c75
Changing to dev branch on NuGet build for testing
MZole Nov 6, 2022
550a318
Reverting NuGet solution changes
MZole Nov 7, 2022
13a1224
Testing IdleTenantsTests
MZole Nov 7, 2022
2cdc8c4
Updating submodules to latest dev branches
MZole Nov 7, 2022
01bb42b
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
MZole Nov 7, 2022
60a3afd
Testing IdleTenantTests
MZole Nov 7, 2022
ec958a9
Updating Lombiq.Hosting.Tenants to latest dev
MZole Nov 7, 2022
3bca5f0
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
MZole Nov 7, 2022
2075610
Updating Lombiq.GitHub.Actions to latest dev and using OrchardCore.Ba…
MZole Nov 7, 2022
91dab96
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
MZole Nov 7, 2022
5b7528b
Using const OrchardCore.Data.DatabaseProviderValue.SqlConnection in U…
MZole Nov 7, 2022
c288ea3
Testing if another error would raise if we don't lock the log file
MZole Nov 7, 2022
377dce1
Updating Nlog configuration in Lombiq.UITestingToolbox
MZole Nov 8, 2022
2ac5249
Changing NLog.config and updating log file read Lombiq.UITestingToolbox
MZole Nov 8, 2022
537a37d
Updating Lombiq.GitHub.Actions to latest dev
MZole Nov 8, 2022
444059a
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
MZole Nov 8, 2022
1850737
Addressing change requests in submodules
MZole Nov 8, 2022
41ac986
Updating workflow branches
MZole Nov 8, 2022
04a54e0
Updating Lombiq.GitHub.Actions to latest dev and extending docs
MZole Nov 8, 2022
70e6a39
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
MZole Nov 8, 2022
85813b8
Using OrchardCore.Logging.Nlog in Lombiq.UITestingToolbox
MZole Nov 9, 2022
0d5d52a
Updating log file's content reading in Lombiq.UITestingToolbox
MZole Nov 9, 2022
fca143d
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
MZole Nov 9, 2022
441d3ec
Updating EventId in Nlog.config
MZole Nov 9, 2022
8965de7
Using ReadToEndAsync() in Lombiq.UITestingToolbox
MZole Nov 10, 2022
41c4cb9
Updating Lombiq and OC NuGet package references in NuGet solution
MZole Nov 10, 2022
72b4947
Updating OC Lucene namespace in test recipe
MZole Nov 11, 2022
52449b4
Re-adding future CancellationToken usage to Lombiq.UITestingToolbox
Piedone Nov 11, 2022
61e25fc
Updating Lombiq.GitHub.Actions to merged dev
Piedone Nov 11, 2022
f78af4d
Revert workflow and Lombiq.UITestingToolbox changes to see if those c…
Piedone Nov 11, 2022
14c9980
Putting Spelling workflow back to dev
Piedone Nov 11, 2022
0a2ce1b
Refactoring in Lombiq.UITestingToolbox
Piedone Nov 11, 2022
1620f69
Removing Obsolete types/members
Piedone Nov 11, 2022
53bf265
Reverting refactoring in Lombiq.UITestingToolbox
Piedone Nov 11, 2022
ee91c45
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
Piedone Nov 11, 2022
464459b
Revert removing Obsolete types/members in /Lombiq.UITestingToolbox, b…
Piedone Nov 11, 2022
0aa8aa9
Revert previous
Piedone Nov 11, 2022
99cc9d8
Removing just obsolete AccessbilityCheckingAndAssertionOnPageChangeRu…
Piedone Nov 11, 2022
257144d
Removing just obsolete InstanceCommandLineArgs.Add() in Lombiq.UITest…
Piedone Nov 11, 2022
b19ba30
Removing just obsolete IsNotFoundMessage() in Lombiq.UITestingToolbox
Piedone Nov 11, 2022
01162c6
Removing just obsolete BrowserLogMessage and related method in Lombiq…
Piedone Nov 11, 2022
c94efc4
Removing Obsolete types/members again, but not IsNotFoundMessage() in…
Piedone Nov 11, 2022
6c55dc6
Dummy change to kick off another build
Piedone Nov 11, 2022
e72d7a3
Revert "Dummy change to kick off another build"
Piedone Nov 11, 2022
c3dbe1c
Restoring mistakenly removed IsNotFoundMessage() in Lombiq.UITestingT…
Piedone Nov 11, 2022
8b4751f
Dummy change to kick off another build
Piedone Nov 11, 2022
a592d2a
Revert "Dummy change to kick off another build"
Piedone Nov 11, 2022
7ab2a2b
Updating Lombiq.GitHub.Actions to latest dev and disabling NuGet tests
MZole Nov 11, 2022
e82bad7
Updating Silenium and WebDriverManager in Lombiq.UITestingToolbox
MZole Nov 11, 2022
5a1e65e
Dummy commit to trigger build
MZole Nov 11, 2022
aff3fdb
Revert "Dummy commit to trigger build"
MZole Nov 11, 2022
fc87660
Using ReadAllTextAsync in GetLogs() and reverting NLog.config change
MZole Nov 11, 2022
4ca75a5
Skipping majority of tests to speed up builds
MZole Nov 11, 2022
5ece5f3
Dummy commit to trigger build
MZole Nov 11, 2022
84e6d58
Revert "Dummy commit to trigger build"
MZole Nov 11, 2022
8ba6749
Not excluding IdleTenantsTests and it should fail
MZole Nov 11, 2022
838fdee
Revert "Not excluding IdleTenantsTests and it should fail"
MZole Nov 11, 2022
e5974a2
Dummy commit, please fail
MZole Nov 11, 2022
9e18601
Revert "Dummy commit, please fail"
MZole Nov 11, 2022
1687a1c
Re-adding tests since it didn't fail once with less tests
MZole Nov 12, 2022
143a3a4
Changing NLog.config
MZole Nov 12, 2022
a87db5a
Changing loglevel to Information
MZole Nov 12, 2022
c9f34e3
Adding RemoveLoggerFactoryFilter option to nlog to hopefully see logs
MZole Nov 12, 2022
3ca1338
Different appsettings.json config to see if logs appear
MZole Nov 12, 2022
ff573a8
Changing nlog config to see if logs appear
MZole Nov 12, 2022
8f0bd74
Dummy commit to kick off another build
MZole Nov 12, 2022
cfec2ce
Revert "Dummy commit to kick off another build"
MZole Nov 12, 2022
5762d4a
Updating Azure.Storage.Blobs version in UITT
MZole Nov 12, 2022
572bce7
Dummy commit to see if previous build pass is false positive
MZole Nov 12, 2022
f5165ae
Revert "Dummy commit to see if previous build pass is false positive"
MZole Nov 12, 2022
54dfc00
Testing if all tests fail when IdleTenantsTests is skipped
MZole Nov 12, 2022
f1cd6b7
Dummy commit to kick off another build
MZole Nov 12, 2022
dd27189
Revert "Dummy commit to kick off another build"
MZole Nov 12, 2022
a2ad67b
Setting loglevel to info in NLog.config
MZole Nov 12, 2022
e73ea76
Disabling Html validation on some tests for testing
MZole Nov 13, 2022
7c1b277
Dummy commit to start another build that fails
MZole Nov 13, 2022
d23b193
Revert "Dummy commit to start another build that fails"
MZole Nov 13, 2022
c43f830
Reverting Html validation changes from testing
MZole Nov 13, 2022
185bb37
Adding debug log message for testing in Lombiq.UITestingToolbox
MZole Nov 13, 2022
6854391
Dummy commit to kick off another build
MZole Nov 13, 2022
dbd52de
Revert "Dummy commit to kick off another build"
MZole Nov 13, 2022
88a8f27
Placing debug log message in ExecuteTestAfterSetupAsync
MZole Nov 13, 2022
5a0f804
Dummy commit to start another build
MZole Nov 13, 2022
effebe8
Revert "Dummy commit to start another build"
MZole Nov 13, 2022
2cc6d7b
Creating debug point in CreateContextAsync for logging in Lombiq.UITe…
MZole Nov 13, 2022
68f30cf
Dummy commit to start another build
MZole Nov 13, 2022
e527e5d
Revert "Dummy commit to start another build"
MZole Nov 13, 2022
4a2d011
More debugging points in SetupAsync() in Lombiq.UITestingToolbox
MZole Nov 13, 2022
416d20e
Adding more logging points
MZole Nov 13, 2022
051f8a0
Dummy commit to kick off another build
MZole Nov 13, 2022
01f5d03
Revert "Dummy commit to kick off another build"
MZole Nov 13, 2022
8adca87
Updating UITT and LGHA to latest dev
MZole Nov 14, 2022
5c6152b
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
MZole Nov 14, 2022
f49bc9f
Dummy commit to start another build
MZole Nov 14, 2022
c9b3260
Revert "Dummy commit to start another build"
MZole Nov 14, 2022
7773126
Changing test config in Lombiq.UITestingToolbox
MZole Nov 14, 2022
cdcdaf6
Merge branch 'dev' into issue/OSOE-392
MZole Nov 14, 2022
c6a98e9
Updating submodules to latest dev branches
MZole Nov 17, 2022
8061820
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
MZole Nov 17, 2022
c276e88
Excluding spelling workflow
MZole Nov 17, 2022
ca7abdf
Updating Lombiq.UITestingToolbox to latest dev
MZole Nov 17, 2022
5d60c3d
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
MZole Nov 17, 2022
2fc8219
Reverting appsettings.json changes from testing
MZole Nov 17, 2022
6a0923e
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
MZole Nov 21, 2022
5c0740c
Testing with uploading the Temp folder
MZole Nov 21, 2022
ed6521e
Dummy commit to start another build
MZole Nov 21, 2022
f251b6c
Updating upload job in Lombiq.GitHub.Actions
MZole Nov 21, 2022
319ef6a
Moving Temp folder to same location as FailureDumps in Lombiq.GitHub.…
MZole Nov 21, 2022
4c9f74f
Revereting test changes in Lombiq.UITestingToolbox
MZole Nov 21, 2022
45d0b27
Adding debug log message in Program
MZole Nov 22, 2022
805c7f6
Placing logging outside of Program
MZole Nov 22, 2022
682a912
Creating txt file for debugging
MZole Nov 23, 2022
e7a3bd8
Updating Lombiq.GitHub.Actions to latest dev
MZole Nov 23, 2022
e28c007
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
MZole Nov 23, 2022
9277c85
Changing EventId syntax in NLog.config
MZole Nov 23, 2022
fc02f08
Adding the build name to uploaded temp folder
MZole Nov 23, 2022
cdac2e9
Dummy commit to start another build
MZole Nov 23, 2022
e7f861e
Updating Lombiq.Hosting.MediaTheme to latest dev
MZole Nov 23, 2022
71669c2
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
MZole Nov 23, 2022
dd20e5b
Dummy commit to start another build
MZole Nov 23, 2022
7c8a551
Revert "Dummy commit to start another build"
MZole Nov 23, 2022
8be49b9
Starting another build, please fail
MZole Nov 23, 2022
2a43756
Adding timeout in Lombiq.UITestingToolbox and updating to latest dev …
MZole Nov 23, 2022
568f6d9
Updating Lombiq.GitHub.Actions to latest dev
MZole Nov 23, 2022
16a95ac
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
MZole Nov 23, 2022
b672de7
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
MZole Nov 23, 2022
7767f13
Post merge fixing in Lombiq.HelpfulLibraries
MZole Nov 23, 2022
9682cb2
Updating submodules to latest dev
MZole Nov 24, 2022
dac9188
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
MZole Nov 24, 2022
2a4a969
Updating submodule:
dministro Dec 2, 2022
c17c788
Merge branch 'dev' of https://github.com/Lombiq/Open-Source-Orchard-C…
dministro Dec 2, 2022
b31ecb2
Temporary removing post-pull-request-checks-automation
dministro Dec 2, 2022
08b037c
Targeting issue branch in spelling
dministro Dec 2, 2022
f24136c
Updating submodule:
dministro Dec 2, 2022
a83804c
dummy 1.
dministro Dec 2, 2022
e2eba3c
dummy 2.
dministro Dec 2, 2022
849fd19
dummy 3.
dministro Dec 2, 2022
94413a8
dummy 4.
dministro Dec 2, 2022
cefde7e
dummy 5.
dministro Dec 2, 2022
9cf2111
Merge branch 'dev' of https://github.com/Lombiq/Open-Source-Orchard-C…
dministro Dec 3, 2022
4cdc23d
Fixing GHA parameter
dministro Dec 3, 2022
e15ad83
Merge branch 'issue/OSOE-392' of https://github.com/Lombiq/Open-Sourc…
dministro Dec 3, 2022
5c4bb61
Updating submodules:
dministro Dec 3, 2022
0d87c43
Merge branch 'issue/OSOE-392' of https://github.com/Lombiq/Open-Sourc…
dministro Dec 3, 2022
84ac098
Updating submodules:
dministro Dec 3, 2022
be120ef
Merge branch 'issue/OSOE-392' of https://github.com/Lombiq/Open-Sourc…
dministro Dec 3, 2022
cf185db
dummy 6.
dministro Dec 3, 2022
7a0bd38
dummy 7.
dministro Dec 3, 2022
2320690
dummy 8.
dministro Dec 3, 2022
4c8f9ad
dummy 9.
dministro Dec 3, 2022
e3fbcfd
dummy 10.
dministro Dec 3, 2022
982c4d5
Addressing GH workflow
dministro Dec 5, 2022
4685254
Updating Lombiq.UITestingToolbox to merged issue/OSOE-392
Piedone Dec 5, 2022
c0b31de
Merge pull request #307 from Lombiq/issue/OSOE-483
Piedone Dec 5, 2022
721f685
Pointing to dev branch
Piedone Dec 5, 2022
f1d82a9
Reverting changes from debugging
MZole Dec 5, 2022
f9a84a4
Updating submodules to latest dev branches
MZole Dec 5, 2022
9186358
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
MZole Dec 5, 2022
058d2f1
Reverting more changes from debugging
MZole Dec 5, 2022
b1fa04c
Updating NuGet package reference of Lombiq.Tests.UI
MZole Dec 6, 2022
c491a49
Updating all submodules to merged dev, NuGet publishing
Piedone Dec 6, 2022
bd19867
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
Piedone Dec 6, 2022
10a2e4a
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
Piedone Dec 6, 2022
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
48 changes: 24 additions & 24 deletions NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Lombiq.OSOCE.NuGet.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,34 +11,34 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Lombiq.AuditTrailExtensions" Version="2.1.0" />
<PackageReference Include="Lombiq.BaseTheme" Version="1.2.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.BaseTheme.Samples" Version="1.2.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.ChartJs" Version="2.4.2-alpha.1.osoe-412" />
<PackageReference Include="Lombiq.ChartJs.Samples" Version="2.4.2-alpha.1.osoe-412" />
<PackageReference Include="Lombiq.DataTables" Version="3.3.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.DataTables.Samples" Version="3.3.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.HelpfulExtensions" Version="3.6.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights" Version="3.3.2-alpha.1.osoe-412" />
<PackageReference Include="Lombiq.Hosting.MediaTheme" Version="1.0.2-alpha.0.nest-370" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge" Version="1.0.2-alpha.0.nest-370" />
<PackageReference Include="Lombiq.Hosting.Tenants.Admin.Login" Version="2.3.3-alpha.14.nest-358" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard" Version="2.3.3-alpha.14.nest-358" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement" Version="2.3.3-alpha.14.nest-358" />
<PackageReference Include="Lombiq.Hosting.Tenants.Management" Version="2.3.3-alpha.14.nest-358" />
<PackageReference Include="Lombiq.JsonEditor" Version="2.2.0" />
<PackageReference Include="Lombiq.OrchardCoreApiClient" Version="1.1.0" />
<PackageReference Include="Lombiq.Privacy" Version="3.2.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.Privacy.Samples" Version="3.2.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.SetupExtensions" Version="2.1.0" />
<PackageReference Include="Lombiq.Tests.UI.Shortcuts" Version="4.0.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.UIKit" Version="2.3.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.AuditTrailExtensions" Version="2.1.1-alpha.0.osoe-392" />
<PackageReference Include="Lombiq.BaseTheme" Version="1.2.2-alpha.1.osoe-392" />
<PackageReference Include="Lombiq.BaseTheme.Samples" Version="1.2.2-alpha.1.osoe-392" />
<PackageReference Include="Lombiq.ChartJs" Version="2.4.2-alpha.2.osoe-392" />
<PackageReference Include="Lombiq.ChartJs.Samples" Version="2.4.2-alpha.2.osoe-392" />
<PackageReference Include="Lombiq.DataTables" Version="3.3.2-alpha.1.osoe-392" />
<PackageReference Include="Lombiq.DataTables.Samples" Version="3.3.2-alpha.1.osoe-392" />
<PackageReference Include="Lombiq.HelpfulExtensions" Version="3.6.2-alpha.1.osoe-392" />
<PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights" Version="3.3.2-alpha.2.osoe-392" />
<PackageReference Include="Lombiq.Hosting.MediaTheme" Version="1.0.2-alpha.1.osoe-392" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge" Version="1.0.2-alpha.1.osoe-392" />
<PackageReference Include="Lombiq.Hosting.Tenants.Admin.Login" Version="2.3.3-alpha.15.osoe-392" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard" Version="2.3.3-alpha.15.osoe-392" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement" Version="2.3.3-alpha.15.osoe-392" />
<PackageReference Include="Lombiq.Hosting.Tenants.Management" Version="2.3.3-alpha.15.osoe-392" />
<PackageReference Include="Lombiq.JsonEditor" Version="2.2.1-alpha.2.osoe-392" />
<PackageReference Include="Lombiq.OrchardCoreApiClient" Version="1.1.1-alpha.0.osoe-392" />
<PackageReference Include="Lombiq.Privacy" Version="3.2.2-alpha.1.osoe-392" />
<PackageReference Include="Lombiq.Privacy.Samples" Version="3.2.2-alpha.1.osoe-392" />
<PackageReference Include="Lombiq.SetupExtensions" Version="2.1.1-alpha.0.osoe-392" />
<PackageReference Include="Lombiq.Tests.UI.Shortcuts" Version="4.0.2-alpha.14.osoe-392" />
<PackageReference Include="Lombiq.UIKit" Version="2.3.2-alpha.1.osoe-392" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="1.2.2" Condition="'$(RazorRuntimeCompilation)' == 'true'" />
</ItemGroup>

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

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
},
{
"Rule": "Exclude",
"Expression": "OrchardCore.Lucene"
"Expression": "OrchardCore.Search.Lucene"
},
{
"Rule": "Exclude",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Lombiq.HelpfulLibraries" Version="4.7.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.4.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.4.0" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.4.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.4.0" />
<PackageReference Include="Lombiq.HelpfulLibraries" Version="4.7.1-alpha.0.osoe-392" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.5.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.5.0" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.5.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.5.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@

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

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Lombiq.BaseTheme.Tests.UI" Version="1.2.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.ChartJs.Tests.UI" Version="2.4.2-alpha.1.osoe-412" />
<PackageReference Include="Lombiq.DataTables.Tests.UI" Version="3.3.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights.Tests.UI" Version="3.3.2-alpha.1.osoe-412" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Tests.UI" Version="1.0.2-alpha.2.osoe-456" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI" Version="2.3.3-alpha.14.nest-358" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI" Version="2.3.3-alpha.14.nest-358" />
<PackageReference Include="Lombiq.Privacy.Tests.UI" Version="3.2.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.HelpfulExtensions.Tests.UI" Version="3.6.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.Tests.UI" Version="4.0.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.BaseTheme.Tests.UI" Version="1.2.2-alpha.1.osoe-392" />
<PackageReference Include="Lombiq.ChartJs.Tests.UI" Version="2.4.2-alpha.2.osoe-392" />
<PackageReference Include="Lombiq.DataTables.Tests.UI" Version="3.3.2-alpha.1.osoe-392" />
<PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights.Tests.UI" Version="3.3.2-alpha.2.osoe-392" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Tests.UI" Version="1.0.2-alpha.1.osoe-392" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI" Version="2.3.3-alpha.15.osoe-392" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI" Version="2.3.3-alpha.15.osoe-392" />
<PackageReference Include="Lombiq.Privacy.Tests.UI" Version="3.2.2-alpha.1.osoe-392" />
<PackageReference Include="Lombiq.HelpfulExtensions.Tests.UI" Version="3.6.2-alpha.1.osoe-392" />
<PackageReference Include="Lombiq.Tests.UI" Version="4.0.2-alpha.14.osoe-392" />
Piedone marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Lombiq.HelpfulLibraries" Version="4.7.0" />
<PackageReference Include="Lombiq.HelpfulLibraries" Version="4.7.1-alpha.0.osoe-392" />
<PackageReference Include="Lombiq.Tests" Version="2.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
Expand Down
6 changes: 3 additions & 3 deletions src/Lombiq.OSOCE.Web/Lombiq.OSOCE.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.4.0" />
<PackageReference Include="OrchardCore.Logging.NLog" Version="1.4.0" />
<PackageReference Include="OrchardCore.Application.Cms.Targets" Version="1.4.0" />
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.5.0" />
<PackageReference Include="OrchardCore.Logging.NLog" Version="1.5.0" />
<PackageReference Include="OrchardCore.Application.Cms.Targets" Version="1.5.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Lombiq.OSOCE.Web/NLog.config
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<targets>
<!-- write logs to file -->
<target xsi:type="File" name="allfile" fileName="${var:configDir}/App_Data/logs/orchard-log-${shortdate}.log"
layout="${longdate}|${orchard-tenant-name}|${aspnet-traceidentifier}|${event-properties:item=EventId.Id}|${logger}|${uppercase:${level}}|${message} ${exception:format=ToString,StackTrace}" />
layout="${longdate}|${orchard-tenant-name}|${aspnet-traceidentifier}|${event-properties:item=EventId}|${logger}|${uppercase:${level}}|${message} ${exception:format=ToString,StackTrace}" />

<!--<target xsi:type="Null" name="blackhole" /> -->
</targets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
},
{
"Rule": "Exclude",
"Expression": "OrchardCore.Lucene"
"Expression": "OrchardCore.Search.Lucene"
},
{
"Rule": "Exclude",
Expand Down
2 changes: 1 addition & 1 deletion src/Modules/Lombiq.JsonEditor
8 changes: 4 additions & 4 deletions src/Modules/Lombiq.OSOCE.Samples/Lombiq.OSOCE.Samples.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="1.4.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.4.0" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.4.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.4.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.5.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.5.0" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.5.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.5.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Utilities/Lombiq.SetupExtensions