Skip to content

Commit 69d26c9

Browse files
modabasmodabas
authored
Dev (#38)
* - test projects target .net 8 and .net 9 - update deps to latest - bugfix resulving web result endpoint's preferred status code for .net 9 * - update deps - bump version
1 parent 2304584 commit 69d26c9

File tree

11 files changed

+48
-18
lines changed

11 files changed

+48
-18
lines changed

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1919
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
2020

21-
<Version>1.3.4</Version>
21+
<Version>1.3.5</Version>
2222
</PropertyGroup>
2323
</Project>

‎samples/ServiceEndpointClient/ServiceEndpointClient.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
10-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.6" />
9+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.7" />
10+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.7" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎samples/ShowcaseWebApi/ShowcaseWebApi.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.6" />
9-
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.4" />
8+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.7" />
9+
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3" />
1010
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
1111
<PackageReference Include="Asp.Versioning.Http" Version="8.1.0" />
1212
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />

‎samples/WeatherForecastWebApi/WeatherForecastWebApi.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.6" />
11-
<PackageReference Include="Scalar.AspNetCore" Version="2.4.13" />
10+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.7" />
11+
<PackageReference Include="Scalar.AspNetCore" Version="2.6.3" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎src/ModEndpoints.RemoteServices/ModEndpoints.RemoteServices.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.6" />
25-
<PackageReference Include="ModResults" Version="1.0.1" />
24+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.7" />
25+
<PackageReference Include="ModResults" Version="1.0.2" />
2626
</ItemGroup>
2727

2828
<ItemGroup>

‎src/ModEndpoints/ModEndpoints.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="ModResults.MinimalApis" Version="1.0.1" />
24+
<PackageReference Include="ModResults.MinimalApis" Version="1.0.2" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

‎src/ModEndpoints/[WebResultEndpoint]/DefaultPreferredSuccessStatusCodeCacheForResult.cs‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,19 @@ public class DefaultPreferredSuccessStatusCodeCacheForResult : IPreferredSuccess
4040
var producesList = endpoint
4141
.Metadata
4242
.GetOrderedMetadata<IProducesResponseTypeMetadata>();
43-
if (producesList is null || producesList.Count == 0)
43+
#if NET9_0
44+
// Exclude IResult responses with application/json content type for StatusCodes.Status200OK
45+
// .NET 9.0 adds it by default, so we filter it out while determining preferred status code
46+
// see https://github.com/dotnet/aspnetcore/issues/57801
47+
producesList = producesList.Where(p =>
48+
(p.StatusCode == StatusCodes.Status200OK &&
49+
p.ContentTypes.Count() == 1 &&
50+
p.ContentTypes.First() == "application/json" &&
51+
p.Type == typeof(IResult)) == false)
52+
.ToList()
53+
.AsReadOnly();
54+
#endif
55+
if (producesList.Count == 0)
4456
{
4557
return null;
4658
}

‎src/ModEndpoints/[WebResultEndpoint]/DefaultPreferredSuccessStatusCodeCacheForResultOfT.cs‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,19 @@ public class DefaultPreferredSuccessStatusCodeCacheForResultOfT : IPreferredSucc
4040
var producesList = endpoint
4141
.Metadata
4242
.GetOrderedMetadata<IProducesResponseTypeMetadata>();
43-
if (producesList is null || producesList.Count == 0)
43+
#if NET9_0
44+
// Exclude IResult responses with application/json content type for StatusCodes.Status200OK
45+
// .NET 9.0 adds it by default, so we filter it out while determining preferred status code
46+
// see https://github.com/dotnet/aspnetcore/issues/57801
47+
producesList = producesList.Where(p =>
48+
(p.StatusCode == StatusCodes.Status200OK &&
49+
p.ContentTypes.Count() == 1 &&
50+
p.ContentTypes.First() == "application/json" &&
51+
p.Type == typeof(IResult)) == false)
52+
.ToList()
53+
.AsReadOnly();
54+
#endif
55+
if (producesList.Count == 0)
4456
{
4557
return null;
4658
}

‎tests/ModEndpoints.TestServer.Customers/ModEndpoints.TestServer.Customers.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

‎tests/ModEndpoints.TestServer/ModEndpoints.TestServer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>

0 commit comments

Comments
 (0)