From efd92a6af006b7c966cec168cbc52e3fa5b4727c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20M=C3=A1t=C3=A9?= Date: Sat, 11 Feb 2023 18:36:21 +0100 Subject: [PATCH 1/2] Adding MigrationServiceCollectionExtensions so we don't have to upgrade to nightly version --- .../MigrationServiceCollectionExtensions.cs | 16 ++++++++++++++++ Lombiq.Privacy/Startup.cs | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 Lombiq.Privacy/Extensions/MigrationServiceCollectionExtensions.cs diff --git a/Lombiq.Privacy/Extensions/MigrationServiceCollectionExtensions.cs b/Lombiq.Privacy/Extensions/MigrationServiceCollectionExtensions.cs new file mode 100644 index 0000000..38675e8 --- /dev/null +++ b/Lombiq.Privacy/Extensions/MigrationServiceCollectionExtensions.cs @@ -0,0 +1,16 @@ +using Microsoft.Extensions.DependencyInjection; +using OrchardCore.Data.Migration; + +namespace Lombiq.Privacy.Extensions; + +/// We need to use this until the Orchard Core 1.6 upgrade so we don't have to upgrade submodules to +/// to nightly versions. This is the same method as what is in the 1.6 nightly version of Orchard Core. +/// During the upgrade, this can be removed and use the Orchard Core method for data migrations. +/// +/// Provides extension methods for to add YesSql migration . +/// +public static class MigrationServiceCollectionExtensions +{ + public static IServiceCollection AddDataMigration(this IServiceCollection services) + where TDataMigration : class, IDataMigration => services.AddScoped(); +} diff --git a/Lombiq.Privacy/Startup.cs b/Lombiq.Privacy/Startup.cs index 7ee440b..48a524d 100644 --- a/Lombiq.Privacy/Startup.cs +++ b/Lombiq.Privacy/Startup.cs @@ -1,6 +1,7 @@ using Lombiq.Privacy.Activities; using Lombiq.Privacy.Constants; using Lombiq.Privacy.Drivers; +using Lombiq.Privacy.Extensions; using Lombiq.Privacy.Filters; using Lombiq.Privacy.Handlers; using Lombiq.Privacy.Migrations; @@ -15,7 +16,6 @@ using Microsoft.Extensions.Options; using OrchardCore.ContentManagement; using OrchardCore.ContentManagement.Display.ContentDisplay; -using OrchardCore.Data.Migration; using OrchardCore.Modules; using OrchardCore.Navigation; using OrchardCore.ResourceManagement; From 58be1fc7329673094f27a0f1ac1f3716988e205b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Mon, 20 Feb 2023 18:34:23 +0100 Subject: [PATCH 2/2] Code styling --- .../Extensions/MigrationServiceCollectionExtensions.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Lombiq.Privacy/Extensions/MigrationServiceCollectionExtensions.cs b/Lombiq.Privacy/Extensions/MigrationServiceCollectionExtensions.cs index 38675e8..95eea48 100644 --- a/Lombiq.Privacy/Extensions/MigrationServiceCollectionExtensions.cs +++ b/Lombiq.Privacy/Extensions/MigrationServiceCollectionExtensions.cs @@ -3,9 +3,10 @@ namespace Lombiq.Privacy.Extensions; -/// We need to use this until the Orchard Core 1.6 upgrade so we don't have to upgrade submodules to -/// to nightly versions. This is the same method as what is in the 1.6 nightly version of Orchard Core. -/// During the upgrade, this can be removed and use the Orchard Core method for data migrations. +// We need to use this until the Orchard Core upgrade so we don't have to upgrade submodules to nightly versions. This +// is the same method as what is in the 1.6 nightly version of Orchard Core. During the upgrade, this can be removed and +// use the Orchard Core method for data migrations. + /// /// Provides extension methods for to add YesSql migration . ///