From a8205ffd3ba7b054084a00ce2ab7457f84338e51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Tue, 28 May 2024 11:47:45 +0200
Subject: [PATCH 01/27] Update OC preview version.

---
 .../Lombiq.TrainingDemo.csproj                | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
index 711ff85b..ea33cbe7 100644
--- a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
+++ b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
@@ -22,24 +22,24 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18200" />
-    <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="2.0.0-preview-18200" />
-    <PackageReference Include="OrchardCore.BackgroundTasks" Version="2.0.0-preview-18200" />
-    <PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18200" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18200" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18200" />
-    <PackageReference Include="OrchardCore.Data.Abstractions" Version="2.0.0-preview-18200" />
-    <PackageReference Include="OrchardCore.DynamicCache" Version="2.0.0-preview-18200" />
-    <PackageReference Include="OrchardCore.FileStorage.FileSystem" Version="2.0.0-preview-18200" />
-    <PackageReference Include="OrchardCore.Indexing.Abstractions" Version="2.0.0-preview-18200" />
-    <PackageReference Include="OrchardCore.Media.Abstractions" Version="2.0.0-preview-18200" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18222" />
+    <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="2.0.0-preview-18222" />
+    <PackageReference Include="OrchardCore.BackgroundTasks" Version="2.0.0-preview-18222" />
+    <PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18222" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18222" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18222" />
+    <PackageReference Include="OrchardCore.Data.Abstractions" Version="2.0.0-preview-18222" />
+    <PackageReference Include="OrchardCore.DynamicCache" Version="2.0.0-preview-18222" />
+    <PackageReference Include="OrchardCore.FileStorage.FileSystem" Version="2.0.0-preview-18222" />
+    <PackageReference Include="OrchardCore.Indexing.Abstractions" Version="2.0.0-preview-18222" />
+    <PackageReference Include="OrchardCore.Media.Abstractions" Version="2.0.0-preview-18222" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18222" />
     <!-- Note that you need to add a reference to OrchardCore.ResourceManagement for the basic tag helpers like <style>
     and <script> to properly work when the app is built for production (and thus Razor Runtime Compilation is turned
     off. OrchardCore.DisplayManagement is needed for a variety of things but also for the <shape> tag helper for the
     same reason. -->
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18200" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18222" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18222" />
   </ItemGroup>
 
   <!-- This module requires Lombiq.HelpfulLibraries.OrchardCore, and it can be included two ways. The PackageReference

From 3f6b261c507c084ebada56dee33cdbe2f15411c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Tue, 28 May 2024 12:23:52 +0200
Subject: [PATCH 02/27] Fix breaking changes.

---
 Lombiq.TrainingDemo.Tests/Services/TestedServiceTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lombiq.TrainingDemo.Tests/Services/TestedServiceTests.cs b/Lombiq.TrainingDemo.Tests/Services/TestedServiceTests.cs
index 49ab16c1..d853f072 100644
--- a/Lombiq.TrainingDemo.Tests/Services/TestedServiceTests.cs
+++ b/Lombiq.TrainingDemo.Tests/Services/TestedServiceTests.cs
@@ -45,7 +45,7 @@ public void NonExistingContentItemsShouldThrow()
 
         mocker
             .GetMock<IContentManager>()
-            .Verify(contentManager => contentManager.GetAsync(It.Is<string>(id => id == TestContentId)));
+            .Verify(contentManager => contentManager.GetAsync(It.Is<string>(id => id == TestContentId), It.IsAny<VersionOptions>()));
     }
 
     [Fact]
@@ -58,7 +58,7 @@ public async Task ContentItemsAreRetrieved()
         // Setting up an IContentManager mock that'll return a basic ContentItem placeholder.
         mocker
             .GetMock<IContentManager>()
-            .Setup(contentManager => contentManager.GetAsync(It.IsAny<string>()))
+            .Setup(contentManager => contentManager.GetAsync(It.IsAny<string>(), It.IsAny<VersionOptions>()))
             .ReturnsAsync<string, IContentManager, ContentItem>(id => new ContentItem { ContentItemId = id });
 
         var contentItem = await service.GetContentItemOrThrowAsync(TestContentId);

From 1b6868e3603da3383042d8b9a758d5f7d92faf08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Tue, 28 May 2024 12:44:06 +0200
Subject: [PATCH 03/27] grammar

---
 Lombiq.TrainingDemo.Tests/Services/TestedServiceTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lombiq.TrainingDemo.Tests/Services/TestedServiceTests.cs b/Lombiq.TrainingDemo.Tests/Services/TestedServiceTests.cs
