From 228c11a6fbe84bb705df620ee04a825ffb24d14d Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 6 Jan 2022 18:06:22 +0100 Subject: [PATCH] Fix OpenAPI responses. --- .../Squidex.Domain.Apps.Core.Operations.csproj | 2 +- backend/src/Squidex.Domain.Apps.Entities/FodyWeavers.xml | 3 --- .../Squidex.Domain.Apps.Entities.csproj | 5 ----- .../Squidex.Infrastructure/Squidex.Infrastructure.csproj | 4 ++-- .../Areas/Api/Config/OpenApi/XmlResponseTypesProcessor.cs | 6 +++--- backend/src/Squidex/Squidex.csproj | 6 +++--- 6 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 backend/src/Squidex.Domain.Apps.Entities/FodyWeavers.xml diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj b/backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj index da135f774..ca468df27 100644 --- a/backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj +++ b/backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj @@ -26,7 +26,7 @@ - + diff --git a/backend/src/Squidex.Domain.Apps.Entities/FodyWeavers.xml b/backend/src/Squidex.Domain.Apps.Entities/FodyWeavers.xml deleted file mode 100644 index 1b04e09ca..000000000 --- a/backend/src/Squidex.Domain.Apps.Entities/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj b/backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj index 6267db4ac..efdbefbbc 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj +++ b/backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj @@ -19,11 +19,6 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj b/backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj index 086be9f21..82bf6182a 100644 --- a/backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj +++ b/backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj @@ -28,12 +28,12 @@ - + - + diff --git a/backend/src/Squidex/Areas/Api/Config/OpenApi/XmlResponseTypesProcessor.cs b/backend/src/Squidex/Areas/Api/Config/OpenApi/XmlResponseTypesProcessor.cs index 65b315228..e20924e55 100644 --- a/backend/src/Squidex/Areas/Api/Config/OpenApi/XmlResponseTypesProcessor.cs +++ b/backend/src/Squidex/Areas/Api/Config/OpenApi/XmlResponseTypesProcessor.cs @@ -1,4 +1,4 @@ -// ========================================================================== +// ========================================================================== // Squidex Headless CMS // ========================================================================== // Copyright (c) Squidex UG (haftungsbeschraenkt) @@ -15,7 +15,7 @@ namespace Squidex.Areas.Api.Config.OpenApi { public sealed class XmlResponseTypesProcessor : IOperationProcessor { - private static readonly Regex ResponseRegex = new Regex("(?[0-9]{3}) => (?.*)", RegexOptions.Compiled); + private static readonly Regex ResponseRegex = new Regex("(?[0-9]{3})[\\s]*=((>)|>)[\\s]*(?.*)", RegexOptions.Compiled | RegexOptions.ExplicitCapture); public bool Process(OperationProcessorContext context) { @@ -50,4 +50,4 @@ namespace Squidex.Areas.Api.Config.OpenApi return true; } } -} \ No newline at end of file +} diff --git a/backend/src/Squidex/Squidex.csproj b/backend/src/Squidex/Squidex.csproj index c40bdb87b..df9d006a6 100644 --- a/backend/src/Squidex/Squidex.csproj +++ b/backend/src/Squidex/Squidex.csproj @@ -60,11 +60,11 @@ - + - + - +