From 52fd853d52851fc19b3f55162c86491f57af148e Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Wed, 1 Nov 2023 11:47:27 +0100 Subject: [PATCH] Move to core (#15084) --- .../SqlServerMigrationProvider.cs | 1 + .../SqlServerMigrationProviderSetup.cs | 1 + .../SqliteMigrationProvider.cs | 2 +- .../SqliteMigrationProviderSetup.cs | 1 + .../Extensions/UmbracoEFCoreServiceCollectionExtensions.cs | 4 ++-- .../Constants-ProviderNames.cs | 2 +- 6 files changed, 7 insertions(+), 4 deletions(-) rename src/{Umbraco.Cms.Persistence.EFCore => Umbraco.Core}/Constants-ProviderNames.cs (84%) diff --git a/src/Umbraco.Cms.Persistence.EFCore.SqlServer/SqlServerMigrationProvider.cs b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/SqlServerMigrationProvider.cs index 57a3a634fe..823a9e737f 100644 --- a/src/Umbraco.Cms.Persistence.EFCore.SqlServer/SqlServerMigrationProvider.cs +++ b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/SqlServerMigrationProvider.cs @@ -1,4 +1,5 @@ using Microsoft.EntityFrameworkCore; +using Umbraco.Cms.Core; using Umbraco.Cms.Persistence.EFCore.Migrations; using Umbraco.Extensions; diff --git a/src/Umbraco.Cms.Persistence.EFCore.SqlServer/SqlServerMigrationProviderSetup.cs b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/SqlServerMigrationProviderSetup.cs index 6425e712f6..2d561e9f5a 100644 --- a/src/Umbraco.Cms.Persistence.EFCore.SqlServer/SqlServerMigrationProviderSetup.cs +++ b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/SqlServerMigrationProviderSetup.cs @@ -1,4 +1,5 @@ using Microsoft.EntityFrameworkCore; +using Umbraco.Cms.Core; using Umbraco.Cms.Persistence.EFCore.Migrations; namespace Umbraco.Cms.Persistence.EFCore.SqlServer; diff --git a/src/Umbraco.Cms.Persistence.EFCore.Sqlite/SqliteMigrationProvider.cs b/src/Umbraco.Cms.Persistence.EFCore.Sqlite/SqliteMigrationProvider.cs index 1ff7b1535e..468f52021f 100644 --- a/src/Umbraco.Cms.Persistence.EFCore.Sqlite/SqliteMigrationProvider.cs +++ b/src/Umbraco.Cms.Persistence.EFCore.Sqlite/SqliteMigrationProvider.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore; +using Umbraco.Cms.Core; using Umbraco.Cms.Persistence.EFCore.Migrations; using Umbraco.Extensions; -using Umbraco.Cms.Persistence.EFCore; namespace Umbraco.Cms.Persistence.EFCore.Sqlite; diff --git a/src/Umbraco.Cms.Persistence.EFCore.Sqlite/SqliteMigrationProviderSetup.cs b/src/Umbraco.Cms.Persistence.EFCore.Sqlite/SqliteMigrationProviderSetup.cs index bb6b9feac7..3a1b97e76c 100644 --- a/src/Umbraco.Cms.Persistence.EFCore.Sqlite/SqliteMigrationProviderSetup.cs +++ b/src/Umbraco.Cms.Persistence.EFCore.Sqlite/SqliteMigrationProviderSetup.cs @@ -1,4 +1,5 @@ using Microsoft.EntityFrameworkCore; +using Umbraco.Cms.Core; using Umbraco.Cms.Persistence.EFCore.Migrations; namespace Umbraco.Cms.Persistence.EFCore.Sqlite; diff --git a/src/Umbraco.Cms.Persistence.EFCore/Extensions/UmbracoEFCoreServiceCollectionExtensions.cs b/src/Umbraco.Cms.Persistence.EFCore/Extensions/UmbracoEFCoreServiceCollectionExtensions.cs index 8fb8e53617..d901088064 100644 --- a/src/Umbraco.Cms.Persistence.EFCore/Extensions/UmbracoEFCoreServiceCollectionExtensions.cs +++ b/src/Umbraco.Cms.Persistence.EFCore/Extensions/UmbracoEFCoreServiceCollectionExtensions.cs @@ -132,10 +132,10 @@ public static class UmbracoEFCoreServiceCollectionExtensions { switch (providerName) { - case Cms.Persistence.EFCore.Constants.ProviderNames.SQLServer: + case Constants.ProviderNames.SQLServer: builder.UseSqlServer(connectionString); break; - case Cms.Persistence.EFCore.Constants.ProviderNames.SQLLite: + case Constants.ProviderNames.SQLLite: builder.UseSqlite(connectionString); break; default: diff --git a/src/Umbraco.Cms.Persistence.EFCore/Constants-ProviderNames.cs b/src/Umbraco.Core/Constants-ProviderNames.cs similarity index 84% rename from src/Umbraco.Cms.Persistence.EFCore/Constants-ProviderNames.cs rename to src/Umbraco.Core/Constants-ProviderNames.cs index 0f29e5944c..67f376612c 100644 --- a/src/Umbraco.Cms.Persistence.EFCore/Constants-ProviderNames.cs +++ b/src/Umbraco.Core/Constants-ProviderNames.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Cms.Persistence.EFCore; +namespace Umbraco.Cms.Core; public static partial class Constants {