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

OSOE-751: Upgrade to Orchard Core 1.8
Lombiq · Feb 21, 2024 · 832018d · 832018d
2 parents 39b6f30 + c34acc4
commit 832018d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/Lombiq.UIKit.Tests.UI/Lombiq.UIKit.Tests.UI.csproj b/Lombiq.UIKit.Tests.UI/Lombiq.UIKit.Tests.UI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -25,7 +25,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.UIKit/Extensions/AttributeExtension.cs b/Lombiq.UIKit/Extensions/AttributeExtension.cs
@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
 
 namespace Lombiq.UIKit.Extensions;
 
@@ -23,5 +22,5 @@ public static bool RequiredAttributeExists(this ModelMetadata metaData) =>
                 .ContainerType
                 .GetProperty(metaData.PropertyName)
                 .GetCustomAttributes(typeof(RequiredAttribute), inherit: false)
-                .Any());
+                .Length != 0);
 }
diff --git a/Lombiq.UIKit/Lombiq.UIKit.csproj b/Lombiq.UIKit/Lombiq.UIKit.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,10 +36,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Contents" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Contents" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.8.2" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
@@ -48,8 +48,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.UIKit/Manifest.cs b/Lombiq.UIKit/Manifest.cs
@@ -21,5 +21,5 @@
     Name = "Lombiq UI Kit - Showcase page",
     Category = "Development",
     Description = "You can reach the showcase page under /UIKitShowcase",
-    Dependencies = new[] { "Lombiq.UIKit" }
+    Dependencies = ["Lombiq.UIKit"]
 )]