Browse Source

Super strange .NET FX bug.

pull/131/head
Sebastian Stehle 9 years ago
parent
commit
cc679d8598
  1. 2
      src/Squidex.Domain.Apps.Core/Schemas/Field.cs
  2. 2
      src/Squidex.Domain.Apps.Core/Schemas/GeolocationField.cs
  3. 2
      src/Squidex.Domain.Apps.Core/Schemas/StringField.cs
  4. 2
      src/Squidex.Domain.Apps.Core/Squidex.Domain.Apps.Core.csproj
  5. 2
      src/Squidex.Domain.Apps.Read/Contents/JsonSchema/ContentSchemaBuilder.cs
  6. 2
      src/Squidex.Domain.Apps.Read/Squidex.Domain.Apps.Read.csproj
  7. 2
      src/Squidex/Config/Swagger/XmlResponseTypesProcessor.cs
  8. 4
      src/Squidex/Controllers/ContentApi/Generator/SchemasSwaggerGenerator.cs
  9. 7
      src/Squidex/Pipeline/Swagger/SwaggerHelper.cs
  10. 8
      src/Squidex/Squidex.csproj
  11. 2
      tests/RunCoverage.ps1
  12. 2
      tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj

2
src/Squidex.Domain.Apps.Core/Schemas/Field.cs

@ -182,7 +182,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
partitionObject.Properties.Add(partitionItem.Key, partitionItemProperty);
}
partitionProperty.SchemaReference = schemaResolver($"{schemaName}{Name.ToPascalCase()}Property", partitionObject);
partitionProperty.Reference = schemaResolver($"{schemaName}{Name.ToPascalCase()}Property", partitionObject);
schema.Properties.Add(Name, partitionProperty);
}

2
src/Squidex.Domain.Apps.Core/Schemas/GeolocationField.cs

@ -83,7 +83,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
var schemaReference = schemaResolver("GeolocationDto", geolocationSchema);
jsonProperty.SchemaReference = schemaReference;
jsonProperty.Reference = schemaReference;
}
protected override IEdmTypeReference CreateEdmType()

2
src/Squidex.Domain.Apps.Core/Schemas/StringField.cs

@ -66,7 +66,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
if (Properties.AllowedValues != null)
{
jsonProperty.EnumerationNames = new Collection<string>(Properties.AllowedValues);
jsonProperty.EnumerationNames = new Collection<string>(Properties.AllowedValues.ToList());
}
}

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

@ -13,7 +13,7 @@
<PackageReference Include="Jint" Version="2.11.23" />
<PackageReference Include="Microsoft.OData.Core" Version="7.3.1" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="NJsonSchema" Version="9.5.0" />
<PackageReference Include="NJsonSchema" Version="9.7.1" />
<PackageReference Include="NodaTime" Version="2.2.0" />
<PackageReference Include="RefactoringEssentials" Version="5.2.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />

2
src/Squidex.Domain.Apps.Read/Contents/JsonSchema/ContentSchemaBuilder.cs

@ -41,7 +41,7 @@ namespace Squidex.Domain.Apps.Read.Contents.JsonSchema
private static JsonProperty CreateProperty(string description, JsonSchema4 dataSchema)
{
return new JsonProperty { Description = description, IsRequired = true, Type = JsonObjectType.Object, SchemaReference = dataSchema };
return new JsonProperty { Description = description, IsRequired = true, Type = JsonObjectType.Object, Reference = dataSchema };
}
private static JsonProperty CreateProperty(string description, JsonObjectType type)

2
src/Squidex.Domain.Apps.Read/Squidex.Domain.Apps.Read.csproj

@ -12,7 +12,7 @@
<ProjectReference Include="..\Squidex.Infrastructure\Squidex.Infrastructure.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="GraphQL" Version="0.17.2" />
<PackageReference Include="GraphQL" Version="0.17.3" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="1.1.2" />
<PackageReference Include="NodaTime" Version="2.2.0" />
<PackageReference Include="RefactoringEssentials" Version="5.2.0" />

2
src/Squidex/Config/Swagger/XmlResponseTypesProcessor.cs

