Skip to content

✅ Add tests verifying support of Swashbuckle V10 #25

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
desjoerd merged 1 commit into from
Nov 30, 2025
Merged

✅ Add tests verifying support of Swashbuckle V10 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 10 additions & 13 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
<Project>
<PropertyGroup>
<!-- Custom properties, which are used in the main projects -->
<OptionalValuesLibraryTargetFrameworks>net8.0;net9.0;net10.0</OptionalValuesLibraryTargetFrameworks>
<OptionalValuesSwashbuckleTargetFrameworks>net8.0;net9.0</OptionalValuesSwashbuckleTargetFrameworks>
<OptionalValuesOpenApiTargetFrameworks>net10.0</OptionalValuesOpenApiTargetFrameworks>
<OptionalValuesTestsTargetFrameworks>net8.0;net9.0;net10.0</OptionalValuesTestsTargetFrameworks>

<CommonPackageTags>optional partial json undefined jsonpatch jsonmergepatch patch
System.Text.Json Api unspecified</CommonPackageTags>
</PropertyGroup>
Expand Down Expand Up @@ -37,19 +31,19 @@
<DebugType>portable</DebugType>
</PropertyGroup>

<Sdk Name="DotNet.ReproducibleBuilds.Isolated" Version="1.2.39"/>
<Sdk Name="DotNet.ReproducibleBuilds.Isolated" Version="1.2.39" />

<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all"/>
<PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="All"/>
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
<PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="All" />
</ItemGroup>

<ItemGroup Condition="'$(IsPackable)' == 'true'">
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
</ItemGroup>

<!-- Common nuget package properties -->
Expand All @@ -70,8 +64,11 @@
</PropertyGroup>

<ItemGroup Condition="'$(IsPackable)' == 'true'">
<None Include="$(MSBuildThisFileDirectory)/README.md" CopyToPublishDirectory="Always" Pack="true" PackagePath="\" />
<None Include="$(MSBuildThisFileDirectory)/LICENSE" CopyToPublishDirectory="Always" Pack="true" PackagePath="\" />
<None Include="$(MSBuildThisFileDirectory)/assets/icon.png" CopyToPublishDirectory="Always" Pack="true" PackagePath="\" />
<None Include="$(MSBuildThisFileDirectory)/README.md" CopyToPublishDirectory="Always"
Pack="true" PackagePath="\" />
<None Include="$(MSBuildThisFileDirectory)/LICENSE" CopyToPublishDirectory="Always" Pack="true"
PackagePath="\" />
<None Include="$(MSBuildThisFileDirectory)/assets/icon.png" CopyToPublishDirectory="Always"
Pack="true" PackagePath="\" />
</ItemGroup>
</Project>
26 changes: 18 additions & 8 deletions OptionalValues.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,35 @@
</Folder>
<Folder Name="/examples/">
<Project Path="examples/OptionalValues.Examples.NSwag/OptionalValues.Examples.NSwag.csproj" />
<Project Path="examples/OptionalValues.Examples.Swashbuckle/OptionalValues.Examples.Swashbuckle.csproj" />
<Project Path="examples/OptionalValues.Examples.OpenApi/OptionalValues.Examples.OpenApi.csproj" Type="Classic C#" />
<Project
Path="examples/OptionalValues.Examples.Swashbuckle/OptionalValues.Examples.Swashbuckle.csproj" />
<Project Path="examples/OptionalValues.Examples.OpenApi/OptionalValues.Examples.OpenApi.csproj" />
</Folder>
<Folder Name="/src/">
<Project Path="src/OptionalValues.DataAnnotations/OptionalValues.DataAnnotations.csproj" />
<Project Path="src/OptionalValues.FluentValidation/OptionalValues.FluentValidation.csproj" />
<Project Path="src/OptionalValues.NSwag/OptionalValues.NSwag.csproj" />
<Project Path="src/OptionalValues.Swashbuckle/OptionalValues.Swashbuckle.csproj" />
<Project Path="src/OptionalValues/OptionalValues.csproj" />
<Project Path="src/OptionalValues.OpenApi/OptionalValues.OpenApi.csproj" Type="Classic C#" />
<Project Path="src/OptionalValues.OpenApi/OptionalValues.OpenApi.csproj" />
</Folder>
<Folder Name="/test/">
<Project Path="test/OptionalValues.Benchmarks/OptionalValues.Benchmarks.csproj" />
<Project Path="test/OptionalValues.DataAnnotations.Tests/OptionalValues.DataAnnotations.Tests.csproj" />
<Project Path="test/OptionalValues.FluentValidation.Tests/OptionalValues.FluentValidation.Tests.csproj" />
<Project
Path="test/OptionalValues.DataAnnotations.Tests/OptionalValues.DataAnnotations.Tests.csproj" />
<Project
Path="test/OptionalValues.FluentValidation.Tests/OptionalValues.FluentValidation.Tests.csproj" />
<Project Path="test/OptionalValues.NSwag.Tests/OptionalValues.NSwag.Tests.csproj" />
<Project Path="test/OptionalValues.Swashbuckle.Tests/OptionalValues.Swashbuckle.Tests.csproj" />
<Project
Path="test/OptionalValues.Swashbuckle.V7.Tests/OptionalValues.Swashbuckle.V7.Tests.csproj" />
<Project
Path="test/OptionalValues.Swashbuckle.V8.Tests/OptionalValues.Swashbuckle.V8.Tests.csproj" />
<Project
Path="test/OptionalValues.Swashbuckle.V9.Tests/OptionalValues.Swashbuckle.V9.Tests.csproj" />
<Project
Path="test/OptionalValues.Swashbuckle.V10.Tests/OptionalValues.Swashbuckle.V10.Tests.csproj" />
<Project Path="test/OptionalValues.Tests/OptionalValues.Tests.csproj" />
<Project Path="test\OptionalValues.OpenApi.TestApp\OptionalValues.OpenApi.TestApp.csproj" Type="Classic C#" />
<Project Path="test/OptionalValues.OpenApi.Tests/OptionalValues.OpenApi.Tests.csproj" Type="Classic C#" />
<Project Path="test/OptionalValues.OpenApi.TestApp/OptionalValues.OpenApi.TestApp.csproj" />
<Project Path="test/OptionalValues.OpenApi.Tests/OptionalValues.OpenApi.Tests.csproj" />
</Folder>
</Solution>
4 changes: 2 additions & 2 deletions src/OptionalValues.DataAnnotations/OptionalValues.DataAnnotations.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(OptionalValuesLibraryTargetFrameworks)</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>

