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

Jump to bottom

OCC-245: Update OC preview version #122

Merged
merged 36 commits into from
Jul 28, 2024
Merged

OCC-245: Update OC preview version #122

Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
aa243f2
Update OC preview version.
sarahelsaig May 28, 2024
2c8617f
Update OC preview version.
sarahelsaig May 30, 2024
a629f8f
Update OC preview version.
sarahelsaig Jun 5, 2024
d9953fd
Merge branch 'task/system-text-json-migration' into issue/OCC-245
sarahelsaig Jun 14, 2024
6cbd8c4
Fix ForbiddenTenantsFilter.
sarahelsaig Jun 17, 2024
bb6385d
Merge branch 'task/system-text-json-migration' into issue/OCC-245
sarahelsaig Jun 17, 2024
b2bbda9
Update OC version.
sarahelsaig Jun 18, 2024
fca7d0c
Update OC version.
sarahelsaig Jun 19, 2024
31dda19
Update OC preview version.
sarahelsaig Jun 20, 2024
ef93284
Update OC preview version.
sarahelsaig Jun 21, 2024
bab4db6
Merge remote-tracking branch 'origin/issue/OCC-245' into issue/OCC-245
sarahelsaig Jun 21, 2024
bac2f35
Merge branch 'task/system-text-json-migration' into issue/OCC-245
sarahelsaig Jun 24, 2024
5a5c09c
Update HL and UITT NuGet versions.
sarahelsaig Jun 24, 2024
0622a00
Update OC NuGet versions.
sarahelsaig Jun 24, 2024
b536758
Update to latest OC preview version.
sarahelsaig Jul 2, 2024
43feee2
Update OC preview version.
sarahelsaig Jul 11, 2024
48ebd7f
Fix package consolidation.
sarahelsaig Jul 11, 2024
c446092
Update HL version.
sarahelsaig Jul 13, 2024
acdbdad
Update UITT version.
sarahelsaig Jul 13, 2024
e7f887c
Update HL nuget version.
sarahelsaig Jul 16, 2024
5797d95
Update all UITT Nuget versions.
sarahelsaig Jul 16, 2024
1bfc56a
Update package version.
sarahelsaig Jul 16, 2024
ce1f989
Update OC preview versions.
sarahelsaig Jul 24, 2024
2f9899e
Merge branch 'task/system-text-json-migration' into issue/OCC-245
sarahelsaig Jul 24, 2024
d238c02
Merge branch 'task/system-text-json-migration' into issue/OCC-245
sarahelsaig Jul 26, 2024
7591ef9
Update Lombiq.Hosting.Tenants.Management/Filters/ForbiddenTenantsFilt…
sarahelsaig Jul 26, 2024
7897587
Update HL preview version.
sarahelsaig Jul 26, 2024
e9ef782
Update UITT preview version.
sarahelsaig Jul 26, 2024
5d06562
Update HL preview.
sarahelsaig Jul 27, 2024
fa6cd08
Update UITT version.
sarahelsaig Jul 27, 2024
c95f56c
Update UITT preview version.
sarahelsaig Jul 27, 2024
7682ce8
Update HE version.
sarahelsaig Jul 27, 2024
ee42d02
NuGet.config
sarahelsaig Jul 27, 2024
00300a8
Fix wrong package ref.
sarahelsaig Jul 27, 2024
d175d9b
Update HL nuget version.
sarahelsaig Jul 27, 2024
8dcbfa9
Update HL.
sarahelsaig Jul 27, 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
10 changes: 5 additions & 5 deletions Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,18 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Tenants" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Users" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Tenants" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Users" Version="2.0.0-preview-18282" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' != 'true'">
<ProjectReference Include="..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.OrchardCore\Lombiq.HelpfulLibraries.OrchardCore.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.0" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-preview.4.occ-245" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ...EmailQuotaManagement.Tests.UI/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-alpha.0.nest-501" />
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-preview.3.occ-245" />
</ItemGroup>

</Project>
18 changes: 9 additions & 9 deletions ...q.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Admin" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Email" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.AdminDashboard" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Email.Abstractions" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Admin" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Email" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.AdminDashboard" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Email.Abstractions" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="2.0.0-preview-18282" />
<PackageReference Include="Scrutor" Version="4.2.2" />
</ItemGroup>

