V14: Fix pipelines (#14566)

* Try undoing inheritance change

Just to see if the issue stems from there

* Try specifying order again

* Log something

* Maybe it's a culture thing

* That wasn't it

* Maybe content deliver need to exist as an applicationPart

* Order found types

* Cleanup
This commit is contained in:
Mole
2023-07-18 10:18:31 +02:00
committed by GitHub
parent b31c59d2a5
commit d306a65bd4
4 changed files with 7 additions and 6 deletions

View File

@@ -22,7 +22,7 @@ public sealed class UmbracoJsonTypeInfoResolver : DefaultJsonTypeInfoResolver, I
return cachedResult;
}
var result = _typeFinder.FindClassesOfType(type).ToHashSet();
var result = _typeFinder.FindClassesOfType(type).OrderBy(x => x.Name).ToHashSet();
_subTypesCache.TryAdd(type, result);
return result;
}

View File

@@ -20,6 +20,7 @@ public class ConfigureUmbracoManagementApiSwaggerGenOptions : IConfigureOptions<
public void Configure(SwaggerGenOptions swaggerGenOptions)
{
swaggerGenOptions.SwaggerDoc(
ManagementApiConfiguration.ApiName,
new OpenApiInfo
@@ -36,7 +37,7 @@ public class ConfigureUmbracoManagementApiSwaggerGenOptions : IConfigureOptions<
swaggerGenOptions.AddSecurityDefinition(
ManagementApiConfiguration.ApiSecurityName,
new OpenApiSecurityScheme
new OpenApiSecurityScheme
{
In = ParameterLocation.Header,
Name = "Umbraco",
@@ -56,4 +57,5 @@ public class ConfigureUmbracoManagementApiSwaggerGenOptions : IConfigureOptions<
// Sets Security requirement on backoffice apis
swaggerGenOptions.OperationFilter<BackOfficeSecurityRequirementsOperationFilter>();
}
}

View File

@@ -17407,6 +17407,9 @@
{
"$ref": "#/components/schemas/ContentTreeItemResponseModel"
},
{
"$ref": "#/components/schemas/DataTypeTreeItemResponseModel"
},
{
"$ref": "#/components/schemas/DocumentBlueprintTreeItemResponseModel"
},
@@ -17424,9 +17427,6 @@
},
{
"$ref": "#/components/schemas/MediaTypeTreeItemResponseModel"
},
{
"$ref": "#/components/schemas/DataTypeTreeItemResponseModel"
}
]
}

View File

@@ -46,7 +46,6 @@ internal sealed class OpenAPIContractTest : UmbracoTestServerTestBase
public async Task Validate_OpenApi_Contract_is_implemented()
{
string[] keysToIgnore = { "servers", "x-generator" };
var officePath = GlobalSettings.GetBackOfficePath(HostingEnvironment);
var urlToContract = $"{officePath}/management/api/openapi.json";