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

Add nullability to web.common

Browse Source
This commit is contained in:
Nikolaj Geisle
2022-03-29 13:44:21 +02:00
parent 86ae730b1e
commit b52c4e50cf
151 changed files with 731 additions and 675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Collections.cs
View File

@@ -14,10 +14,10 @@ namespace Umbraco.Extensions
/// Gets the mappers collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static MapperCollectionBuilder Mappers(this IUmbracoBuilder builder)
public static MapperCollectionBuilder? Mappers(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<MapperCollectionBuilder>();
public static NPocoMapperCollectionBuilder NPocoMappers(this IUmbracoBuilder builder)
public static NPocoMapperCollectionBuilder? NPocoMappers(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<NPocoMapperCollectionBuilder>();
@@ -25,7 +25,7 @@ namespace Umbraco.Extensions
/// Gets the package migration plans collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static PackageMigrationPlanCollectionBuilder PackageMigrationPlans(this IUmbracoBuilder builder)
public static PackageMigrationPlanCollectionBuilder? PackageMigrationPlans(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<PackageMigrationPlanCollectionBuilder>();
}

12
src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
View File

@@ -73,8 +73,8 @@ namespace Umbraco.Cms.Infrastructure.DependencyInjection
builder.Services.AddSingleton<IDistributedLockingMechanismFactory, DefaultDistributedLockingMechanismFactory>();
builder.Services.AddSingleton<IUmbracoDatabaseFactory, UmbracoDatabaseFactory>();
builder.Services.AddSingleton(factory => factory.GetRequiredService<IUmbracoDatabaseFactory>().SqlContext);
builder.NPocoMappers().Add<NullableDateMapper>();
builder.PackageMigrationPlans().Add(() => builder.TypeLoader.GetPackageMigrationPlans());
builder.NPocoMappers()?.Add<NullableDateMapper>();
builder.PackageMigrationPlans()?.Add(() => builder.TypeLoader.GetPackageMigrationPlans());
builder.Services.AddSingleton<IRuntimeState, RuntimeState>();
builder.Services.AddSingleton<IRuntime, CoreRuntime>();
@@ -93,7 +93,7 @@ namespace Umbraco.Cms.Infrastructure.DependencyInjection
// register persistence mappers - required by database factory so needs to be done here
// means the only place the collection can be modified is in a runtime - afterwards it
// has been frozen and it is too late
builder.Mappers().AddCoreMappers();
builder.Mappers()?.AddCoreMappers();
// register the scope provider
builder.Services.AddSingleton<ScopeProvider>(); // implements IScopeProvider, IScopeAccessor
@@ -117,7 +117,7 @@ namespace Umbraco.Cms.Infrastructure.DependencyInjection
// register the manifest filter collection builder (collection is empty by default)
builder.ManifestFilters();
builder.MediaUrlGenerators()
builder.MediaUrlGenerators()?
.Add<FileUploadPropertyEditor>()
.Add<ImageCropperPropertyEditor>();
@@ -147,7 +147,7 @@ namespace Umbraco.Cms.Infrastructure.DependencyInjection
// both TinyMceValueConverter (in Core) and RteMacroRenderingValueConverter (in Web) will be
// discovered when CoreBootManager configures the converters. We will remove the basic one defined
// in core so that the more enhanced version is active.
builder.PropertyValueConverters()
builder.PropertyValueConverters()?
.Remove<SimpleTinyMceValueConverter>();
// register *all* checks, except those marked [HideFromTypeFinder] of course
@@ -263,7 +263,7 @@ namespace Umbraco.Cms.Infrastructure.DependencyInjection
private static IUmbracoBuilder AddPreValueMigrators(this IUmbracoBuilder builder)
{
builder.WithCollectionBuilder<PreValueMigratorCollectionBuilder>()
builder.WithCollectionBuilder<PreValueMigratorCollectionBuilder>()?
.Append<RenamingPreValueMigrator>()
.Append<RichTextPreValueMigrator>()
.Append<UmbracoSliderPreValueMigrator>()

2
src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.MappingProfiles.cs
View File

@@ -16,7 +16,7 @@ namespace Umbraco.Cms.Infrastructure.DependencyInjection
{
builder.Services.AddUnique<IUmbracoMapper, UmbracoMapper>();
builder.WithCollectionBuilder<MapDefinitionCollectionBuilder>()
builder.WithCollectionBuilder<MapDefinitionCollectionBuilder>()?
.Add<AuditMapDefinition>()
.Add<CodeFileMapDefinition>()
.Add<ContentPropertyMapDefinition>()