Expand All @@ -50,7 +50,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.0" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-preview.4.occ-245" />
<PackageReference Include="Lombiq.HelpfulExtensions" Version="8.0.1" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...nants.EnvironmentRobots.Tests.UI/Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-alpha.0.nest-501" />
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-preview.3.occ-245" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18282" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...sting.Tenants.FeaturesGuard.Tests.UI/Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-alpha.0.nest-501" />
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-preview.3.occ-245" />
</ItemGroup>

</Project>
14 changes: 7 additions & 7 deletions Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18282" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' != 'true'">
Expand All @@ -46,8 +46,8 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.0" />
<PackageReference Include="Lombiq.HelpfulLibraries.Common" Version="10.0.0" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-preview.4.occ-245" />
<PackageReference Include="Lombiq.HelpfulLibraries.Common" Version="10.0.1-preview.4.occ-245" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ...IdleTenantManagement.Tests.UI/Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-alpha.0.nest-501" />
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-preview.3.occ-245" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions ...q.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />
<PackageReference Include="OrchardCore.Abstractions" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Abstractions" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18282" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...q.Hosting.Tenants.Maintenance.Tests.UI/Lombiq.Hosting.Tenants.Maintenance.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-alpha.0.nest-501" />
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-preview.3.occ-245" />
</ItemGroup>

<ItemGroup>
Expand Down
18 changes: 9 additions & 9 deletions Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Settings" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Users.Core" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Settings" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Users.Core" Version="2.0.0-preview-18282" />
<PackageReference Include="RandomNameGeneratorLibrary" Version="1.2.2" />
</ItemGroup>

Expand All @@ -49,8 +49,8 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.Common" Version="10.0.0" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.0" />
<PackageReference Include="Lombiq.HelpfulLibraries.Common" Version="10.0.1-preview.4.occ-245" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-preview.4.occ-245" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Lombiq.Hosting.Tenants.Management.Tests.UI/Lombiq.Hosting.Tenants.Management.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-alpha.0.nest-501" />
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-preview.3.occ-245" />
</ItemGroup>

<ItemGroup>
Expand Down
9 changes: 4 additions & 5 deletions Lombiq.Hosting.Tenants.Management/Filters/ForbiddenTenantsFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Lombiq.Hosting.Tenants.Management.Settings;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.Extensions.Localization;
using Microsoft.Extensions.Options;
Expand Down Expand Up @@ -33,12 +34,10 @@ public Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecuti
if (!context.HttpContext.Request.Method.EqualsOrdinalIgnoreCase(Http.Post) ||
!routeValues["Area"].EqualsOrdinalIgnoreCase($"{nameof(OrchardCore)}.{nameof(OrchardCore.Tenants)}") ||

!((routeValues["Controller"].EqualsOrdinalIgnoreCase(typeof(AdminController).ControllerName()) &&
(routeValues["Action"].EqualsOrdinalIgnoreCase(nameof(AdminController.Create)) ||
routeValues["Action"].EqualsOrdinalIgnoreCase(nameof(AdminController.Edit)))) ||
!(context.IsMvcRoute(nameof(AdminController.Create), typeof(AdminController).ControllerName()) ||
context.IsMvcRoute(nameof(AdminController.Edit), typeof(AdminController).ControllerName())) ||

(routeValues["Controller"].EqualsOrdinalIgnoreCase(typeof(ApiController).ControllerName()) &&
routeValues["Action"].EqualsOrdinalIgnoreCase(nameof(ApiController.Create)))))
context.IsMvcRoute(nameof(TenantApiController.Create), typeof(TenantApiController).ControllerName()))
{
return next();
}
Expand Down
8 changes: 4 additions & 4 deletions Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Tenants" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Tenants" Version="2.0.0-preview-18282" />
<PackageReference Include="Scrutor" Version="4.2.2" />
</ItemGroup>

Expand All @@ -44,7 +44,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.0" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-preview.4.occ-245" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ...aStorageManagement.Tests.UI/Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-alpha.0.nest-501" />
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-preview.3.occ-245" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 deletions ...sting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Media" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Media" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18282" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
</ItemGroup>

Expand All @@ -45,7 +45,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.0" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-preview.4.occ-245" />
</ItemGroup>

</Project>