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

OSOE-751: Upgrade to Orchard Core 1.8
Lombiq · Feb 21, 2024 · 4616c50 · 4616c50
2 parents 5c6e645 + 18e19f6
commit 4616c50
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/Lombiq.JsonEditor.Test.UI/Lombiq.JsonEditor.Tests.UI.csproj b/Lombiq.JsonEditor.Test.UI/Lombiq.JsonEditor.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.1.0-alpha.1.osoe-638" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="8.2.1-alpha.22.osoe-751" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Lombiq.JsonEditor/Controllers/AdminController.cs b/Lombiq.JsonEditor/Controllers/AdminController.cs
@@ -1,4 +1,4 @@
-using AngleSharp.Common;
+using AngleSharp.Common;
 using Lombiq.HelpfulLibraries.OrchardCore.Contents;
 using Lombiq.HelpfulLibraries.OrchardCore.DependencyInjection;
 using Lombiq.HelpfulLibraries.OrchardCore.Mvc;
@@ -77,7 +77,7 @@ await _contentManager.GetAsync(contentItemId, VersionOptions.Latest) is not { }
         });
         await _layoutAccessor.AddShapeToZoneAsync("Title", titleShape);
 
-        var definition = _contentDefinitionManager.GetTypeDefinition(contentItem.ContentType);
+        var definition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
         return View(new EditContentItemViewModel(contentItem, definition, JsonConvert.SerializeObject(contentItem)));
     }
 

diff --git a/Lombiq.JsonEditor/Lombiq.JsonEditor.csproj b/Lombiq.JsonEditor/Lombiq.JsonEditor.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,12 +36,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Contents" 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.Contents" 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'">
@@ -50,8 +50,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="8.0.3-alpha.0.lmbq-249" />
-    <PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.3.2" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="8.1.1-alpha.7.osoe-751" />
+    <PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.3.3-alpha.0.osoe-751" />
   </ItemGroup>
 
   <Import Condition="'$(NuGetBuild)' != 'true'" Project="..\..\..\Utilities\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions.targets" />

diff --git a/Lombiq.JsonEditor/Manifest.cs b/Lombiq.JsonEditor/Manifest.cs
@@ -14,20 +14,20 @@
     Name = "Lombiq JSON Editor",
     Category = "Content",
     Description = "Module for displaying a JSON Editor like on jsoneditoronline.org.",
-    Dependencies = new[]
-    {
+    Dependencies =
+    [
         "OrchardCore.Contents",
         "OrchardCore.ResourceManagement",
-    }
+    ]
 )]
 
 [assembly: Feature(
     Id = ContentEditor,
     Name = "Lombiq JSON Content Editor",
     Category = "Content",
     Description = "Adds an actions menu item to the content item list for editing them as JSON.",
-    Dependencies = new[]
-    {
+    Dependencies =
+    [
         Default,
-    }
+    ]
 )]
diff --git a/Lombiq.JsonEditor/Views/JsonField.Edit.cshtml b/Lombiq.JsonEditor/Views/JsonField.Edit.cshtml
@@ -10,7 +10,7 @@
 }
 
 <div class="form-group">
-    <label>@Model.PartFieldDefinition.DisplayName()</label>
+    <label class="form-label">@Model.PartFieldDefinition.DisplayName()</label>
     <json-editor
         json="@Model.Value"
         options="@options"