Merge pull request #102 from Lombiq/issue/OSOE-392

OSOE-392: Upgrade to Orchard Core 1.5 in Helpful-Extensions
Lombiq · Dec 6, 2022 · 97055ba · 97055ba
2 parents 82f70d3 + bdca42d
commit 97055ba
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj
@@ -42,7 +42,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="5.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentTypes/Startup.cs b/Lombiq.HelpfulExtensions/Extensions/ContentTypes/Startup.cs
@@ -10,7 +10,7 @@ namespace Lombiq.HelpfulExtensions.Extensions.ContentTypes;
 [Feature(FeatureIds.ContentTypes)]
 public class Startup : StartupBase
 {
-    public override void ConfigureServices(IServiceCollection services) => services.AddScoped<IDataMigration, Migrations>();
+    public override void ConfigureServices(IServiceCollection services) => services.AddDataMigration<Migrations>();
 
     public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
     {

diff --git a/Lombiq.HelpfulExtensions/Extensions/SiteTexts/Startup.cs b/Lombiq.HelpfulExtensions/Extensions/SiteTexts/Startup.cs
@@ -10,8 +10,8 @@ public class Startup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<IDataMigration, SiteTextMigrations>();
-        services.AddScoped<IDataMigration, LocalizationMigrations>();
+        services.AddDataMigration<SiteTextMigrations>();
+        services.AddDataMigration<LocalizationMigrations>();
         services.AddScoped<ISiteTextService, SiteTextService>();
     }
 }

diff --git a/Lombiq.HelpfulExtensions/Extensions/Widgets/Startup.cs b/Lombiq.HelpfulExtensions/Extensions/Widgets/Startup.cs
@@ -11,7 +11,7 @@ namespace Lombiq.HelpfulExtensions.Extensions.Widgets;
 public class Startup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services) =>
-        services.AddScoped<IDataMigration, Migrations>();
+        services.AddDataMigration<Migrations>();
 
     public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
     {

diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj
@@ -34,21 +34,21 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Autoroute" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.Contents" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.Flows" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.Html" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.Markdown" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.MetaWeblog.Abstractions" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.4.0" />
+    <PackageReference Include="OrchardCore.Autoroute" 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.Markdown" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.MetaWeblog.Abstractions" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.Module.Targets" 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="5.0.0" />
   </ItemGroup>
 
 </Project>