OSOE-925: Upgrade OC preview

Lombiq.TrainingDemo.Tests/Lombiq.TrainingDemo.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
@@ -18,7 +18,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
-    <PackageReference Include="Moq.AutoMock" Version="3.5.0" />
+    <PackageReference Include="Moq.AutoMock" Version="4.0.1" />
     <PackageReference Include="Shouldly" Version="4.3.0" />
     <PackageReference Include="xunit.v3" Version="3.2.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">

Lombiq.TrainingDemo.Web/Lombiq.TrainingDemo.Web.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <OrchardCoreVersion>2.2.1</OrchardCoreVersion>
+    <OrchardCoreVersion>3.0.0</OrchardCoreVersion>
   </PropertyGroup>
 
   <ItemGroup>

Lombiq.TrainingDemo.slnx

@@ -0,0 +1,19 @@
+<Solution>
+  <Folder Name="/.github/" />
+  <Folder Name="/.github/workflows/">
+    <File Path=".github/workflows/build-and-test.yml" />
+    <File Path=".github/workflows/create-jira-issues-for-community-activities.yml" />
+    <File Path=".github/workflows/validate-pull-request.yml" />
+  </Folder>
+  <Folder Name="/Solution Items/">
+    <File Path=".gitattributes" />
+    <File Path=".gitignore" />
+    <File Path="License.md" />
+    <File Path="NuGet.config" />
+    <File Path="Readme.md" />
+    <File Path="Reset-Local.ps1" />
+  </Folder>
+  <Project Path="Lombiq.TrainingDemo.Tests/Lombiq.TrainingDemo.Tests.csproj" />
+  <Project Path="Lombiq.TrainingDemo.Web/Lombiq.TrainingDemo.Web.csproj" />
+  <Project Path="Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj" />
+</Solution>

Lombiq.TrainingDemo/Controllers/AdminController.cs

@@ -62,7 +62,7 @@ public async Task<IActionResult> PersonListNewest()
             .Where(index => index.ContentType == ContentTypes.PersonPage)
             .OrderByDescending(index => index.CreatedUtc)
             .Take(10)
-            .ListAsync();
+            .ListAsync(HttpContext.RequestAborted);
 
         // In the Views/Admin/PersonList.cshtml file you can see how shape lists (IEnumerable<dynamic>) are displayed.
         return View("PersonList", await GetShapesAsync(persons));
@@ -81,7 +81,7 @@ public async Task<IActionResult> PersonListOldest()
             .Where(index => index.ContentType == ContentTypes.PersonPage)
             .OrderBy(index => index.CreatedUtc)
             .Take(10)
-            .ListAsync();
+            .ListAsync(HttpContext.RequestAborted);
 
         return View("PersonList", await GetShapesAsync(persons));
     }

Lombiq.TrainingDemo/Controllers/DatabaseStorageController.cs

@@ -65,7 +65,7 @@ public async Task<IActionResult> CreateBooksPost()
         foreach (var book in CreateDemoBooks())
         {
             // So now you understand what will happen in the background when this service is being called.
-            await _session.SaveAsync(book);
+            await _session.SaveAsync(book, cancellationToken: HttpContext.RequestAborted);
         }
 
         await _notifier.InformationAsync(H["Books have been created in the database."]);
@@ -84,7 +84,7 @@ public async Task<IActionResult> JKRosenzweigBooks()
             // In the .Where() method you can describe a lambda where the object will be the index object.
             .Where(index => index.Author == "J.K. (Joanne) Rosenzweig")
             // When the query is built up you can call ListAsync() to execute it. This will return a list of books.
-            .ListAsync();
+            .ListAsync(HttpContext.RequestAborted);
 
         // Now this is what we possibly understand now, we will create a list of display shapes from the previously
         // fetched books. Note how we use the AwaitEachAsync() extension to run async operations sequentially. This is

Lombiq.TrainingDemo/Controllers/PersonListController.cs

@@ -57,7 +57,7 @@ public async Task<IActionResult> OlderThan30()
             // threshold date. Notice that there is no Where method. The Query method has an overload for that which can
             // be useful if you don't want to filter in multiple indexes.
             .Query<ContentItem, PersonPartIndex>(index => index.BirthDateUtc < thresholdDate)
-            .ListAsync();
+            .ListAsync(HttpContext.RequestAborted);
 
         // Now let's build the display shape for a content item! Notice that this is not the IDisplayManager service.
         // The IContentItemDisplayManager is an abstraction over that and it's specifically for content items. The
