Skip to content

Commit 4f6bb97

Browse files
authored
Merge pull request #125 from Lombiq/issue/OSOE-548
OSOE-548: Upgrade to Orchard Core 1.6 in Helpful-Extensions
2 parents 3d78ee9 + fc38cf0 commit 4f6bb97

File tree

6 files changed

+17
-31
lines changed

6 files changed

+17
-31
lines changed

Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
<ItemGroup>
3232
<ProjectReference Include="..\Lombiq.HelpfulExtensions\Lombiq.HelpfulExtensions.csproj" />
3333
</ItemGroup>
34-
34+
3535
<ItemGroup Condition="'$(NuGetBuild)' != 'true'">
3636
<ProjectReference Include="..\..\..\..\test\Lombiq.UITestingToolbox\Lombiq.Tests.UI\Lombiq.Tests.UI.csproj" />
3737
</ItemGroup>
3838

3939
<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
40-
<PackageReference Include="Lombiq.Tests.UI" Version="6.1.0" />
40+
<PackageReference Include="Lombiq.Tests.UI" Version="7.0.0" />
4141
</ItemGroup>
4242

4343
</Project>

Lombiq.HelpfulExtensions/Extensions/ContentTypes/Startup.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Microsoft.AspNetCore.Builder;
22
using Microsoft.AspNetCore.Routing;
33
using Microsoft.Extensions.DependencyInjection;
4+
using OrchardCore.Data.Migration;
45
using OrchardCore.Modules;
56
using System;
67

Lombiq.HelpfulExtensions/Extensions/MigrationServiceCollectionExtensions.cs

Lines changed: 0 additions & 17 deletions
This file was deleted.

Lombiq.HelpfulExtensions/Extensions/SiteTexts/Startup.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Lombiq.HelpfulExtensions.Extensions.SiteTexts.Services;
22
using Microsoft.Extensions.DependencyInjection;
3+
using OrchardCore.Data.Migration;
34
using OrchardCore.Modules;
45

56
namespace Lombiq.HelpfulExtensions.Extensions.SiteTexts;

Lombiq.HelpfulExtensions/Extensions/Widgets/Startup.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Microsoft.AspNetCore.Builder;
22
using Microsoft.AspNetCore.Routing;
33
using Microsoft.Extensions.DependencyInjection;
4+
using OrchardCore.Data.Migration;
45
using OrchardCore.Modules;
56
using System;
67

Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@
3636
</ItemGroup>
3737

3838
<ItemGroup>
39-
<PackageReference Include="OrchardCore.Autoroute" Version="1.5.0" />
40-
<PackageReference Include="OrchardCore.ContentFields" Version="1.5.0" />
41-
<PackageReference Include="OrchardCore.Contents" Version="1.5.0" />
42-
<PackageReference Include="OrchardCore.Flows" Version="1.5.0" />
43-
<PackageReference Include="OrchardCore.Html" Version="1.5.0" />
44-
<PackageReference Include="OrchardCore.Lists" Version="1.5.0" />
45-
<PackageReference Include="OrchardCore.Markdown" Version="1.5.0" />
46-
<PackageReference Include="OrchardCore.MetaWeblog.Abstractions" Version="1.5.0" />
47-
<PackageReference Include="OrchardCore.Module.Targets" Version="1.5.0" />
48-
<PackageReference Include="OrchardCore.Workflows" Version="1.5.0" />
39+
<PackageReference Include="OrchardCore.Autoroute" Version="1.6.0" />
40+
<PackageReference Include="OrchardCore.ContentFields" Version="1.6.0" />
41+
<PackageReference Include="OrchardCore.Contents" Version="1.6.0" />
42+
<PackageReference Include="OrchardCore.Flows" Version="1.6.0" />
43+
<PackageReference Include="OrchardCore.Html" Version="1.6.0" />
44+
<PackageReference Include="OrchardCore.Lists" Version="1.6.0" />
45+
<PackageReference Include="OrchardCore.Markdown" Version="1.6.0" />
46+
<PackageReference Include="OrchardCore.MetaWeblog.Abstractions" Version="1.6.0" />
47+
<PackageReference Include="OrchardCore.Module.Targets" Version="1.6.0" />
48+
<PackageReference Include="OrchardCore.Workflows" Version="1.6.0" />
4949
</ItemGroup>
5050

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

5656
<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
57-
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="5.2.0" />
58-
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.2.3" />
57+
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="6.0.0" />
58+
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.2.4" />
5959
</ItemGroup>
6060

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

0 commit comments

Comments
 (0)