From 8dd1a83a6fd962ce71b2b6b7b8a1d8e70f60a426 Mon Sep 17 00:00:00 2001
From: hishamco <hishamco_2007@yahoo.com>
Date: Fri, 16 Sep 2022 21:18:03 +0300
Subject: [PATCH] Use AddDataMigration()

---
 src/OrchardCore.Modules/OrchardCore.AdminDashboard/Startup.cs   | 2 +-
 src/OrchardCore.Modules/OrchardCore.Alias/Startup.cs            | 2 +-
 src/OrchardCore.Modules/OrchardCore.ArchiveLater/Startup.cs     | 2 +-
 src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs       | 2 +-
 src/OrchardCore.Modules/OrchardCore.Autoroute/Startup.cs        | 2 +-
 src/OrchardCore.Modules/OrchardCore.ContentFields/Startup.cs    | 2 +-
 .../ServiceCollectionExtensions.cs                              | 2 +-
 src/OrchardCore.Modules/OrchardCore.ContentPreview/Startup.cs   | 2 +-
 .../OrchardCore.Contents/AuditTrail/Startup.cs                  | 2 +-
 src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs         | 2 +-
 src/OrchardCore.Modules/OrchardCore.Demo/Startup.cs             | 2 +-
 src/OrchardCore.Modules/OrchardCore.Flows/Startup.cs            | 2 +-
 src/OrchardCore.Modules/OrchardCore.Forms/Startup.cs            | 2 +-
 src/OrchardCore.Modules/OrchardCore.Html/Startup.cs             | 2 +-
 src/OrchardCore.Modules/OrchardCore.Indexing/Startup.cs         | 2 +-
 src/OrchardCore.Modules/OrchardCore.Layers/Startup.cs           | 2 +-
 src/OrchardCore.Modules/OrchardCore.Liquid/Startup.cs           | 2 +-
 src/OrchardCore.Modules/OrchardCore.Lists/Startup.cs            | 2 +-
 src/OrchardCore.Modules/OrchardCore.Markdown/Startup.cs         | 2 +-
 src/OrchardCore.Modules/OrchardCore.Media/Startup.cs            | 2 +-
 src/OrchardCore.Modules/OrchardCore.Menu/Startup.cs             | 2 +-
 src/OrchardCore.Modules/OrchardCore.PublishLater/Startup.cs     | 2 +-
 src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/Startup.cs  | 2 +-
 src/OrchardCore.Modules/OrchardCore.Seo/Startup.cs              | 2 +-
 src/OrchardCore.Modules/OrchardCore.Sitemaps/Startup.cs         | 2 +-
 src/OrchardCore.Modules/OrchardCore.Taxonomies/Startup.cs       | 2 +-
 src/OrchardCore.Modules/OrchardCore.Title/Startup.cs            | 2 +-
 src/OrchardCore.Modules/OrchardCore.Users/Startup.cs            | 2 +-
 src/OrchardCore.Modules/OrchardCore.Widgets/Startup.cs          | 2 +-
 src/OrchardCore.Modules/OrchardCore.Workflows/Startup.cs        | 2 +-
 .../ServiceCollectionExtensions.cs                              | 2 +-
 .../content/OrchardCore.Templates.Cms.Module/Startup.cs         | 2 +-
 32 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Startup.cs b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Startup.cs
index b3b030f14d5..13855f471e2 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Startup.cs
@@ -42,7 +42,7 @@ public override void ConfigureServices(IServiceCollection services)
 
             services.AddScoped<IContentDisplayDriver, DashboardContentDisplayDriver>();
 
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
         }
 
         public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Alias/Startup.cs
index 17631b3a50b..7346fd590dd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/Startup.cs
@@ -59,7 +59,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddScoped<IScopedIndexProvider>(sp => sp.GetRequiredService<AliasPartIndexProvider>());
             services.AddScoped<IContentHandler>(sp => sp.GetRequiredService<AliasPartIndexProvider>());
 
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
             services.AddScoped<IContentHandleProvider, AliasPartContentHandleProvider>();
 
             // Identity Part
diff --git a/src/OrchardCore.Modules/OrchardCore.ArchiveLater/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ArchiveLater/Startup.cs
index 3ce9e8b3000..dd1999e5366 100644
--- a/src/OrchardCore.Modules/OrchardCore.ArchiveLater/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ArchiveLater/Startup.cs
@@ -29,7 +29,7 @@ public override void ConfigureServices(IServiceCollection services)
             .AddContentPart<ArchiveLaterPart>()
             .UseDisplayDriver<ArchiveLaterPartDisplayDriver>();
 
