From 6a8f8a48edaf673d6c02cf77d7015d3a67ca1381 Mon Sep 17 00:00:00 2001 From: kjac Date: Sun, 22 Oct 2023 11:48:27 +0200 Subject: [PATCH] Fixed merge conflicts and ensured same version of OpenIddict abstractions across the solution --- ...eUmbracoMemberAuthenticationDeliveryApiSwaggerGenOptions.cs | 2 +- .../Routing/DeliveryApiItemsEndpointsMatcherPolicy.cs | 3 ++- src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Cms.Api.Delivery/Configuration/ConfigureUmbracoMemberAuthenticationDeliveryApiSwaggerGenOptions.cs b/src/Umbraco.Cms.Api.Delivery/Configuration/ConfigureUmbracoMemberAuthenticationDeliveryApiSwaggerGenOptions.cs index 49f5a6fc56..11e8070f4c 100644 --- a/src/Umbraco.Cms.Api.Delivery/Configuration/ConfigureUmbracoMemberAuthenticationDeliveryApiSwaggerGenOptions.cs +++ b/src/Umbraco.Cms.Api.Delivery/Configuration/ConfigureUmbracoMemberAuthenticationDeliveryApiSwaggerGenOptions.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Options; using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.SwaggerGen; using Umbraco.Cms.Api.Common.Security; -using Umbraco.Cms.Api.Delivery.Controllers; +using Umbraco.Cms.Api.Delivery.Controllers.Content; using Umbraco.Cms.Api.Delivery.Filters; namespace Umbraco.Cms.Api.Delivery.Configuration; diff --git a/src/Umbraco.Cms.Api.Delivery/Routing/DeliveryApiItemsEndpointsMatcherPolicy.cs b/src/Umbraco.Cms.Api.Delivery/Routing/DeliveryApiItemsEndpointsMatcherPolicy.cs index ec1b222cd0..52b38414f8 100644 --- a/src/Umbraco.Cms.Api.Delivery/Routing/DeliveryApiItemsEndpointsMatcherPolicy.cs +++ b/src/Umbraco.Cms.Api.Delivery/Routing/DeliveryApiItemsEndpointsMatcherPolicy.cs @@ -2,7 +2,8 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Routing.Matching; -using Umbraco.Cms.Api.Delivery.Controllers; +using Umbraco.Cms.Api.Delivery.Controllers.Content; +using Umbraco.Cms.Api.Delivery.Controllers.Media; namespace Umbraco.Cms.Api.Delivery.Routing; diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj index 0c1a5b8d1c..8a7ad9fa8b 100644 --- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj +++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj @@ -26,7 +26,7 @@ - +