Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OSOE-682: Upgrading Lombiq.HelpfulLibraries to OrchardCore 1.7 #216

Merged
merged 6 commits into from
Sep 11, 2023
Merged

OSOE-682: Upgrading Lombiq.HelpfulLibraries to OrchardCore 1.7 #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e328620
Upgrading projects to OrchardCore 1.7.
Psichorex Sep 6, 2023
0d70725
Fixing breaking change.
Psichorex Sep 6, 2023
6efbadb
Using long instead of int.
Psichorex Sep 6, 2023
7659360
Using long instead of int.
Psichorex Sep 6, 2023
183b4b2
Removing GetItemDisplayUrlAsync.
Psichorex Sep 7, 2023
98f2ec0
Merge remote-tracking branch 'origin/dev' into issue/OSOE-682
Psichorex Sep 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Lombiq.HelpfulLibraries.LinqToDb/Lombiq.HelpfulLibraries.LinqToDb.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
14 changes: 0 additions & 14 deletions Lombiq.HelpfulLibraries.OrchardCore/Contents/ContentOrchardHelperExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions Lombiq.HelpfulLibraries.OrchardCore/Data/IManualConnectingIndexService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion Lombiq.HelpfulLibraries.OrchardCore/Data/ManualConnectingIndexService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
36 changes: 18 additions & 18 deletions Lombiq.HelpfulLibraries.OrchardCore/Lombiq.HelpfulLibraries.OrchardCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 6 additions & 6 deletions Lombiq.HelpfulLibraries.Samples/Lombiq.HelpfulLibraries.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down