Merge a0d863f into 4392777

Author: maurei

test/OpenApiClientTests/OpenApiClientTests.csproj

@@ -3,12 +3,6 @@
     <TargetFramework>$(TargetFrameworkName)</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Update="xunit.runner.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\JsonApiDotNetCore.OpenApi.Client\JsonApiDotNetCore.OpenApi.Client.csproj" />
     <ProjectReference Include="..\TestBuildingBlocks\TestBuildingBlocks.csproj" />

test/OpenApiClientTests/xunit.runner.json

@@ -32,5 +32,7 @@ protected override void OnModelCreating(ModelBuilder builder)
         builder.Entity<Flight>()
             .HasOne(flight => flight.BackupPurser)
             .WithMany();
+
+        base.OnModelCreating(builder);
     }
 }

test/OpenApiTests/LegacyOpenApiIntegration/LegacyIntegrationDbContext.cs

@@ -3,12 +3,6 @@
     <TargetFramework>$(TargetFrameworkName)</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Update="xunit.runner.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="LegacyOpenApiIntegration\swagger.json" />
   </ItemGroup>