Merge remote-tracking branch 'refs/remotes/origin/v14/dev' into v15/dev

# Conflicts:
#	build/nightly-E2E-test-pipelines.yml
#	src/Umbraco.Infrastructure/Security/BackOfficeIdentityUser.cs
#	src/Umbraco.Web.UI.Client
#	src/Umbraco.Web.UI.Login/package-lock.json
#	version.json
This commit is contained in:
Bjarke Berg
2024-09-26 08:56:43 +02:00
116 changed files with 1433 additions and 603 deletions

View File

@@ -53,6 +53,7 @@ public class ContentBuilder
private int? _sortOrder;
private bool? _trashed;
private DateTime? _updateDate;
private bool? _blueprint;
private int? _versionId;
DateTime? IWithCreateDateBuilder.CreateDate
@@ -145,6 +146,13 @@ public class ContentBuilder
set => _updateDate = value;
}
public ContentBuilder WithBlueprint(bool blueprint)
{
_blueprint = blueprint;
return this;
}
public ContentBuilder WithVersionId(int versionId)
{
_versionId = versionId;
@@ -217,6 +225,7 @@ public class ContentBuilder
{
var id = _id ?? 0;
var versionId = _versionId ?? 0;
var blueprint = _blueprint ?? false;
var key = _key ?? Guid.NewGuid();
var parentId = _parentId ?? -1;
var parent = _parent;
@@ -253,6 +262,7 @@ public class ContentBuilder
content.Id = id;
content.VersionId = versionId;
content.Blueprint = blueprint;
content.Key = key;
content.CreateDate = createDate;
content.UpdateDate = updateDate;

View File

@@ -7,7 +7,10 @@
<IsPackable>true</IsPackable>
<EnablePackageValidation>$(BaseEnablePackageValidation)</EnablePackageValidation>
</PropertyGroup>
<PropertyGroup>
<!-- TODO: Fix all warnings and remove this override -->
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AutoFixture.AutoMoq" />
<PackageReference Include="Moq" />