Browse Source

Fix OpenAPI responses.

pull/824/head
Sebastian 4 years ago
parent
commit
228c11a6fb
  1. 2
      backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj
  2. 3
      backend/src/Squidex.Domain.Apps.Entities/FodyWeavers.xml
  3. 5
      backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
  4. 4
      backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
  5. 4
      backend/src/Squidex/Areas/Api/Config/OpenApi/XmlResponseTypesProcessor.cs
  6. 6
      backend/src/Squidex/Squidex.csproj

2
backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj

@ -26,7 +26,7 @@
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
<PackageReference Include="Microsoft.OData.Core" Version="7.9.4" /> <PackageReference Include="Microsoft.OData.Core" Version="7.9.4" />
<PackageReference Include="NJsonSchema" Version="10.6.4" /> <PackageReference Include="NJsonSchema" Version="10.6.6" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Collections.Immutable" Version="6.0.0" /> <PackageReference Include="System.Collections.Immutable" Version="6.0.0" />

3
backend/src/Squidex.Domain.Apps.Entities/FodyWeavers.xml

@ -1,3 +0,0 @@
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<Equals />
</Weavers>

5
backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj

@ -19,11 +19,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CsvHelper" Version="27.2.1" /> <PackageReference Include="CsvHelper" Version="27.2.1" />
<PackageReference Include="Equals.Fody" Version="4.0.1" PrivateAssets="all" />
<PackageReference Include="Fody" Version="6.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="GraphQL" Version="4.6.1" /> <PackageReference Include="GraphQL" Version="4.6.1" />
<PackageReference Include="GraphQL.DataLoader" Version="4.6.1" /> <PackageReference Include="GraphQL.DataLoader" Version="4.6.1" />
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680"> <PackageReference Include="Meziantou.Analyzer" Version="1.0.680">

4
backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj

@ -28,12 +28,12 @@
<PackageReference Include="Microsoft.Orleans.Core" Version="3.5.1" /> <PackageReference Include="Microsoft.Orleans.Core" Version="3.5.1" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.5.1" /> <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.5.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NJsonSchema" Version="10.6.4" /> <PackageReference Include="NJsonSchema" Version="10.6.6" />
<PackageReference Include="OpenTelemetry.Api" Version="1.1.0" /> <PackageReference Include="OpenTelemetry.Api" Version="1.1.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="Squidex.Assets" Version="2.6.0" /> <PackageReference Include="Squidex.Assets" Version="2.6.0" />
<PackageReference Include="Squidex.Caching" Version="1.8.0" /> <PackageReference Include="Squidex.Caching" Version="1.8.0" />
<PackageReference Include="Squidex.Hosting.Abstractions" Version="2.4.0" /> <PackageReference Include="Squidex.Hosting.Abstractions" Version="2.8.0" />
<PackageReference Include="Squidex.Log" Version="1.6.0" /> <PackageReference Include="Squidex.Log" Version="1.6.0" />
<PackageReference Include="Squidex.Text" Version="1.7.0" /> <PackageReference Include="Squidex.Text" Version="1.7.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />

4
backend/src/Squidex/Areas/Api/Config/OpenApi/XmlResponseTypesProcessor.cs

@ -1,4 +1,4 @@
// ========================================================================== // ==========================================================================
// Squidex Headless CMS // Squidex Headless CMS
// ========================================================================== // ==========================================================================
// Copyright (c) Squidex UG (haftungsbeschraenkt) // Copyright (c) Squidex UG (haftungsbeschraenkt)
@ -15,7 +15,7 @@ namespace Squidex.Areas.Api.Config.OpenApi
{ {
public sealed class XmlResponseTypesProcessor : IOperationProcessor public sealed class XmlResponseTypesProcessor : IOperationProcessor
{ {
private static readonly Regex ResponseRegex = new Regex("(?<Code>[0-9]{3}) =&gt; (?<Description>.*)", RegexOptions.Compiled); private static readonly Regex ResponseRegex = new Regex("(?<Code>[0-9]{3})[\\s]*=((&gt;)|>)[\\s]*(?<Description>.*)", RegexOptions.Compiled | RegexOptions.ExplicitCapture);
public bool Process(OperationProcessorContext context) public bool Process(OperationProcessorContext context)
{ {

6
backend/src/Squidex/Squidex.csproj

@ -60,11 +60,11 @@
<PackageReference Include="Microsoft.Orleans.Hosting.Kubernetes" Version="3.5.1" /> <PackageReference Include="Microsoft.Orleans.Hosting.Kubernetes" Version="3.5.1" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.5.1" /> <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.5.1" />
<PackageReference Include="MongoDB.Driver" Version="2.14.1" /> <PackageReference Include="MongoDB.Driver" Version="2.14.1" />
<PackageReference Include="Namotion.Reflection" Version="2.0.8" /> <PackageReference Include="Namotion.Reflection" Version="2.0.9" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NJsonSchema" Version="10.6.4" /> <PackageReference Include="NJsonSchema" Version="10.6.6" />
<PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.0.0" /> <PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.0.0" />
<PackageReference Include="NSwag.AspNetCore" Version="13.15.3" /> <PackageReference Include="NSwag.AspNetCore" Version="13.15.5" />
<PackageReference Include="OpenCover" Version="4.7.1221" PrivateAssets="all" /> <PackageReference Include="OpenCover" Version="4.7.1221" PrivateAssets="all" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc7" /> <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc7" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc7" /> <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc7" />

Loading…
Cancel
Save