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

OSOE-392: Upgrade to Orchard Core 1.5 in Hosting-Tenants #42

Merged
merged 7 commits into from
Dec 6, 2022
Merged

OSOE-392: Upgrade to Orchard Core 1.5 in Hosting-Tenants #42

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
75186aa
Updating OrchardCore NuGet packages to latest
MZole Nov 5, 2022
b7002e3
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
MZole Nov 7, 2022
4945949
Updating Lucene namespace
MZole Nov 8, 2022
9d1c040
Updating HL and Lombiq.Tests.UI NuGet packages
MZole Nov 10, 2022
12256c2
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
MZole Nov 17, 2022
2136a34
Merge remote-tracking branch 'origin/dev' into issue/OSOE-392
MZole Nov 24, 2022
66253a3
Updating Lombiq NuGet package references
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
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 @@ -34,18 +34,18 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.4.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.4.0" />
<PackageReference Include="OrchardCore.Tenants" Version="1.4.0" />
<PackageReference Include="OrchardCore.Users" Version="1.4.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.5.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.5.0" />
<PackageReference Include="OrchardCore.Tenants" Version="1.5.0" />
<PackageReference Include="OrchardCore.Users" Version="1.5.0" />
</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="4.7.0" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="4.7.1-alpha.0.osoe-392" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public static async Task TestForbiddenFeaturesAsync(this UITestContext context,

// Ensure forbidden features are not available in the list.
context.Missing(By.XPath("//label[@for='OrchardCore.Workflows.Session']"));
context.Missing(By.XPath("//label[@for='OrchardCore.Lucene']"));
context.Missing(By.XPath("//label[@for='OrchardCore.Search.Lucene']"));
context.Missing(By.XPath("//label[@for='OrchardCore.MiniProfiler']"));
context.Missing(By.XPath("//label[@for='Lombiq.Tests.UI.Shortcuts']"));
}
Expand Down
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 @@ -33,7 +33,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="4.0.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.Tests.UI" Version="4.0.2-alpha.14.osoe-392" />
</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 @@ -34,11 +34,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.4.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="OrchardCore.Infrastructure.Abstractions" Version="1.5.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 Condition="'$(NuGetBuild)' != 'true'">
Expand All @@ -47,8 +47,8 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="4.7.0" />
<PackageReference Include="Lombiq.HelpfulLibraries.Common" Version="4.7.0" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="4.7.1-alpha.0.osoe-392" />
<PackageReference Include="Lombiq.HelpfulLibraries.Common" Version="4.7.1-alpha.0.osoe-392" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Lombiq.Hosting.Tenants.FeaturesGuard/Readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Example case 2:
},
{
"Rule": "Exclude",
"Expression": "OrchardCore.Lucene"
"Expression": "OrchardCore.Search.Lucene"
},
{
"Rule": "Exclude",
Expand Down
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="4.0.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.Tests.UI" Version="4.0.2-alpha.14.osoe-392" />
</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="6.0.0" />
<PackageReference Include="OrchardCore.Abstractions" Version="1.4.0" />
<PackageReference Include="OrchardCore" Version="1.4.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.4.0" />
<PackageReference Include="OrchardCore.Abstractions" Version="1.5.0" />
<PackageReference Include="OrchardCore" Version="1.5.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.5.0" />
</ItemGroup>

<ItemGroup>
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 @@ -34,9 +34,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore" Version="1.4.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.4.0" />
<PackageReference Include="OrchardCore.Tenants" Version="1.4.0" />
<PackageReference Include="OrchardCore" Version="1.5.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.5.0" />
<PackageReference Include="OrchardCore.Tenants" Version="1.5.0" />
<PackageReference Include="Scrutor" Version="4.2.0" />
</ItemGroup>

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

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="4.7.0" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="4.7.1-alpha.0.osoe-392" />
</ItemGroup>

</Project>