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

OSOE-392: Upgrade to Orchard Core 1.5 in Orchard-Base-Theme
Lombiq · Dec 6, 2022 · 6b107b6 · 6b107b6
2 parents b86575f + 32e9370
commit 6b107b6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/Lombiq.BaseTheme.Samples/Lombiq.BaseTheme.Samples.csproj b/Lombiq.BaseTheme.Samples/Lombiq.BaseTheme.Samples.csproj
@@ -15,7 +15,7 @@
     <PackageIcon>NuGetIcon.png</PackageIcon>
     <PackageTags>OrchardCore;Lombiq;AspNetCore;Sass;Theming</PackageTags>
     <RepositoryUrl>https://github.com/Lombiq/Orchard-Base-Theme</RepositoryUrl>
-    <PackageProjectUrl>https://github.com/Lombiq/Orchard-Base-Theme/Lombiq.BaseTheme.Samples/Readme.md</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/Lombiq/Orchard-Base-Theme/blob/dev/Lombiq.BaseTheme.Samples/Readme.md</PackageProjectUrl>
     <PackageLicenseFile>License.md</PackageLicenseFile>
   </PropertyGroup>
 
@@ -28,8 +28,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Admin" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.Theme.Targets" Version="1.4.0" />
+    <PackageReference Include="OrchardCore.Admin" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.Theme.Targets" Version="1.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Lombiq.BaseTheme.Tests.UI/Lombiq.BaseTheme.Tests.UI.csproj b/Lombiq.BaseTheme.Tests.UI/Lombiq.BaseTheme.Tests.UI.csproj
@@ -12,7 +12,7 @@
     <PackageIcon>NuGetIcon.png</PackageIcon>
     <PackageTags>OrchardCore;Lombiq;AspNetCore;Sass;;Shouldly;xUnit;UITesting;Testing</PackageTags>
     <RepositoryUrl>https://github.com/Lombiq/Orchard-Base-Theme</RepositoryUrl>
-    <PackageProjectUrl>https://github.com/Lombiq/Orchard-Base-Theme/Lombiq.BaseTheme.Tests.UI/Readme.md</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/Lombiq/Orchard-Base-Theme/blob/dev/Lombiq.BaseTheme.Tests.UI/Readme.md</PackageProjectUrl>
     <PackageLicenseFile>License.md</PackageLicenseFile>
   </PropertyGroup>
 
@@ -25,7 +25,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>
 
   <ItemGroup>

diff --git a/Lombiq.BaseTheme/Lombiq.BaseTheme.csproj b/Lombiq.BaseTheme/Lombiq.BaseTheme.csproj
@@ -34,10 +34,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <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" />
+    <PackageReference Include="OrchardCore.Theme.Targets" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.5.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
@@ -48,8 +48,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.HelpfulLibraries" Version="4.7.0" />
-    <PackageReference Include="Lombiq.HelpfulExtensions" Version="3.6.2-alpha.0.osoe-412" />
+    <PackageReference Include="Lombiq.HelpfulLibraries" Version="5.0.0" />
+    <PackageReference Include="Lombiq.HelpfulExtensions" Version="4.0.0" />
 
     <Content Include="Assets/Styles/**/*.*">
       <IncludeInPackage>true</IncludeInPackage>

diff --git a/Lombiq.BaseTheme/Startup.cs b/Lombiq.BaseTheme/Startup.cs
@@ -19,7 +19,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
         services.Configure<MvcOptions>(options => options.Filters.Add(typeof(MainMenuWidgetFilter)));
 
-        services.AddScoped<IDataMigration, LayoutInjectionMigrations>();
+        services.AddDataMigration<LayoutInjectionMigrations>();
 
         services.AddScoped<IResourceFilterProvider, ResourceFilters>();
     }