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

Merge branch 'v14/dev' into v15/dev

Browse Source 
# Conflicts:
#	Directory.Packages.props
#	src/Umbraco.Cms.Api.Common/DependencyInjection/UmbracoBuilderAuthExtensions.cs
#	src/Umbraco.Cms.Api.Delivery/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Cms.Api.Delivery/Querying/Selectors/AncestorsSelector.cs
#	src/Umbraco.Cms.Api.Management/OpenApi.json
#	src/Umbraco.Infrastructure/Examine/ExamineIndexRebuilder.cs
#	src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs
#	src/Umbraco.PublishedCache.NuCache/ContentStore.cs
#	tests/Directory.Packages.props
This commit is contained in:
Sven Geusens
2025-01-21 10:17:46 +01:00
parent 2a73cfefbb 56c0aebd76
commit f96ac32b2b
40 changed files with 11506 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/Umbraco.JsonSchema/UmbracoCmsSchema.cs
View File

@@ -78,8 +78,21 @@ internal class UmbracoCmsSchema
public required DataTypesSettings DataTypes { get; set; }
public required MarketplaceSettings Marketplace { get; set; }
public InstallDefaultDataNamedOptions InstallDefaultData { get; set; } = null!;
public required WebhookSettings Webhook { get; set; }
public required CacheSettings Cache { get; set; }
}
public class InstallDefaultDataNamedOptions
{
public InstallDefaultDataSettings Languages { get; set; } = null!;
public InstallDefaultDataSettings DataTypes { get; set; } = null!;
public InstallDefaultDataSettings MediaTypes { get; set; } = null!;
public InstallDefaultDataSettings MemberTypes { get; set; } = null!;
}
}