Merge pull request #136 from Lombiq/issue/OSOE-548

OSOE-548: Upgrade to Orchard Core 1.6 in Orchard-Data-Tables
Lombiq · Jun 18, 2023 · 6403cf2 · 6403cf2
2 parents 77e3064 + bdfb653
commit 6403cf2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 20 deletions.
diff --git a/Lombiq.DataTables.Samples/Lombiq.DataTables.Samples.csproj b/Lombiq.DataTables.Samples/Lombiq.DataTables.Samples.csproj
@@ -34,8 +34,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.ContentFields" Version="1.5.0" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.ContentFields" Version="1.6.0" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.6.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Lombiq.DataTables.Samples/Views/Sample/DataTableTagHelper.cshtml b/Lombiq.DataTables.Samples/Views/Sample/DataTableTagHelper.cshtml
@@ -1,4 +1,3 @@
-@using System.Globalization
 @model IEnumerable<Lombiq.DataTables.Samples.Models.EmployeePart>
 @* This is a static data table. It simply adds the script and stylesheet resources to the page, otherwise it behaves
     like a zero configuration DataTable (https://datatables.net/examples/basic_init/zero_configuration.html). But you
@@ -8,13 +7,6 @@
 
 @* Always make sure Views/_ViewImports.cshtml has "@addTagHelper *, Lombiq.DataTables" for the tag helper. *@
 
-@{
-    // Forces the CultureInfo to use the canonical date format. This prevents user or system level customizations. We
-    // need this for the UI tests to work in a portable way. This is a temporary workaround,  and the problem has been
-    // reported and a general solution requested here: https://github.com/OrchardCMS/OrchardCore/issues/11228
-    var cultureInfo = new CultureInfo(CultureInfo.CurrentCulture.Name, useUserOverride: false);
-}
-
 <datatable data-options='{ "order": [[ 3, "desc" ]] }'>
     <thead>
         <tr>
@@ -39,7 +31,7 @@
                 <td data-order="@(employee.StartDate.Value?.Ticks ?? 0)">
                     @if (employee.StartDate.Value is { } startDate)
                     {
-                        @startDate.ToString("d", cultureInfo)
+                        @startDate.ToString("d")
                     }
                 </td>
                 <td data-order="@(employee.Salary.Value ?? 0)">

diff --git a/Lombiq.DataTables/Lombiq.DataTables.csproj b/Lombiq.DataTables/Lombiq.DataTables.csproj
@@ -39,11 +39,11 @@
 
   <ItemGroup>
     <PackageReference Include="ClosedXML" Version="0.101.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
-    <PackageReference Include="OrchardCore.Contents" Version="1.5.0" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.5.0" />
-    <PackageReference Include="OrchardCore.Search.Lucene" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.Contents" Version="1.6.0" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.6.0" />
+    <PackageReference Include="OrchardCore.Search.Lucene" Version="1.6.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
@@ -53,9 +53,9 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="5.2.0" />
-    <PackageReference Include="Lombiq.HelpfulLibraries.LinqToDb" Version="5.2.0" />
-    <PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.2.3" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="6.0.0" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.LinqToDb" 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" />

diff --git a/Lombiq.DataTables/Tests/Lombiq.DataTables.Tests.UI/Lombiq.DataTables.Tests.UI.csproj b/Lombiq.DataTables/Tests/Lombiq.DataTables.Tests.UI/Lombiq.DataTables.Tests.UI.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.Tests.UI" Version="6.1.0" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Lombiq.DataTables/Tests/Lombiq.DataTables.Tests/Lombiq.DataTables.Tests.csproj b/Lombiq.DataTables/Tests/Lombiq.DataTables.Tests/Lombiq.DataTables.Tests.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="OrchardCore.Liquid" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.Liquid" Version="1.6.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>