yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/12.0' into v12/dev

Browse Source
This commit is contained in:
Nikolaj
2023-05-22 15:17:25 +02:00
parent 8bbca79e55 459d664531
commit dee01e950c
7 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj
View File

@@ -10,8 +10,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.8" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="OpenIddict.Abstractions" Version="4.3.0" />
<PackageReference Include="OpenIddict.AspNetCore" Version="4.3.0" />
<PackageReference Include="OpenIddict.Abstractions" Version="4.2.0" />
<PackageReference Include="OpenIddict.AspNetCore" Version="4.2.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />

9
src/Umbraco.Cms.Persistence.EFCore/Extensions/UmbracoEFCoreServiceCollectionExtensions.cs
View File

@@ -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<T>(
options =>
{

2
src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj
View File

@@ -9,7 +9,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5" />
<PackageReference Include="OpenIddict.EntityFrameworkCore" Version="4.3.0" />
<PackageReference Include="OpenIddict.EntityFrameworkCore" Version="4.2.0" />
</ItemGroup>
<ItemGroup>

2
src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs
View File

@@ -15,7 +15,7 @@ public class ConnectionStrings // TODO: Rename to [Umbraco]ConnectionString (sin
/// <summary>
/// The DataDirectory placeholder.
/// </summary>
public const string DataDirectoryPlaceholder = ConfigurationExtensions.DataDirectoryPlaceholder;
public const string DataDirectoryPlaceholder = Constants.System.DataDirectoryPlaceholder;
/// <summary>
/// The postfix used to identify a connection strings provider setting.

10
src/Umbraco.Core/Constants-System.cs
View File

@@ -64,5 +64,15 @@ public static partial class Constants
public const string UmbracoConnectionName = "umbracoDbDSN";
public const string DefaultUmbracoPath = "~/umbraco";
/// <summary>
/// The DataDirectory name.
/// </summary>
public const string DataDirectoryName = "DataDirectory";
/// <summary>
/// The DataDirectory placeholder.
/// </summary>
public const string DataDirectoryPlaceholder = "|DataDirectory|";
}
}

14
src/Umbraco.Core/Extensions/ConfigurationExtensions.cs
View File

@@ -10,16 +10,6 @@ namespace Umbraco.Extensions;
/// </summary>
public static class ConfigurationExtensions
{
/// <summary>
/// The DataDirectory name.
/// </summary>
internal const string DataDirectoryName = "DataDirectory";
/// <summary>
/// The DataDirectory placeholder.
/// </summary>
internal const string DataDirectoryPlaceholder = "|DataDirectory|";
/// <summary>
/// The postfix used to identify a connection string provider setting.
/// </summary>
@@ -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

2
version.json
View File

@@ -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"
},