-        services.AddScoped<IDataMigration, Migrations>();
+        services.AddDataMigration<Migrations>();
 
         services.AddScoped<ArchiveLaterPartIndexProvider>();
         services.AddScoped<IScopedIndexProvider>(sp => sp.GetRequiredService<ArchiveLaterPartIndexProvider>());
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs
index cdafba2d486..4b61f2a067c 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs
@@ -55,7 +55,7 @@ public override void ConfigureServices(IServiceCollection services)
 
             services.Configure<StoreCollectionOptions>(o => o.Collections.Add(AuditTrailEvent.Collection));
 
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
             services.AddSingleton<IIndexProvider, AuditTrailEventIndexProvider>();
             services.AddSingleton<IBackgroundTask, AuditTrailBackgroundTask>();
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/Startup.cs
index 27ac1ae4b0b..28633a49ed1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/Startup.cs
@@ -82,7 +82,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddScoped<IScopedIndexProvider>(sp => sp.GetRequiredService<AutoroutePartIndexProvider>());
             services.AddScoped<IContentHandler>(sp => sp.GetRequiredService<AutoroutePartIndexProvider>());
 
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
             services.AddSingleton<IAutorouteEntries, AutorouteEntries>();
             services.AddScoped<IContentHandleProvider, AutorouteHandleProvider>();
 
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Startup.cs
index 294e5cd068f..5dff6834101 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Startup.cs
@@ -134,7 +134,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddScoped<IContentPickerResultProvider, DefaultContentPickerResultProvider>();
 
             // Migration, can be removed in a future release.
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
         }
 
         public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/ServiceCollectionExtensions.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/ServiceCollectionExtensions.cs