<!-- CA1813: Avoid unsealed attributes -->
<NoWarn>$(NoWarn);CA1813</NoWarn>
Expand All @@ -15,7 +15,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\OptionalValues\OptionalValues.csproj"/>
<ProjectReference Include="..\OptionalValues\OptionalValues.csproj" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions src/OptionalValues.FluentValidation/OptionalValues.FluentValidation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(OptionalValuesLibraryTargetFrameworks)</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -12,11 +12,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentValidation"/>
<PackageReference Include="FluentValidation" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\OptionalValues\OptionalValues.csproj"/>
<ProjectReference Include="..\OptionalValues\OptionalValues.csproj" />
</ItemGroup>

</Project>
</Project>
2 changes: 1 addition & 1 deletion src/OptionalValues.NSwag/OptionalValues.NSwag.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(OptionalValuesLibraryTargetFrameworks)</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/OptionalValues.Swashbuckle/OptionalValues.Swashbuckle.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(OptionalValuesSwashbuckleTargetFrameworks)</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/OptionalValues/OptionalValues.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(OptionalValuesLibraryTargetFrameworks)</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -15,7 +15,7 @@
<ItemGroup Condition="$(TargetFramework) == 'netstandard2.0'">
<PackageReference Include="System.Text.Json" />
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="OptionalValues.DataAnnotations" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/OptionalValues.Benchmarks/OptionalValues.Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand Down
17 changes: 9 additions & 8 deletions test/OptionalValues.DataAnnotations.Tests/OptionalValues.DataAnnotations.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(OptionalValuesTestsTargetFrameworks)</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand All @@ -10,22 +10,23 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector"/>
<PackageReference Include="Microsoft.NET.Test.Sdk"/>
<PackageReference Include="Shouldly"/>
<PackageReference Include="xunit"/>
<PackageReference Include="coverlet.collector" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Shouldly" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<Using Include="Xunit"/>
<Using Include="Xunit" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\OptionalValues.DataAnnotations\OptionalValues.DataAnnotations.csproj"/>
<ProjectReference
Include="..\..\src\OptionalValues.DataAnnotations\OptionalValues.DataAnnotations.csproj" />
</ItemGroup>

</Project>
</Project>
17 changes: 9 additions & 8 deletions test/OptionalValues.FluentValidation.Tests/OptionalValues.FluentValidation.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(OptionalValuesTestsTargetFrameworks)</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand All @@ -10,22 +10,23 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector"/>
<PackageReference Include="Microsoft.NET.Test.Sdk"/>
<PackageReference Include="Shouldly"/>
<PackageReference Include="xunit"/>
<PackageReference Include="coverlet.collector" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Shouldly" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<Using Include="Xunit"/>
<Using Include="Xunit" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\OptionalValues.FluentValidation\OptionalValues.FluentValidation.csproj"/>
<ProjectReference
Include="..\..\src\OptionalValues.FluentValidation\OptionalValues.FluentValidation.csproj" />
</ItemGroup>

</Project>
</Project>
16 changes: 8 additions & 8 deletions test/OptionalValues.NSwag.Tests/OptionalValues.NSwag.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(OptionalValuesTestsTargetFrameworks)</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand All @@ -10,24 +10,24 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector"/>
<PackageReference Include="Microsoft.NET.Test.Sdk"/>
<PackageReference Include="coverlet.collector" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="NJsonSchema" />
<PackageReference Include="NSwag.AspNetCore" />
<PackageReference Include="Shouldly"/>
<PackageReference Include="xunit"/>
<PackageReference Include="Shouldly" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<Using Include="Xunit"/>
<Using Include="Xunit" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\OptionalValues.NSwag\OptionalValues.NSwag.csproj"/>
<ProjectReference Include="..\..\src\OptionalValues.NSwag\OptionalValues.NSwag.csproj" />
</ItemGroup>

</Project>
</Project>
31 changes: 0 additions & 31 deletions test/OptionalValues.Swashbuckle.Tests/OptionalValues.Swashbuckle.Tests.csproj
View file
Open in desktop

This file was deleted.

37 changes: 37 additions & 0 deletions test/OptionalValues.Swashbuckle.V10.Tests/OptionalValues.Swashbuckle.V10.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>

<ItemGroup>
<!-- V10 uses a different test file due to Microsoft.OpenApi 2.x API changes -->
</ItemGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Shouldly" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" VersionOverride="10.0.1" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<Using Include="Xunit" />
</ItemGroup>

<ItemGroup>
<ProjectReference
Include="..\..\src\OptionalValues.Swashbuckle\OptionalValues.Swashbuckle.csproj" />
</ItemGroup>

</Project>
Loading