NEST-536: Update OC version

Directory.Packages.props

@@ -6,7 +6,7 @@
     <!-- The Orchard Core version should always be x.y.0 of the latest minor version for maximum compatibility when
          distributed as NuGet packages. On the other hand, the consuming projects (including OrchardCore.Commerce.Web)
          should use Orchard Core references for the latest patch version to pull all versions up in the final app. -->
-    <OrchardCoreVersion>2.0.0-preview-18301</OrchardCoreVersion>
+    <OrchardCoreVersion>2.0.0-preview-18315</OrchardCoreVersion>
 
     <LombiqHelpfulLibrariesVersion>10.0.1-alpha.6.occ-280</LombiqHelpfulLibrariesVersion>
     <LombiqTestsUIVersion>10.0.2-alpha.3.occ-280</LombiqTestsUIVersion>

src/Modules/OrchardCore.Commerce/Startup.cs

@@ -258,18 +258,17 @@ public class DeploymentStartup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddTransient<IDeploymentSource, SiteSettingsPropertyDeploymentSource<RegionSettings>>();
-        services.AddScoped<IDisplayDriver<DeploymentStep>>(serviceProvider =>
-            {
-                // It's the IStringLocalizer.
-#pragma warning disable SA1312 // Variable names should begin with lower-case letter
-                var T = serviceProvider.GetService<IStringLocalizer<DeploymentStartup>>();
-#pragma warning restore SA1312 // Variable names should begin with lower-case letter
-                return new SiteSettingsPropertyDeploymentStepDriver<RegionSettings>(
-                    T["Region settings"],
-                    T["Exports the region settings."]);
-            });
-        services.AddSingleton<IDeploymentStepFactory>(new SiteSettingsPropertyDeploymentStepFactory<RegionSettings>());
+        services.AddDeployment<SiteSettingsPropertyDeploymentSource<RegionSettings>, SiteSettingsPropertyDeploymentStep<RegionSettings>>();
+        services.AddScoped(ImplementationFactory);
+    }
+
+    private IDisplayDriver<DeploymentStep> ImplementationFactory(IServiceProvider serviceProvider)
+    {
+        var localizer = serviceProvider.GetService<IStringLocalizer<DeploymentStartup>>();
+
+        return new SiteSettingsPropertyDeploymentStepDriver<RegionSettings>(
+            localizer["Region settings"],
+            localizer["Exports the region settings."]);
     }
 }