index aadc2d3382d..763badabe2e 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/ServiceCollectionExtensions.cs
@@ -26,7 +26,7 @@ public static IServiceCollection AddContentLocalization(this IServiceCollection
             services.AddScoped<IScopedIndexProvider>(sp => sp.GetRequiredService<LocalizedContentItemIndexProvider>());
             services.AddScoped<IContentHandler>(sp => sp.GetRequiredService<LocalizedContentItemIndexProvider>());
 
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
             services.AddScoped<IContentLocalizationHandler, ContentLocalizationPartHandlerCoordinator>();
 
             return services;
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentPreview/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ContentPreview/Startup.cs
index 9695494c269..b1d805463c8 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentPreview/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentPreview/Startup.cs
@@ -26,7 +26,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddContentPart<PreviewPart>()
                 .AddHandler<PreviewPartHandler>();
 
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
             services.AddScoped<IContentTypePartDefinitionDisplayDriver, PreviewPartSettingsDisplayDriver>();
             services.TryAddEnumerable(ServiceDescriptor.Singleton<IStartupFilter, PreviewStartupFilter>());
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Startup.cs
index fe4bed4e6ae..b69433097bc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Startup.cs
@@ -36,7 +36,7 @@ public Startup(IOptions<AdminOptions> adminOptions)
 
         public override void ConfigureServices(IServiceCollection services)
         {
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
             services.AddContentPart<AuditTrailPart>()
                 .UseDisplayDriver<AuditTrailPartDisplayDriver>();
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs
index 987d3e401bc..8eee9b893cd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs
@@ -165,7 +165,7 @@ async Task<FluidValue> GetContentByHandleAsync(LiquidTemplateContext context, st
             services.AddScoped<IContentHandleProvider, ContentItemIdHandleProvider>();
             services.AddScoped<IContentItemIndexHandler, ContentItemIndexCoordinator>();
 
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
 
             // Common Part
             services.AddContentPart<CommonPart>()
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Startup.cs
index 724af449eac..0c68d779729 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Startup.cs
@@ -93,7 +93,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddShapeAttributes<DemoShapeProvider>();
             services.AddScoped<INavigationProvider, AdminMenu>();
             services.AddScoped<IContentDisplayDriver, TestContentElementDisplayDriver>();
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
             services.AddScoped<IPermissionProvider, Permissions>();
             services.AddContentPart<TestContentPartA>();
             services.AddScoped<IUserClaimsProvider, UserProfileClaimsProvider>();
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Flows/Startup.cs
index 81425dae715..736a1d08901 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Startup.cs
@@ -57,7 +57,7 @@ public override void ConfigureServices(IServiceCollection services)
 
             services.AddContentPart<FlowMetadata>();
 
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
         }
 
         public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Startup.cs
index d621d6d4bf1..f0ff50d0f15 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Startup.cs
@@ -72,7 +72,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddContentPart<FormElementValidationPart>()
                     .UseDisplayDriver<FormElementValidationPartDisplayDriver>();
 
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Html/Startup.cs
index e7ea6d63760..4ba19266480 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Startup.cs
@@ -29,7 +29,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddScoped<IContentTypePartDefinitionDisplayDriver, HtmlBodyPartSettingsDisplayDriver>();
             services.AddScoped<IContentTypePartDefinitionDisplayDriver, HtmlBodyPartTrumbowygEditorSettingsDriver>();
             services.AddScoped<IContentTypePartDefinitionDisplayDriver, HtmlBodyPartMonacoEditorSettingsDriver>();
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
             services.AddScoped<IContentPartIndexHandler, HtmlBodyPartIndexHandler>();
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Indexing/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Indexing/Startup.cs
index 80f5ed06346..8fed0e446e1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Indexing/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Indexing/Startup.cs
@@ -15,7 +15,7 @@ public override void ConfigureServices(IServiceCollection services)
         {
             services.AddScoped<IIndexingTaskManager, IndexingTaskManager>();
             services.AddScoped<IContentHandler, CreateIndexingTaskContentHandler>();
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Startup.cs
index 56741f6c186..072473e9bd3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Startup.cs
@@ -60,7 +60,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddScoped<ILayerService, LayerService>();
             services.AddScoped<IContentHandler, LayerMetadataHandler>();
             services.AddSingleton<IIndexProvider, LayerMetadataIndexProvider>();
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
             services.AddScoped<IPermissionProvider, Permissions>();
             services.AddRecipeExecutionStep<LayerStep>();
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Startup.cs
index 1b1b332af01..3f4d374c94b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/Startup.cs
@@ -89,7 +89,7 @@ public override void ConfigureServices(IServiceCollection services)
                 .UseDisplayDriver<LiquidPartDisplayDriver>()
                 .AddHandler<LiquidPartHandler>();
 
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
             services.AddScoped<IContentPartIndexHandler, LiquidPartIndexHandler>();
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Startup.cs
index 555487ffca9..77c0bd07fdd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Startup.cs
@@ -68,7 +68,7 @@ public override void ConfigureServices(IServiceCollection services)
                 .AddHandler<ListPartHandler>();
 
             services.AddScoped<IContentTypePartDefinitionDisplayDriver, ListPartSettingsDisplayDriver>();
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
             services.AddScoped<IContentItemIndexHandler, ContainedPartContentIndexHandler>();
             services.AddScoped<IContainerService, ContainerService>();
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Startup.cs
index 54ad28714e4..a408af71958 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Startup.cs
@@ -48,7 +48,7 @@ public override void ConfigureServices(IServiceCollection services)
                 .AddHandler<MarkdownBodyPartHandler>();
 
             services.AddScoped<IContentTypePartDefinitionDisplayDriver, MarkdownBodyPartSettingsDisplayDriver>();
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
             services.AddScoped<IContentPartIndexHandler, MarkdownBodyPartIndexHandler>();
 
             // Markdown Field
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Media/Startup.cs
index 6bf60d222f4..0b66a6078fe 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Startup.cs
@@ -159,7 +159,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddScoped<AttachedMediaFieldFileService, AttachedMediaFieldFileService>();
             services.AddScoped<IContentHandler, AttachedMediaFieldContentHandler>();
             services.AddScoped<IModularTenantEvents, TempDirCleanerService>();
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
             services.AddScoped<IContentFieldIndexHandler, MediaFieldIndexHandler>();
             services.AddMediaFileTextProvider<PdfMediaFileTextProvider>(".pdf");
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Menu/Startup.cs
index 93c1a6fd802..886d02ba192 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Startup.cs
@@ -34,7 +34,7 @@ public Startup(IOptions<AdminOptions> adminOptions)
 
         public override void ConfigureServices(IServiceCollection services)
         {
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
             services.AddScoped<IShapeTableProvider, MenuShapes>();
             services.AddScoped<IPermissionProvider, Permissions>();
             services.AddScoped<INavigationProvider, AdminMenu>();
diff --git a/src/OrchardCore.Modules/OrchardCore.PublishLater/Startup.cs b/src/OrchardCore.Modules/OrchardCore.PublishLater/Startup.cs
index 2db25717151..fa10200c08b 100644
--- a/src/OrchardCore.Modules/OrchardCore.PublishLater/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.PublishLater/Startup.cs
@@ -31,7 +31,7 @@ public override void ConfigureServices(IServiceCollection services)
                 .UseDisplayDriver<PublishLaterPartDisplayDriver>()
                 .AddHandler<PublishLaterPartHandler>();
 
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
 
             services.AddScoped<PublishLaterPartIndexProvider>();
             services.AddScoped<IScopedIndexProvider>(sp => sp.GetRequiredService<PublishLaterPartIndexProvider>());
diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/Startup.cs
index 275a2495e5c..801d73fff82 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/Startup.cs
@@ -20,7 +20,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddContentPart<ReCaptchaPart>()
                 .UseDisplayDriver<ReCaptchaPartDisplayDriver>();
 
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Seo/Startup.cs
index 620ea55dcda..68c2596fa0d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Seo/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Seo/Startup.cs
@@ -15,7 +15,7 @@ public class Startup : StartupBase
     {
         public override void ConfigureServices(IServiceCollection services)
         {
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
 
             services.AddContentPart<SeoMetaPart>()
                 .UseDisplayDriver<SeoMetaPartDisplayDriver>()
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Startup.cs
index 0fc4c1c0b0f..4d731e72765 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Startup.cs
@@ -41,7 +41,7 @@ public Startup(IOptions<AdminOptions> adminOptions)
 
         public override void ConfigureServices(IServiceCollection services)
         {
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
             services.AddScoped<INavigationProvider, AdminMenu>();
             services.AddScoped<IPermissionProvider, Permissions>();
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Startup.cs
index 2e2c558f984..982ff35d10a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Startup.cs
@@ -59,7 +59,7 @@ public override void ConfigureServices(IServiceCollection services)
             .AddLiquidFilter<InheritedTermsFilter>("inherited_terms")
             .AddLiquidFilter<TaxonomyTermsFilter>("taxonomy_terms");
 
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
             services.AddScoped<IShapeTableProvider, TermShapes>();
             services.AddScoped<IPermissionProvider, Permissions>();
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Title/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Title/Startup.cs
index f9630af86df..e1143648573 100644
--- a/src/OrchardCore.Modules/OrchardCore.Title/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Title/Startup.cs
@@ -33,7 +33,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddScoped<IContentPartIndexHandler, TitlePartIndexHandler>();
             services.AddScoped<IContentTypePartDefinitionDisplayDriver, TitlePartSettingsDisplayDriver>();
 
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Users/Startup.cs
index 666b3c07820..df89334ff88 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Startup.cs
@@ -195,7 +195,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddSingleton<IIndexProvider, UserByRoleNameIndexProvider>();
             services.AddSingleton<IIndexProvider, UserByLoginInfoIndexProvider>();
             services.AddSingleton<IIndexProvider, UserByClaimIndexProvider>();
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
 
             services.AddScoped<IUserService, UserService>();
             services.AddScoped<IUserClaimsPrincipalFactory<IUser>, DefaultUserClaimsPrincipalProviderFactory>();
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Widgets/Startup.cs
index 4ed1189b81a..c6c41b83e50 100644
--- a/src/OrchardCore.Modules/OrchardCore.Widgets/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Widgets/Startup.cs
@@ -37,7 +37,7 @@ public override void ConfigureServices(IServiceCollection services)
 
             services.AddScoped<IContentTypePartDefinitionDisplayDriver, WidgetsListPartSettingsDisplayDriver>();
             services.AddContentPart<WidgetMetadata>();
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
         }
 
         public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Startup.cs
index 104b9e08178..cb0b213dadb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Startup.cs
@@ -61,7 +61,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddScoped<IWorkflowStore, WorkflowStore>();
             services.AddScoped<IWorkflowManager, WorkflowManager>();
             services.AddScoped<IActivityDisplayManager, ActivityDisplayManager>();
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
             services.AddScoped<INavigationProvider, AdminMenu>();
             services.AddScoped<IPermissionProvider, Permissions>();
             services.AddScoped<IDisplayDriver<IActivity>, MissingActivityDisplayDriver>();
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement/ServiceCollectionExtensions.cs
index 5564e2d147b..f48e39aa10a 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/ServiceCollectionExtensions.cs
@@ -20,7 +20,7 @@ public static IServiceCollection AddContentManagement(this IServiceCollection se
             services.TryAddScoped<IContentManager, DefaultContentManager>();
             services.TryAddScoped<IContentManagerSession, DefaultContentManagerSession>();
             services.AddSingleton<IIndexProvider, ContentItemIndexProvider>();
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
             services.AddScoped<IContentHandler, UpdateContentsHandler>();
             services.AddScoped<IContentHandler, ContentPartHandlerCoordinator>();
             services.AddSingleton<ITypeActivatorFactory<ContentPart>, ContentPartFactory>();
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/Startup.cs b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/Startup.cs
index cd6f25956fd..970ef1884ba 100644
--- a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/Startup.cs
+++ b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/Startup.cs
@@ -34,7 +34,7 @@ public override void ConfigureServices(IServiceCollection services)
                 .AddHandler<MyTestPartHandler>();
 
             services.AddScoped<IContentTypePartDefinitionDisplayDriver, MyTestPartSettingsDisplayDriver>();
-            services.AddScoped<IDataMigration, Migrations>();
+            services.AddDataMigration<Migrations>();
 #endif
         }