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

Merge branch 'main' into v17/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
This commit is contained in:
Laura Neto
2025-07-22 15:39:26 +02:00
parent 3fcc09169a b722c0d72d
commit 04ac8d3ea9
392 changed files with 4458 additions and 1242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Umbraco.Tests.Common/Builders/ContentDataBuilder.cs
View File

@@ -7,7 +7,7 @@ using Umbraco.Extensions;
namespace Umbraco.Cms.Tests.Common.Builders;
internal class ContentDataBuilder : BuilderBase<ContentData>, IWithNameBuilder
internal sealed class ContentDataBuilder : BuilderBase<ContentData>, IWithNameBuilder
{
private Dictionary<string, CultureVariation> _cultureInfos;
private string _name;

3
tests/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs
View File

@@ -178,10 +178,9 @@ public class DataTypeBuilder
elementSettingKey,
editorAlias == Constants.PropertyEditors.Aliases.BlockGrid ? true : null);
var dataTypeBuilder = new DataTypeBuilder()
.WithId(0)
.WithDatabaseType(ValueStorageType.Nvarchar)
.WithDatabaseType(ValueStorageType.Ntext)
.AddEditor()
.WithAlias(editorAlias);