Merge pull request #216 from Lombiq/issue/OSOE-682

OSOE-682: Upgrading Lombiq.HelpfulLibraries to OrchardCore 1.7
Lombiq · Sep 11, 2023 · 3625d4c · 3625d4c
2 parents 8dbec02 + 98f2ec0
commit 3625d4c
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 42 deletions.
diff --git a/Lombiq.HelpfulLibraries.LinqToDb/Lombiq.HelpfulLibraries.LinqToDb.csproj b/Lombiq.HelpfulLibraries.LinqToDb/Lombiq.HelpfulLibraries.LinqToDb.csproj
@@ -25,6 +25,6 @@
 
   <ItemGroup>
     <PackageReference Include="linq2db" Version="5.2.2" />
-    <PackageReference Include="OrchardCore.Data.YesSql" Version="1.6.0" />
+    <PackageReference Include="OrchardCore.Data.YesSql" Version="1.7.0" />
   </ItemGroup>
 </Project>
diff --git a/Lombiq.HelpfulLibraries.OrchardCore/Contents/ContentOrchardHelperExtensions.cs b/Lombiq.HelpfulLibraries.OrchardCore/Contents/ContentOrchardHelperExtensions.cs
@@ -37,20 +37,6 @@ public static string GetItemEditUrl(this IOrchardHelper orchardHelper, string co
         return urlHelper.EditContentItem(contentItemId);
     }
 
-    /// <summary>
-    /// Gets the given content item's display URL.
-    /// </summary>
-    [Obsolete($"Use {nameof(GetItemDisplayUrl)} instead as this method does not need to be async.")]
-    public static Task<string> GetItemDisplayUrlAsync(this IOrchardHelper orchardHelper, ContentItem contentItem) =>
-        Task.FromResult(orchardHelper.GetItemDisplayUrl(contentItem));
-
-    /// <summary>
-    /// Gets the given content item's display URL.
-    /// </summary>
-    [SuppressMessage("Design", "CA1055:URI-like return values should not be strings", Justification = "It only returns relative URL.")]
-    public static string GetItemDisplayUrl(this IOrchardHelper orchardHelper, ContentItem contentItem) =>
-        orchardHelper.GetItemDisplayUrl(contentItem?.ContentItemId);
-
     /// <summary>
     /// Gets the given content item's display URL.
     /// </summary>

diff --git a/Lombiq.HelpfulLibraries.OrchardCore/Data/IManualConnectingIndexService.cs b/Lombiq.HelpfulLibraries.OrchardCore/Data/IManualConnectingIndexService.cs
@@ -34,7 +34,7 @@ public interface IManualConnectingIndexService<in T>
     /// created just on call.
     /// </param>
     /// <param name="session">If not null, its connection and transaction is used instead of creating a new one.</param>
-    Task AddAsync(T item, ISession session, int? setDocumentId = null);
+    Task AddAsync(T item, ISession session, long? setDocumentId = null);
 
     /// <summary>
     /// Removes one or more existing indices using a standard SQL query where the given column has the given <paramref
@@ -54,7 +54,7 @@ public static class ManualConnectingIndexServiceExtensions
     /// <typeparam name="T">The index to operate on.</typeparam>
     public static Task RemoveByIndexAsync<T>(
         this IManualConnectingIndexService<T> service,
-        int documentId,
+        long documentId,
         ISession session)
         where T : MapIndex =>
         service.RemoveAsync("DocumentId", documentId, session);

diff --git a/Lombiq.HelpfulLibraries.OrchardCore/Data/ManualConnectingIndexService.cs b/Lombiq.HelpfulLibraries.OrchardCore/Data/ManualConnectingIndexService.cs
@@ -41,7 +41,7 @@ public ManualConnectingIndexService(
         _keys = string.Join(", ", _properties.Keys.Select(key => "@" + key));
     }
 
-    public Task AddAsync(T item, ISession session, int? setDocumentId = null) =>
+    public Task AddAsync(T item, ISession session, long? setDocumentId = null) =>
         RunTransactionAsync(session, async (connection, transaction, dialect, name) =>
         {
             _documentIdKey ??= dialect.QuoteForColumnName("DocumentId");

diff --git a/Lombiq.HelpfulLibraries.OrchardCore/Lombiq.HelpfulLibraries.OrchardCore.csproj b/Lombiq.HelpfulLibraries.OrchardCore/Lombiq.HelpfulLibraries.OrchardCore.csproj
@@ -24,26 +24,26 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Alias" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.Autoroute" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.Html" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.Markdown" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.Media.Core" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.Taxonomies" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.ContentManagement.Abstractions" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.FileStorage.Abstractions" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.Queries" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.Users.Core" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.Title" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.Themes" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.Email.Abstractions" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.Infrastructure" Version="1.6.0" />
+    <PackageReference Include="OrchardCore.Alias" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.Autoroute" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.Html" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.Markdown" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.Media.Core" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.Taxonomies" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.ContentManagement.Abstractions" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.FileStorage.Abstractions" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.Queries" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.Users.Core" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.Title" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.Themes" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.Email.Abstractions" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.Infrastructure" Version="1.7.0" />
     <PackageReference Include="NodaTime" Version="3.1.9" />
     <!-- Necessary so tag helpers will work in the projects depending on this. -->
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="1.6.0" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="1.7.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Lombiq.HelpfulLibraries.Samples/Lombiq.HelpfulLibraries.Samples.csproj b/Lombiq.HelpfulLibraries.Samples/Lombiq.HelpfulLibraries.Samples.csproj
@@ -12,12 +12,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.ContentFields" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.6.0" />
-    <PackageReference Include="OrchardCore.Autoroute" Version="1.6.0" />
+    <PackageReference Include="OrchardCore.ContentFields" Version="1.7.0" />
+    <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.Autoroute" Version="1.7.0" />
   </ItemGroup>
 
   <ItemGroup>