@ -65,7 +65,7 @@ namespace Squidex.Config.Swagger
return;
}
operation.AddResponse("500", "Operation failed", await context.SwaggerGenerator.GetErrorDtoSchemaAsync());
operation.AddResponse("500", "Operation failed", await context.SchemaGenerator.GetErrorDtoSchemaAsync(context.SchemaResolver));
}
private static void RemoveOkResponse(SwaggerOperation operation)

4
src/Squidex/Controllers/ContentApi/Generator/SchemasSwaggerGenerator.cs

@ -70,7 +70,7 @@ namespace Squidex.Controllers.ContentApi.Generator
{
const string errorDescription = "Operation failed with internal server error.";
var errorDtoSchema = await swaggerGenerator.GetErrorDtoSchemaAsync();
var errorDtoSchema = await schemaGenerator.GetErrorDtoSchemaAsync(schemaResolver);
foreach (var operation in document.Paths.Values.SelectMany(x => x.Values))
{
@ -82,7 +82,7 @@ namespace Squidex.Controllers.ContentApi.Generator
{
name = char.ToUpperInvariant(name[0]) + name.Substring(1);
return new JsonSchema4 { SchemaReference = document.Definitions.GetOrAdd(name, x => schema) };
return new JsonSchema4 { Reference = document.Definitions.GetOrAdd(name, x => schema) };
}
}
}

7
src/Squidex/Pipeline/Swagger/SwaggerHelper.cs

@ -9,12 +9,13 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using NJsonSchema;
using NJsonSchema.Generation;
using NSwag;
using NSwag.SwaggerGeneration;
using Squidex.Config;
using Squidex.Controllers.Api;
using Squidex.Shared.Identity;
@ -105,11 +106,11 @@ namespace Squidex.Pipeline.Swagger
return result;
}
public static async Task<JsonSchema4> GetErrorDtoSchemaAsync(this SwaggerGenerator swaggerGenerator)
public static async Task<JsonSchema4> GetErrorDtoSchemaAsync(this JsonSchemaGenerator schemaGenerator, JsonSchemaResolver resolver)
{
var errorType = typeof(ErrorDto);
return await swaggerGenerator.GenerateAndAppendSchemaFromTypeAsync(errorType, false, null);
return await schemaGenerator.GenerateWithReference<JsonSchema4>(errorType, Enumerable.Empty<Attribute>(), resolver);
}
public static void AddQueryParameter(this SwaggerOperation operation, string name, JsonObjectType type, string description = null)

8
src/Squidex/Squidex.csproj

@ -70,15 +70,15 @@
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
<PackageReference Include="Microsoft.Data.Edm" Version="5.8.2" />
<PackageReference Include="Microsoft.Data.Edm" Version="5.8.3" />
<PackageReference Include="Microsoft.OData.Core" Version="7.3.1" />
<PackageReference Include="MongoDB.Driver" Version="2.4.4" />
<PackageReference Include="NJsonSchema" Version="9.5.0" />
<PackageReference Include="NJsonSchema" Version="9.7.1" />
<PackageReference Include="NodaTime.Serialization.JsonNet" Version="2.0.0" />
<PackageReference Include="NSwag.AspNetCore" Version="11.5.1" />
<PackageReference Include="NSwag.AspNetCore" Version="11.9.0" />
<PackageReference Include="OpenCover" Version="4.6.519" />
<PackageReference Include="RefactoringEssentials" Version="5.2.0" />
<PackageReference Include="ReportGenerator" Version="2.5.11" />
<PackageReference Include="ReportGenerator" Version="3.0.0" />
<PackageReference Include="StackExchange.Redis.StrongName" Version="1.2.6" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
<PackageReference Include="System.Linq" Version="4.3.0" />

2
tests/RunCoverage.ps1

@ -76,6 +76,6 @@ if ($all -Or $users) {
-oldStyle
}
&"$folderHome\.nuget\packages\ReportGenerator\2.5.11\tools\ReportGenerator.exe" `
&"$folderHome\.nuget\packages\ReportGenerator\3.0.0\tools\ReportGenerator.exe" `
-reports:"$folderWorking\$folderReports\*.xml" `
-targetdir:"$folderWorking\$folderReports\Output"

2
tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj

@ -11,7 +11,7 @@
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="4.19.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="Moq" Version="4.7.99" />
<PackageReference Include="Moq" Version="4.7.127" />
<PackageReference Include="RefactoringEssentials" Version="5.2.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" />

Loading…
Cancel
Save