Improve test reliability

.gitignore

@@ -1,20 +1,48 @@
-[Oo]bj/
-[Bb]in/
 .dotnet/
+.DS_Store
 .vs/
 .idea*
+_ReSharper*
+_reports
+_UpgradeReport_Files/
+artifacts/
+Backup*/
 BenchmarkDotNet.Artifacts*/
+[Bb]in/
 coverage
 coverage.*
 junit.xml
+MSBuild_Logs/
 node_modules/
+[Oo]bj/
+PublishProfiles
+TestResults/
+Thumbs.db
+UpgradeLog*.htm
+UpgradeLog*.XML
 *.binlog
-*.user
-*.pdb
-artifacts/
+*.db
+*.db-shm
+*.db-wal
+*.DotSettings
+*.GhostDoc.xml
+*.log
 *.nuget.props
-.DS_Store
-Thumbs.db
+*.nupkg
+!.packages/*.nupkg
+*.opensdf
+*.pdb
+*.[Pp]ublish.xml
+*.publishproj
+*.pubxml
+*.sdf
+*.sln.cache
+*.sln.docstates
+*.sln.ide
+*.suo
+*.user
+*.nupkg
+!.packages/*.nupkg
 test/WebSites/CliExample/wwwroot/api-docs/v1/*.json
 test/WebSites/CliExampleWithFactory/wwwroot/api-docs/v1/*.json
 test/WebSites/NswagClientExample/NSwagClient/

Directory.Build.targets

@@ -12,13 +12,12 @@
     <PackageReference Include="ReportGenerator" PrivateAssets="All" />
   </ItemGroup>
   <PropertyGroup Condition=" '$(CollectCoverage)' == 'true' ">
-    <CoverletOutput>$([System.IO.Path]::Combine($(ArtifactsPath), 'coverage', 'coverage'))</CoverletOutput>
+    <CoverletReportsPath>$([System.IO.Path]::Combine($(ArtifactsPath), 'coverage', '$(MSBuildProjectName)'))</CoverletReportsPath>
+    <CoverletOutput>$([System.IO.Path]::Combine('$(CoverletReportsPath)', 'coverage'))</CoverletOutput>
     <ReportGeneratorOutputMarkdown Condition=" '$(ReportGeneratorOutputMarkdown)' == '' AND '$(GITHUB_SHA)' != '' ">true</ReportGeneratorOutputMarkdown>
     <ReportGeneratorReportTypes>HTML</ReportGeneratorReportTypes>
     <ReportGeneratorReportTypes Condition=" '$(ReportGeneratorOutputMarkdown)' == 'true' ">$(ReportGeneratorReportTypes);MarkdownSummaryGitHub</ReportGeneratorReportTypes>
-    <ReportGeneratorTargetDirectory>$([System.IO.Path]::Combine($(ArtifactsPath), 'coverage'))</ReportGeneratorTargetDirectory>
-    <ReportGeneratorMarkdownSummary>$([System.IO.Path]::Combine($(ReportGeneratorTargetDirectory), 'SummaryGithub.md'))</ReportGeneratorMarkdownSummary>
-    <MergeWith>$([System.IO.Path]::Combine($(ReportGeneratorTargetDirectory), 'coverage.$(TargetFramework).json'))</MergeWith>
+    <ReportGeneratorMarkdownSummary>$([System.IO.Path]::Combine($(CoverletReportsPath), 'SummaryGithub.md'))</ReportGeneratorMarkdownSummary>
   </PropertyGroup>
   <UsingTask TaskName="WriteLinesToFileWithRetry" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
     <ParameterGroup>
@@ -50,7 +49,7 @@
     </Task>
   </UsingTask>
   <Target Name="GenerateCoverageReports" AfterTargets="GenerateCoverageResultAfterTest" Condition=" '$(CollectCoverage)' == 'true' ">
-    <ReportGenerator ReportFiles="@(CoverletReport)" ReportTypes="$(ReportGeneratorReportTypes)" Tag="$(Version)" TargetDirectory="$(ReportGeneratorTargetDirectory)" Title="$(AssemblyName)" VerbosityLevel="Warning" />
+    <ReportGenerator ReportFiles="@(CoverletReport)" ReportTypes="$(ReportGeneratorReportTypes)" Tag="$(Version)" TargetDirectory="$(CoverletReportsPath)" Title="$(AssemblyName)" VerbosityLevel="Warning" />
     <PropertyGroup Condition=" '$(ReportGeneratorOutputMarkdown)' == 'true' AND Exists('$(ReportGeneratorMarkdownSummary)') ">
       <_ReportSummaryContent>&lt;details&gt;&lt;summary&gt;:chart_with_upwards_trend: &lt;b&gt;$(AssemblyName) Code Coverage report&lt;/b&gt; %28$(TargetFramework)%29&lt;/summary&gt;</_ReportSummaryContent>
       <_ReportSummaryContent>$(_ReportSummaryContent)$([System.Environment]::NewLine)</_ReportSummaryContent>

Directory.Packages.props

@@ -1,7 +1,7 @@
 <Project>
   <ItemGroup>
     <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
-    <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.15.0" />
     <PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
     <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageVersion Include="IdentityServer4" Version="3.1.4" />
@@ -11,28 +11,28 @@
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.ApiExplorer" Version="2.3.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.3.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.3.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.16" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.32" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.16" />
     <PackageVersion Include="Microsoft.AspNetCore.Razor.Design" Version="2.3.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Routing" Version="2.3.0" />
     <PackageVersion Include="Microsoft.AspNetCore.StaticFiles" Version="2.3.0" />
     <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="6.0.32" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0" />
     <PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="2.1.1" />
     <PackageVersion Include="Microsoft.OpenApi" Version="1.6.23" />
     <PackageVersion Include="Microsoft.OpenApi.Readers" Version="1.6.23" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="NSwag.MSBuild" Version="14.4.0" />
-    <PackageVersion Include="ReportGenerator" Version="5.4.4" />
+    <PackageVersion Include="ReportGenerator" Version="5.4.7" />
     <PackageVersion Include="System.Text.Json" Version="4.6.0" />
-    <PackageVersion Include="Verify.XunitV3" Version="30.0.0" />
+    <PackageVersion Include="Verify.XunitV3" Version="30.1.0" />
     <PackageVersion Include="xunit" Version="2.9.3" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0" />
     <PackageVersion Include="xunit.v3" Version="2.0.2" />
     <PackageVersion Include="xunit.v3.extensibility.core" Version="2.0.2" />
   </ItemGroup>

src/Swashbuckle.AspNetCore.Newtonsoft/DependencyInjection/NewtonsoftServiceCollectionExtensions.cs

@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
 using Swashbuckle.AspNetCore.Newtonsoft;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
@@ -19,7 +18,7 @@
             ServiceDescriptor.Transient<ISerializerDataContractResolver>((s) =>
             {
                 var serializerSettings = s.GetRequiredService<IOptions<MvcNewtonsoftJsonOptions>>().Value?.SerializerSettings
-                    ?? new JsonSerializerSettings();
+                    ?? new();
 
                 return new NewtonsoftDataContractResolver(serializerSettings);
             }));

test/Swashbuckle.AspNetCore.IntegrationTests/Swashbuckle.AspNetCore.IntegrationTests.csproj

@@ -43,13 +43,13 @@
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" VersionOverride="8.0.14" />
-    <PackageReference Update="Microsoft.AspNetCore.TestHost" VersionOverride="8.0.14" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" VersionOverride="8.0.16" />
+    <PackageReference Update="Microsoft.AspNetCore.TestHost" VersionOverride="8.0.16" />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" VersionOverride="9.0.3" />
-    <PackageReference Update="Microsoft.AspNetCore.TestHost" VersionOverride="9.0.3" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" VersionOverride="9.0.5" />
+    <PackageReference Update="Microsoft.AspNetCore.TestHost" VersionOverride="9.0.5" />
   </ItemGroup>
 
 </Project>

test/WebSites/CustomUIConfig/CustomUIConfig.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
+    <StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
     <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 

test/WebSites/CustomUIIndex/CustomUIIndex.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
+    <StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
     <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 

test/WebSites/MvcWithNullable/MvcWithNullable.csproj

@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
-    <PackageReference Update="Microsoft.AspNetCore.OpenApi" VersionOverride="9.0.3" />
+    <PackageReference Update="Microsoft.AspNetCore.OpenApi" VersionOverride="9.0.5" />
   </ItemGroup>
 
 </Project>

test/WebSites/OAuth2Integration/OAuth2Integration.csproj

@@ -11,13 +11,13 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" VersionOverride="8.0.14" />
-    <PackageReference Include="Duende.IdentityServer" VersionOverride="7.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" VersionOverride="8.0.16" />
+    <PackageReference Include="Duende.IdentityServer" VersionOverride="7.2.3" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" VersionOverride="9.0.3" />
-    <PackageReference Include="Duende.IdentityServer" VersionOverride="7.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" VersionOverride="9.0.5" />
+    <PackageReference Include="Duende.IdentityServer" VersionOverride="7.2.3" />
   </ItemGroup>
 
 </Project>

test/WebSites/WebApi/WebApi.csproj

@@ -19,11 +19,11 @@
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-    <PackageReference Update="Microsoft.AspNetCore.OpenApi" VersionOverride="8.0.14" />
+    <PackageReference Update="Microsoft.AspNetCore.OpenApi" VersionOverride="8.0.16" />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
-    <PackageReference Update="Microsoft.AspNetCore.OpenApi" VersionOverride="9.0.3" />
+    <PackageReference Update="Microsoft.AspNetCore.OpenApi" VersionOverride="9.0.5" />
   </ItemGroup>
 
 </Project>