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-548: Upgrade to Orchard Core 1.6 in Helpful-Extensions #125

Merged
merged 18 commits into from
Jun 18, 2023
Merged

OSOE-548: Upgrade to Orchard Core 1.6 in Helpful-Extensions #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
71c4a6e
Upgrading to OC 1.6.
Psichorex Apr 25, 2023
34f0f1c
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Psichorex Apr 29, 2023
98c3a07
Removing AddDataMigration workaround.
Psichorex May 12, 2023
8396321
Removing AddDataMigration workaround form Startups.
Psichorex May 12, 2023
155d638
Upgrading Lombiq.ChartJs.Tests.UI package.
Psichorex May 20, 2023
8b2935e
Updating to latest Lombiq alpha releases.
Psichorex May 22, 2023
8ef5679
Removing mistakenly included "v" from versions.
Psichorex May 22, 2023
dbc1079
Updating to latest Lombiq.Tests.UI alpha release.
Psichorex May 22, 2023
ba3c370
Upgrading Lombiq.HelpfulLibraries.* package reference version
dministro Jun 9, 2023
a88c49a
Merge branch 'dev' of https://github.com/Lombiq/Helpful-Extensions in…
dministro Jun 10, 2023
2c4d2e2
Merge branch 'issue/OSOE-548' of https://github.com/Lombiq/Helpful-Ex…
dministro Jun 10, 2023
3d14c22
Merge pull request #128 from Lombiq/issue/OSOE-641
Piedone Jun 10, 2023
9fd0fc1
Updating Lombiq.NodeJs.Extensions NuGet to latest alpha
Piedone Jun 11, 2023
9aba094
Updating Lombiq.HelpfulLibraries NuGet reference to latest alpha
Piedone Jun 16, 2023
ad44d90
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Piedone Jun 16, 2023
02a6981
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Piedone Jun 18, 2023
325fd90
Updating Lombiq.Tests.UI to latest
Piedone Jun 18, 2023
fc38cf0
Updating Lombiq NuGet references to release versions
Piedone Jun 18, 2023
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.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
<ItemGroup>
<ProjectReference Include="..\Lombiq.HelpfulExtensions\Lombiq.HelpfulExtensions.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' != 'true'">
<ProjectReference Include="..\..\..\..\test\Lombiq.UITestingToolbox\Lombiq.Tests.UI\Lombiq.Tests.UI.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="6.1.0" />
<PackageReference Include="Lombiq.Tests.UI" Version="7.0.0" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions Lombiq.HelpfulExtensions/Extensions/ContentTypes/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.DependencyInjection;
using OrchardCore.Data.Migration;
using OrchardCore.Modules;
using System;

Expand Down
17 changes: 0 additions & 17 deletions Lombiq.HelpfulExtensions/Extensions/MigrationServiceCollectionExtensions.cs
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions Lombiq.HelpfulExtensions/Extensions/SiteTexts/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Lombiq.HelpfulExtensions.Extensions.SiteTexts.Services;
using Microsoft.Extensions.DependencyInjection;
using OrchardCore.Data.Migration;
using OrchardCore.Modules;

namespace Lombiq.HelpfulExtensions.Extensions.SiteTexts;
Expand Down
1 change: 1 addition & 0 deletions Lombiq.HelpfulExtensions/Extensions/Widgets/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.DependencyInjection;
using OrchardCore.Data.Migration;
using OrchardCore.Modules;
using System;

Expand Down
24 changes: 12 additions & 12 deletions Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Autoroute" Version="1.5.0" />
<PackageReference Include="OrchardCore.ContentFields" Version="1.5.0" />
<PackageReference Include="OrchardCore.Contents" Version="1.5.0" />
<PackageReference Include="OrchardCore.Flows" Version="1.5.0" />
<PackageReference Include="OrchardCore.Html" Version="1.5.0" />
<PackageReference Include="OrchardCore.Lists" Version="1.5.0" />
<PackageReference Include="OrchardCore.Markdown" Version="1.5.0" />
<PackageReference Include="OrchardCore.MetaWeblog.Abstractions" Version="1.5.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.5.0" />
<PackageReference Include="OrchardCore.Workflows" Version="1.5.0" />
<PackageReference Include="OrchardCore.Autoroute" Version="1.6.0" />
<PackageReference Include="OrchardCore.ContentFields" Version="1.6.0" />
<PackageReference Include="OrchardCore.Contents" Version="1.6.0" />
<PackageReference Include="OrchardCore.Flows" Version="1.6.0" />
<PackageReference Include="OrchardCore.Html" Version="1.6.0" />
<PackageReference Include="OrchardCore.Lists" Version="1.6.0" />
<PackageReference Include="OrchardCore.Markdown" Version="1.6.0" />
<PackageReference Include="OrchardCore.MetaWeblog.Abstractions" Version="1.6.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.6.0" />
<PackageReference Include="OrchardCore.Workflows" Version="1.6.0" />
</ItemGroup>

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

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="5.2.0" />
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.2.3" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="6.0.0" />
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.2.4" />
</ItemGroup>

<Import Condition="'$(NuGetBuild)' != 'true'" Project="..\..\..\Utilities\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions.targets" />
Expand Down