@@ -92,7 +92,7 @@ public async Task<string> FountainOfEternalYouth()
         var thresholdDate = _clock.UtcNow.AddYears(-90);
         var oldPeople = (await _session
             .Query<ContentItem, PersonPartIndex>(index => index.BirthDateUtc < thresholdDate)
-            .ListAsync())
+            .ListAsync(HttpContext.RequestAborted))
             .ToList();
 
         foreach (var person in oldPeople)
@@ -136,7 +136,7 @@ public async Task<string> FountainOfEternalYouth()
 
         return "People modified: " +
             (oldPeople.Count != 0 ?
-                string.Join(", ", oldPeople.Select(person => person.As<PersonPart>().Name)) :
+                string.Join(", ", oldPeople.Select(person => person.GetOrCreate<PersonPart>().Name)) :
                 "Nobody. Did you create people older than 90?");
 
         // That was a quick intro to modifying content items from code. It's a lot more involved than this but it should
@@ -167,7 +167,7 @@ public async Task<string> CreateAnAndroid()
 
         // Watch out, this is different compared to editing existing content items! You can't do this within
         // person.Alter<PersonPart>(). You have to fetch the content part anew and alter the fields like this:
-        var personPart = person.As<PersonPart>();
+        var personPart = person.GetOrCreate<PersonPart>();
         personPart.Alter<TextField>(nameof(PersonPart.Biography), field => field.Text = "I'm sentient now!");
 
         // This is the point where we actually save the content item into the database. Note that it's saved as a draft.

Lombiq.TrainingDemo/Drivers/ColorFieldDisplayDriver.cs

@@ -74,7 +74,7 @@ public override async Task<IDisplayResult> UpdateAsync(ColorField field, UpdateF
 
         // Also some custom validation for our ColorField hex value.
         var isInvalidHexColor = !string.IsNullOrWhiteSpace(viewModel.Value) &&
-                                !RegexExpression().IsMatch(viewModel.Value);
+                                !RegexExpression.IsMatch(viewModel.Value);
 
         if (isInvalidHexColor) updater.ModelState.AddModelError(Prefix, T["The given color is invalid."]);
 
@@ -85,7 +85,7 @@ public override async Task<IDisplayResult> UpdateAsync(ColorField field, UpdateF
     }
 
     [GeneratedRegex("^#([A-Fa-f0-9]{8}|[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$", RegexOptions.ExplicitCapture, matchTimeoutMilliseconds: 1000)]
-    private static partial Regex RegexExpression();
+    private static partial Regex RegexExpression { get; }
 }
 
 // END OF TRAINING SECTION: Content Field development

Lombiq.TrainingDemo/Events/LoginGreeting.cs

@@ -5,6 +5,9 @@
  * login events.
  */
 
+#nullable enable
+
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Localization;
 using OrchardCore.DisplayManagement.Notify;
 using OrchardCore.Users;
@@ -15,7 +18,7 @@
 namespace Lombiq.TrainingDemo.Events;
 
 // ILoginFormEvent exposes events of the, well, login form :). Useful to display a login greeting or anything even more
