Merge pull request #5 from Lombiq/issue/OSOE-751

OSOE-751: Upgrade to Orchard Core 1.8
Lombiq · Feb 21, 2024 · 96db38c · 96db38c
2 parents 352cc42 + 9364da8
commit 96db38c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj b/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.Tests.UI" Version="8.2.1-alpha.16.osoe-771" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="8.2.1-alpha.22.osoe-751" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Lombiq.Walkthroughs/Assets/Scripts/walkthroughs.js b/Lombiq.Walkthroughs/Assets/Scripts/walkthroughs.js
@@ -3586,7 +3586,7 @@ jQuery(($) => {
                         title: 'Deployment',
                         text: `Here you can use <em>"File Download"</em> so the exported <em>recipe.json</em> file will 
                             be downloaded (inside a zip file).`,
-                        attachTo: { element: '.btn.btn-primary.btn-sm[href*="ExportFile"]', on: 'top' },
+                        attachTo: { element: '.btn.btn-primary.btn-sm[href*="ExportFile"]', on: 'right' },
                         buttons: [
                             backButton,
                         ],

diff --git a/Lombiq.Walkthroughs/Filters/WalkthroughsButtonFilter.cs b/Lombiq.Walkthroughs/Filters/WalkthroughsButtonFilter.cs
@@ -3,7 +3,7 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.Layout;
-using System;
+using OrchardCore.Modules;
 using System.Threading.Tasks;
 
 namespace Lombiq.Walkthroughs.Filters;

diff --git a/Lombiq.Walkthroughs/Lombiq.Walkthroughs.csproj b/Lombiq.Walkthroughs/Lombiq.Walkthroughs.csproj
@@ -3,7 +3,7 @@
   <Import Condition="'$(NuGetBuild)' != 'true'" Project="..\..\..\Utilities\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions.props" />
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;node_modules\**;Tests\**</DefaultItemExcludes>
   </PropertyGroup>
@@ -36,11 +36,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.ContentFields" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.ContentFields" Version="1.8.2" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
@@ -49,8 +49,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.3.2" />
-    <PackageReference Include="Lombiq.HelpfulLibraries" Version="8.1.0" />
+    <PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.3.3-alpha.0.osoe-751" />
+    <PackageReference Include="Lombiq.HelpfulLibraries" Version="8.1.1-alpha.7.osoe-751" />
   </ItemGroup>
 
   <Import Condition="'$(NuGetBuild)' != 'true'" Project="..\..\..\Utilities\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions.targets" />

diff --git a/Lombiq.Walkthroughs/Manifest.cs b/Lombiq.Walkthroughs/Manifest.cs
@@ -14,9 +14,9 @@
     Name = "Lombiq Walkthroughs",
     Category = "Content",
     Description = "Module for enabling the walkthroughs.",
-    Dependencies = new[]
-    {
+    Dependencies =
+    [
         "OrchardCore.Contents",
         "OrchardCore.ResourceManagement",
-    }
+    ]
 )]