From 867a8a4066915d0839269865bba69a5b4e274a85 Mon Sep 17 00:00:00 2001 From: Nikolaj Date: Wed, 17 May 2023 13:25:08 +0200 Subject: [PATCH 1/3] Bump version to next RC --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index e22da7303c..b465096390 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "12.0.0-rc1", + "version": "12.0.0-rc2", "assemblyVersion": { "precision": "build" }, From 1e6c2206105287d75c84ec3bd76e34bf637253a9 Mon Sep 17 00:00:00 2001 From: Mole Date: Mon, 22 May 2023 12:29:16 +0200 Subject: [PATCH 2/3] Downgrade OpenIdDict (#14279) --- src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj | 4 ++-- .../Umbraco.Cms.Persistence.EFCore.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj b/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj index 5a2dfa69ef..9deb226783 100644 --- a/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj +++ b/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj b/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj index 3e6e57983f..3702db461b 100644 --- a/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj +++ b/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj @@ -9,7 +9,7 @@ - + From 459d664531b742b40674ecbcc7477af69ed10815 Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Mon, 22 May 2023 12:44:52 +0200 Subject: [PATCH 3/3] V12: Map |DataDirectory| to path in connectionString (#14278) * Add Data directory as constants * Use new constants instead of internal ones * Replace data directory in connection string if its there * Update src/Umbraco.Cms.Persistence.EFCore/Extensions/UmbracoEFCoreServiceCollectionExtensions.cs --------- Co-authored-by: Zeegaan Co-authored-by: Mole --- .../UmbracoEFCoreServiceCollectionExtensions.cs | 9 ++++++++- .../Configuration/Models/ConnectionStrings.cs | 2 +- src/Umbraco.Core/Constants-System.cs | 10 ++++++++++ .../Extensions/ConfigurationExtensions.cs | 14 ++------------ 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/Umbraco.Cms.Persistence.EFCore/Extensions/UmbracoEFCoreServiceCollectionExtensions.cs b/src/Umbraco.Cms.Persistence.EFCore/Extensions/UmbracoEFCoreServiceCollectionExtensions.cs index 857661fd83..4d47e64448 100644 --- a/src/Umbraco.Cms.Persistence.EFCore/Extensions/UmbracoEFCoreServiceCollectionExtensions.cs +++ b/src/Umbraco.Cms.Persistence.EFCore/Extensions/UmbracoEFCoreServiceCollectionExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Umbraco.Cms.Core; using Umbraco.Cms.Core.DistributedLocking; using Umbraco.Cms.Persistence.EFCore.Locking; using Umbraco.Cms.Persistence.EFCore.Scoping; @@ -16,6 +16,13 @@ public static class UmbracoEFCoreServiceCollectionExtensions { defaultEFCoreOptionsAction ??= DefaultOptionsAction; + // Replace data directory + string? dataDirectory = AppDomain.CurrentDomain.GetData(Constants.System.DataDirectoryName)?.ToString(); + if (string.IsNullOrEmpty(dataDirectory) is false) + { + connectionString = connectionString.Replace(Constants.System.DataDirectoryPlaceholder, dataDirectory); + } + services.AddDbContext( options => { diff --git a/src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs b/src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs index a5161eca86..1d7690ab52 100644 --- a/src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs +++ b/src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs @@ -15,7 +15,7 @@ public class ConnectionStrings // TODO: Rename to [Umbraco]ConnectionString (sin /// /// The DataDirectory placeholder. /// - public const string DataDirectoryPlaceholder = ConfigurationExtensions.DataDirectoryPlaceholder; + public const string DataDirectoryPlaceholder = Constants.System.DataDirectoryPlaceholder; /// /// The postfix used to identify a connection strings provider setting. diff --git a/src/Umbraco.Core/Constants-System.cs b/src/Umbraco.Core/Constants-System.cs index 43de01995b..4a88da6459 100644 --- a/src/Umbraco.Core/Constants-System.cs +++ b/src/Umbraco.Core/Constants-System.cs @@ -64,5 +64,15 @@ public static partial class Constants public const string UmbracoConnectionName = "umbracoDbDSN"; public const string DefaultUmbracoPath = "~/umbraco"; + + /// + /// The DataDirectory name. + /// + public const string DataDirectoryName = "DataDirectory"; + + /// + /// The DataDirectory placeholder. + /// + public const string DataDirectoryPlaceholder = "|DataDirectory|"; } } diff --git a/src/Umbraco.Core/Extensions/ConfigurationExtensions.cs b/src/Umbraco.Core/Extensions/ConfigurationExtensions.cs index 53f3b76c06..3dffdd8e67 100644 --- a/src/Umbraco.Core/Extensions/ConfigurationExtensions.cs +++ b/src/Umbraco.Core/Extensions/ConfigurationExtensions.cs @@ -10,16 +10,6 @@ namespace Umbraco.Extensions; /// public static class ConfigurationExtensions { - /// - /// The DataDirectory name. - /// - internal const string DataDirectoryName = "DataDirectory"; - - /// - /// The DataDirectory placeholder. - /// - internal const string DataDirectoryPlaceholder = "|DataDirectory|"; - /// /// The postfix used to identify a connection string provider setting. /// @@ -76,10 +66,10 @@ public static class ConfigurationExtensions if (!string.IsNullOrEmpty(connectionString)) { // Replace data directory - string? dataDirectory = AppDomain.CurrentDomain.GetData(DataDirectoryName)?.ToString(); + string? dataDirectory = AppDomain.CurrentDomain.GetData(Constants.System.DataDirectoryName)?.ToString(); if (!string.IsNullOrEmpty(dataDirectory)) { - connectionString = connectionString.Replace(DataDirectoryPlaceholder, dataDirectory); + connectionString = connectionString.Replace(Constants.System.DataDirectoryPlaceholder, dataDirectory); } // Get provider name