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: Upgrading to Orchard Core 1.6 in Orchard-Content-Editors #39

Merged
merged 15 commits into from
Jun 18, 2023
Merged

OSOE-548: Upgrading to Orchard Core 1.6 in Orchard-Content-Editors #39

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2b078ad
Upgrading to OC 1.6
Psichorex Apr 25, 2023
053dcf4
OC 1.6 upgrade
Psichorex Apr 25, 2023
8ebd38c
Using AddIndexProvider.
Psichorex Apr 28, 2023
5ab9d02
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Psichorex Apr 29, 2023
614dbc4
Upgrading Lombiq.ChartJs.Tests.UI package.
Psichorex May 20, 2023
dd02969
Updating to latest Lombiq alpha releases.
Psichorex May 22, 2023
0787991
Removing mistakenly included "v" from versions.
Psichorex May 22, 2023
e67923f
Updating to latest Lombiq.Tests.UI alpha release.
Psichorex May 22, 2023
2ea3e3d
Upgrading Lombiq.HelpfulLibraries.* package reference version
dministro Jun 9, 2023
9d8129d
Merge pull request #44 from Lombiq/issue/OSOE-641
Piedone Jun 10, 2023
f20cd1b
Updating Lombiq.NodeJs.Extensions NuGet to latest alpha
Piedone Jun 11, 2023
fb24036
Updating Lombiq.HelpfulLibraries NuGet reference to latest alpha
Piedone Jun 16, 2023
1ef0f51
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Piedone Jun 16, 2023
417eb28
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Piedone Jun 18, 2023
fbc760a
Updating Lombiq NuGet references
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.ContentEditors.Samples/Lombiq.ContentEditors.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="1.5.0" />
<PackageReference Include="OrchardCore.Contents" Version="1.5.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.6.0" />
<PackageReference Include="OrchardCore.Contents" Version="1.6.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Lombiq.ContentEditors.Tests.UI/Lombiq.ContentEditors.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="6.0.0" />
<PackageReference Include="Lombiq.Tests.UI" Version="6.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
16 changes: 8 additions & 8 deletions Lombiq.ContentEditors/Lombiq.ContentEditors.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="1.5.0" />
<PackageReference Include="OrchardCore.ContentFields" 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" />
<PackageReference Include="OrchardCore.Media" Version="1.5.0" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="1.5.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.6.0" />
<PackageReference Include="OrchardCore.ContentFields" Version="1.6.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.6.0" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.6.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.6.0" />
<PackageReference Include="OrchardCore.Media" Version="1.6.0" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="1.6.0" />
</ItemGroup>

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

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

Expand Down
4 changes: 2 additions & 2 deletions Lombiq.ContentEditors/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using OrchardCore.ContentManagement;
using OrchardCore.Data;
using OrchardCore.Data.Migration;
using OrchardCore.Modules;
using OrchardCore.ResourceManagement;
using YesSql.Indexes;

namespace Lombiq.ContentEditors;

Expand All @@ -24,7 +24,7 @@ public override void ConfigureServices(IServiceCollection services)
services.AddScoped(typeof(IContentItemAsyncEditorProviderServices<>), typeof(ContentItemAsyncEditorProviderServices<>));
services.AddContentPart<AsyncEditorPart>();
services.AddScoped<IDataMigration, AsyncEditorMigrations>();
services.AddSingleton<IIndexProvider, AsyncEditorPartIndexProvider>();
services.AddIndexProvider<AsyncEditorPartIndexProvider>();
services.AddScoped<IAsyncEditorProvider<ContentItem>, DefaultContentItemAsyncEditorProvider>();
}
}