Skip to content

Fix I/O conflicts when running OpenAPI tests #2013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bkoelman merged 3 commits into from
May 25, 2026
Merged

Fix I/O conflicts when running OpenAPI tests #2013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef8a0c6
Simplify ConfigureServices
bkoelman May 24, 2026
4824295
Rename SwaggerDocument to OpenApiDocument in tests
bkoelman May 25, 2026
93ef9f5
Include TFM in generated OpenAPI directory names to fix I/O contentio…
bkoelman May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public void ConfigureMvc()
if (_options.ValidateModelState)
{
_mvcBuilder.AddDataAnnotations();
_services.Replace(new ServiceDescriptor(typeof(IModelMetadataProvider), typeof(JsonApiModelMetadataProvider), ServiceLifetime.Singleton));
_services.Replace(ServiceDescriptor.Singleton<IModelMetadataProvider, JsonApiModelMetadataProvider>());
}
}

Expand Down
6 changes: 2 additions & 4 deletions .../IntegrationTests/ContentNegotiation/CustomExtensions/CustomExtensionsContentTypeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using JsonApiDotNetCore.Serialization.Request.Adapters;
using JsonApiDotNetCore.Serialization.Response;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using TestBuildingBlocks;
using Xunit;

Expand Down Expand Up @@ -40,10 +39,9 @@ public CustomExtensionsContentTypeTests(IntegrationTestContext<TestableStartup<P
var requestDocumentStore = serviceProvider.GetRequiredService<RequestDocumentStore>();
return new CapturingDocumentAdapter(documentAdapter, requestDocumentStore);
});
});

testContext.PostConfigureServices(services => services.Replace(
ServiceDescriptor.Singleton<TimeProvider>(new FrozenTimeProvider(CurrentTime, TimeZoneInfo.FindSystemTimeZoneById("Tokyo Standard Time")))));
services.AddSingleton<TimeProvider>(new FrozenTimeProvider(CurrentTime, TimeZoneInfo.FindSystemTimeZoneById("Tokyo Standard Time")));
});

var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
#pragma warning disable CS0618 // Type or member is obsolete
Expand Down
3 changes: 1 addition & 2 deletions ...piDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/ResourceInjectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using JsonApiDotNetCore.Serialization.Objects;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using TestBuildingBlocks;
using Xunit;

Expand All @@ -26,7 +25,7 @@ public ResourceInjectionTests(IntegrationTestContext<TestableStartup<InjectionDb
testContext.UseController<GiftCertificatesController>();
testContext.UseController<PostOfficesController>();

testContext.PostConfigureServices(services => services.Replace(ServiceDescriptor.Singleton<TimeProvider>(new FrozenTimeProvider(CurrentTime))));
testContext.ConfigureServices(services => services.AddSingleton<TimeProvider>(new FrozenTimeProvider(CurrentTime)));

var timeProvider = (FrozenTimeProvider)testContext.Factory.Services.GetRequiredService<TimeProvider>();
timeProvider.Reset();
Expand Down
5 changes: 2 additions & 3 deletions test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using JsonApiDotNetCore.Serialization.Objects;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using TestBuildingBlocks;
using Xunit;

Expand All @@ -30,9 +29,9 @@ public SoftDeletionTests(IntegrationTestContext<TestableStartup<SoftDeletionDbCo
{
services.AddResourceService<SoftDeletionAwareResourceService<Company, long>>();
services.AddResourceService<SoftDeletionAwareResourceService<Department, long>>();
});

testContext.PostConfigureServices(services => services.Replace(ServiceDescriptor.Singleton<TimeProvider>(new FrozenTimeProvider(CurrentTime))));
services.AddSingleton<TimeProvider>(new FrozenTimeProvider(CurrentTime));
});

var timeProvider = (FrozenTimeProvider)testContext.Factory.Services.GetRequiredService<TimeProvider>();
timeProvider.Reset();
Expand Down
62 changes: 31 additions & 31 deletions test/OpenApiKiotaEndToEndTests/OpenApiKiotaEndToEndTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>
Expand All @@ -23,113 +23,113 @@
</ItemGroup>

