* Update to dotnet 9 and update nuget packages * Update umbraco code version * Update Directory.Build.props Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> * Include preview version in pipeline * update template projects * update global json with specific version * Update version.json to v15 * Rename TrimStart and TrimEnd to string specific * Rename to Exact * Update global.json Co-authored-by: Ronald Barendse <ronald@barend.se> * Remove includePreviewVersion * Rename to trim exact * Add new Hybridcache project * Add tests * Start implementing PublishedContent.cs * Implement repository for content * Refactor to use async everywhere * Add cache refresher * make public as needed for serialization * Use content type cache to get content type out * Refactor to use ContentCacheNode model, that goes in the memory cache * Remove content node kit as its not needed * Implement tests for ensuring caching * Implement better asserts * Implement published property * Refactor to use mapping * Rename to document tests * Update to test properties * Create more tests * Refactor mock tests into own file * Update property test * Fix published version of content * Change default cache level to elements * Refactor to always have draft * Refactor to not use PublishedModelFactory * Added tests * Added and updated tests * Fixed tests * Don't return empty object with id * More tests * Added key * Another key * Refactor CacheService to be responsible for using the hybrid cache * Use notification handler to remove deleted content from cache * Add more tests for missing functions * Implement missing methods * Remove HasContent as it pertains to routing * Fik up test * formatting * refactor variable names * Implement variant tests * Map all the published content properties * Get item out of cache first, to assert updated * Implement member cache * Add member test * Implement media cache * Implement property tests for media tests * Refactor tests to use extension method * Add more media tests * Refactor properties to no longer have element caching * Don't use property cache level * Start implementing seeding * Only seed when main * Add Immutable for performance * Implement permanent seeding of content * Implement cache settings * Implement tests for seeding * Update package version * start refactoring nurepo * Refactor so draft & published nodes are cached individually * Refactor RefreshContent to take node instead of IContent * Refactor media to also use cache nodes * Remove member from repo as it isn't cached * Refactor media to not include preview, as media has no draft * create new benchmark project * POC Integration benchmarks with custom api controllers * Start implementing content picker tests * Implement domain cache * Rework content cache to implement interface * Start implementing elements cache * Implement published snapshot service * Publish snapshot tests * Use snapshot for elements cache * Create test proving we don't clear cache when updating content picker * Clear entire elements cache * Remove properties from element cache, when content gets updated. * Rename methods to async * Refactor to use old cache interfaces instead of new ones * Remove snapshot, as it is no longer needed * Fix tests building * Refactor domaincache to not have snapshots * Delete benchmarks * Delete benchmarks * Add HybridCacheProject to Umbraco * Add comment to route value transformer * Implement is draft * remove snapshot from property * V15 updated the hybrid caching integration tests to use ContentEditingService (#16947) * Added builder extension withParentKey * Created builder with ContentEditingService * Added usage of the ContentEditingService to SETUP * Started using ContentEditingService builder in tests * Updated builder extensions * Fixed builder * Clean up * Clean up, not done * Added Ids * Remove entries from cache on delete * Fix up seeding logic * Don't register hybrid cache twice * Change seeded entry options * Update hybrid cache package * Fix up published property to work with delivery api again * Fix dependency injection to work with tests * Fix naming * Dont make caches nullable * Make content node sealed * Remove path and other unused from content node * Remove hacky 2 phase ctor * Refactor to actually set content templates * Remove umbraco context * Remove "HasBy" methods * rename property data * Delete obsolete legacy stuff * Add todo for making expiration configurable * Add todo in UmbracoContext * Add clarifying comment in content factory * Remove xml stuff from published property * Fix according to review * Make content type cache injectible * Make content type cache injectible * Rename to database cache repository * Rename to document cache * Add TODO * Refactor to async * Rename to async * Make everything async * Remove duplicate line from json schema * Move Hybrid cache project * Remove leftover file * Refactor to use keys * Refactor published content to no longer have content data, as it is on the node itself * Refactor to member to use proper content node ctor * Move tests to own folder * Add immutable objects to property and content data for performance * Make property data public * Fix member caching to be singleton * Obsolete GetContentType * Remove todo * Fix naming * Fix lots of exposed errors due to scope test * Add final scope tests * Rename to document cache service * Rename test files * Create new doc type tests * Add ignore to tests * Start implementing refresh for content type save * Clear contenttype cache when contenttype is updated * Fix test Teh contenttype is not upated unless the property is dirty * Use init for ContentSourceDto * Fix get by key in PublishedContentTypeCache * Remove ContentType from PublishedContentTypeCache when contenttype is deleted * Update to preview 7 * Fix versions * Increase timeout for sqlite integration tests * Undo timeout increase * Try and undo init change to ContentSourceDto * That wasn't it chief * Try and make DomainAndUrlsTests non NonParallelizable * Update versions * Only run cache tests on linux for now --------- Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Co-authored-by: Ronald Barendse <ronald@barend.se> Co-authored-by: Andreas Zerbst <andr317c@live.dk> Co-authored-by: Sven Geusens <sge@umbraco.dk> Co-authored-by: Andreas Zerbst <73799582+andr317c@users.noreply.github.com> Co-authored-by: nikolajlauridsen <nikolajlauridsen@protonmail.ch>
125 lines
6.8 KiB
C#
125 lines
6.8 KiB
C#
using System.Reflection;
|
|
using Microsoft.Extensions.Configuration;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Options;
|
|
using Umbraco.Cms.Core.Configuration;
|
|
using Umbraco.Cms.Core.Configuration.Models;
|
|
using Umbraco.Cms.Core.Configuration.Models.Validation;
|
|
using Umbraco.Cms.Core.Models;
|
|
|
|
namespace Umbraco.Cms.Core.DependencyInjection;
|
|
|
|
/// <summary>
|
|
/// Extension methods for <see cref="IUmbracoBuilder" />
|
|
/// </summary>
|
|
public static partial class UmbracoBuilderExtensions
|
|
{
|
|
private static IUmbracoBuilder AddUmbracoOptions<TOptions>(this IUmbracoBuilder builder, Action<OptionsBuilder<TOptions>>? configure = null)
|
|
where TOptions : class
|
|
{
|
|
UmbracoOptionsAttribute? umbracoOptionsAttribute = typeof(TOptions).GetCustomAttribute<UmbracoOptionsAttribute>();
|
|
if (umbracoOptionsAttribute is null)
|
|
{
|
|
throw new ArgumentException($"{typeof(TOptions)} do not have the UmbracoOptionsAttribute.");
|
|
}
|
|
|
|
OptionsBuilder<TOptions>? optionsBuilder = builder.Services.AddOptions<TOptions>()
|
|
.Bind(
|
|
builder.Config.GetSection(umbracoOptionsAttribute.ConfigurationKey),
|
|
o => o.BindNonPublicProperties = umbracoOptionsAttribute.BindNonPublicProperties)
|
|
.ValidateDataAnnotations();
|
|
|
|
configure?.Invoke(optionsBuilder);
|
|
|
|
return builder;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Add Umbraco configuration services and options
|
|
/// </summary>
|
|
public static IUmbracoBuilder AddConfiguration(this IUmbracoBuilder builder)
|
|
{
|
|
// Register configuration validators.
|
|
builder.Services.AddSingleton<IValidateOptions<ContentSettings>, ContentSettingsValidator>();
|
|
builder.Services.AddSingleton<IValidateOptions<GlobalSettings>, GlobalSettingsValidator>();
|
|
builder.Services.AddSingleton<IValidateOptions<HealthChecksSettings>, HealthChecksSettingsValidator>();
|
|
builder.Services.AddSingleton<IValidateOptions<RequestHandlerSettings>, RequestHandlerSettingsValidator>();
|
|
builder.Services.AddSingleton<IValidateOptions<UnattendedSettings>, UnattendedSettingsValidator>();
|
|
builder.Services.AddSingleton<IValidateOptions<SecuritySettings>, SecuritySettingsValidator>();
|
|
|
|
// Register configuration sections.
|
|
builder
|
|
.AddUmbracoOptions<ModelsBuilderSettings>()
|
|
.AddUmbracoOptions<IndexCreatorSettings>()
|
|
.AddUmbracoOptions<MarketplaceSettings>()
|
|
.AddUmbracoOptions<ContentSettings>()
|
|
.AddUmbracoOptions<DeliveryApiSettings>()
|
|
.AddUmbracoOptions<CoreDebugSettings>()
|
|
.AddUmbracoOptions<ExceptionFilterSettings>()
|
|
.AddUmbracoOptions<GlobalSettings>(optionsBuilder => optionsBuilder.PostConfigure(options =>
|
|
{
|
|
if (string.IsNullOrEmpty(options.UmbracoMediaPhysicalRootPath))
|
|
{
|
|
options.UmbracoMediaPhysicalRootPath = options.UmbracoMediaPath;
|
|
}
|
|
}))
|
|
.AddUmbracoOptions<HealthChecksSettings>()
|
|
.AddUmbracoOptions<HostingSettings>()
|
|
.AddUmbracoOptions<ImagingSettings>()
|
|
.AddUmbracoOptions<IndexingSettings>()
|
|
.AddUmbracoOptions<LoggingSettings>()
|
|
.AddUmbracoOptions<MemberPasswordConfigurationSettings>()
|
|
.AddUmbracoOptions<NuCacheSettings>()
|
|
.AddUmbracoOptions<RequestHandlerSettings>()
|
|
.AddUmbracoOptions<RuntimeSettings>()
|
|
.AddUmbracoOptions<SecuritySettings>()
|
|
.AddUmbracoOptions<TypeFinderSettings>()
|
|
.AddUmbracoOptions<UserPasswordConfigurationSettings>()
|
|
.AddUmbracoOptions<WebRoutingSettings>()
|
|
.AddUmbracoOptions<UmbracoPluginSettings>()
|
|
.AddUmbracoOptions<UnattendedSettings>()
|
|
.AddUmbracoOptions<BasicAuthSettings>()
|
|
.AddUmbracoOptions<RuntimeMinificationSettings>()
|
|
.AddUmbracoOptions<LegacyPasswordMigrationSettings>()
|
|
.AddUmbracoOptions<PackageMigrationSettings>()
|
|
.AddUmbracoOptions<ContentDashboardSettings>()
|
|
.AddUmbracoOptions<HelpPageSettings>()
|
|
.AddUmbracoOptions<DataTypesSettings>()
|
|
.AddUmbracoOptions<WebhookSettings>()
|
|
.AddUmbracoOptions<CacheSettings>();
|
|
|
|
// Configure connection string and ensure it's updated when the configuration changes
|
|
builder.Services.AddSingleton<IConfigureOptions<ConnectionStrings>, ConfigureConnectionStrings>();
|
|
builder.Services.AddSingleton<IOptionsChangeTokenSource<ConnectionStrings>, ConfigurationChangeTokenSource<ConnectionStrings>>();
|
|
|
|
builder.Services.Configure<InstallDefaultDataSettings>(
|
|
Constants.Configuration.NamedOptions.InstallDefaultData.Languages,
|
|
builder.Config.GetSection($"{Constants.Configuration.ConfigInstallDefaultData}:{Constants.Configuration.NamedOptions.InstallDefaultData.Languages}"));
|
|
builder.Services.Configure<InstallDefaultDataSettings>(
|
|
Constants.Configuration.NamedOptions.InstallDefaultData.DataTypes,
|
|
builder.Config.GetSection($"{Constants.Configuration.ConfigInstallDefaultData}:{Constants.Configuration.NamedOptions.InstallDefaultData.DataTypes}"));
|
|
builder.Services.Configure<InstallDefaultDataSettings>(
|
|
Constants.Configuration.NamedOptions.InstallDefaultData.MediaTypes,
|
|
builder.Config.GetSection($"{Constants.Configuration.ConfigInstallDefaultData}:{Constants.Configuration.NamedOptions.InstallDefaultData.MediaTypes}"));
|
|
builder.Services.Configure<InstallDefaultDataSettings>(
|
|
Constants.Configuration.NamedOptions.InstallDefaultData.MemberTypes,
|
|
builder.Config.GetSection($"{Constants.Configuration.ConfigInstallDefaultData}:{Constants.Configuration.NamedOptions.InstallDefaultData.MemberTypes}"));
|
|
|
|
// TODO: Remove this in V12
|
|
// This is to make the move of the AllowEditInvariantFromNonDefault setting from SecuritySettings to ContentSettings backwards compatible
|
|
// If there is a value in security settings, but no value in content setting we'll use that value, otherwise content settings always wins.
|
|
builder.Services.Configure<ContentSettings>(settings =>
|
|
{
|
|
var securitySettingsValue = builder.Config.GetSection($"{Constants.Configuration.ConfigSecurity}").GetValue<bool?>(nameof(SecuritySettings.AllowEditInvariantFromNonDefault));
|
|
var contentSettingsValue = builder.Config.GetSection($"{Constants.Configuration.ConfigContent}").GetValue<bool?>(nameof(ContentSettings.AllowEditInvariantFromNonDefault));
|
|
|
|
if (securitySettingsValue is not null && contentSettingsValue is null)
|
|
{
|
|
settings.AllowEditInvariantFromNonDefault = securitySettingsValue.Value;
|
|
}
|
|
});
|
|
|
|
return builder;
|
|
}
|
|
}
|