Merge pull request #165 from Lombiq/issue/OSOE-392

OSOE-392: Upgrade to Orchard Core 1.5 in Helpful-Libraries
Lombiq · Dec 6, 2022 · 1e4076d · 1e4076d
2 parents 4de643c + cfbeec8
commit 1e4076d
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 101 deletions.
diff --git a/Lombiq.HelpfulLibraries.Common/Extensions/RNGCryptoServiceProviderExtensions.cs b/Lombiq.HelpfulLibraries.Common/Extensions/RNGCryptoServiceProviderExtensions.cs
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="4.3.0" />
-    <PackageReference Include="OrchardCore.Data.YesSql" Version="1.4.0" />
+    <PackageReference Include="OrchardCore.Data.YesSql" Version="1.5.0" />
   </ItemGroup>
 </Project>
diff --git a/Lombiq.HelpfulLibraries.OrchardCore/Data/ManualConnectingIndexService.cs b/Lombiq.HelpfulLibraries.OrchardCore/Data/ManualConnectingIndexService.cs
@@ -82,7 +82,9 @@ async Task<TOut> Run(
         {
             _tablePrefix ??= session?.Store.Configuration.TablePrefix;
             var dialect = session?.Store.Configuration.SqlDialect;
-            var quotedTableName = dialect?.QuoteForTableName(_tablePrefix + _type.Name);
+            var quotedTableName = dialect?.QuoteForTableName(
+                _tablePrefix + _type.Name,
+                session?.Store.Configuration.Schema);
 
             var result = await request(transaction.Connection, transaction, dialect, quotedTableName);
             if (doCommit) await transaction.CommitAsync();

diff --git a/Lombiq.HelpfulLibraries.OrchardCore/Data/SessionExtensions.cs b/Lombiq.HelpfulLibraries.OrchardCore/Data/SessionExtensions.cs
@@ -73,6 +73,7 @@ private static string GetQuery(
     {
         var parserResult = SqlParser.TryParse(
             sql,
+            session.Store.Configuration.Schema,
             session.Store.Configuration.SqlDialect,
             session.Store.Configuration.TablePrefix,
             parameters: null,
@@ -106,7 +107,7 @@ public static async Task<bool> UpdateDocumentDirectlyAsync(this ISession session
         var tableName = session.Store.Configuration.TablePrefix +
             session.Store.Configuration.TableNameConvention.GetDocumentTable();
 
-        var sql = @$"UPDATE {dialect.QuoteForTableName(tableName)}
+        var sql = @$"UPDATE {dialect.QuoteForTableName(tableName, session.Store.Configuration.Schema)}
                 SET {dialect.QuoteForColumnName("Content")} = @Content
                 WHERE {dialect.QuoteForColumnName("Id")} = @Id";
 

diff --git a/Lombiq.HelpfulLibraries.OrchardCore/Data/TransactionSqlDialectFactory.cs b/Lombiq.HelpfulLibraries.OrchardCore/Data/TransactionSqlDialectFactory.cs
diff --git a/Lombiq.HelpfulLibraries.OrchardCore/GraphQL/TotalOfContentTypeBuilder.cs b/Lombiq.HelpfulLibraries.OrchardCore/GraphQL/TotalOfContentTypeBuilder.cs
@@ -1,7 +1,6 @@
 using GraphQL.Types;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
-using OrchardCore.Apis.GraphQL;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.GraphQL.Queries.Types;
 using OrchardCore.ContentManagement.Metadata.Models;
@@ -30,7 +29,7 @@ public void Build(FieldType contentQuery, ContentTypeDefinition contentTypeDefin
 
         builder.ResolveAsync(async context =>
         {
-            var serviceProvider = context.ResolveServiceProvider();
+            var serviceProvider = context.RequestServices;
             var session = serviceProvider.GetService<ISession>();
             return await session.QueryIndex<ContentItemIndex>(index =>
                 index.Published &&

diff --git a/Lombiq.HelpfulLibraries.OrchardCore/Liquid/LiquidTemplateManagerExtensions.cs b/Lombiq.HelpfulLibraries.OrchardCore/Liquid/LiquidTemplateManagerExtensions.cs
diff --git a/Lombiq.HelpfulLibraries.OrchardCore/Lombiq.HelpfulLibraries.OrchardCore.csproj b/Lombiq.HelpfulLibraries.OrchardCore/Lombiq.HelpfulLibraries.OrchardCore.csproj
@@ -24,26 +24,25 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Alias" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.Autoroute" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.Markdown" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.Media.Core" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.Taxonomies" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.ContentManagement.Abstractions" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.FileStorage.Abstractions" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.Queries" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.Users.Core" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.Title" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.Themes" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.Email.Abstractions" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.Infrastructure" Version="1.4.0" />
-    <PackageReference Include="NodaTime" Version="3.1.4" />
-    <!-- Can't update to YesSql.Abstractions v3.1.0 or later until an Orchard upgrade. -->
-    <PackageReference Include="YesSql.Abstractions" Version="3.0.12" />
+    <PackageReference Include="OrchardCore.Alias" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.Autoroute" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.Markdown" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.Media.Core" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.Taxonomies" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.ContentManagement.Abstractions" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.FileStorage.Abstractions" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.Queries" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.Users.Core" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.Title" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.Themes" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.Email.Abstractions" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.Infrastructure" Version="1.5.0" />
+    <PackageReference Include="NodaTime" Version="3.1.5" />
+    <PackageReference Include="YesSql.Abstractions" Version="3.2.0" />
     <!-- Necessary so tag helpers will work in the projects depending on this. -->
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.4.0" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Lombiq.HelpfulLibraries.Samples/Controllers/LinqToDbSamplesController.cs b/Lombiq.HelpfulLibraries.Samples/Controllers/LinqToDbSamplesController.cs
@@ -2,6 +2,7 @@
 using Lombiq.HelpfulLibraries.LinqToDb;
 using Lombiq.HelpfulLibraries.Samples.Models;
 using Microsoft.AspNetCore.Mvc;
+using OrchardCore.Autoroute.Core.Indexes;
 using OrchardCore.ContentManagement.Records;
 using System;
 using System.Collections.Generic;

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.4.0" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.Autoroute" Version="1.4.0" />
+    <PackageReference Include="OrchardCore.ContentFields" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.5.0" />
+    <PackageReference Include="OrchardCore.Autoroute" Version="1.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Lombiq.HelpfulLibraries.Samples/Startup.cs b/Lombiq.HelpfulLibraries.Samples/Startup.cs
@@ -11,8 +11,8 @@ public class Startup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<IDataMigration, BookRecordMigrations>();
-        services.AddScoped<IDataMigration, ExpressionSampleMigration>();
+        services.AddDataMigration<BookRecordMigrations>();
+        services.AddDataMigration<ExpressionSampleMigration>();
         services.AddScoped<INavigationProvider, HelpfulLibrariesNavigationProvider>();
     }
 }