<ItemGroup>
<KiotaReference Include="../OpenApiTests/AtomicOperations/GeneratedSwagger/swagger.g.json">
<KiotaReference Include="..\OpenApiTests\AtomicOperations\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Name>AtomicOperations</Name>
<NamespaceName>$(MSBuildProjectName).%(Name).GeneratedCode</NamespaceName>
<ClassName>%(Name)Client</ClassName>
<OutputPath>./%(Name)/GeneratedCode</OutputPath>
<OutputPath>.\%(Name)\GeneratedCode</OutputPath>
<ExtraArguments>$(JsonApiExtraArguments)</ExtraArguments>
</KiotaReference>
<KiotaReference Include="../OpenApiTests/AttributeTypes/GeneratedSwagger/swagger.g.json">
<KiotaReference Include="..\OpenApiTests\AttributeTypes\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Name>AttributeTypes</Name>
<NamespaceName>$(MSBuildProjectName).%(Name).GeneratedCode</NamespaceName>
<ClassName>%(Name)Client</ClassName>
<OutputPath>./%(Name)/GeneratedCode</OutputPath>
<OutputPath>.\%(Name)\GeneratedCode</OutputPath>
<ExtraArguments>$(JsonApiExtraArguments)</ExtraArguments>
</KiotaReference>
<KiotaReference Include="../OpenApiTests/ClientIdGenerationModes/GeneratedSwagger/swagger.g.json">
<KiotaReference Include="..\OpenApiTests\ClientIdGenerationModes\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Name>ClientIdGenerationModes</Name>
<NamespaceName>$(MSBuildProjectName).%(Name).GeneratedCode</NamespaceName>
<ClassName>%(Name)Client</ClassName>
<OutputPath>./%(Name)/GeneratedCode</OutputPath>
<OutputPath>.\%(Name)\GeneratedCode</OutputPath>
<ExtraArguments>$(JsonApiExtraArguments)</ExtraArguments>
</KiotaReference>
<KiotaReference Include="../OpenApiTests/CustomRoutes/GeneratedSwagger/swagger.g.json">
<KiotaReference Include="..\OpenApiTests\CustomRoutes\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Name>CustomRoutes</Name>
<NamespaceName>$(MSBuildProjectName).%(Name).GeneratedCode</NamespaceName>
<ClassName>%(Name)Client</ClassName>
<OutputPath>./%(Name)/GeneratedCode</OutputPath>
<OutputPath>.\%(Name)\GeneratedCode</OutputPath>
<ExtraArguments>$(JsonApiExtraArguments)</ExtraArguments>
</KiotaReference>
<KiotaReference Include="../OpenApiTests/Headers/GeneratedSwagger/swagger.g.json">
<KiotaReference Include="..\OpenApiTests\Headers\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Name>Headers</Name>
<NamespaceName>$(MSBuildProjectName).%(Name).GeneratedCode</NamespaceName>
<ClassName>%(Name)Client</ClassName>
<OutputPath>./%(Name)/GeneratedCode</OutputPath>
<OutputPath>.\%(Name)\GeneratedCode</OutputPath>
<ExtraArguments>$(JsonApiExtraArguments)</ExtraArguments>
</KiotaReference>
<KiotaReference Include="../OpenApiTests/IdObfuscation/GeneratedSwagger/swagger.g.json">
<KiotaReference Include="..\OpenApiTests\IdObfuscation\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Name>IdObfuscation</Name>
<NamespaceName>$(MSBuildProjectName).%(Name).GeneratedCode</NamespaceName>
<ClassName>%(Name)Client</ClassName>
<OutputPath>./%(Name)/GeneratedCode</OutputPath>
<OutputPath>.\%(Name)\GeneratedCode</OutputPath>
<ExtraArguments>$(JsonApiExtraArguments)</ExtraArguments>
</KiotaReference>
<KiotaReference Include="../OpenApiTests/Links/Enabled/GeneratedSwagger/swagger.g.json">
<KiotaReference Include="..\OpenApiTests\Links\Enabled\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Name>Links</Name>
<NamespaceName>$(MSBuildProjectName).%(Name).GeneratedCode</NamespaceName>
<ClassName>%(Name)Client</ClassName>
<OutputPath>./%(Name)/GeneratedCode</OutputPath>
<OutputPath>.\%(Name)\GeneratedCode</OutputPath>
<ExtraArguments>$(JsonApiExtraArguments)</ExtraArguments>
</KiotaReference>
<KiotaReference Include="../OpenApiTests/MixedControllers/GeneratedSwagger/swagger.g.json">
<KiotaReference Include="..\OpenApiTests\MixedControllers\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Name>MixedControllers</Name>
<NamespaceName>$(MSBuildProjectName).%(Name).GeneratedCode</NamespaceName>
<ClassName>%(Name)Client</ClassName>
<OutputPath>./%(Name)/GeneratedCode</OutputPath>
<OutputPath>.\%(Name)\GeneratedCode</OutputPath>
<ExtraArguments>$(JsonApiExtraArguments)</ExtraArguments>
</KiotaReference>
<KiotaReference Include="../OpenApiTests/ModelStateValidation/GeneratedSwagger/swagger.g.json">
<KiotaReference Include="..\OpenApiTests\ModelStateValidation\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Name>ModelStateValidation</Name>
<NamespaceName>$(MSBuildProjectName).%(Name).GeneratedCode</NamespaceName>
<ClassName>%(Name)Client</ClassName>
<OutputPath>./%(Name)/GeneratedCode</OutputPath>
<OutputPath>.\%(Name)\GeneratedCode</OutputPath>
<ExtraArguments>$(JsonApiExtraArguments)</ExtraArguments>
</KiotaReference>
<KiotaReference Include="../OpenApiTests/QueryStrings/GeneratedSwagger/swagger.g.json">
<KiotaReference Include="..\OpenApiTests\QueryStrings\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Name>QueryStrings</Name>
<NamespaceName>$(MSBuildProjectName).%(Name).GeneratedCode</NamespaceName>
<ClassName>%(Name)Client</ClassName>
<OutputPath>./%(Name)/GeneratedCode</OutputPath>
<OutputPath>.\%(Name)\GeneratedCode</OutputPath>
<ExtraArguments>$(JsonApiExtraArguments)</ExtraArguments>
</KiotaReference>
<KiotaReference Include="../OpenApiTests/ResourceInheritance/NoOperations/GeneratedSwagger/swagger.g.json">
<KiotaReference Include="..\OpenApiTests\ResourceInheritance\NoOperations\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Subcategory>ResourceInheritance</Subcategory>
<Name>NoOperations</Name>
<NamespaceName>$(MSBuildProjectName).%(Subcategory).%(Name).GeneratedCode</NamespaceName>
<ClassName>%(Name)InheritanceClient</ClassName>
<OutputPath>./%(Subcategory)/%(Name)/GeneratedCode</OutputPath>
<OutputPath>.\%(Subcategory)\%(Name)\GeneratedCode</OutputPath>
<ExtraArguments>$(JsonApiExtraArguments)</ExtraArguments>
</KiotaReference>
<KiotaReference Include="../OpenApiTests/ResourceInheritance/OnlyRelationships/GeneratedSwagger/swagger.g.json">
<KiotaReference Include="..\OpenApiTests\ResourceInheritance\OnlyRelationships\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Subcategory>ResourceInheritance</Subcategory>
<Name>OnlyRelationships</Name>
<NamespaceName>$(MSBuildProjectName).%(Subcategory).%(Name).GeneratedCode</NamespaceName>
<ClassName>%(Name)InheritanceClient</ClassName>
<OutputPath>./%(Subcategory)/%(Name)/GeneratedCode</OutputPath>
<OutputPath>.\%(Subcategory)\%(Name)\GeneratedCode</OutputPath>
<ExtraArguments>$(JsonApiExtraArguments)</ExtraArguments>
</KiotaReference>
<KiotaReference Include="../OpenApiTests/ResourceInheritance/SubsetOfOperations/GeneratedSwagger/swagger.g.json">
<KiotaReference Include="..\OpenApiTests\ResourceInheritance\SubsetOfOperations\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Subcategory>ResourceInheritance</Subcategory>
<Name>SubsetOfOperations</Name>
<NamespaceName>$(MSBuildProjectName).%(Subcategory).%(Name).GeneratedCode</NamespaceName>
<ClassName>%(Name)InheritanceClient</ClassName>
<OutputPath>./%(Subcategory)/%(Name)/GeneratedCode</OutputPath>
<OutputPath>.\%(Subcategory)\%(Name)\GeneratedCode</OutputPath>
<ExtraArguments>$(JsonApiExtraArguments)</ExtraArguments>
</KiotaReference>
<KiotaReference Include="../OpenApiTests/ResourceInheritance/SubsetOfVarious/GeneratedSwagger/swagger.g.json">
<KiotaReference Include="..\OpenApiTests\ResourceInheritance\SubsetOfVarious\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Subcategory>ResourceInheritance</Subcategory>
<Name>SubsetOfVarious</Name>
<NamespaceName>$(MSBuildProjectName).%(Subcategory).%(Name).GeneratedCode</NamespaceName>
<ClassName>%(Name)InheritanceClient</ClassName>
<OutputPath>./%(Subcategory)/%(Name)/GeneratedCode</OutputPath>
<OutputPath>.\%(Subcategory)\%(Name)\GeneratedCode</OutputPath>
<ExtraArguments>$(JsonApiExtraArguments)</ExtraArguments>
</KiotaReference>
<KiotaReference Include="../OpenApiTests/RestrictedControllers/GeneratedSwagger/swagger.g.json">
<KiotaReference Include="..\OpenApiTests\RestrictedControllers\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Name>RestrictedControllers</Name>
<NamespaceName>$(MSBuildProjectName).%(Name).GeneratedCode</NamespaceName>
<ClassName>%(Name)Client</ClassName>
<OutputPath>./%(Name)/GeneratedCode</OutputPath>
<OutputPath>.\%(Name)\GeneratedCode</OutputPath>
<ExtraArguments>$(JsonApiExtraArguments)</ExtraArguments>
</KiotaReference>
</ItemGroup>
Expand Down
18 changes: 9 additions & 9 deletions test/OpenApiNSwagClientTests/OpenApiNSwagClientTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- TargetFrameworks does not work, see https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/2706 -->
<TargetFramework>net10.0</TargetFramework>
Expand Down Expand Up @@ -27,33 +27,33 @@
</PropertyGroup>

