Merge remote-tracking branch 'origin/dev' into issue/SPAL-15

# Conflicts: # Lombiq.HelpfulExtensions/Extensions/Widgets/Startup.cs # Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj
Lombiq · Jun 19, 2023 · 24e56d0 · 24e56d0
2 parents a042ce8 + 4f6bb97
commit 24e56d0
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 32 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ node_modules/
 *.user
 .pnpm-debug.log
 .editorconfig
+*.orig
diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj b/Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj
@@ -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.0.0" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="7.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentTypes/Startup.cs b/Lombiq.HelpfulExtensions/Extensions/ContentTypes/Startup.cs
@@ -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;
 

diff --git a/Lombiq.HelpfulExtensions/Extensions/MigrationServiceCollectionExtensions.cs b/Lombiq.HelpfulExtensions/Extensions/MigrationServiceCollectionExtensions.cs
diff --git a/Lombiq.HelpfulExtensions/Extensions/SiteTexts/Startup.cs b/Lombiq.HelpfulExtensions/Extensions/SiteTexts/Startup.cs
@@ -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;

diff --git a/Lombiq.HelpfulExtensions/Extensions/Widgets/Startup.cs b/Lombiq.HelpfulExtensions/Extensions/Widgets/Startup.cs
@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
+using OrchardCore.Data.Migration;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Display.ContentDisplay;
 using OrchardCore.DisplayManagement.Handlers;

diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj
@@ -36,17 +36,17 @@
   </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.Rules.Abstractions" 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.Rules.Abstractions" Version="1.6.0" />
+    <PackageReference Include="OrchardCore.Workflows" Version="1.6.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
@@ -55,8 +55,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="5.1.1" />
-    <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" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,3 +9,4 @@ node_modules/ @@
     *.user
     .pnpm-debug.log
     .editorconfig
+    *.orig