Post merge fixes

src/Umbraco.Core/Routing/UmbracoRequestPaths.cs

@@ -48,7 +48,7 @@ public class UmbracoRequestPaths
         _previewMvcPath = "/" + mvcArea + "/Preview/";
         _surfaceMvcPath = "/" + mvcArea + "/Surface/";
         _apiMvcPath = "/" + mvcArea + "/Api/";
-        _managementApiPath = "/" + _mvcArea + "/management/api/";
+        _managementApiPath = "/" + mvcArea + "/management/api/";
         _installPath = hostingEnvironment.ToAbsolute(Constants.SystemDirectories.Install);
         _umbracoRequestPathsOptions = umbracoRequestPathsOptions;
     }

src/Umbraco.PublishedCache.NuCache/DependencyInjection/UmbracoBuilderExtensions.cs

@@ -26,7 +26,6 @@ public static class UmbracoBuilderExtensions
     /// </summary>
     public static IUmbracoBuilder AddNuCache(this IUmbracoBuilder builder)
     {
-        // register the NuCache database data source
         builder.Services.TryAddSingleton<INuCacheContentRepository, NuCacheContentRepository>();
         builder.Services.TryAddSingleton<INuCacheContentService, NuCacheContentService>();
         builder.Services.TryAddSingleton<PublishedSnapshotServiceEventHandler>();

src/Umbraco.Web.BackOffice/Controllers/ContentController.cs

@@ -126,61 +126,6 @@ public class ContentController : ContentControllerBase
         _contentSettings = contentSettings.Value;
     }
 
-    [Obsolete("Use constructor that accepts ContentSettings as a parameter, scheduled for removal in V13")]
-    public ContentController(
-        ICultureDictionary cultureDictionary,
-        ILoggerFactory loggerFactory,
-        IShortStringHelper shortStringHelper,
-        IEventMessagesFactory eventMessages,
-        ILocalizedTextService localizedTextService,
-        PropertyEditorCollection propertyEditors,
-        IContentService contentService,
-        IUserService userService,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        IContentTypeService contentTypeService,
-        IUmbracoMapper umbracoMapper,
-        IPublishedUrlProvider publishedUrlProvider,
-        IDomainService domainService,
-        IDataTypeService dataTypeService,
-        ILocalizationService localizationService,
-        IFileService fileService,
-        INotificationService notificationService,
-        ActionCollection actionCollection,
-        ISqlContext sqlContext,
-        IJsonSerializer serializer,
-        ICoreScopeProvider scopeProvider,
-        IAuthorizationService authorizationService,
-        IContentVersionService contentVersionService,
-        ICultureImpactFactory cultureImpactFactory)
-        : this(
-            cultureDictionary,
-            loggerFactory,
-            shortStringHelper,
-            eventMessages,
-            localizedTextService,
-            propertyEditors,
-            contentService,
-            userService,
-            backofficeSecurityAccessor,
-            contentTypeService,
-            umbracoMapper,
-            publishedUrlProvider,
-            domainService,
-            dataTypeService,
-            localizationService,
-            fileService,
-            notificationService,
-            actionCollection,
-            sqlContext,
-            serializer,
-            scopeProvider,
-            authorizationService,
-            contentVersionService,
-            cultureImpactFactory,
-            StaticServiceProvider.Instance.GetRequiredService<IOptions<ContentSettings>>())
-    {
-    }
-
     [Obsolete("User constructor that takes a IUserGroupService, scheduled for removal in V15.")]
     public ContentController(
         ICultureDictionary cultureDictionary,
@@ -232,7 +177,8 @@ public class ContentController : ContentControllerBase
             authorizationService,
             contentVersionService,
             cultureImpactFactory,
-            StaticServiceProvider.Instance.GetRequiredService<IUserGroupService>()
+            StaticServiceProvider.Instance.GetRequiredService<IUserGroupService>(),
+            StaticServiceProvider.Instance.GetRequiredService<IOptions<ContentSettings>>()
         )
     {
     }

tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs

@@ -270,7 +270,6 @@ public class ContentControllerTests
             Mock.Of<IContentVersionService>(),
             Mock.Of<ICultureImpactFactory>(),
             Mock.Of<IUserGroupService>(),
-            Mock.Of<ICultureImpactFactory>(),
             new OptionsWrapper<ContentSettings>(new ContentSettings()));
 
         return controller;