<ItemGroup>
<OpenApiReference Include="..\OpenApiTests\LegacyOpenApi\GeneratedSwagger\swagger.g.json">
<OpenApiReference Include="..\OpenApiTests\LegacyOpenApi\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Namespace>$(MSBuildProjectName).LegacyOpenApi.GeneratedCode</Namespace>
<ClassName>LegacyClient</ClassName>
<OutputPath>%(ClassName).cs</OutputPath>
<NSwagGenerateNullableReferenceTypes>false</NSwagGenerateNullableReferenceTypes>
<NSwagGenerateOptionalPropertiesAsNullable>false</NSwagGenerateOptionalPropertiesAsNullable>
<NSwagGenerateOptionalParameters>false</NSwagGenerateOptionalParameters>
</OpenApiReference>
<OpenApiReference Include="..\OpenApiTests\NamingConventions\KebabCase\GeneratedSwagger\swagger.g.json">
<OpenApiReference Include="..\OpenApiTests\NamingConventions\KebabCase\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Name>KebabCase</Name>
<Namespace>$(MSBuildProjectName).NamingConventions.%(Name).GeneratedCode</Namespace>
<ClassName>%(Name)Client</ClassName>
<OutputPath>%(ClassName).cs</OutputPath>
</OpenApiReference>
<OpenApiReference Include="..\OpenApiTests\NamingConventions\CamelCase\GeneratedSwagger\swagger.g.json">
<OpenApiReference Include="..\OpenApiTests\NamingConventions\CamelCase\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Name>CamelCase</Name>
<Namespace>$(MSBuildProjectName).NamingConventions.%(Name).GeneratedCode</Namespace>
<ClassName>%(Name)Client</ClassName>
<OutputPath>%(ClassName).cs</OutputPath>
</OpenApiReference>
<OpenApiReference Include="..\OpenApiTests\NamingConventions\PascalCase\GeneratedSwagger\swagger.g.json">
<OpenApiReference Include="..\OpenApiTests\NamingConventions\PascalCase\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Name>PascalCase</Name>
<Namespace>$(MSBuildProjectName).NamingConventions.%(Name).GeneratedCode</Namespace>
<ClassName>%(Name)Client</ClassName>
<OutputPath>%(ClassName).cs</OutputPath>
</OpenApiReference>
<OpenApiReference Include="..\OpenApiTests\ResourceFieldValidation\NullableReferenceTypesOff\ModelStateValidationOff\GeneratedSwagger\swagger.g.json">
<OpenApiReference Include="..\OpenApiTests\ResourceFieldValidation\NullableReferenceTypesOff\ModelStateValidationOff\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Name>NrtOffMsvOff</Name>
<Namespace>$(MSBuildProjectName).ResourceFieldValidation.NullableReferenceTypesOff.ModelStateValidationOff.GeneratedCode</Namespace>
<ClassName>%(Name)Client</ClassName>
Expand All @@ -62,7 +62,7 @@
<NSwagGenerateOptionalPropertiesAsNullable>false</NSwagGenerateOptionalPropertiesAsNullable>
<NSwagGenerateOptionalParameters>false</NSwagGenerateOptionalParameters>
</OpenApiReference>
<OpenApiReference Include="..\OpenApiTests\ResourceFieldValidation\NullableReferenceTypesOff\ModelStateValidationOn\GeneratedSwagger\swagger.g.json">
<OpenApiReference Include="..\OpenApiTests\ResourceFieldValidation\NullableReferenceTypesOff\ModelStateValidationOn\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Name>NrtOffMsvOn</Name>
<Namespace>$(MSBuildProjectName).ResourceFieldValidation.NullableReferenceTypesOff.ModelStateValidationOn.GeneratedCode</Namespace>
<ClassName>%(Name)Client</ClassName>
Expand All @@ -71,7 +71,7 @@
<NSwagGenerateOptionalPropertiesAsNullable>false</NSwagGenerateOptionalPropertiesAsNullable>
<NSwagGenerateOptionalParameters>false</NSwagGenerateOptionalParameters>
</OpenApiReference>
<OpenApiReference Include="..\OpenApiTests\ResourceFieldValidation\NullableReferenceTypesOn\ModelStateValidationOff\GeneratedSwagger\swagger.g.json">
<OpenApiReference Include="..\OpenApiTests\ResourceFieldValidation\NullableReferenceTypesOn\ModelStateValidationOff\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Name>NrtOnMsvOff</Name>
<Namespace>$(MSBuildProjectName).ResourceFieldValidation.NullableReferenceTypesOn.ModelStateValidationOff.GeneratedCode</Namespace>
<ClassName>%(Name)Client</ClassName>
Expand All @@ -80,7 +80,7 @@
<NSwagGenerateOptionalPropertiesAsNullable>false</NSwagGenerateOptionalPropertiesAsNullable>
<NSwagGenerateOptionalParameters>false</NSwagGenerateOptionalParameters>
</OpenApiReference>
<OpenApiReference Include="..\OpenApiTests\ResourceFieldValidation\NullableReferenceTypesOn\ModelStateValidationOn\GeneratedSwagger\swagger.g.json">
<OpenApiReference Include="..\OpenApiTests\ResourceFieldValidation\NullableReferenceTypesOn\ModelStateValidationOn\GeneratedSwagger\$(TargetFramework)\swagger.g.json">
<Name>NrtOnMsvOn</Name>
<Namespace>$(MSBuildProjectName).ResourceFieldValidation.NullableReferenceTypesOn.ModelStateValidationOn.GeneratedCode</Namespace>
<ClassName>%(Name)Client</ClassName>
Expand Down
Loading
Loading