-// useful! The rest of it is pretty standard and we just use INotifier again.
+// useful! The rest of it is pretty standard, and we just use INotifier again.
 public class LoginGreeting : ILoginFormEvent
 {
     private readonly INotifier _notifier;
@@ -29,15 +32,14 @@ public LoginGreeting(INotifier notifier, IHtmlLocalizer<LoginGreeting> htmlLocal
 
     public Task IsLockedOutAsync(IUser user) => Task.CompletedTask;
 
-    public async Task LoggedInAsync(IUser user)
-    {
+    public async Task LoggedInAsync(IUser user) =>
         await _notifier.SuccessAsync(H["Hi {0}!", user.UserName]);
 
-        return;
-    }
-
     public Task LoggingInAsync(string userName, Action<string, string> reportError) => Task.CompletedTask;
 
+    public Task<IActionResult?> LoggingInAsync() => Task.FromResult<IActionResult?>(null);
+    public Task<IActionResult?> ValidatingLoginAsync(IUser user) => Task.FromResult<IActionResult?>(null);
+
     public Task LoggingInFailedAsync(string userName) => Task.CompletedTask;
 
     public Task LoggingInFailedAsync(IUser user) => Task.CompletedTask;

Lombiq.TrainingDemo/GraphQL/Services/ContentItemTypeBuilder.cs

@@ -40,6 +40,11 @@ public void Build(
         AddFilter(contentQuery, "_ne");
     }
 
+    public void Clear()
+    {
+        // Nothing to do here.
+    }
+
     private static void AddFilter(FieldType contentQuery, string suffix)
     {
         var argument = new QueryArgument<IntGraphType>

Lombiq.TrainingDemo/GraphQL/Services/PersonAgeGraphQLFilter.cs

@@ -42,7 +42,7 @@ public Task<IEnumerable<ContentItem>> PostQueryAsync(
             var filterType = name[^2..]; // The name operator like gt, le, etc.
 
             contentItems = contentItems.Where(item =>
-                item.As<PersonPart>()?.BirthDateUtc is { } birthDateUtc &&
+                item.GetMaybe<PersonPart>()?.BirthDateUtc is { } birthDateUtc &&
                 Filter((now - birthDateUtc).TotalYears(), age, filterType));
         }
 

Lombiq.TrainingDemo/GraphQL/Services/PersonPartWhereInputObjectGraphType.cs

@@ -1,6 +1,7 @@
 using GraphQL.Types;
 using Lombiq.TrainingDemo.Indexes;
 using Lombiq.TrainingDemo.Models;
+using Microsoft.Extensions.Localization;
 using OrchardCore.Apis.GraphQL.Queries;
 using static Lombiq.TrainingDemo.GraphQL.Services.PersonPartObjectGraphType;
 
@@ -10,7 +11,8 @@ namespace Lombiq.TrainingDemo.GraphQL.Services;
 // automatically generate YesSql logic for database-side filtering.
 public class PersonPartWhereInputObjectGraphType : WhereInputObjectGraphType<PersonPart>
 {
-    public PersonPartWhereInputObjectGraphType()
+    public PersonPartWhereInputObjectGraphType(IStringLocalizer<PersonPartWhereInputObjectGraphType> stringLocalizer)
+        : base(stringLocalizer)
     {
         // Since filters depend on the index, we use their "nameof" as reference.
         AddScalarFilterFields<DateTimeGraphType>(nameof(PersonPartIndex.BirthDateUtc), BirthDateDescription);

Lombiq.TrainingDemo/Handlers/PersonPartHandler.cs

@@ -6,7 +6,7 @@ namespace Lombiq.TrainingDemo.Handlers;
 
 // Handlers are basically event handlers for content parts and content items. When you ask something like "how can I run
 // my code when my content part is published?" most possibly the answer will be to write a handler. This one here is a
-// handler for a content part but you could similarly have a handler for whole content items by inheriting from
+// handler for a content part, but you could similarly have a handler for whole content items by inheriting from
 // ContentHandlerBase.
 public class PersonPartHandler : ContentPartHandler<PersonPart>
 {
@@ -16,10 +16,18 @@ public class PersonPartHandler : ContentPartHandler<PersonPart>
     // content item is updated. Check out all the other events that you can use!
     public override Task UpdatedAsync(UpdateContentContext context, PersonPart part)
     {
+        // Note that the Title Part already does this specific thing. So if that's all you wanted from a handler than
+        // using Title Part instead of a custom field and handler combination makes more sense.
         context.ContentItem.DisplayText = part.Name;
 
         return Task.CompletedTask;
     }
+
+    // If you've ever used Orchard Core before 3.0, "UpdatedAsync" used to be called during content item creation as
+    // well. Since 3.0 it's intentionally not the case, so you have to apply such a bridge code if you use "Updating*"
+    // or "Updated*" methods. Alternatively, put the shared code in a private method and call it from both.
+    public override Task CreatedAsync(CreateContentContext context, PersonPart part) =>
+        UpdatedAsync(new UpdateContentContext(context.ContentItem), part);
 }
 
 // END OF TRAINING SECTION: Content Item display management and queries

Lombiq.TrainingDemo/Indexes/PersonPartIndex.cs

@@ -37,7 +37,7 @@ public override void Describe(DescribeContext<ContentItem> context) =>
             // https://github.com/sebastienros/yessql/wiki/Tutorial
             .Map(contentItem =>
             {
-                var personPart = contentItem.As<PersonPart>();
+                var personPart = contentItem.GetOrCreate<PersonPart>();
 
                 return new PersonPartIndex
                 {