index d853f072..7e5c3183 100644
--- a/Lombiq.TrainingDemo.Tests/Services/TestedServiceTests.cs
+++ b/Lombiq.TrainingDemo.Tests/Services/TestedServiceTests.cs
@@ -51,7 +51,7 @@ public void NonExistingContentItemsShouldThrow()
     [Fact]
     public async Task ContentItemsAreRetrieved()
     {
-        // In this test we'll mock IContentManager so it actually returns something we can then verify.
+        // In this test we'll mock IContentManager, so it actually returns something we can then verify.
 
         var service = CreateTestedService(out var mocker);
 
@@ -71,7 +71,7 @@ private static TestedService CreateTestedService(out AutoMocker mocker)
         // We're using a library called AutoMocker here. It extends the Moq mocking library with the ability to
         // automatically substitute injected dependencies with a mocked instance. It's a bit like a special dependency
         // injection container. This way, your tested classes will get all their dependencies injected even if you don't
-        // explicitly register a mock or stub for the.
+        // explicitly register a mock or stub.
 
         mocker = new AutoMocker();
         return mocker.CreateInstance<TestedService>();

From 4c5fcac8af05c35c9478bf88f530894b951a5e76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Tue, 28 May 2024 13:14:24 +0200
Subject: [PATCH 04/27] Bug fix.

---
 Lombiq.TrainingDemo.Tests/Services/TestedServiceTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.TrainingDemo.Tests/Services/TestedServiceTests.cs b/Lombiq.TrainingDemo.Tests/Services/TestedServiceTests.cs
index 7e5c3183..f663a1e9 100644
--- a/Lombiq.TrainingDemo.Tests/Services/TestedServiceTests.cs
+++ b/Lombiq.TrainingDemo.Tests/Services/TestedServiceTests.cs
@@ -59,7 +59,7 @@ public async Task ContentItemsAreRetrieved()
         mocker
             .GetMock<IContentManager>()
             .Setup(contentManager => contentManager.GetAsync(It.IsAny<string>(), It.IsAny<VersionOptions>()))
-            .ReturnsAsync<string, IContentManager, ContentItem>(id => new ContentItem { ContentItemId = id });
+            .ReturnsAsync<string, VersionOptions, IContentManager, ContentItem>((id, _) => new ContentItem { ContentItemId = id });
 
         var contentItem = await service.GetContentItemOrThrowAsync(TestContentId);
 

From 3092386f9be6df7ea14a39df3f2b2b95688bae85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Thu, 30 May 2024 13:48:52 +0200
Subject: [PATCH 05/27] Update OC preview version.

---
 .../Lombiq.TrainingDemo.csproj                | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
index ea33cbe7..b1bb3a0e 100644
--- a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
+++ b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
@@ -22,24 +22,24 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18222" />
-    <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="2.0.0-preview-18222" />
-    <PackageReference Include="OrchardCore.BackgroundTasks" Version="2.0.0-preview-18222" />
-    <PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18222" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18222" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18222" />
-    <PackageReference Include="OrchardCore.Data.Abstractions" Version="2.0.0-preview-18222" />
-    <PackageReference Include="OrchardCore.DynamicCache" Version="2.0.0-preview-18222" />
-    <PackageReference Include="OrchardCore.FileStorage.FileSystem" Version="2.0.0-preview-18222" />
-    <PackageReference Include="OrchardCore.Indexing.Abstractions" Version="2.0.0-preview-18222" />
-    <PackageReference Include="OrchardCore.Media.Abstractions" Version="2.0.0-preview-18222" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18222" />
+    <PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18226" />
+    <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="2.0.0-preview-18226" />
+    <PackageReference Include="OrchardCore.BackgroundTasks" Version="2.0.0-preview-18226" />
+    <PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18226" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18226" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18226" />
+    <PackageReference Include="OrchardCore.Data.Abstractions" Version="2.0.0-preview-18226" />
+    <PackageReference Include="OrchardCore.DynamicCache" Version="2.0.0-preview-18226" />
+    <PackageReference Include="OrchardCore.FileStorage.FileSystem" Version="2.0.0-preview-18226" />
+    <PackageReference Include="OrchardCore.Indexing.Abstractions" Version="2.0.0-preview-18226" />
+    <PackageReference Include="OrchardCore.Media.Abstractions" Version="2.0.0-preview-18226" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18226" />
     <!-- Note that you need to add a reference to OrchardCore.ResourceManagement for the basic tag helpers like <style>
     and <script> to properly work when the app is built for production (and thus Razor Runtime Compilation is turned
     off. OrchardCore.DisplayManagement is needed for a variety of things but also for the <shape> tag helper for the
     same reason. -->
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18222" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18222" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18226" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18226" />
   </ItemGroup>
 
   <!-- This module requires Lombiq.HelpfulLibraries.OrchardCore, and it can be included two ways. The PackageReference

From 308f5e20e23dfc66e06834b5bcb96a52f625a493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Wed, 5 Jun 2024 12:11:39 +0200
Subject: [PATCH 06/27] Update OC preview version.

---
 .../Lombiq.TrainingDemo.csproj                | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
index b1bb3a0e..28c6ad3d 100644
--- a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
+++ b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
@@ -22,24 +22,24 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18226" />
-    <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="2.0.0-preview-18226" />
-    <PackageReference Include="OrchardCore.BackgroundTasks" Version="2.0.0-preview-18226" />
-    <PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18226" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18226" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18226" />
-    <PackageReference Include="OrchardCore.Data.Abstractions" Version="2.0.0-preview-18226" />
-    <PackageReference Include="OrchardCore.DynamicCache" Version="2.0.0-preview-18226" />
-    <PackageReference Include="OrchardCore.FileStorage.FileSystem" Version="2.0.0-preview-18226" />
-    <PackageReference Include="OrchardCore.Indexing.Abstractions" Version="2.0.0-preview-18226" />
-    <PackageReference Include="OrchardCore.Media.Abstractions" Version="2.0.0-preview-18226" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18226" />
+    <PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18232" />
+    <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="2.0.0-preview-18232" />
+    <PackageReference Include="OrchardCore.BackgroundTasks" Version="2.0.0-preview-18232" />
+    <PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18232" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18232" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18232" />
+    <PackageReference Include="OrchardCore.Data.Abstractions" Version="2.0.0-preview-18232" />
+    <PackageReference Include="OrchardCore.DynamicCache" Version="2.0.0-preview-18232" />
+    <PackageReference Include="OrchardCore.FileStorage.FileSystem" Version="2.0.0-preview-18232" />
+    <PackageReference Include="OrchardCore.Indexing.Abstractions" Version="2.0.0-preview-18232" />
+    <PackageReference Include="OrchardCore.Media.Abstractions" Version="2.0.0-preview-18232" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18232" />
     <!-- Note that you need to add a reference to OrchardCore.ResourceManagement for the basic tag helpers like <style>
     and <script> to properly work when the app is built for production (and thus Razor Runtime Compilation is turned
     off. OrchardCore.DisplayManagement is needed for a variety of things but also for the <shape> tag helper for the
     same reason. -->
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18226" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18226" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18232" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18232" />
   </ItemGroup>
 
   <!-- This module requires Lombiq.HelpfulLibraries.OrchardCore, and it can be included two ways. The PackageReference

From f2f8c4b07d60b8391d4967367fca9b8fc85a5851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Mon, 17 Jun 2024 19:21:55 +0200
Subject: [PATCH 07/27] Fix build error.

---
 .../GraphQL/Services/ContentItemTypeBuilder.cs     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Lombiq.TrainingDemo/GraphQL/Services/ContentItemTypeBuilder.cs b/Lombiq.TrainingDemo/GraphQL/Services/ContentItemTypeBuilder.cs
index b330c4ec..3d75f9ec 100644
--- a/Lombiq.TrainingDemo/GraphQL/Services/ContentItemTypeBuilder.cs
+++ b/Lombiq.TrainingDemo/GraphQL/Services/ContentItemTypeBuilder.cs
@@ -15,6 +15,7 @@ public class ContentItemTypeBuilder : IContentTypeBuilder
 
     // Here you can add arguments to every Content Type (top level) field.
     public void Build(
+        ISchema schema,
         FieldType contentQuery,
         ContentTypeDefinition contentTypeDefinition,
         ContentItemType contentItemType)
@@ -26,11 +27,7 @@ public void Build(
 
         // The resolved type can be anything that can be represented with JSON and has a known graph type, but we stick
         // with numbers for simplicity's sake. This one filters for equation.
-        contentQuery.Arguments.Add(new QueryArgument<IntGraphType>
-        {
-            Name = AgeFilterName,
-            ResolvedType = new IntGraphType(),
-        });
+        AddFilter(contentQuery, suffix: string.Empty);
 
         // You can't use special characters in the argument names so by GraphQL convention these two letter suffixes
         // that represent the relational operators. Except equation which customarily gets no suffix.
@@ -43,12 +40,15 @@ public void Build(
         AddFilter(contentQuery, "_ne");
     }
 
-    private static void AddFilter(FieldType contentQuery, string suffix) =>
-        contentQuery.Arguments.Add(new QueryArgument<IntGraphType>
+    private static void AddFilter(FieldType contentQuery, string suffix)
+    {
+        contentQuery.Arguments ??= [];
+        contentQuery.Arguments!.Add(new QueryArgument<IntGraphType>
         {
             Name = AgeFilterName + suffix,
             ResolvedType = new IntGraphType(),
         });
+    }
 }
 
 // NEXT STATION: Services/PersonAgeGraphQLFilter.cs

From cccccd8e2d22e2799113d10f8daba3573e2c2c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Tue, 18 Jun 2024 10:58:23 +0200
Subject: [PATCH 08/27] Update OC version.

---
 .../Lombiq.TrainingDemo.csproj                | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
index 28c6ad3d..2ea5f86b 100644
--- a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
+++ b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
@@ -22,24 +22,24 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18232" />
-    <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="2.0.0-preview-18232" />
-    <PackageReference Include="OrchardCore.BackgroundTasks" Version="2.0.0-preview-18232" />
-    <PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18232" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18232" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18232" />
-    <PackageReference Include="OrchardCore.Data.Abstractions" Version="2.0.0-preview-18232" />
-    <PackageReference Include="OrchardCore.DynamicCache" Version="2.0.0-preview-18232" />
-    <PackageReference Include="OrchardCore.FileStorage.FileSystem" Version="2.0.0-preview-18232" />
-    <PackageReference Include="OrchardCore.Indexing.Abstractions" Version="2.0.0-preview-18232" />
-    <PackageReference Include="OrchardCore.Media.Abstractions" Version="2.0.0-preview-18232" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18232" />
+    <PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18244" />
+    <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="2.0.0-preview-18244" />
+    <PackageReference Include="OrchardCore.BackgroundTasks" Version="2.0.0-preview-18244" />
+    <PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18244" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18244" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18244" />
+    <PackageReference Include="OrchardCore.Data.Abstractions" Version="2.0.0-preview-18244" />
+    <PackageReference Include="OrchardCore.DynamicCache" Version="2.0.0-preview-18244" />
+    <PackageReference Include="OrchardCore.FileStorage.FileSystem" Version="2.0.0-preview-18244" />
+    <PackageReference Include="OrchardCore.Indexing.Abstractions" Version="2.0.0-preview-18244" />
+    <PackageReference Include="OrchardCore.Media.Abstractions" Version="2.0.0-preview-18244" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18244" />
     <!-- Note that you need to add a reference to OrchardCore.ResourceManagement for the basic tag helpers like <style>
     and <script> to properly work when the app is built for production (and thus Razor Runtime Compilation is turned
     off. OrchardCore.DisplayManagement is needed for a variety of things but also for the <shape> tag helper for the
     same reason. -->
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18232" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18232" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18244" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18244" />
   </ItemGroup>
 
   <!-- This module requires Lombiq.HelpfulLibraries.OrchardCore, and it can be included two ways. The PackageReference

From c8776f257071d3e720025d427d517521ef3b33d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Wed, 19 Jun 2024 11:19:54 +0200
Subject: [PATCH 09/27] Update OC version.

---
 .../Lombiq.TrainingDemo.csproj                | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
index 2ea5f86b..743ea651 100644
--- a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
+++ b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
@@ -22,24 +22,24 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18244" />
-    <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="2.0.0-preview-18244" />
-    <PackageReference Include="OrchardCore.BackgroundTasks" Version="2.0.0-preview-18244" />
-    <PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18244" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18244" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18244" />
-    <PackageReference Include="OrchardCore.Data.Abstractions" Version="2.0.0-preview-18244" />
-    <PackageReference Include="OrchardCore.DynamicCache" Version="2.0.0-preview-18244" />
-    <PackageReference Include="OrchardCore.FileStorage.FileSystem" Version="2.0.0-preview-18244" />
-    <PackageReference Include="OrchardCore.Indexing.Abstractions" Version="2.0.0-preview-18244" />
-    <PackageReference Include="OrchardCore.Media.Abstractions" Version="2.0.0-preview-18244" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18244" />
+    <PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18246" />
+    <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="2.0.0-preview-18246" />
+    <PackageReference Include="OrchardCore.BackgroundTasks" Version="2.0.0-preview-18246" />
+    <PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18246" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18246" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18246" />
+    <PackageReference Include="OrchardCore.Data.Abstractions" Version="2.0.0-preview-18246" />
+    <PackageReference Include="OrchardCore.DynamicCache" Version="2.0.0-preview-18246" />
+    <PackageReference Include="OrchardCore.FileStorage.FileSystem" Version="2.0.0-preview-18246" />
+    <PackageReference Include="OrchardCore.Indexing.Abstractions" Version="2.0.0-preview-18246" />
+    <PackageReference Include="OrchardCore.Media.Abstractions" Version="2.0.0-preview-18246" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18246" />
     <!-- Note that you need to add a reference to OrchardCore.ResourceManagement for the basic tag helpers like <style>
     and <script> to properly work when the app is built for production (and thus Razor Runtime Compilation is turned
     off. OrchardCore.DisplayManagement is needed for a variety of things but also for the <shape> tag helper for the
     same reason. -->
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18244" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18244" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18246" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18246" />
   </ItemGroup>
 
   <!-- This module requires Lombiq.HelpfulLibraries.OrchardCore, and it can be included two ways. The PackageReference

From 86968be85dca63fbc274a0dff72ffffce77c47aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Fri, 21 Jun 2024 13:11:40 +0200
Subject: [PATCH 10/27] Update OC preview version.

---
 .../Lombiq.TrainingDemo.csproj                | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
index 743ea651..39b296af 100644
--- a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
+++ b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
@@ -22,24 +22,24 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18246" />
-    <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="2.0.0-preview-18246" />
-    <PackageReference Include="OrchardCore.BackgroundTasks" Version="2.0.0-preview-18246" />
-    <PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18246" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18246" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18246" />
-    <PackageReference Include="OrchardCore.Data.Abstractions" Version="2.0.0-preview-18246" />
-    <PackageReference Include="OrchardCore.DynamicCache" Version="2.0.0-preview-18246" />
-    <PackageReference Include="OrchardCore.FileStorage.FileSystem" Version="2.0.0-preview-18246" />
-    <PackageReference Include="OrchardCore.Indexing.Abstractions" Version="2.0.0-preview-18246" />
-    <PackageReference Include="OrchardCore.Media.Abstractions" Version="2.0.0-preview-18246" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18246" />
+    <PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18248" />
+    <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="2.0.0-preview-18248" />
+    <PackageReference Include="OrchardCore.BackgroundTasks" Version="2.0.0-preview-18248" />
+    <PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18248" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18248" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18248" />
+    <PackageReference Include="OrchardCore.Data.Abstractions" Version="2.0.0-preview-18248" />
+    <PackageReference Include="OrchardCore.DynamicCache" Version="2.0.0-preview-18248" />
+    <PackageReference Include="OrchardCore.FileStorage.FileSystem" Version="2.0.0-preview-18248" />
+    <PackageReference Include="OrchardCore.Indexing.Abstractions" Version="2.0.0-preview-18248" />
+    <PackageReference Include="OrchardCore.Media.Abstractions" Version="2.0.0-preview-18248" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18248" />
     <!-- Note that you need to add a reference to OrchardCore.ResourceManagement for the basic tag helpers like <style>
     and <script> to properly work when the app is built for production (and thus Razor Runtime Compilation is turned
     off. OrchardCore.DisplayManagement is needed for a variety of things but also for the <shape> tag helper for the
     same reason. -->
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18246" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18246" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18248" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18248" />
   </ItemGroup>
 
   <!-- This module requires Lombiq.HelpfulLibraries.OrchardCore, and it can be included two ways. The PackageReference

From 4057643c4fdbeeebdd1e8ca710dbfd4daa797445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Thu, 11 Jul 2024 20:16:29 +0200
Subject: [PATCH 11/27] Update OC preview version.

---
 .../Lombiq.TrainingDemo.csproj                | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
index 39b296af..22709a80 100644
--- a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
+++ b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
@@ -22,24 +22,24 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18248" />
-    <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="2.0.0-preview-18248" />
-    <PackageReference Include="OrchardCore.BackgroundTasks" Version="2.0.0-preview-18248" />
-    <PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18248" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18248" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18248" />
-    <PackageReference Include="OrchardCore.Data.Abstractions" Version="2.0.0-preview-18248" />
-    <PackageReference Include="OrchardCore.DynamicCache" Version="2.0.0-preview-18248" />
-    <PackageReference Include="OrchardCore.FileStorage.FileSystem" Version="2.0.0-preview-18248" />
-    <PackageReference Include="OrchardCore.Indexing.Abstractions" Version="2.0.0-preview-18248" />
-    <PackageReference Include="OrchardCore.Media.Abstractions" Version="2.0.0-preview-18248" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18248" />
+    <PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18268" />
+    <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="2.0.0-preview-18268" />
+    <PackageReference Include="OrchardCore.BackgroundTasks" Version="2.0.0-preview-18268" />
+    <PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18268" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18268" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18268" />
+    <PackageReference Include="OrchardCore.Data.Abstractions" Version="2.0.0-preview-18268" />
+    <PackageReference Include="OrchardCore.DynamicCache" Version="2.0.0-preview-18268" />
+    <PackageReference Include="OrchardCore.FileStorage.FileSystem" Version="2.0.0-preview-18268" />
+    <PackageReference Include="OrchardCore.Indexing.Abstractions" Version="2.0.0-preview-18268" />
+    <PackageReference Include="OrchardCore.Media.Abstractions" Version="2.0.0-preview-18268" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18268" />
     <!-- Note that you need to add a reference to OrchardCore.ResourceManagement for the basic tag helpers like <style>
     and <script> to properly work when the app is built for production (and thus Razor Runtime Compilation is turned
     off. OrchardCore.DisplayManagement is needed for a variety of things but also for the <shape> tag helper for the
     same reason. -->
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18248" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18248" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18268" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18268" />
   </ItemGroup>
 
   <!-- This module requires Lombiq.HelpfulLibraries.OrchardCore, and it can be included two ways. The PackageReference

From 201eefdf595a5daa3a23c968d0f7753c60e59dec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Thu, 11 Jul 2024 20:49:52 +0200
Subject: [PATCH 12/27] Fix package consolidation.

---
 Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
index 22709a80..b0d3be43 100644
--- a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
+++ b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
@@ -51,7 +51,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="!Exists('..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.OrchardCore\Lombiq.HelpfulLibraries.OrchardCore.csproj')">
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.0" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-preview.0.occ-245" />
   </ItemGroup>
 
 </Project>

From 5f8c6c25f4019a266f331c3018a6e84c14145b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Sat, 13 Jul 2024 17:10:02 +0200
Subject: [PATCH 13/27] Update HL version.

---
 Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
index b0d3be43..b7e2f0a2 100644
--- a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
+++ b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
@@ -51,7 +51,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="!Exists('..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.OrchardCore\Lombiq.HelpfulLibraries.OrchardCore.csproj')">
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-preview.0.occ-245" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-preview.2.occ-245" />
   </ItemGroup>
 
 </Project>

From d203dfab3dc472015d563791e1e94e47306d9a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Tue, 16 Jul 2024 19:43:39 +0200
Subject: [PATCH 14/27] Update HL nuget version.

---
 Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
index b7e2f0a2..8007ead5 100644
--- a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
+++ b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
@@ -51,7 +51,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="!Exists('..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.OrchardCore\Lombiq.HelpfulLibraries.OrchardCore.csproj')">
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-preview.2.occ-245" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-preview.4.occ-245" />
   </ItemGroup>
 
 </Project>

From b31788fdefe56751e47f7c650524d9e383a05c50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Wed, 24 Jul 2024 10:24:43 +0200
Subject: [PATCH 15/27] Fix outdated suppression.

---
 Lombiq.TrainingDemo/Controllers/ApiController.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Lombiq.TrainingDemo/Controllers/ApiController.cs b/Lombiq.TrainingDemo/Controllers/ApiController.cs
index c2b1de10..3bf0c419 100644
--- a/Lombiq.TrainingDemo/Controllers/ApiController.cs
+++ b/Lombiq.TrainingDemo/Controllers/ApiController.cs
@@ -29,12 +29,7 @@ namespace Lombiq.TrainingDemo.Controllers;
 // endpoints should most of the time use the "Api" authentication scheme: This is not the same that standard users are
 // authenticated with (via cookies).
 [Authorize(AuthenticationSchemes = "Api"), IgnoreAntiforgeryToken, AllowAnonymous]
-[System.Diagnostics.CodeAnalysis.SuppressMessage(
-    "Major Code Smell",
-    "S6961:API Controllers should derive from ControllerBase instead of Controller",
-    Justification = "Can't be changed due to line 62. Will be applicable after an Orchard upgrade due to " +
-        "https://github.com/OrchardCMS/OrchardCore/issues/16186 being fixed.")]
-public class ApiController : Controller
+public class ApiController : ControllerBase
 {
     private readonly IAuthorizationService _authorizationService;
     private readonly IContentManager _contentManager;

From bbc44dc3342db95c7113abfa8eca983a989361ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Wed, 24 Jul 2024 10:45:33 +0200
Subject: [PATCH 16/27] Remove outdated comment.

---
 .../GraphQL/Services/PersonPartObjectGraphType.cs             | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Lombiq.TrainingDemo/GraphQL/Services/PersonPartObjectGraphType.cs b/Lombiq.TrainingDemo/GraphQL/Services/PersonPartObjectGraphType.cs
index cbab9deb..61df22d9 100644
--- a/Lombiq.TrainingDemo/GraphQL/Services/PersonPartObjectGraphType.cs
+++ b/Lombiq.TrainingDemo/GraphQL/Services/PersonPartObjectGraphType.cs
@@ -41,8 +41,4 @@ public PersonPartObjectGraphType()
     }
 }
 
-// Warning: There seems to be a bug when your query includes the built-in "biography" field before the "person" field.
-// If you do it the other way around it works though. You can track the issue here:
-// https://github.com/OrchardCMS/OrchardCore/issues/10181
-
 // NEXT STATION: Services/PersonPartWhereInputObjectGraphType.cs

From b2c25107f4c186323a171bc1c427e031316281e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Wed, 24 Jul 2024 11:02:09 +0200
Subject: [PATCH 17/27] Update OC preview versions.

---
 .../Lombiq.TrainingDemo.csproj                | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
index 8007ead5..bb6bb9c8 100644
--- a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
+++ b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
@@ -22,24 +22,24 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18268" />
-    <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="2.0.0-preview-18268" />
-    <PackageReference Include="OrchardCore.BackgroundTasks" Version="2.0.0-preview-18268" />
-    <PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18268" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18268" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18268" />
-    <PackageReference Include="OrchardCore.Data.Abstractions" Version="2.0.0-preview-18268" />
-    <PackageReference Include="OrchardCore.DynamicCache" Version="2.0.0-preview-18268" />
-    <PackageReference Include="OrchardCore.FileStorage.FileSystem" Version="2.0.0-preview-18268" />
-    <PackageReference Include="OrchardCore.Indexing.Abstractions" Version="2.0.0-preview-18268" />
-    <PackageReference Include="OrchardCore.Media.Abstractions" Version="2.0.0-preview-18268" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18268" />
+    <PackageReference Include="OrchardCore.Users.Abstractions" Version="2.0.0-preview-18282" />
+    <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="2.0.0-preview-18282" />
+    <PackageReference Include="OrchardCore.BackgroundTasks" Version="2.0.0-preview-18282" />
+    <PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18282" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18282" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18282" />
+    <PackageReference Include="OrchardCore.Data.Abstractions" Version="2.0.0-preview-18282" />
+    <PackageReference Include="OrchardCore.DynamicCache" Version="2.0.0-preview-18282" />
+    <PackageReference Include="OrchardCore.FileStorage.FileSystem" Version="2.0.0-preview-18282" />
+    <PackageReference Include="OrchardCore.Indexing.Abstractions" Version="2.0.0-preview-18282" />
+    <PackageReference Include="OrchardCore.Media.Abstractions" Version="2.0.0-preview-18282" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18282" />
     <!-- Note that you need to add a reference to OrchardCore.ResourceManagement for the basic tag helpers like <style>
     and <script> to properly work when the app is built for production (and thus Razor Runtime Compilation is turned
     off. OrchardCore.DisplayManagement is needed for a variety of things but also for the <shape> tag helper for the
     same reason. -->
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18268" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18268" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18282" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18282" />
   </ItemGroup>
 
   <!-- This module requires Lombiq.HelpfulLibraries.OrchardCore, and it can be included two ways. The PackageReference

From 9986850e0a22dcfd040a1f16d9042c655bf6763f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= <zoltan.lehoczky@lombiq.com>
Date: Fri, 26 Jul 2024 15:54:07 +0200
Subject: [PATCH 18/27] Fixing ambiguous HTTP methods as warned by Swagger

---
 .../Controllers/CrossTenantServicesController.cs                | 2 +-
 .../Controllers/YourFirstOrchardCoreController.cs               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lombiq.TrainingDemo/Controllers/CrossTenantServicesController.cs b/Lombiq.TrainingDemo/Controllers/CrossTenantServicesController.cs
index c637cb34..cdd1e705 100644
--- a/Lombiq.TrainingDemo/Controllers/CrossTenantServicesController.cs
+++ b/Lombiq.TrainingDemo/Controllers/CrossTenantServicesController.cs
@@ -35,7 +35,7 @@ public class CrossTenantServicesController : Controller
     // A simple route for convenience. You can access this from under /CrossTenantServices?contentItemId=ID. Here ID
     // needs to be a content item ID that you can get e.g. from the URL when you open an item to edit from the admin (it
     // looks something like "4da2sme18cc2k2r5d4w23d4cwj" which is NOT made by a cat walking across the keyboard!).
-    [Route("CrossTenantServices")]
+    [HttpGet, Route("CrossTenantServices")]
     public async Task<string> Index(string contentItemId)
     {
         // If ModelState is not in a valid state we should abort the action and return null.
diff --git a/Lombiq.TrainingDemo/Controllers/YourFirstOrchardCoreController.cs b/Lombiq.TrainingDemo/Controllers/YourFirstOrchardCoreController.cs
index dc2cadcb..a38bff6b 100644
--- a/Lombiq.TrainingDemo/Controllers/YourFirstOrchardCoreController.cs
+++ b/Lombiq.TrainingDemo/Controllers/YourFirstOrchardCoreController.cs
@@ -59,7 +59,7 @@ public ActionResult Index()
     }
 
     // Let's see some custom routing here. This attribute will override the default route and use this one.
-    [Route("TrainingDemo/NotifyMe")]
+    [HttpGet, Route("TrainingDemo/NotifyMe")]
     public async Task<IActionResult> NotifyMe()
     {
         // ILogger is an ASP.NET Core service that will write something into the specific log files. In Orchard Core

From f3a9d4547f6acd85cf3bc2b02bfd6a334a2be49e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Fri, 26 Jul 2024 17:36:51 +0200
Subject: [PATCH 19/27] Fix duplicate PackageReference.

---
 Lombiq.TrainingDemo.Web/Lombiq.TrainingDemo.Web.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Lombiq.TrainingDemo.Web/Lombiq.TrainingDemo.Web.csproj b/Lombiq.TrainingDemo.Web/Lombiq.TrainingDemo.Web.csproj
index c6b393b4..99da63db 100644
--- a/Lombiq.TrainingDemo.Web/Lombiq.TrainingDemo.Web.csproj
+++ b/Lombiq.TrainingDemo.Web/Lombiq.TrainingDemo.Web.csproj
@@ -20,7 +20,6 @@
   <ItemGroup>
     <PackageReference Include="OrchardCore.Logging.NLog" Version="2.0.0-preview-18200" />
     <PackageReference Include="OrchardCore.Application.Cms.Targets" Version="2.0.0-preview-18200" />
-    <PackageReference Include="OrchardCore.Application.Cms.Targets" Version="1.8.3" />
     <!-- This reference is not strictly needed here but included so if the web and the module projects' Orchard Core
     versions go out of sync, the CI build's package consolidation validation will fail. -->
     <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18200" />

From 701a0b3e0a05702d3398321bd0a14cd456150da5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Fri, 26 Jul 2024 18:41:59 +0200
Subject: [PATCH 20/27] Update OC preview version.

---
 Lombiq.TrainingDemo.Web/Lombiq.TrainingDemo.Web.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Lombiq.TrainingDemo.Web/Lombiq.TrainingDemo.Web.csproj b/Lombiq.TrainingDemo.Web/Lombiq.TrainingDemo.Web.csproj
index 99da63db..7001a986 100644
--- a/Lombiq.TrainingDemo.Web/Lombiq.TrainingDemo.Web.csproj
+++ b/Lombiq.TrainingDemo.Web/Lombiq.TrainingDemo.Web.csproj
@@ -18,11 +18,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Logging.NLog" Version="2.0.0-preview-18200" />
-    <PackageReference Include="OrchardCore.Application.Cms.Targets" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.Logging.NLog" Version="2.0.0-preview-18282" />
+    <PackageReference Include="OrchardCore.Application.Cms.Targets" Version="2.0.0-preview-18282" />
     <!-- This reference is not strictly needed here but included so if the web and the module projects' Orchard Core
     versions go out of sync, the CI build's package consolidation validation will fail. -->
-    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18282" />
   </ItemGroup>
 
   <ItemGroup>

From 258e11916f26670ef983fa95842f55510382d5a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Fri, 26 Jul 2024 18:42:06 +0200
Subject: [PATCH 21/27] Fix build warnings.

---
 Lombiq.TrainingDemo.Web/Program.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.TrainingDemo.Web/Program.cs b/Lombiq.TrainingDemo.Web/Program.cs
index 6ec7912d..47d5097a 100644
--- a/Lombiq.TrainingDemo.Web/Program.cs
+++ b/Lombiq.TrainingDemo.Web/Program.cs
@@ -14,4 +14,4 @@
     .UseStaticFiles()
     .UseOrchardCore();
 
-app.Run();
+await app.RunAsync();

From 09e2121ad837a724e77cc6a290390c0d02ecfdf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Fri, 26 Jul 2024 20:48:18 +0200
Subject: [PATCH 22/27] Add LombiqPreview to the NuGet.config.

---
 NuGet.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NuGet.config b/NuGet.config
index c7b3bd52..57de4523 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,5 +5,6 @@
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="OrchardCorePreview" value="https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json" />
+    <add key="LombiqPreview" value="https://nuget.cloudsmith.io/lombiq/open-source-orchard-core-extensions/v3/index.json" />
   </packageSources>
 </configuration>

From 52479dc6a1b8e9b040d5944932b8b234b791c719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Fri, 26 Jul 2024 21:12:45 +0200
Subject: [PATCH 23/27] Fix GraphQL filter PersonAgeGraphQLFilter.

---
 Lombiq.TrainingDemo/GraphQL/Services/PersonAgeGraphQLFilter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.TrainingDemo/GraphQL/Services/PersonAgeGraphQLFilter.cs b/Lombiq.TrainingDemo/GraphQL/Services/PersonAgeGraphQLFilter.cs
index df92df3f..f28c6481 100644
--- a/Lombiq.TrainingDemo/GraphQL/Services/PersonAgeGraphQLFilter.cs
+++ b/Lombiq.TrainingDemo/GraphQL/Services/PersonAgeGraphQLFilter.cs
@@ -33,7 +33,7 @@ public Task<IEnumerable<ContentItem>> PostQueryAsync(
         IResolveFieldContext context)
     {
         var (name, value) = context.Arguments.FirstOrDefault(
-            argument => argument.Key.StartsWith(AgeFilterName, StringComparison.Ordinal));
+            argument => argument.Value.Value is int && argument.Key.StartsWithOrdinal(AgeFilterName));
 
         if (name != null && value.Value is int age)
         {

From 71d8d3bcf4abb487a682f92610ef43e24d91a751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Fri, 26 Jul 2024 22:03:02 +0200
Subject: [PATCH 24/27] Update HL preview version.

---
 Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
index bb6bb9c8..2f4d612b 100644
--- a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
+++ b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
@@ -51,7 +51,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="!Exists('..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.OrchardCore\Lombiq.HelpfulLibraries.OrchardCore.csproj')">
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-preview.4.occ-245" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-preview.5.occ-245" />
   </ItemGroup>
 
 </Project>

From 067fa3c69d84c3e3ca6d4a1f43057e3cf587eeab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Sat, 27 Jul 2024 11:32:16 +0200
Subject: [PATCH 25/27] Update HL preview.

---
 Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
index 2f4d612b..ce05cc78 100644
--- a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
+++ b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
@@ -51,7 +51,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="!Exists('..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.OrchardCore\Lombiq.HelpfulLibraries.OrchardCore.csproj')">
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-preview.5.occ-245" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-alpha.0.occ-245" />
   </ItemGroup>
 
 </Project>

From 83312a67edc592a5f5ab2d58b082ca79b7c3ae51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Sat, 27 Jul 2024 19:00:26 +0200
Subject: [PATCH 26/27] Update HL nuget version.

---
 Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
index ce05cc78..cdb571cd 100644
--- a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
+++ b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
@@ -51,7 +51,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="!Exists('..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.OrchardCore\Lombiq.HelpfulLibraries.OrchardCore.csproj')">
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-alpha.0.occ-245" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-alpha.1.occ-245" />
   </ItemGroup>
 
 </Project>

From bc78c587bc9b4869e355cfae61b368f22408cfa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Sat, 27 Jul 2024 21:35:45 +0200
Subject: [PATCH 27/27] Update HL.

---
 Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
index cdb571cd..461fd240 100644
--- a/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
+++ b/Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
@@ -51,7 +51,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="!Exists('..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.OrchardCore\Lombiq.HelpfulLibraries.OrchardCore.csproj')">
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-alpha.1.occ-245" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-alpha.2.occ-245" />
   </ItemGroup>
 
 </Project>