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

OSOE-127: Upgrade to Orchard Core 1.4 #20

Merged
merged 4 commits into from
Jun 7, 2022
Merged

OSOE-127: Upgrade to Orchard Core 1.4 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3806e9
Upgrading to OC 1.4.0
DemeSzabolcs Jun 3, 2022
22f994c
Fixing test
DemeSzabolcs Jun 3, 2022
776aa39
Update Lombiq.BaseTheme.Tests.UI/Extensions/TestCaseUITestContextExte…
DemeSzabolcs Jun 7, 2022
8d5ff15
Replacing capital H with lower
DemeSzabolcs Jun 7, 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
4 changes: 2 additions & 2 deletions Lombiq.BaseTheme.Samples/Lombiq.BaseTheme.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Admin" Version="1.3.0" />
<PackageReference Include="OrchardCore.Theme.Targets" Version="1.3.0" />
<PackageReference Include="OrchardCore.Admin" Version="1.4.0" />
<PackageReference Include="OrchardCore.Theme.Targets" Version="1.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Lombiq.BaseTheme.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Lombiq.Tests.UI.Extensions;
using Lombiq.Tests.UI.Extensions;
using Lombiq.Tests.UI.Services;
using OpenQA.Selenium;
using Shouldly;
Expand Down Expand Up @@ -39,6 +39,6 @@ await context.DoWithRetriesOrFailAsync(() =>
await context.ClickMainMenuPathAsync("Account", "Log Out");

await context.ClickMainMenuPathAsync("Log In");
context.Exists(By.XPath("//form[@action = '/Login']/h4[contains(., 'Log in')]"));
context.Exists(By.XPath("//form[@action = '/Login']/*[starts-with(name(), 'h') and contains(., 'Log in')]"));
}
}
8 changes: 4 additions & 4 deletions Lombiq.BaseTheme/Lombiq.BaseTheme.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Theme.Targets" Version="1.3.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.3.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.3.0" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="1.3.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" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' != 'true'">
Expand Down